+7 -1

appview/db/db.go

reviewed

··· 567 567 unique (from_at, to_at) 568 568 ); 569 569 570 570 + create table if not exists knot_preferences ( 571 571 + id integer primary key autoincrement, 572 572 + user_did text not null unique, 573 573 + default_knot text 574 574 + ); 575 575 + 570 576 create table if not exists migrations ( 571 577 id integer primary key autoincrement, 572 578 name text unique ··· 1078 1084 // transfer data, constructing pull_at from pulls table 1079 1085 _, err = tx.Exec(` 1080 1086 insert into pull_submissions_new (id, pull_at, round_number, patch, created) 1081 1081 - select 1087 1087 + select 1082 1088 ps.id, 1083 1089 'at://' || p.owner_did || '/sh.tangled.repo.pull/' || p.rkey, 1084 1090 ps.round_number,

+42

appview/db/preferences.go

reviewed

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + 6 6 + "tangled.org/core/appview/models" 7 7 + ) 8 8 + 9 9 + func GetKnotPreference(e Execer, did string) (*models.KnotPreference, error) { 10 10 + var knotPreference models.KnotPreference 11 11 + 12 12 + err := e.QueryRow( 13 13 + `select id, user_did, default_knot from knot_preferences where user_did = ?`, 14 14 + did, 15 15 + ).Scan(&knotPreference.ID, &knotPreference.Did, &knotPreference.DefaultKnot) 16 16 + if err == sql.ErrNoRows { 17 17 + return nil, nil 18 18 + } 19 19 + 20 20 + if err != nil { 21 21 + return nil, err 22 22 + } 23 23 + 24 24 + return &knotPreference, nil 25 25 + } 26 26 + 27 27 + func UpsertKnotPreference(e Execer, did, defaultKnot string) error { 28 28 + _, err := e.Exec( 29 29 + `insert or replace into knot_preferences ( 30 30 + user_did, 31 31 + default_knot 32 32 + ) 33 33 + values (?, ?)`, 34 34 + did, 35 35 + defaultKnot, 36 36 + ) 37 37 + if err != nil { 38 38 + return err 39 39 + } 40 40 + 41 41 + return nil 42 42 + }

+22 -4

appview/knots/knots.go

reviewed

··· 81 81 return 82 82 } 83 83 84 84 + availableKnots, err := k.Enforcer.GetKnotsForUser(user.Did()) 85 85 + if err != nil { 86 86 + k.Logger.Error("failed to fetch available knots for user", "err", err) 87 87 + w.WriteHeader(http.StatusInternalServerError) 88 88 + return 89 89 + } 90 90 + 91 91 + defaultKnot := "" 92 92 + knotPrefence, err := db.GetKnotPreference(k.Db, user.Did()) 93 93 + if err != nil { 94 94 + k.Logger.Warn("gettings users knot preferences", "error", err) 95 95 + } 96 96 + if knotPrefence != nil { 97 97 + defaultKnot = knotPrefence.DefaultKnot 98 98 + } 99 99 + 84 100 k.Pages.Knots(w, pages.KnotsParams{ 85 85 - LoggedInUser: user, 86 86 - Registrations: registrations, 87 87 - Tabs: knotsTabs, 88 88 - Tab: "knots", 101 101 + LoggedInUser: user, 102 102 + Registrations: registrations, 103 103 + Tabs: knotsTabs, 104 104 + Tab: "knots", 105 105 + AvailableKnots: availableKnots, 106 106 + DefaultKnot: defaultKnot, 89 107 }) 90 108 } 91 109

+7

appview/models/preferences.go

reviewed

··· 1 1 + package models 2 2 + 3 3 + type KnotPreference struct { 4 4 + ID int 5 5 + Did string 6 6 + DefaultKnot string 7 7 + }

+8 -4

appview/pages/pages.go

reviewed

··· 417 417 } 418 418 419 419 type KnotsParams struct { 420 420 - LoggedInUser *oauth.MultiAccountUser 421 421 - Registrations []models.Registration 422 422 - Tabs []map[string]any 423 423 - Tab string 420 420 + LoggedInUser *oauth.MultiAccountUser 421 421 + Registrations []models.Registration 422 422 + Tabs []map[string]any 423 423 + Tab string 424 424 + AvailableKnots []string 425 425 + DefaultKnot string 424 426 } 425 427 426 428 func (p *Pages) Knots(w io.Writer, params KnotsParams) error { ··· 486 488 type NewRepoParams struct { 487 489 LoggedInUser *oauth.MultiAccountUser 488 490 Knots []string 491 491 + DefaultKnot string 489 492 } 490 493 491 494 func (p *Pages) NewRepo(w io.Writer, params NewRepoParams) error { ··· 496 499 LoggedInUser *oauth.MultiAccountUser 497 500 Knots []string 498 501 RepoInfo repoinfo.RepoInfo 502 502 + DefaultKnot string 499 503 } 500 504 501 505 func (p *Pages) ForkRepo(w io.Writer, params ForkRepoParams) error {

+28

appview/pages/templates/knots/index.html

reviewed

··· 31 31 <div class="flex flex-col gap-6"> 32 32 {{ block "list" . }} {{ end }} 33 33 {{ block "register" . }} {{ end }} 34 34 + {{ block "default-knot" . }} {{ end }} 34 35 </div> 35 36 </section> 36 37 {{ end }} ··· 60 61 </div> 61 62 <div id="operation-error" class="text-red-500 dark:text-red-400"></div> 62 63 </section> 64 64 + {{ end }} 65 65 + 66 66 + {{ define "default-knot" }} 67 67 + <section class="rounded w-full flex flex-col gap-2"> 68 68 + <h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">default knot</h2> 69 69 + <form hx-post="/profile/default-knot" class="col-span-1 md:col-span-1 md:justify-self-end group flex gap-2 items-stretch"> 70 70 + <select 71 71 + id="default-knot" 72 72 + name="default-knot" 73 73 + required 74 74 + class="p-1 max-w-64 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"> 75 75 + {{/* For some reason, we can't use an empty string in a <select> in all scenarios unless it is preceded by a disabled select?? No idea, could just be a Firefox thing? */}} 76 76 + <option value="[[none]]" class="py-1" {{ if not $.DefaultKnot }}selected{{ end }}> 77 77 + Choose a default knot 78 78 + </option> 79 79 + {{ range $.AvailableKnots }} 80 80 + <option value="{{ . }}" class="py-1" {{ if eq . $.DefaultKnot }}selected{{ end }}> 81 81 + {{ . }} 82 82 + </option> 83 83 + {{ end }} 84 84 + </select> 85 85 + <button class="btn flex gap-2 items-center" type="submit"> 86 86 + {{ i "check" "size-4" }} 87 87 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 88 88 + </button> 89 89 + </form> 90 90 + </section> 63 91 {{ end }} 64 92 65 93 {{ define "register" }}

+3 -1

appview/pages/templates/repo/fork.html

reviewed

··· 25 25 value="{{ . }}" 26 26 class="mr-2" 27 27 id="domain-{{ . }}" 28 28 - {{if eq (len $.Knots) 1}}checked{{end}} 28 28 + {{if eq (len $.Knots) 1}}checked 29 29 + {{else if eq $.DefaultKnot . }}checked 30 30 + {{end}} 29 31 /> 30 32 <label for="domain-{{ . }}" class="dark:text-white">{{ . }}</label> 31 33 </div>

+3 -1

appview/pages/templates/repo/new.html

reviewed

··· 155 155 class="mr-2" 156 156 id="domain-{{ . }}" 157 157 required 158 158 - {{if eq (len $.Knots) 1}}checked{{end}} 158 158 + {{if eq (len $.Knots) 1}}checked 159 159 + {{else if eq $.DefaultKnot . }}checked 160 160 + {{end}} 159 161 /> 160 162 <label for="domain-{{ . }}" class="dark:text-white lowercase">{{ . }}</label> 161 163 </div>

+10

appview/repo/repo.go

reviewed

··· 1004 1004 return 1005 1005 } 1006 1006 1007 1007 + defaultKnot := "" 1008 1008 + knotPrefence, err := db.GetKnotPreference(rp.db, user.Did()) 1009 1009 + if err != nil { 1010 1010 + rp.logger.Warn("gettings users knot preferences", "error", err) 1011 1011 + } 1012 1012 + if knotPrefence != nil { 1013 1013 + defaultKnot = knotPrefence.DefaultKnot 1014 1014 + } 1015 1015 + 1007 1016 rp.pages.ForkRepo(w, pages.ForkRepoParams{ 1008 1017 LoggedInUser: user, 1009 1018 Knots: knots, 1010 1019 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 1020 1020 + DefaultKnot: defaultKnot, 1011 1021 }) 1012 1022 1013 1023 case http.MethodPost:

+23

appview/state/profile.go

reviewed

··· 616 616 s.updateProfile(profile, w, r) 617 617 } 618 618 619 619 + func (s *State) UpdateDefaultKnotPreference(w http.ResponseWriter, r *http.Request) { 620 620 + err := r.ParseForm() 621 621 + if err != nil { 622 622 + log.Println("invalid preference update form", err) 623 623 + return 624 624 + } 625 625 + user := s.oauth.GetMultiAccountUser(r) 626 626 + 627 627 + defaultKnot := r.Form.Get("default-knot") 628 628 + 629 629 + if defaultKnot == "[[none]]" { // see pages/templates/knots/index.html for more info on why we use this value 630 630 + defaultKnot = "" 631 631 + } 632 632 + 633 633 + err = db.UpsertKnotPreference(s.db, user.Did(), defaultKnot) 634 634 + if err != nil { 635 635 + log.Println("failed to update default knot preference", err) 636 636 + return 637 637 + } 638 638 + 639 639 + s.pages.HxRefresh(w) 640 640 + } 641 641 + 619 642 func (s *State) updateProfile(profile *models.Profile, w http.ResponseWriter, r *http.Request) { 620 643 user := s.oauth.GetMultiAccountUser(r) 621 644 tx, err := s.db.BeginTx(r.Context(), nil)

+1

appview/state/router.go

reviewed

··· 165 165 r.Get("/edit-pins", s.EditPinsFragment) 166 166 r.Post("/bio", s.UpdateProfileBio) 167 167 r.Post("/pins", s.UpdateProfilePins) 168 168 + r.Post("/default-knot", s.UpdateDefaultKnotPreference) 168 169 }) 169 170 170 171 r.Mount("/settings", s.SettingsRouter())

+10

appview/state/state.go

reviewed

··· 418 418 return 419 419 } 420 420 421 421 + defaultKnot := "" 422 422 + knotPrefence, err := db.GetKnotPreference(s.db, user.Did()) 423 423 + if err != nil { 424 424 + s.logger.Warn("gettings users knot preferences", "error", err) 425 425 + } 426 426 + if knotPrefence != nil { 427 427 + defaultKnot = knotPrefence.DefaultKnot 428 428 + } 429 429 + 421 430 s.pages.NewRepo(w, pages.NewRepoParams{ 422 431 LoggedInUser: user, 423 432 Knots: knots, 433 433 + DefaultKnot: defaultKnot, 424 434 }) 425 435 426 436 case http.MethodPost: