willdot.net
forked from
tangled.org/core
Monorepo for Tangled
appview: allows a default knot to be configured
Signed-off-by: Will Andrews <will7989@hotmail.com>
+116
-7
+8
-1
appview/db/db.go
+8
-1
appview/db/db.go
···
1078
1078
// transfer data, constructing pull_at from pulls table
1079
1079
_, err = tx.Exec(`
1080
1080
insert into pull_submissions_new (id, pull_at, round_number, patch, created)
1081
-
select
1081
+
select
1082
1082
ps.id,
1083
1083
'at://' || p.owner_did || '/sh.tangled.repo.pull/' || p.rkey,
1084
1084
ps.round_number,
···
1170
1170
create index if not exists idx_stars_created on stars(created);
1171
1171
create index if not exists idx_stars_subject_at_created on stars(subject_at, created);
1172
1172
`)
1173
+
return err
1174
+
})
1175
+
1176
+
orm.RunMigration(conn, logger, "add-default-knot-profile", func(tx *sql.Tx) error {
1177
+
_, err := tx.Exec(`
1178
+
alter table profile add column default_knot text;
1179
+
`)
1173
1180
return err
1174
1181
})
1175
1182
+11
-4
appview/db/profile.go
+11
-4
appview/db/profile.go
···
138
138
description,
139
139
include_bluesky,
140
140
location,
141
-
pronouns
141
+
pronouns,
142
+
default_knot
142
143
)
143
-
values (?, ?, ?, ?, ?)`,
144
+
values (?, ?, ?, ?, ?, ? )`,
144
145
profile.Did,
145
146
profile.Description,
146
147
includeBskyValue,
147
148
profile.Location,
148
149
profile.Pronouns,
150
+
profile.DefaultKnot,
149
151
)
150
152
151
153
if err != nil {
···
324
326
func GetProfile(e Execer, did string) (*models.Profile, error) {
325
327
var profile models.Profile
326
328
var pronouns sql.Null[string]
329
+
var defaultKnot sql.Null[string]
327
330
328
331
profile.Did = did
329
332
330
333
includeBluesky := 0
331
334
332
335
err := e.QueryRow(
333
-
`select description, include_bluesky, location, pronouns from profile where did = ?`,
336
+
`select description, include_bluesky, location, pronouns, default_knot from profile where did = ?`,
334
337
did,
335
-
).Scan(&profile.Description, &includeBluesky, &profile.Location, &pronouns)
338
+
).Scan(&profile.Description, &includeBluesky, &profile.Location, &pronouns, &defaultKnot)
336
339
if err == sql.ErrNoRows {
337
340
profile := models.Profile{}
338
341
profile.Did = did
···
349
352
350
353
if pronouns.Valid {
351
354
profile.Pronouns = pronouns.V
355
+
}
356
+
357
+
if defaultKnot.Valid {
358
+
profile.DefaultKnot = defaultKnot.V
352
359
}
353
360
354
361
rows, err := e.Query(`select link from profile_links where did = ?`, did)
+10
appview/knots/knots.go
+10
appview/knots/knots.go
···
81
81
return
82
82
}
83
83
84
+
defaultKnot := ""
85
+
profile, err := db.GetProfile(k.Db, user.Did())
86
+
if err != nil {
87
+
k.Logger.Warn("gettings user profile to get default knot", "error", err)
88
+
}
89
+
if profile != nil {
90
+
defaultKnot = profile.DefaultKnot
91
+
}
92
+
84
93
k.Pages.Knots(w, pages.KnotsParams{
85
94
LoggedInUser: user,
86
95
Registrations: registrations,
87
96
Tabs: knotsTabs,
88
97
Tab: "knots",
98
+
DefaultKnot: defaultKnot,
89
99
})
90
100
}
91
101
+1
appview/models/profile.go
+1
appview/models/profile.go
+3
appview/pages/pages.go
+3
appview/pages/pages.go
···
421
421
Registrations []models.Registration
422
422
Tabs []map[string]any
423
423
Tab string
424
+
DefaultKnot string
424
425
}
425
426
426
427
func (p *Pages) Knots(w io.Writer, params KnotsParams) error {
···
486
487
type NewRepoParams struct {
487
488
LoggedInUser *oauth.MultiAccountUser
488
489
Knots []string
490
+
DefaultKnot string
489
491
}
490
492
491
493
func (p *Pages) NewRepo(w io.Writer, params NewRepoParams) error {
···
496
498
LoggedInUser *oauth.MultiAccountUser
497
499
Knots []string
498
500
RepoInfo repoinfo.RepoInfo
501
+
DefaultKnot string
499
502
}
500
503
501
504
func (p *Pages) ForkRepo(w io.Writer, params ForkRepoParams) error {
+24
appview/pages/templates/knots/index.html
+24
appview/pages/templates/knots/index.html
···
31
31
<div class="flex flex-col gap-6">
32
32
{{ block "list" . }} {{ end }}
33
33
{{ block "register" . }} {{ end }}
34
+
{{ block "default-knot" . }} {{ end }}
34
35
</div>
35
36
</section>
36
37
{{ end }}
···
59
60
{{ end }}
60
61
</div>
61
62
<div id="operation-error" class="text-red-500 dark:text-red-400"></div>
63
+
</section>
64
+
{{ end }}
65
+
66
+
{{ define "default-knot" }}
67
+
<section class="rounded w-full flex flex-col gap-2">
68
+
<h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">default knot</h2>
69
+
<select id="default-knot" name="default-knot"
70
+
class="p-1 max-w-64 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"
71
+
hx-post="/profile/default-knot"
72
+
hx-swap="none"
73
+
name="default-knot">
74
+
<option value="" >
75
+
Choose a default Knot
76
+
</option>
77
+
<option value="knot1.tangled.sh" {{if eq $.DefaultKnot "knot1.tangled.sh"}}selected{{end}} >
78
+
knot1.tangled.sh
79
+
</option>
80
+
{{ range $registration := .Registrations }}
81
+
<option value="{{ .Domain }}" class="py-1" {{if eq $.DefaultKnot .Domain}}selected{{end}}>
82
+
{{ .Domain }}
83
+
</option>
84
+
{{ end }}
85
+
</select>
62
86
</section>
63
87
{{ end }}
64
88
+3
-1
appview/pages/templates/repo/fork.html
+3
-1
appview/pages/templates/repo/fork.html
···
25
25
value="{{ . }}"
26
26
class="mr-2"
27
27
id="domain-{{ . }}"
28
-
{{if eq (len $.Knots) 1}}checked{{end}}
28
+
{{if eq (len $.Knots) 1}}checked
29
+
{{else if eq $.DefaultKnot . }}checked
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
+3
-1
appview/pages/templates/repo/new.html
···
155
155
class="mr-2"
156
156
id="domain-{{ . }}"
157
157
required
158
-
{{if eq (len $.Knots) 1}}checked{{end}}
158
+
{{if eq (len $.Knots) 1}}checked
159
+
{{else if eq $.DefaultKnot . }}checked
160
+
{{end}}
159
161
/>
160
162
<label for="domain-{{ . }}" class="dark:text-white lowercase">{{ . }}</label>
161
163
</div>
+10
appview/repo/repo.go
+10
appview/repo/repo.go
···
1004
1004
return
1005
1005
}
1006
1006
1007
+
defaultKnot := ""
1008
+
profile, err := db.GetProfile(rp.db, user.Did())
1009
+
if err != nil {
1010
+
rp.logger.Warn("gettings user profile to get default knot", "error", err)
1011
+
}
1012
+
if profile != nil {
1013
+
defaultKnot = profile.DefaultKnot
1014
+
}
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
+
DefaultKnot: defaultKnot,
1011
1021
})
1012
1022
1013
1023
case http.MethodPost:
+32
appview/state/profile.go
+32
appview/state/profile.go
···
616
616
s.updateProfile(profile, w, r)
617
617
}
618
618
619
+
func (s *State) UpdateProfileDefaultKnot(w http.ResponseWriter, r *http.Request) {
620
+
err := r.ParseForm()
621
+
if err != nil {
622
+
log.Println("invalid profile update form", err)
623
+
return
624
+
}
625
+
user := s.oauth.GetUser(r)
626
+
627
+
profile, err := db.GetProfile(s.db, user.Did)
628
+
if err != nil {
629
+
log.Printf("getting profile data for %s: %s", user.Did, err)
630
+
}
631
+
632
+
if profile == nil {
633
+
return
634
+
}
635
+
636
+
profile.DefaultKnot = r.Form.Get("default-knot")
637
+
638
+
tx, err := s.db.BeginTx(r.Context(), nil)
639
+
if err != nil {
640
+
log.Println("failed to start transaction", err)
641
+
return
642
+
}
643
+
644
+
err = db.UpsertProfile(tx, profile)
645
+
if err != nil {
646
+
log.Println("failed to update profile", err)
647
+
return
648
+
}
649
+
}
650
+
619
651
func (s *State) updateProfile(profile *models.Profile, w http.ResponseWriter, r *http.Request) {
620
652
user := s.oauth.GetMultiAccountUser(r)
621
653
tx, err := s.db.BeginTx(r.Context(), nil)
+1
appview/state/router.go
+1
appview/state/router.go
+10
appview/state/state.go
+10
appview/state/state.go
···
418
418
return
419
419
}
420
420
421
+
defaultKnot := ""
422
+
profile, err := db.GetProfile(s.db, user.Did())
423
+
if err != nil {
424
+
s.logger.Warn("gettings user profile to get default knot", "error", err)
425
+
}
426
+
if profile != nil {
427
+
defaultKnot = profile.DefaultKnot
428
+
}
429
+
421
430
s.pages.NewRepo(w, pages.NewRepoParams{
422
431
LoggedInUser: user,
423
432
Knots: knots,
433
+
DefaultKnot: defaultKnot,
424
434
})
425
435
426
436
case http.MethodPost: