+8 -9

appview/issues/issues.go

··· 129 129 } 130 130 131 131 rp.pages.RepoSingleIssue(w, pages.RepoSingleIssueParams{ 132 132 - LoggedInUser: user, 133 133 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 134 134 - Issue: issue, 135 135 - CommentList: issue.CommentList(), 136 136 - Backlinks: backlinks, 137 137 - OrderedReactionKinds: models.OrderedReactionKinds, 138 138 - Reactions: reactionMap, 139 139 - UserReacted: userReactions, 140 140 - LabelDefs: defs, 132 132 + LoggedInUser: user, 133 133 + RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 134 134 + Issue: issue, 135 135 + CommentList: issue.CommentList(), 136 136 + Backlinks: backlinks, 137 137 + Reactions: reactionMap, 138 138 + UserReacted: userReactions, 139 139 + LabelDefs: defs, 141 140 }) 142 141 } 143 142

-15

appview/knots/knots.go

··· 40 40 Knotstream *eventconsumer.Consumer 41 41 } 42 42 43 43 - type tab = map[string]any 44 44 - 45 45 - var ( 46 46 - knotsTabs []tab = []tab{ 47 47 - {"Name": "profile", "Icon": "user"}, 48 48 - {"Name": "keys", "Icon": "key"}, 49 49 - {"Name": "emails", "Icon": "mail"}, 50 50 - {"Name": "notifications", "Icon": "bell"}, 51 51 - {"Name": "knots", "Icon": "volleyball"}, 52 52 - {"Name": "spindles", "Icon": "spool"}, 53 53 - } 54 54 - ) 55 55 - 56 43 func (k *Knots) Router() http.Handler { 57 44 r := chi.NewRouter() 58 45 ··· 84 71 k.Pages.Knots(w, pages.KnotsParams{ 85 72 LoggedInUser: user, 86 73 Registrations: registrations, 87 87 - Tabs: knotsTabs, 88 74 Tab: "knots", 89 75 }) 90 76 } ··· 148 134 Members: members, 149 135 Repos: repoMap, 150 136 IsOwner: true, 151 151 - Tabs: knotsTabs, 152 137 Tab: "knots", 153 138 }) 154 139 }

+22

appview/pages/funcmap.go

··· 32 32 "tangled.org/core/crypto" 33 33 ) 34 34 35 35 + type tab map[string]string 36 36 + 35 37 func (p *Pages) funcMap() template.FuncMap { 36 38 return template.FuncMap{ 37 39 "split": func(s string) []string { ··· 384 386 return "error" 385 387 } 386 388 return fp 389 389 + }, 390 390 + // constant values used to define a template 391 391 + "const": func() map[string]any { 392 392 + return map[string]any{ 393 393 + "OrderedReactionKinds": models.OrderedReactionKinds, 394 394 + // would be great to have ordered maps right about now 395 395 + "UserSettingsTabs": []tab{ 396 396 + {"Name": "profile", "Icon": "user"}, 397 397 + {"Name": "keys", "Icon": "key"}, 398 398 + {"Name": "emails", "Icon": "mail"}, 399 399 + {"Name": "notifications", "Icon": "bell"}, 400 400 + {"Name": "knots", "Icon": "volleyball"}, 401 401 + {"Name": "spindles", "Icon": "spool"}, 402 402 + }, 403 403 + "RepoSettingsTabs": []tab{ 404 404 + {"Name": "general", "Icon": "sliders-horizontal"}, 405 405 + {"Name": "access", "Icon": "users"}, 406 406 + {"Name": "pipelines", "Icon": "layers-2"}, 407 407 + }, 408 408 + } 387 409 }, 388 410 } 389 411 }

+23 -42

appview/pages/pages.go

··· 336 336 337 337 type UserProfileSettingsParams struct { 338 338 LoggedInUser *oauth.User 339 339 - Tabs []map[string]any 340 339 Tab string 341 340 } 342 341 ··· 375 374 type UserKeysSettingsParams struct { 376 375 LoggedInUser *oauth.User 377 376 PubKeys []models.PublicKey 378 378 - Tabs []map[string]any 379 377 Tab string 380 378 } 381 379 ··· 386 384 type UserEmailsSettingsParams struct { 387 385 LoggedInUser *oauth.User 388 386 Emails []models.Email 389 389 - Tabs []map[string]any 390 387 Tab string 391 388 } 392 389 ··· 397 394 type UserNotificationSettingsParams struct { 398 395 LoggedInUser *oauth.User 399 396 Preferences *models.NotificationPreferences 400 400 - Tabs []map[string]any 401 397 Tab string 402 398 } 403 399 ··· 417 413 type KnotsParams struct { 418 414 LoggedInUser *oauth.User 419 415 Registrations []models.Registration 420 420 - Tabs []map[string]any 421 416 Tab string 422 417 } 423 418 ··· 431 426 Members []string 432 427 Repos map[string][]models.Repo 433 428 IsOwner bool 434 434 - Tabs []map[string]any 435 429 Tab string 436 430 } 437 431 ··· 450 444 type SpindlesParams struct { 451 445 LoggedInUser *oauth.User 452 446 Spindles []models.Spindle 453 453 - Tabs []map[string]any 454 447 Tab string 455 448 } 456 449 ··· 460 453 461 454 type SpindleListingParams struct { 462 455 models.Spindle 463 463 - Tabs []map[string]any 464 464 - Tab string 456 456 + Tab string 465 457 } 466 458 467 459 func (p *Pages) SpindleListing(w io.Writer, params SpindleListingParams) error { ··· 473 465 Spindle models.Spindle 474 466 Members []string 475 467 Repos map[string][]models.Repo 476 476 - Tabs []map[string]any 477 468 Tab string 478 469 } 479 470 ··· 612 603 } 613 604 614 605 type FollowFragmentParams struct { 615 615 - UserDid string 616 616 - FollowStatus models.FollowStatus 617 617 - FollowersCount int64 606 606 + UserDid string 607 607 + FollowStatus models.FollowStatus 618 608 } 619 609 620 610 func (p *Pages) FollowFragment(w io.Writer, params FollowFragmentParams) error { 621 621 - return p.executePlain("user/fragments/follow-oob", w, params) 611 611 + return p.executePlain("user/fragments/follow", w, params) 622 612 } 623 613 624 614 type EditBioParams struct { ··· 649 639 IsStarred bool 650 640 SubjectAt syntax.ATURI 651 641 StarCount int 652 652 - HxSwapOob bool 653 642 } 654 643 655 644 func (p *Pages) StarBtnFragment(w io.Writer, params StarBtnFragmentParams) error { 656 656 - params.HxSwapOob = true 657 657 - return p.executePlain("fragments/starBtn", w, params) 645 645 + return p.executePlain("fragments/starBtn-oob", w, params) 658 646 } 659 647 660 648 type RepoIndexParams struct { ··· 884 872 SubscribedLabels map[string]struct{} 885 873 ShouldSubscribeAll bool 886 874 Active string 887 887 - Tabs []map[string]any 888 875 Tab string 889 876 Branches []types.Branch 890 877 } ··· 898 885 LoggedInUser *oauth.User 899 886 RepoInfo repoinfo.RepoInfo 900 887 Active string 901 901 - Tabs []map[string]any 902 888 Tab string 903 889 Collaborators []Collaborator 904 890 } ··· 912 898 LoggedInUser *oauth.User 913 899 RepoInfo repoinfo.RepoInfo 914 900 Active string 915 915 - Tabs []map[string]any 916 901 Tab string 917 902 Spindles []string 918 903 CurrentSpindle string ··· 950 935 Backlinks []models.RichReferenceLink 951 936 LabelDefs map[string]*models.LabelDefinition 952 937 953 953 - OrderedReactionKinds []models.ReactionKind 954 954 - Reactions map[models.ReactionKind]models.ReactionDisplayData 955 955 - UserReacted map[models.ReactionKind]bool 938 938 + Reactions map[models.ReactionKind]models.ReactionDisplayData 939 939 + UserReacted map[models.ReactionKind]bool 956 940 } 957 941 958 942 func (p *Pages) RepoSingleIssue(w io.Writer, params RepoSingleIssueParams) error { ··· 1107 1091 ResubmitCheck ResubmitResult 1108 1092 Pipelines map[string]models.Pipeline 1109 1093 1110 1110 - OrderedReactionKinds []models.ReactionKind 1111 1111 - Reactions map[models.ReactionKind]models.ReactionDisplayData 1112 1112 - UserReacted map[models.ReactionKind]bool 1094 1094 + Reactions map[models.ReactionKind]models.ReactionDisplayData 1095 1095 + UserReacted map[models.ReactionKind]bool 1113 1096 1114 1097 LabelDefs map[string]*models.LabelDefinition 1115 1098 } ··· 1120 1103 } 1121 1104 1122 1105 type RepoPullPatchParams struct { 1123 1123 - LoggedInUser *oauth.User 1124 1124 - RepoInfo repoinfo.RepoInfo 1125 1125 - Pull *models.Pull 1126 1126 - Stack models.Stack 1127 1127 - Diff *types.NiceDiff 1128 1128 - Round int 1129 1129 - Submission *models.PullSubmission 1130 1130 - OrderedReactionKinds []models.ReactionKind 1131 1131 - DiffOpts types.DiffOpts 1106 1106 + LoggedInUser *oauth.User 1107 1107 + RepoInfo repoinfo.RepoInfo 1108 1108 + Pull *models.Pull 1109 1109 + Stack models.Stack 1110 1110 + Diff *types.NiceDiff 1111 1111 + Round int 1112 1112 + Submission *models.PullSubmission 1113 1113 + DiffOpts types.DiffOpts 1132 1114 } 1133 1115 1134 1116 // this name is a mouthful ··· 1137 1119 } 1138 1120 1139 1121 type RepoPullInterdiffParams struct { 1140 1140 - LoggedInUser *oauth.User 1141 1141 - RepoInfo repoinfo.RepoInfo 1142 1142 - Pull *models.Pull 1143 1143 - Round int 1144 1144 - Interdiff *patchutil.InterdiffResult 1145 1145 - OrderedReactionKinds []models.ReactionKind 1146 1146 - DiffOpts types.DiffOpts 1122 1122 + LoggedInUser *oauth.User 1123 1123 + RepoInfo repoinfo.RepoInfo 1124 1124 + Pull *models.Pull 1125 1125 + Round int 1126 1126 + Interdiff *patchutil.InterdiffResult 1127 1127 + DiffOpts types.DiffOpts 1147 1128 } 1148 1129 1149 1130 // this name is a mouthful

+5

appview/pages/templates/fragments/starBtn-oob.html

··· 1 1 + {{ define "fragments/starBtn-oob" }} 2 2 + <div hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]'> 3 3 + {{ template "fragments/starBtn" . }} 4 4 + </div> 5 5 + {{ end }}

-1

appview/pages/templates/fragments/starBtn.html

··· 9 9 {{ else }} 10 10 hx-post="/star?subject={{ .SubjectAt }}&countHint={{ .StarCount }}" 11 11 {{ end }} 12 12 - {{ if .HxSwapOob }}hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]'{{ end }} 13 12 14 13 hx-trigger="click" 15 14 hx-disabled-elt="#starBtn"

+2 -2

appview/pages/templates/layouts/fragments/footer.html

··· 47 47 48 48 <!-- Right section --> 49 49 <div class="text-right"> 50 50 - <div class="text-xs">&copy; 2026 Tangled Labs Oy. All rights reserved.</div> 50 50 + <div class="text-xs">&copy; 2025 Tangled Labs Oy. All rights reserved.</div> 51 51 </div> 52 52 </div> 53 53 ··· 93 93 </div> 94 94 95 95 <div class="text-center"> 96 96 - <div class="text-xs">&copy; 2026 Tangled Labs Oy. All rights reserved.</div> 96 96 + <div class="text-xs">&copy; 2025 Tangled Labs Oy. All rights reserved.</div> 97 97 </div> 98 98 </div> 99 99 </div>

+50

appview/pages/templates/repo/fragments/reactions.html

··· 1 1 + {{ define "repo/fragments/reactions" }} 2 2 + <div class="flex flex-wrap items-center gap-2"> 3 3 + {{- $reactions := .Reactions -}} 4 4 + {{- $userReacted := .UserReacted -}} 5 5 + {{- $threadAt := .ThreadAt -}} 6 6 + 7 7 + {{ template "reactionsPopup" }} 8 8 + {{ range $kind := const.OrderedReactionKinds }} 9 9 + {{ $reactionData := index $reactions $kind }} 10 10 + {{ template "repo/fragments/reaction" 11 11 + (dict 12 12 + "Kind" $kind 13 13 + "Count" $reactionData.Count 14 14 + "IsReacted" (index $userReacted $kind) 15 15 + "ThreadAt" $threadAt 16 16 + "Users" $reactionData.Users) }} 17 17 + {{ end }} 18 18 + </div> 19 19 + {{ end }} 20 20 + 21 21 + {{ define "reactionsPopup" }} 22 22 + <details 23 23 + id="reactionsPopUp" 24 24 + class="relative inline-block" 25 25 + > 26 26 + <summary 27 27 + class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700 28 28 + hover:bg-gray-50 29 29 + hover:border-gray-300 30 30 + dark:hover:bg-gray-700 31 31 + dark:hover:border-gray-600 32 32 + cursor-pointer list-none" 33 33 + > 34 34 + {{ i "smile" "size-4" }} 35 35 + </summary> 36 36 + <div 37 37 + class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg" 38 38 + > 39 39 + {{ range $kind := const.OrderedReactionKinds }} 40 40 + <button 41 41 + id="reactBtn-{{ $kind }}" 42 42 + class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700" 43 43 + hx-on:click="this.parentElement.parentElement.removeAttribute('open')" 44 44 + > 45 45 + {{ $kind }} 46 46 + </button> 47 47 + {{ end }} 48 48 + </div> 49 49 + </details> 50 50 + {{ end }}

-30

appview/pages/templates/repo/fragments/reactionsPopUp.html

··· 1 1 - {{ define "repo/fragments/reactionsPopUp" }} 2 2 - <details 3 3 - id="reactionsPopUp" 4 4 - class="relative inline-block" 5 5 - > 6 6 - <summary 7 7 - class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700 8 8 - hover:bg-gray-50 9 9 - hover:border-gray-300 10 10 - dark:hover:bg-gray-700 11 11 - dark:hover:border-gray-600 12 12 - cursor-pointer list-none" 13 13 - > 14 14 - {{ i "smile" "size-4" }} 15 15 - </summary> 16 16 - <div 17 17 - class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg" 18 18 - > 19 19 - {{ range $kind := . }} 20 20 - <button 21 21 - id="reactBtn-{{ $kind }}" 22 22 - class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700" 23 23 - hx-on:click="this.parentElement.parentElement.removeAttribute('open')" 24 24 - > 25 25 - {{ $kind }} 26 26 - </button> 27 27 - {{ end }} 28 28 - </div> 29 29 - </details> 30 30 - {{ end }}

+5 -21

appview/pages/templates/repo/issues/issue.html

··· 35 35 {{ if .Issue.Body }} 36 36 <article id="body" class="mt-4 prose dark:prose-invert">{{ .Issue.Body | markdown }}</article> 37 37 {{ end }} 38 38 - <div class="flex flex-wrap gap-2 items-stretch mt-4"> 39 39 - {{ template "issueReactions" . }} 38 38 + <div class="mt-4"> 39 39 + {{ template "repo/fragments/reactions" 40 40 + (dict "Reactions" .Reactions 41 41 + "UserReacted" .UserReacted 42 42 + "ThreadAt" .Issue.AtUri) }} 40 43 </div> 41 44 </section> 42 45 {{ end }} ··· 106 109 {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 107 110 </a> 108 111 {{ end }} 109 109 - 110 110 - {{ define "issueReactions" }} 111 111 - <div class="flex items-center gap-2"> 112 112 - {{ template "repo/fragments/reactionsPopUp" .OrderedReactionKinds }} 113 113 - {{ range $kind := .OrderedReactionKinds }} 114 114 - {{ $reactionData := index $.Reactions $kind }} 115 115 - {{ 116 116 - template "repo/fragments/reaction" 117 117 - (dict 118 118 - "Kind" $kind 119 119 - "Count" $reactionData.Count 120 120 - "IsReacted" (index $.UserReacted $kind) 121 121 - "ThreadAt" $.Issue.AtUri 122 122 - "Users" $reactionData.Users) 123 123 - }} 124 124 - {{ end }} 125 125 - </div> 126 126 - {{ end }} 127 127 - 128 112 129 113 {{ define "repoAfter" }} 130 114 <div class="flex flex-col gap-4 mt-4">

+5 -16

appview/pages/templates/repo/pulls/fragments/pullHeader.html

··· 64 64 </article> 65 65 {{ end }} 66 66 67 67 - {{ with .OrderedReactionKinds }} 68 68 - <div class="flex items-center gap-2 mt-2"> 69 69 - {{ template "repo/fragments/reactionsPopUp" . }} 70 70 - {{ range $kind := . }} 71 71 - {{ $reactionData := index $.Reactions $kind }} 72 72 - {{ 73 73 - template "repo/fragments/reaction" 74 74 - (dict 75 75 - "Kind" $kind 76 76 - "Count" $reactionData.Count 77 77 - "IsReacted" (index $.UserReacted $kind) 78 78 - "ThreadAt" $.Pull.AtUri 79 79 - "Users" $reactionData.Users) 80 80 - }} 81 81 - {{ end }} 67 67 + <div class="mt-2"> 68 68 + {{ template "repo/fragments/reactions" 69 69 + (dict "Reactions" .Reactions 70 70 + "UserReacted" .UserReacted 71 71 + "ThreadAt" .Pull.AtUri) }} 82 72 </div> 83 83 - {{ end }} 84 73 </section> 85 74 86 75

+1 -2

appview/pages/templates/repo/settings/fragments/sidebar.html

··· 1 1 {{ define "repo/settings/fragments/sidebar" }} 2 2 {{ $active := .Tab }} 3 3 - {{ $tabs := .Tabs }} 4 3 <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 5 4 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 6 5 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 7 7 - {{ range $tabs }} 6 6 + {{ range const.RepoSettingsTabs }} 8 7 <a href="/{{ $.RepoInfo.FullName }}/settings?tab={{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 9 8 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 9 {{ i .Icon "size-4" }}

-6

appview/pages/templates/user/fragments/follow-oob.html

··· 1 1 - {{ define "user/fragments/follow-oob" }} 2 2 - {{ template "user/fragments/follow" . }} 3 3 - <span hx-swap-oob='innerHTML:[data-followers-did="{{ .UserDid }}"]'> 4 4 - <a href="/{{ resolve .UserDid }}?tab=followers">{{ .FollowersCount }} followers</a> 5 5 - </span> 6 6 - {{ end }}

+3 -5

appview/pages/templates/user/fragments/followCard.html

··· 9 9 <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-2 w-full min-w-0"> 10 10 <div class="flex-1 min-h-0 justify-around flex flex-col"> 11 11 <a href="/{{ $userIdent }}"> 12 12 - <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ 13 13 - $userIdent | truncateAt30 }}</span> 12 12 + <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $userIdent | truncateAt30 }}</span> 14 13 </a> 15 14 {{ with .Profile }} 16 15 <p class="text-sm pb-2 md:pb-2 break-words">{{.Description}}</p> 17 16 {{ end }} 18 17 <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full"> 19 18 <span class="flex-shrink-0">{{ i "users" "size-4" }}</span> 20 20 - <span id="followers" data-followers-did="{{ .UserDid }}"><a href="/{{ $userIdent }}?tab=followers">{{ 21 21 - .FollowersCount }} followers</a></span> 19 19 + <span id="followers"><a href="/{{ $userIdent }}?tab=followers">{{ .FollowersCount }} followers</a></span> 22 20 <span class="select-none after:content-['·']"></span> 23 21 <span id="following"><a href="/{{ $userIdent }}?tab=following">{{ .FollowingCount }} following</a></span> 24 22 </div> ··· 31 29 </div> 32 30 </div> 33 31 </div> 34 34 - {{ end }} 32 32 + {{ end }}

+99 -97

appview/pages/templates/user/fragments/profileCard.html

··· 1 1 {{ define "user/fragments/profileCard" }} 2 2 - {{ $userIdent := resolve .UserDid }} 3 3 - <div class="grid grid-cols-3 md:grid-cols-1 gap-1 items-center"> 4 4 - <div id="avatar" class="col-span-1 flex justify-center items-center"> 5 5 - <div class="w-3/4 aspect-square relative"> 6 6 - <img class="absolute inset-0 w-full h-full object-cover rounded-full p-2" src="{{ fullAvatar .UserDid }}" /> 7 7 - </div> 8 8 - </div> 9 9 - <div class="col-span-2"> 10 10 - <div class="flex items-center flex-row flex-nowrap gap-2"> 11 11 - <p title="{{ $userIdent }}" 12 12 - class="text-lg font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap"> 13 13 - {{ $userIdent }} 14 14 - </p> 15 15 - {{ with .Profile }} 16 16 - {{ if .Pronouns }} 17 17 - <p class="text-gray-500 dark:text-gray-400">{{ .Pronouns }}</p> 18 18 - {{ end }} 19 19 - {{ end }} 20 20 - </div> 2 2 + {{ $userIdent := resolve .UserDid }} 3 3 + <div class="grid grid-cols-3 md:grid-cols-1 gap-1 items-center"> 4 4 + <div id="avatar" class="col-span-1 flex justify-center items-center"> 5 5 + <div class="w-3/4 aspect-square relative"> 6 6 + <img class="absolute inset-0 w-full h-full object-cover rounded-full p-2" src="{{ fullAvatar .UserDid }}" /> 7 7 + </div> 8 8 + </div> 9 9 + <div class="col-span-2"> 10 10 + <div class="flex items-center flex-row flex-nowrap gap-2"> 11 11 + <p title="{{ $userIdent }}" 12 12 + class="text-lg font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap"> 13 13 + {{ $userIdent }} 14 14 + </p> 15 15 + {{ with .Profile }} 16 16 + {{ if .Pronouns }} 17 17 + <p class="text-gray-500 dark:text-gray-400">{{ .Pronouns }}</p> 18 18 + {{ end }} 19 19 + {{ end }} 20 20 + </div> 21 21 22 22 - <div class="md:hidden"> 23 23 - {{ block "followerFollowing" (list . $userIdent) }} {{ end }} 24 24 - </div> 25 25 - </div> 26 26 - <div class="col-span-3 md:col-span-full"> 27 27 - <div id="profile-bio" class="text-sm"> 28 28 - {{ $profile := .Profile }} 29 29 - {{ with .Profile }} 22 22 + <div class="md:hidden"> 23 23 + {{ block "followerFollowing" (list . $userIdent) }} {{ end }} 24 24 + </div> 25 25 + </div> 26 26 + <div class="col-span-3 md:col-span-full"> 27 27 + <div id="profile-bio" class="text-sm"> 28 28 + {{ $profile := .Profile }} 29 29 + {{ with .Profile }} 30 30 31 31 - {{ if .Description }} 32 32 - <p class="text-base pb-4 md:pb-2">{{ .Description }}</p> 33 33 - {{ end }} 31 31 + {{ if .Description }} 32 32 + <p class="text-base pb-4 md:pb-2">{{ .Description }}</p> 33 33 + {{ end }} 34 34 35 35 - <div class="hidden md:block"> 36 36 - {{ block "followerFollowing" (list $ $userIdent) }} {{ end }} 37 37 - </div> 35 35 + <div class="hidden md:block"> 36 36 + {{ block "followerFollowing" (list $ $userIdent) }} {{ end }} 37 37 + </div> 38 38 39 39 - <div class="flex flex-col gap-2 mb-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full"> 40 40 - {{ if .Location }} 41 41 - <div class="flex items-center gap-2"> 42 42 - <span class="flex-shrink-0">{{ i "map-pin" "size-4" }}</span> 43 43 - <span>{{ .Location }}</span> 44 44 - </div> 45 45 - {{ end }} 46 46 - {{ if .IncludeBluesky }} 47 47 - <div class="flex items-center gap-2"> 48 48 - <span class="flex-shrink-0">{{ template "user/fragments/bluesky" "w-4 h-4 text-black dark:text-white" 49 49 - }}</span> 50 50 - <a id="bluesky-link" href="https://bsky.app/profile/{{ $.UserDid }}">{{ $userIdent }}</a> 51 51 - </div> 52 52 - {{ end }} 53 53 - {{ range $link := .Links }} 54 54 - {{ if $link }} 55 55 - <div class="flex items-center gap-2"> 56 56 - <span class="flex-shrink-0">{{ i "link" "size-4" }}</span> 57 57 - <a href="{{ $link }}">{{ $link }}</a> 58 58 - </div> 59 59 - {{ end }} 60 60 - {{ end }} 61 61 - {{ if not $profile.IsStatsEmpty }} 62 62 - <div class="flex items-center justify-evenly gap-2 py-2"> 63 63 - {{ range $stat := .Stats }} 64 64 - {{ if $stat.Kind }} 65 65 - <div class="flex flex-col items-center gap-2"> 66 66 - <span class="text-xl font-bold">{{ $stat.Value }}</span> 67 67 - <span>{{ $stat.Kind.String }}</span> 39 39 + <div class="flex flex-col gap-2 mb-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full"> 40 40 + {{ if .Location }} 41 41 + <div class="flex items-center gap-2"> 42 42 + <span class="flex-shrink-0">{{ i "map-pin" "size-4" }}</span> 43 43 + <span>{{ .Location }}</span> 44 44 + </div> 45 45 + {{ end }} 46 46 + {{ if .IncludeBluesky }} 47 47 + <div class="flex items-center gap-2"> 48 48 + <span class="flex-shrink-0">{{ template "user/fragments/bluesky" "w-4 h-4 text-black dark:text-white" }}</span> 49 49 + <a id="bluesky-link" href="https://bsky.app/profile/{{ $.UserDid }}">{{ $userIdent }}</a> 50 50 + </div> 51 51 + {{ end }} 52 52 + {{ range $link := .Links }} 53 53 + {{ if $link }} 54 54 + <div class="flex items-center gap-2"> 55 55 + <span class="flex-shrink-0">{{ i "link" "size-4" }}</span> 56 56 + <a href="{{ $link }}">{{ $link }}</a> 57 57 + </div> 58 58 + {{ end }} 59 59 + {{ end }} 60 60 + {{ if not $profile.IsStatsEmpty }} 61 61 + <div class="flex items-center justify-evenly gap-2 py-2"> 62 62 + {{ range $stat := .Stats }} 63 63 + {{ if $stat.Kind }} 64 64 + <div class="flex flex-col items-center gap-2"> 65 65 + <span class="text-xl font-bold">{{ $stat.Value }}</span> 66 66 + <span>{{ $stat.Kind.String }}</span> 67 67 + </div> 68 68 + {{ end }} 69 69 + {{ end }} 70 70 + </div> 71 71 + {{ end }} 68 72 </div> 69 73 {{ end }} 70 70 - {{ end }} 71 71 - </div> 72 72 - {{ end }} 73 73 - </div> 74 74 - {{ end }} 75 74 76 76 - <div class="flex mt-2 items-center gap-2"> 77 77 - {{ if ne .FollowStatus.String "IsSelf" }} 78 78 - {{ template "user/fragments/follow" . }} 79 79 - {{ else }} 80 80 - <button id="editBtn" class="btn w-full flex items-center gap-2 group" hx-target="#profile-bio" 81 81 - hx-get="/profile/edit-bio" hx-swap="innerHTML"> 82 82 - {{ i "pencil" "w-4 h-4" }} 83 83 - edit 84 84 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 85 85 - </button> 86 86 - {{ end }} 75 75 + <div class="flex mt-2 items-center gap-2"> 76 76 + {{ if ne .FollowStatus.String "IsSelf" }} 77 77 + {{ template "user/fragments/follow" . }} 78 78 + {{ else }} 79 79 + <button id="editBtn" 80 80 + class="btn w-full flex items-center gap-2 group" 81 81 + hx-target="#profile-bio" 82 82 + hx-get="/profile/edit-bio" 83 83 + hx-swap="innerHTML"> 84 84 + {{ i "pencil" "w-4 h-4" }} 85 85 + edit 86 86 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 87 87 + </button> 88 88 + {{ end }} 87 89 88 88 - <a class="btn text-sm no-underline hover:no-underline flex items-center gap-2 group" 89 89 - href="/{{ $userIdent }}/feed.atom"> 90 90 - {{ i "rss" "size-4" }} 91 91 - </a> 92 92 - </div> 90 90 + <a class="btn text-sm no-underline hover:no-underline flex items-center gap-2 group" 91 91 + href="/{{ $userIdent }}/feed.atom"> 92 92 + {{ i "rss" "size-4" }} 93 93 + </a> 94 94 + </div> 93 95 96 96 + </div> 97 97 + <div id="update-profile" class="text-red-400 dark:text-red-500"></div> 98 98 + </div> 94 99 </div> 95 95 - <div id="update-profile" class="text-red-400 dark:text-red-500"></div> 96 96 - </div> 97 97 - </div> 98 100 {{ end }} 99 101 100 102 {{ define "followerFollowing" }} 101 101 - {{ $root := index . 0 }} 102 102 - {{ $userIdent := index . 1 }} 103 103 - {{ with $root }} 104 104 - <div class="flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full text-sm"> 105 105 - <span class="flex-shrink-0">{{ i "users" "size-4" }}</span> 106 106 - <span id="followers" data-followers-did="{{ .UserDid }}"><a href="/{{ $userIdent }}?tab=followers">{{ 107 107 - .Stats.FollowersCount }} followers</a></span> 108 108 - <span class="select-none after:content-['·']"></span> 109 109 - <span id="following"><a href="/{{ $userIdent }}?tab=following">{{ .Stats.FollowingCount }} following</a></span> 110 110 - </div> 103 103 + {{ $root := index . 0 }} 104 104 + {{ $userIdent := index . 1 }} 105 105 + {{ with $root }} 106 106 + <div class="flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full text-sm"> 107 107 + <span class="flex-shrink-0">{{ i "users" "size-4" }}</span> 108 108 + <span id="followers"><a href="/{{ $userIdent }}?tab=followers">{{ .Stats.FollowersCount }} followers</a></span> 109 109 + <span class="select-none after:content-['·']"></span> 110 110 + <span id="following"><a href="/{{ $userIdent }}?tab=following">{{ .Stats.FollowingCount }} following</a></span> 111 111 + </div> 112 112 + {{ end }} 111 113 {{ end }} 112 112 - {{ end }} 114 114 +

+2 -3

appview/pages/templates/user/settings/fragments/sidebar.html

··· 1 1 {{ define "user/settings/fragments/sidebar" }} 2 2 {{ $active := .Tab }} 3 3 - {{ $tabs := .Tabs }} 4 3 <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 5 4 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 6 5 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 7 7 - {{ range $tabs }} 6 6 + {{ range const.UserSettingsTabs }} 8 7 <a href="/settings/{{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 9 8 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 9 {{ i .Icon "size-4" }} ··· 13 12 </a> 14 13 {{ end }} 15 14 </div> 16 16 - {{ end }} 15 15 + {{ end }}

+7 -19

appview/pulls/pulls.go

··· 1 1 package pulls 2 2 3 3 import ( 4 4 - "bytes" 5 5 - "compress/gzip" 6 4 "context" 7 5 "database/sql" 8 6 "encoding/json" 9 7 "errors" 10 8 "fmt" 11 11 - "io" 12 9 "log" 13 10 "log/slog" 14 11 "net/http" ··· 247 244 ResubmitCheck: resubmitResult, 248 245 Pipelines: m, 249 246 250 250 - OrderedReactionKinds: models.OrderedReactionKinds, 251 251 - Reactions: reactionMap, 252 252 - UserReacted: userReactions, 247 247 + Reactions: reactionMap, 248 248 + UserReacted: userReactions, 253 249 254 250 LabelDefs: defs, 255 251 }) ··· 1244 1240 return 1245 1241 } 1246 1242 1247 1247 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 1243 1243 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 1248 1244 if err != nil { 1249 1245 log.Println("failed to upload patch", err) 1250 1246 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") ··· 1338 1334 // apply all record creations at once 1339 1335 var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem 1340 1336 for _, p := range stack { 1341 1341 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(p.LatestPatch())) 1337 1337 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(p.LatestPatch())) 1342 1338 if err != nil { 1343 1339 log.Println("failed to upload patch blob", err) 1344 1340 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") ··· 1888 1884 return 1889 1885 } 1890 1886 1891 1891 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 1887 1887 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 1892 1888 if err != nil { 1893 1889 log.Println("failed to upload patch blob", err) 1894 1890 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") ··· 2030 2026 return 2031 2027 } 2032 2028 2033 2033 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 2029 2029 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 2034 2030 if err != nil { 2035 2031 log.Println("failed to upload patch blob", err) 2036 2032 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") ··· 2072 2068 return 2073 2069 } 2074 2070 2075 2075 - blob, err := comatproto.RepoUploadBlob(r.Context(), client, gz(patch)) 2071 2071 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 2076 2072 if err != nil { 2077 2073 log.Println("failed to upload patch blob", err) 2078 2074 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") ··· 2455 2451 2456 2452 return stack, nil 2457 2453 } 2458 2458 - 2459 2459 - func gz(s string) io.Reader { 2460 2460 - var b bytes.Buffer 2461 2461 - w := gzip.NewWriter(&b) 2462 2462 - w.Write([]byte(s)) 2463 2463 - w.Close() 2464 2464 - return &b 2465 2465 - }

-14

appview/repo/settings.go

··· 22 22 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 23 23 ) 24 24 25 25 - type tab = map[string]any 26 26 - 27 27 - var ( 28 28 - // would be great to have ordered maps right about now 29 29 - settingsTabs []tab = []tab{ 30 30 - {"Name": "general", "Icon": "sliders-horizontal"}, 31 31 - {"Name": "access", "Icon": "users"}, 32 32 - {"Name": "pipelines", "Icon": "layers-2"}, 33 33 - } 34 34 - ) 35 35 - 36 25 func (rp *Repo) SetDefaultBranch(w http.ResponseWriter, r *http.Request) { 37 26 l := rp.logger.With("handler", "SetDefaultBranch") 38 27 ··· 262 251 DefaultLabels: defaultLabels, 263 252 SubscribedLabels: subscribedLabels, 264 253 ShouldSubscribeAll: shouldSubscribeAll, 265 265 - Tabs: settingsTabs, 266 254 Tab: "general", 267 255 }) 268 256 } ··· 308 296 rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{ 309 297 LoggedInUser: user, 310 298 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 311 311 - Tabs: settingsTabs, 312 299 Tab: "access", 313 300 Collaborators: collaborators, 314 301 }) ··· 369 356 rp.pages.RepoPipelineSettings(w, pages.RepoPipelineSettingsParams{ 370 357 LoggedInUser: user, 371 358 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 372 372 - Tabs: settingsTabs, 373 359 Tab: "pipelines", 374 360 Spindles: spindles, 375 361 CurrentSpindle: f.Spindle,

-17

appview/settings/settings.go

··· 35 35 Config *config.Config 36 36 } 37 37 38 38 - type tab = map[string]any 39 39 - 40 40 - var ( 41 41 - settingsTabs []tab = []tab{ 42 42 - {"Name": "profile", "Icon": "user"}, 43 43 - {"Name": "keys", "Icon": "key"}, 44 44 - {"Name": "emails", "Icon": "mail"}, 45 45 - {"Name": "notifications", "Icon": "bell"}, 46 46 - {"Name": "knots", "Icon": "volleyball"}, 47 47 - {"Name": "spindles", "Icon": "spool"}, 48 48 - } 49 49 - ) 50 50 - 51 38 func (s *Settings) Router() http.Handler { 52 39 r := chi.NewRouter() 53 40 ··· 85 72 86 73 s.Pages.UserProfileSettings(w, pages.UserProfileSettingsParams{ 87 74 LoggedInUser: user, 88 88 - Tabs: settingsTabs, 89 75 Tab: "profile", 90 76 }) 91 77 } ··· 104 90 s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{ 105 91 LoggedInUser: user, 106 92 Preferences: prefs, 107 107 - Tabs: settingsTabs, 108 93 Tab: "notifications", 109 94 }) 110 95 } ··· 146 131 s.Pages.UserKeysSettings(w, pages.UserKeysSettingsParams{ 147 132 LoggedInUser: user, 148 133 PubKeys: pubKeys, 149 149 - Tabs: settingsTabs, 150 134 Tab: "keys", 151 135 }) 152 136 } ··· 161 145 s.Pages.UserEmailsSettings(w, pages.UserEmailsSettingsParams{ 162 146 LoggedInUser: user, 163 147 Emails: emails, 164 164 - Tabs: settingsTabs, 165 148 Tab: "emails", 166 149 }) 167 150 }

-15

appview/spindles/spindles.go

··· 39 39 Logger *slog.Logger 40 40 } 41 41 42 42 - type tab = map[string]any 43 43 - 44 44 - var ( 45 45 - spindlesTabs []tab = []tab{ 46 46 - {"Name": "profile", "Icon": "user"}, 47 47 - {"Name": "keys", "Icon": "key"}, 48 48 - {"Name": "emails", "Icon": "mail"}, 49 49 - {"Name": "notifications", "Icon": "bell"}, 50 50 - {"Name": "knots", "Icon": "volleyball"}, 51 51 - {"Name": "spindles", "Icon": "spool"}, 52 52 - } 53 53 - ) 54 54 - 55 42 func (s *Spindles) Router() http.Handler { 56 43 r := chi.NewRouter() 57 44 ··· 83 70 s.Pages.Spindles(w, pages.SpindlesParams{ 84 71 LoggedInUser: user, 85 72 Spindles: all, 86 86 - Tabs: spindlesTabs, 87 73 Tab: "spindles", 88 74 }) 89 75 } ··· 143 129 Spindle: spindle, 144 130 Members: members, 145 131 Repos: repoMap, 146 146 - Tabs: spindlesTabs, 147 132 Tab: "spindles", 148 133 }) 149 134 }

+4 -16

appview/state/follow.go

··· 75 75 76 76 s.notifier.NewFollow(r.Context(), follow) 77 77 78 78 - followStats, err := db.GetFollowerFollowingCount(s.db, subjectIdent.DID.String()) 79 79 - if err != nil { 80 80 - log.Println("failed to get follow stats", err) 81 81 - } 82 82 - 83 78 s.pages.FollowFragment(w, pages.FollowFragmentParams{ 84 84 - UserDid: subjectIdent.DID.String(), 85 85 - FollowStatus: models.IsFollowing, 86 86 - FollowersCount: followStats.Followers, 79 79 + UserDid: subjectIdent.DID.String(), 80 80 + FollowStatus: models.IsFollowing, 87 81 }) 88 82 89 83 return ··· 112 106 // this is not an issue, the firehose event might have already done this 113 107 } 114 108 115 115 - followStats, err := db.GetFollowerFollowingCount(s.db, subjectIdent.DID.String()) 116 116 - if err != nil { 117 117 - log.Println("failed to get follow stats", err) 118 118 - } 119 119 - 120 109 s.pages.FollowFragment(w, pages.FollowFragmentParams{ 121 121 - UserDid: subjectIdent.DID.String(), 122 122 - FollowStatus: models.IsNotFollowing, 123 123 - FollowersCount: followStats.Followers, 110 110 + UserDid: subjectIdent.DID.String(), 111 111 + FollowStatus: models.IsNotFollowing, 124 112 }) 125 113 126 114 s.notifier.DeleteFollow(r.Context(), follow)

-3

docs/DOCS.md

··· 663 663 nixpkgs: 664 664 - nodejs 665 665 - go 666 666 - # unstable 667 667 - nixpkgs/nixpkgs-unstable: 668 668 - - bun 669 666 # custom registry 670 667 git+https://tangled.org/@example.com/my_pkg: 671 668 - my_pkg

-4

input.css

··· 133 133 disabled:before:bg-green-400 dark:disabled:before:bg-green-600; 134 134 } 135 135 136 136 - .prose { 137 137 - overflow-wrap: anywhere; 138 138 - } 139 139 - 140 136 .prose hr { 141 137 @apply my-2; 142 138 }

-3

nix/modules/appview.nix

··· 1 1 { 2 2 - pkgs, 3 2 config, 4 3 lib, 5 4 ... ··· 260 259 after = ["redis-appview.service" "network-online.target"]; 261 260 requires = ["redis-appview.service"]; 262 261 wants = ["network-online.target"]; 263 263 - 264 264 - path = [pkgs.diffutils]; 265 262 266 263 serviceConfig = { 267 264 Type = "simple";