+13

.editorconfig

··· 1 1 + root = true 2 2 + 3 3 + [*.html] 4 4 + indent_size = 2 5 5 + 6 6 + [*.json] 7 7 + indent_size = 2 8 8 + 9 9 + [*.nix] 10 10 + indent_size = 2 11 11 + 12 12 + [*.yml] 13 13 + indent_size = 2

+13 -1

api/tangled/repoblob.go

··· 30 30 // RepoBlob_Output is the output of a sh.tangled.repo.blob call. 31 31 type RepoBlob_Output struct { 32 32 // content: File content (base64 encoded for binary files) 33 33 - Content string `json:"content" cborgen:"content"` 33 33 + Content *string `json:"content,omitempty" cborgen:"content,omitempty"` 34 34 // encoding: Content encoding 35 35 Encoding *string `json:"encoding,omitempty" cborgen:"encoding,omitempty"` 36 36 // isBinary: Whether the file is binary ··· 44 44 Ref string `json:"ref" cborgen:"ref"` 45 45 // size: File size in bytes 46 46 Size *int64 `json:"size,omitempty" cborgen:"size,omitempty"` 47 47 + // submodule: Submodule information if path is a submodule 48 48 + Submodule *RepoBlob_Submodule `json:"submodule,omitempty" cborgen:"submodule,omitempty"` 47 49 } 48 50 49 51 // RepoBlob_Signature is a "signature" in the sh.tangled.repo.blob schema. ··· 54 56 Name string `json:"name" cborgen:"name"` 55 57 // when: Author timestamp 56 58 When string `json:"when" cborgen:"when"` 59 59 + } 60 60 + 61 61 + // RepoBlob_Submodule is a "submodule" in the sh.tangled.repo.blob schema. 62 62 + type RepoBlob_Submodule struct { 63 63 + // branch: Branch to track in the submodule 64 64 + Branch *string `json:"branch,omitempty" cborgen:"branch,omitempty"` 65 65 + // name: Submodule name 66 66 + Name string `json:"name" cborgen:"name"` 67 67 + // url: Submodule repository URL 68 68 + Url string `json:"url" cborgen:"url"` 57 69 } 58 70 59 71 // RepoBlob calls the XRPC method "sh.tangled.repo.blob".

-4

api/tangled/repotree.go

··· 47 47 48 48 // RepoTree_TreeEntry is a "treeEntry" in the sh.tangled.repo.tree schema. 49 49 type RepoTree_TreeEntry struct { 50 50 - // is_file: Whether this entry is a file 51 51 - Is_file bool `json:"is_file" cborgen:"is_file"` 52 52 - // is_subtree: Whether this entry is a directory/subtree 53 53 - Is_subtree bool `json:"is_subtree" cborgen:"is_subtree"` 54 50 Last_commit *RepoTree_LastCommit `json:"last_commit,omitempty" cborgen:"last_commit,omitempty"` 55 51 // mode: File mode 56 52 Mode string `json:"mode" cborgen:"mode"`

+7

appview/db/db.go

··· 1121 1121 return err 1122 1122 }) 1123 1123 1124 1124 + runMigration(conn, logger, "add-usermentioned-preference", func(tx *sql.Tx) error { 1125 1125 + _, err := tx.Exec(` 1126 1126 + alter table notification_preferences add column user_mentioned integer not null default 1; 1127 1127 + `) 1128 1128 + return err 1129 1129 + }) 1130 1130 + 1124 1131 return &DB{ 1125 1132 db, 1126 1133 logger,

+6 -2

appview/db/notifications.go

··· 400 400 pull_created, 401 401 pull_commented, 402 402 followed, 403 403 + user_mentioned, 403 404 pull_merged, 404 405 issue_closed, 405 406 email_notifications ··· 425 426 &prefs.PullCreated, 426 427 &prefs.PullCommented, 427 428 &prefs.Followed, 429 429 + &prefs.UserMentioned, 428 430 &prefs.PullMerged, 429 431 &prefs.IssueClosed, 430 432 &prefs.EmailNotifications, ··· 446 448 query := ` 447 449 INSERT OR REPLACE INTO notification_preferences 448 450 (user_did, repo_starred, issue_created, issue_commented, pull_created, 449 449 - pull_commented, followed, pull_merged, issue_closed, email_notifications) 450 450 - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) 451 451 + pull_commented, followed, user_mentioned, pull_merged, issue_closed, 452 452 + email_notifications) 453 453 + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) 451 454 ` 452 455 453 456 result, err := d.DB.ExecContext(ctx, query, ··· 458 461 prefs.PullCreated, 459 462 prefs.PullCommented, 460 463 prefs.Followed, 464 464 + prefs.UserMentioned, 461 465 prefs.PullMerged, 462 466 prefs.IssueClosed, 463 467 prefs.EmailNotifications,

+2

appview/middleware/middleware.go

··· 206 206 return func(next http.Handler) http.Handler { 207 207 return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { 208 208 repoName := chi.URLParam(req, "repo") 209 209 + repoName = strings.TrimSuffix(repoName, ".git") 210 210 + 209 211 id, ok := req.Context().Value("resolvedId").(identity.Identity) 210 212 if !ok { 211 213 log.Println("malformed middleware")

+3 -1

appview/models/notifications.go

··· 87 87 PullCreated bool 88 88 PullCommented bool 89 89 Followed bool 90 90 + UserMentioned bool 90 91 PullMerged bool 91 92 IssueClosed bool 92 93 EmailNotifications bool ··· 117 118 case NotificationTypeFollowed: 118 119 return prefs.Followed 119 120 case NotificationTypeUserMentioned: 120 120 - return true // always notify on mention 121 121 + return prefs.UserMentioned 121 122 default: 122 123 return false 123 124 } ··· 132 133 PullCreated: true, 133 134 PullCommented: true, 134 135 Followed: true, 136 136 + UserMentioned: true, 135 137 PullMerged: true, 136 138 IssueClosed: true, 137 139 EmailNotifications: false,

+47

appview/models/repo.go

··· 104 104 Repo *Repo 105 105 Issues []Issue 106 106 } 107 107 + 108 108 + type BlobContentType int 109 109 + 110 110 + const ( 111 111 + BlobContentTypeCode BlobContentType = iota 112 112 + BlobContentTypeMarkup 113 113 + BlobContentTypeImage 114 114 + BlobContentTypeSvg 115 115 + BlobContentTypeVideo 116 116 + BlobContentTypeSubmodule 117 117 + ) 118 118 + 119 119 + func (ty BlobContentType) IsCode() bool { return ty == BlobContentTypeCode } 120 120 + func (ty BlobContentType) IsMarkup() bool { return ty == BlobContentTypeMarkup } 121 121 + func (ty BlobContentType) IsImage() bool { return ty == BlobContentTypeImage } 122 122 + func (ty BlobContentType) IsSvg() bool { return ty == BlobContentTypeSvg } 123 123 + func (ty BlobContentType) IsVideo() bool { return ty == BlobContentTypeVideo } 124 124 + func (ty BlobContentType) IsSubmodule() bool { return ty == BlobContentTypeSubmodule } 125 125 + 126 126 + type BlobView struct { 127 127 + HasTextView bool // can show as code/text 128 128 + HasRenderedView bool // can show rendered (markup/image/video/submodule) 129 129 + HasRawView bool // can download raw (everything except submodule) 130 130 + 131 131 + // current display mode 132 132 + ShowingRendered bool // currently in rendered mode 133 133 + ShowingText bool // currently in text/code mode 134 134 + 135 135 + // content type flags 136 136 + ContentType BlobContentType 137 137 + 138 138 + // Content data 139 139 + Contents string 140 140 + ContentSrc string // URL for media files 141 141 + Lines int 142 142 + SizeHint uint64 143 143 + } 144 144 + 145 145 + // if both views are available, then show a toggle between them 146 146 + func (b BlobView) ShowToggle() bool { 147 147 + return b.HasTextView && b.HasRenderedView 148 148 + } 149 149 + 150 150 + func (b BlobView) IsUnsupported() bool { 151 151 + // no view available, only raw 152 152 + return !(b.HasRenderedView || b.HasTextView) 153 153 + }

+7

appview/notify/db/db.go

··· 13 13 "tangled.org/core/idresolver" 14 14 ) 15 15 16 16 + const ( 17 17 + maxMentions = 5 18 18 + ) 19 19 + 16 20 type databaseNotifier struct { 17 21 db *db.DB 18 22 res *idresolver.Resolver ··· 421 425 issueId *int64, 422 426 pullId *int64, 423 427 ) { 428 428 + if eventType == models.NotificationTypeUserMentioned && len(recipients) > maxMentions { 429 429 + recipients = recipients[:maxMentions] 430 430 + } 424 431 recipientSet := make(map[syntax.DID]struct{}) 425 432 for _, did := range recipients { 426 433 // everybody except actor themselves

+41

appview/pages/funcmap.go

··· 1 1 package pages 2 2 3 3 import ( 4 4 + "bytes" 4 5 "context" 5 6 "crypto/hmac" 6 7 "crypto/sha256" ··· 17 18 "strings" 18 19 "time" 19 20 21 21 + "github.com/alecthomas/chroma/v2" 22 22 + chromahtml "github.com/alecthomas/chroma/v2/formatters/html" 23 23 + "github.com/alecthomas/chroma/v2/lexers" 24 24 + "github.com/alecthomas/chroma/v2/styles" 20 25 "github.com/bluesky-social/indigo/atproto/syntax" 21 26 "github.com/dustin/go-humanize" 22 27 "github.com/go-enry/go-enry/v2" ··· 245 250 htmlString := p.rctx.RenderMarkdown(text) 246 251 sanitized := p.rctx.SanitizeDescription(htmlString) 247 252 return template.HTML(sanitized) 253 253 + }, 254 254 + "readme": func(text string) template.HTML { 255 255 + p.rctx.RendererType = markup.RendererTypeRepoMarkdown 256 256 + htmlString := p.rctx.RenderMarkdown(text) 257 257 + sanitized := p.rctx.SanitizeDefault(htmlString) 258 258 + return template.HTML(sanitized) 259 259 + }, 260 260 + "code": func(content, path string) string { 261 261 + var style *chroma.Style = styles.Get("catpuccin-latte") 262 262 + formatter := chromahtml.New( 263 263 + chromahtml.InlineCode(false), 264 264 + chromahtml.WithLineNumbers(true), 265 265 + chromahtml.WithLinkableLineNumbers(true, "L"), 266 266 + chromahtml.Standalone(false), 267 267 + chromahtml.WithClasses(true), 268 268 + ) 269 269 + 270 270 + lexer := lexers.Get(filepath.Base(path)) 271 271 + if lexer == nil { 272 272 + lexer = lexers.Fallback 273 273 + } 274 274 + 275 275 + iterator, err := lexer.Tokenise(nil, content) 276 276 + if err != nil { 277 277 + p.logger.Error("chroma tokenize", "err", "err") 278 278 + return "" 279 279 + } 280 280 + 281 281 + var code bytes.Buffer 282 282 + err = formatter.Format(&code, style, iterator) 283 283 + if err != nil { 284 284 + p.logger.Error("chroma format", "err", "err") 285 285 + return "" 286 286 + } 287 287 + 288 288 + return code.String() 248 289 }, 249 290 "trimUriScheme": func(text string) string { 250 291 text = strings.TrimPrefix(text, "https://")

+10 -98

appview/pages/pages.go

··· 1 1 package pages 2 2 3 3 import ( 4 4 - "bytes" 5 4 "crypto/sha256" 6 5 "embed" 7 6 "encoding/hex" ··· 29 28 "tangled.org/core/patchutil" 30 29 "tangled.org/core/types" 31 30 32 32 - "github.com/alecthomas/chroma/v2" 33 33 - chromahtml "github.com/alecthomas/chroma/v2/formatters/html" 34 34 - "github.com/alecthomas/chroma/v2/lexers" 35 35 - "github.com/alecthomas/chroma/v2/styles" 36 31 "github.com/bluesky-social/indigo/atproto/identity" 37 32 "github.com/bluesky-social/indigo/atproto/syntax" 38 33 "github.com/go-git/go-git/v5/plumbing" ··· 744 739 func (r RepoTreeParams) TreeStats() RepoTreeStats { 745 740 numFolders, numFiles := 0, 0 746 741 for _, f := range r.Files { 747 747 - if !f.IsFile { 742 742 + if !f.IsFile() { 748 743 numFolders += 1 749 749 - } else if f.IsFile { 744 744 + } else if f.IsFile() { 750 745 numFiles += 1 751 746 } 752 747 } ··· 817 812 } 818 813 819 814 type RepoBlobParams struct { 820 820 - LoggedInUser *oauth.User 821 821 - RepoInfo repoinfo.RepoInfo 822 822 - Active string 823 823 - Unsupported bool 824 824 - IsImage bool 825 825 - IsVideo bool 826 826 - ContentSrc string 827 827 - BreadCrumbs [][]string 828 828 - ShowRendered bool 829 829 - RenderToggle bool 830 830 - RenderedContents template.HTML 815 815 + LoggedInUser *oauth.User 816 816 + RepoInfo repoinfo.RepoInfo 817 817 + Active string 818 818 + BreadCrumbs [][]string 819 819 + BlobView models.BlobView 831 820 *tangled.RepoBlob_Output 832 832 - // Computed fields for template compatibility 833 833 - Contents string 834 834 - Lines int 835 835 - SizeHint uint64 836 836 - IsBinary bool 837 821 } 838 822 839 823 func (p *Pages) RepoBlob(w io.Writer, params RepoBlobParams) error { 840 840 - var style *chroma.Style = styles.Get("catpuccin-latte") 841 841 - 842 842 - if params.ShowRendered { 843 843 - switch markup.GetFormat(params.Path) { 844 844 - case markup.FormatMarkdown: 845 845 - p.rctx.RepoInfo = params.RepoInfo 846 846 - p.rctx.RendererType = markup.RendererTypeRepoMarkdown 847 847 - htmlString := p.rctx.RenderMarkdown(params.Contents) 848 848 - sanitized := p.rctx.SanitizeDefault(htmlString) 849 849 - params.RenderedContents = template.HTML(sanitized) 850 850 - } 851 851 - } 852 852 - 853 853 - c := params.Contents 854 854 - formatter := chromahtml.New( 855 855 - chromahtml.InlineCode(false), 856 856 - chromahtml.WithLineNumbers(true), 857 857 - chromahtml.WithLinkableLineNumbers(true, "L"), 858 858 - chromahtml.Standalone(false), 859 859 - chromahtml.WithClasses(true), 860 860 - ) 861 861 - 862 862 - lexer := lexers.Get(filepath.Base(params.Path)) 863 863 - if lexer == nil { 864 864 - lexer = lexers.Fallback 865 865 - } 866 866 - 867 867 - iterator, err := lexer.Tokenise(nil, c) 868 868 - if err != nil { 869 869 - return fmt.Errorf("chroma tokenize: %w", err) 870 870 - } 871 871 - 872 872 - var code bytes.Buffer 873 873 - err = formatter.Format(&code, style, iterator) 874 874 - if err != nil { 875 875 - return fmt.Errorf("chroma format: %w", err) 824 824 + switch params.BlobView.ContentType { 825 825 + case models.BlobContentTypeMarkup: 826 826 + p.rctx.RepoInfo = params.RepoInfo 876 827 } 877 828 878 878 - params.Contents = code.String() 879 829 params.Active = "overview" 880 830 return p.executeRepo("repo/blob", w, params) 881 831 } ··· 1432 1382 } 1433 1383 1434 1384 func (p *Pages) SingleString(w io.Writer, params SingleStringParams) error { 1435 1435 - var style *chroma.Style = styles.Get("catpuccin-latte") 1436 1436 - 1437 1437 - if params.ShowRendered { 1438 1438 - switch markup.GetFormat(params.String.Filename) { 1439 1439 - case markup.FormatMarkdown: 1440 1440 - p.rctx.RendererType = markup.RendererTypeRepoMarkdown 1441 1441 - htmlString := p.rctx.RenderMarkdown(params.String.Contents) 1442 1442 - sanitized := p.rctx.SanitizeDefault(htmlString) 1443 1443 - params.RenderedContents = template.HTML(sanitized) 1444 1444 - } 1445 1445 - } 1446 1446 - 1447 1447 - c := params.String.Contents 1448 1448 - formatter := chromahtml.New( 1449 1449 - chromahtml.InlineCode(false), 1450 1450 - chromahtml.WithLineNumbers(true), 1451 1451 - chromahtml.WithLinkableLineNumbers(true, "L"), 1452 1452 - chromahtml.Standalone(false), 1453 1453 - chromahtml.WithClasses(true), 1454 1454 - ) 1455 1455 - 1456 1456 - lexer := lexers.Get(filepath.Base(params.String.Filename)) 1457 1457 - if lexer == nil { 1458 1458 - lexer = lexers.Fallback 1459 1459 - } 1460 1460 - 1461 1461 - iterator, err := lexer.Tokenise(nil, c) 1462 1462 - if err != nil { 1463 1463 - return fmt.Errorf("chroma tokenize: %w", err) 1464 1464 - } 1465 1465 - 1466 1466 - var code bytes.Buffer 1467 1467 - err = formatter.Format(&code, style, iterator) 1468 1468 - if err != nil { 1469 1469 - return fmt.Errorf("chroma format: %w", err) 1470 1470 - } 1471 1471 - 1472 1472 - params.String.Contents = code.String() 1473 1385 return p.execute("strings/string", w, params) 1474 1386 } 1475 1387

+17 -12

appview/pages/templates/knots/fragments/addMemberModal.html

··· 13 13 <div 14 14 id="add-member-{{ .Id }}" 15 15 popover 16 16 - class="bg-white w-full md:w-96 dark:bg-gray-800 p-4 rounded border border-gray-200 dark:border-gray-700 drop-shadow dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50"> 16 16 + class=" 17 17 + bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50 18 18 + w-full md:w-96 p-4 rounded drop-shadow overflow-visible"> 17 19 {{ block "addKnotMemberPopover" . }} {{ end }} 18 20 </div> 19 21 {{ end }} ··· 29 31 ADD MEMBER 30 32 </label> 31 33 <p class="text-sm text-gray-500 dark:text-gray-400">Members can create repositories and run workflows on this knot.</p> 32 32 - <input 33 33 - autocapitalize="none" 34 34 - autocorrect="off" 35 35 - autocomplete="off" 36 36 - type="text" 37 37 - id="member-did-{{ .Id }}" 38 38 - name="member" 39 39 - required 40 40 - placeholder="foo.bsky.social" 41 41 - /> 34 34 + <actor-typeahead> 35 35 + <input 36 36 + autocapitalize="none" 37 37 + autocorrect="off" 38 38 + autocomplete="off" 39 39 + type="text" 40 40 + id="member-did-{{ .Id }}" 41 41 + name="member" 42 42 + required 43 43 + placeholder="user.tngl.sh" 44 44 + class="w-full" 45 45 + /> 46 46 + </actor-typeahead> 42 47 <div class="flex gap-2 pt-2"> 43 48 <button 44 49 type="button" ··· 57 62 </div> 58 63 <div id="add-member-error-{{ .Id }}" class="text-red-500 dark:text-red-400"></div> 59 64 </form> 60 60 - {{ end }} 65 65 + {{ end }}

+1

appview/pages/templates/layouts/base.html

··· 9 9 10 10 <script defer src="/static/htmx.min.js"></script> 11 11 <script defer src="/static/htmx-ext-ws.min.js"></script> 12 12 + <script defer src="/static/actor-typeahead.js" type="module"></script> 12 13 13 14 <!-- preconnect to image cdn --> 14 15 <link rel="preconnect" href="https://avatar.tangled.sh" />

+62 -39

appview/pages/templates/repo/blob.html

··· 11 11 {{ end }} 12 12 13 13 {{ define "repoContent" }} 14 14 - {{ $lines := split .Contents }} 15 15 - {{ $tot_lines := len $lines }} 16 16 - {{ $tot_chars := len (printf "%d" $tot_lines) }} 17 17 - {{ $code_number_style := "text-gray-400 dark:text-gray-500 left-0 bg-white dark:bg-gray-800 text-right mr-6 select-none inline-block w-12" }} 18 14 {{ $linkstyle := "no-underline hover:underline" }} 19 15 <div class="pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-700"> 20 16 <div class="flex flex-col md:flex-row md:justify-between gap-2"> ··· 36 32 </div> 37 33 <div id="file-info" class="text-gray-500 dark:text-gray-400 text-xs md:text-sm flex flex-wrap items-center gap-1 md:gap-0"> 38 34 <span>at <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Ref }}">{{ .Ref }}</a></span> 39 39 - <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 40 40 - <span>{{ .Lines }} lines</span> 41 41 - <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 42 42 - <span>{{ byteFmt .SizeHint }}</span> 43 43 - <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 44 44 - <a href="/{{ .RepoInfo.FullName }}/raw/{{ .Ref }}/{{ .Path }}">view raw</a> 45 45 - {{ if .RenderToggle }} 46 46 - <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 47 47 - <a 48 48 - href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/{{ .Path }}?code={{ .ShowRendered }}" 49 49 - hx-boost="true" 50 50 - >view {{ if .ShowRendered }}code{{ else }}rendered{{ end }}</a> 35 35 + 36 36 + {{ if .BlobView.ShowingText }} 37 37 + <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 38 38 + <span>{{ .Lines }} lines</span> 39 39 + {{ end }} 40 40 + 41 41 + {{ if .BlobView.SizeHint }} 42 42 + <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 43 43 + <span>{{ byteFmt .BlobView.SizeHint }}</span> 44 44 + {{ end }} 45 45 + 46 46 + {{ if .BlobView.HasRawView }} 47 47 + <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 48 48 + <a href="/{{ .RepoInfo.FullName }}/raw/{{ .Ref }}/{{ .Path }}">view raw</a> 49 49 + {{ end }} 50 50 + 51 51 + {{ if .BlobView.ShowToggle }} 52 52 + <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 53 53 + <a href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/{{ .Path }}?code={{ .BlobView.ShowingRendered }}" hx-boost="true"> 54 54 + view {{ if .BlobView.ShowingRendered }}code{{ else }}rendered{{ end }} 55 55 + </a> 51 56 {{ end }} 52 57 </div> 53 58 </div> 54 59 </div> 55 55 - {{ if and .IsBinary .Unsupported }} 56 56 - <p class="text-center text-gray-400 dark:text-gray-500"> 57 57 - Previews are not supported for this file type. 58 58 - </p> 59 59 - {{ else if .IsBinary }} 60 60 - <div class="text-center"> 61 61 - {{ if .IsImage }} 62 62 - <img src="{{ .ContentSrc }}" 63 63 - alt="{{ .Path }}" 64 64 - class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded" /> 65 65 - {{ else if .IsVideo }} 66 66 - <video controls class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded"> 67 67 - <source src="{{ .ContentSrc }}"> 68 68 - Your browser does not support the video tag. 69 69 - </video> 70 70 - {{ end }} 71 71 - </div> 72 72 - {{ else }} 73 73 - <div class="overflow-auto relative"> 74 74 - {{ if .ShowRendered }} 75 75 - <div id="blob-contents" class="prose dark:prose-invert">{{ .RenderedContents }}</div> 60 60 + {{ if .BlobView.IsUnsupported }} 61 61 + <p class="text-center text-gray-400 dark:text-gray-500"> 62 62 + Previews are not supported for this file type. 63 63 + </p> 64 64 + {{ else if .BlobView.ContentType.IsSubmodule }} 65 65 + <p class="text-center text-gray-400 dark:text-gray-500"> 66 66 + This directory is a git submodule of <a href="{{ .BlobView.ContentSrc }}">{{ .BlobView.ContentSrc }}</a>. 67 67 + </p> 68 68 + {{ else if .BlobView.ContentType.IsImage }} 69 69 + <div class="text-center"> 70 70 + <img src="{{ .BlobView.ContentSrc }}" 71 71 + alt="{{ .Path }}" 72 72 + class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded" /> 73 73 + </div> 74 74 + {{ else if .BlobView.ContentType.IsVideo }} 75 75 + <div class="text-center"> 76 76 + <video controls class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded"> 77 77 + <source src="{{ .BlobView.ContentSrc }}"> 78 78 + Your browser does not support the video tag. 79 79 + </video> 80 80 + </div> 81 81 + {{ else if .BlobView.ContentType.IsSvg }} 82 82 + <div class="overflow-auto relative"> 83 83 + {{ if .BlobView.ShowingRendered }} 84 84 + <div class="text-center"> 85 85 + <img src="{{ .BlobView.ContentSrc }}" 86 86 + alt="{{ .Path }}" 87 87 + class="max-w-full h-auto mx-auto border border-gray-200 dark:border-gray-700 rounded" /> 88 88 + </div> 76 89 {{ else }} 77 77 - <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ $.Contents | escapeHtml }}</div> 90 90 + <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .BlobView.Contents .Path | escapeHtml }}</div> 91 91 + {{ end }} 92 92 + </div> 93 93 + {{ else if .BlobView.ContentType.IsMarkup }} 94 94 + <div class="overflow-auto relative"> 95 95 + {{ if .BlobView.ShowingRendered }} 96 96 + <div id="blob-contents" class="prose dark:prose-invert">{{ .BlobView.Contents | readme }}</div> 97 97 + {{ else }} 98 98 + <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .BlobView.Contents .Path | escapeHtml }}</div> 78 99 {{ end }} 79 79 - </div> 100 100 + </div> 101 101 + {{ else if .BlobView.ContentType.IsCode }} 102 102 + <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .BlobView.Contents .Path | escapeHtml }}</div> 80 103 {{ end }} 81 104 {{ template "fragments/multiline-select" }} 82 105 {{ end }}

+8 -1

appview/pages/templates/repo/index.html

··· 35 35 {{ end }} 36 36 37 37 {{ define "repoLanguages" }} 38 38 - <details class="group -m-6 mb-4"> 38 38 + <details class="group -my-4 -m-6 mb-4"> 39 39 <summary class="flex gap-[1px] h-4 scale-y-50 hover:scale-y-100 origin-top group-open:scale-y-100 transition-all hover:cursor-pointer overflow-hidden rounded-t"> 40 40 {{ range $value := .Languages }} 41 41 <div ··· 129 129 {{ $icon := "folder" }} 130 130 {{ $iconStyle := "size-4 fill-current" }} 131 131 132 132 + {{ if .IsSubmodule }} 133 133 + {{ $link = printf "/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) .Name }} 134 134 + {{ $icon = "folder-input" }} 135 135 + {{ $iconStyle = "size-4" }} 136 136 + {{ end }} 137 137 + 132 138 {{ if .IsFile }} 133 139 {{ $link = printf "/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) .Name }} 134 140 {{ $icon = "file" }} 135 141 {{ $iconStyle = "size-4" }} 136 142 {{ end }} 143 143 + 137 144 <a href="{{ $link }}" class="{{ $linkstyle }}"> 138 145 <div class="flex items-center gap-2"> 139 146 {{ i $icon $iconStyle "flex-shrink-0" }}

+19 -24

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

··· 27 27 "Meta" (string .RepoInfo.Stats.IssueCount.Closed)) }} 28 28 {{ $values := list $open $closed }} 29 29 30 30 - <div class="flex flex-col gap-2"> 31 31 - <div class="flex justify-between items-stretch gap-4"> 32 32 - <form class="flex flex-1 relative" method="GET"> 33 33 - <input type="hidden" name="state" value="{{ if .FilteringByOpen }}open{{ else }}closed{{ end }}"> 34 34 - <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none"> 35 35 - {{ i "search" "w-4 h-4" }} 36 36 - </div> 37 37 - <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" "> 38 38 - <a 39 39 - href="?state={{ if .FilteringByOpen }}open{{ else }}closed{{ end }}" 40 40 - class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block" 41 41 - > 42 42 - {{ i "x" "w-4 h-4" }} 43 43 - </a> 44 44 - </form> 45 45 - <div class="hidden sm:block"> 46 46 - {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }} 30 30 + <div class="grid gap-2 grid-cols-[auto_1fr_auto] grid-row-2"> 31 31 + <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET"> 32 32 + <input type="hidden" name="state" value="{{ if .FilteringByOpen }}open{{ else }}closed{{ end }}"> 33 33 + <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none"> 34 34 + {{ i "search" "w-4 h-4" }} 47 35 </div> 36 36 + <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" "> 48 37 <a 49 49 - href="/{{ .RepoInfo.FullName }}/issues/new" 50 50 - class="btn-create text-sm flex items-center justify-center gap-2 no-underline hover:no-underline hover:text-white" 51 51 - > 52 52 - {{ i "circle-plus" "w-4 h-4" }} 53 53 - <span>new</span> 38 38 + href="?state={{ if .FilteringByOpen }}open{{ else }}closed{{ end }}" 39 39 + class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block" 40 40 + > 41 41 + {{ i "x" "w-4 h-4" }} 54 42 </a> 55 55 - </div> 56 56 - <div class="sm:hidden"> 43 43 + </form> 44 44 + <div class="sm:row-start-1"> 57 45 {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }} 58 46 </div> 47 47 + <a 48 48 + href="/{{ .RepoInfo.FullName }}/issues/new" 49 49 + class="col-start-3 btn-create text-sm flex items-center justify-center gap-2 no-underline hover:no-underline hover:text-white" 50 50 + > 51 51 + {{ i "circle-plus" "w-4 h-4" }} 52 52 + <span>new</span> 53 53 + </a> 59 54 </div> 60 55 <div class="error" id="issues"></div> 61 56 {{ end }}

+81 -83

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

··· 22 22 {{ $isLastRound := eq $roundNumber $lastIdx }} 23 23 {{ $isSameRepoBranch := .Pull.IsBranchBased }} 24 24 {{ $isUpToDate := .ResubmitCheck.No }} 25 25 - <div class="relative w-fit"> 26 26 - <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2"> 27 27 - <button 28 28 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 29 29 - hx-target="#actions-{{$roundNumber}}" 30 30 - hx-swap="outerHtml" 31 31 - class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group"> 32 32 - {{ i "message-square-plus" "w-4 h-4" }} 33 33 - <span>comment</span> 34 34 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 35 35 - </button> 36 36 - {{ if .BranchDeleteStatus }} 37 37 - <button 38 38 - hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 39 39 - hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 40 40 - hx-swap="none" 41 41 - class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 42 42 - {{ i "git-branch" "w-4 h-4" }} 43 43 - <span>delete branch</span> 44 44 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 45 45 - </button> 46 46 - {{ end }} 47 47 - {{ if and $isPushAllowed $isOpen $isLastRound }} 48 48 - {{ $disabled := "" }} 49 49 - {{ if $isConflicted }} 50 50 - {{ $disabled = "disabled" }} 51 51 - {{ end }} 52 52 - <button 53 53 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 54 54 - hx-swap="none" 55 55 - hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 56 56 - class="btn p-2 flex items-center gap-2 group" {{ $disabled }}> 57 57 - {{ i "git-merge" "w-4 h-4" }} 58 58 - <span>merge{{if $stackCount}} {{$stackCount}}{{end}}</span> 59 59 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 60 60 - </button> 61 61 - {{ end }} 25 25 + <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative"> 26 26 + <button 27 27 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 28 28 + hx-target="#actions-{{$roundNumber}}" 29 29 + hx-swap="outerHtml" 30 30 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 31 + {{ i "message-square-plus" "w-4 h-4" }} 32 32 + <span>comment</span> 33 33 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 34 34 + </button> 35 35 + {{ if .BranchDeleteStatus }} 36 36 + <button 37 37 + hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 38 38 + hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 39 39 + hx-swap="none" 40 40 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 41 41 + {{ i "git-branch" "w-4 h-4" }} 42 42 + <span>delete branch</span> 43 43 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 44 44 + </button> 45 45 + {{ end }} 46 46 + {{ if and $isPushAllowed $isOpen $isLastRound }} 47 47 + {{ $disabled := "" }} 48 48 + {{ if $isConflicted }} 49 49 + {{ $disabled = "disabled" }} 50 50 + {{ end }} 51 51 + <button 52 52 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 53 53 + hx-swap="none" 54 54 + hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 55 55 + class="btn p-2 flex items-center gap-2 group" {{ $disabled }}> 56 56 + {{ i "git-merge" "w-4 h-4" }} 57 57 + <span>merge{{if $stackCount}} {{$stackCount}}{{end}}</span> 58 58 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 59 59 + </button> 60 60 + {{ end }} 62 61 63 63 - {{ if and $isPullAuthor $isOpen $isLastRound }} 64 64 - {{ $disabled := "" }} 65 65 - {{ if $isUpToDate }} 66 66 - {{ $disabled = "disabled" }} 62 62 + {{ if and $isPullAuthor $isOpen $isLastRound }} 63 63 + {{ $disabled := "" }} 64 64 + {{ if $isUpToDate }} 65 65 + {{ $disabled = "disabled" }} 66 66 + {{ end }} 67 67 + <button id="resubmitBtn" 68 68 + {{ if not .Pull.IsPatchBased }} 69 69 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 70 70 + {{ else }} 71 71 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 72 72 + hx-target="#actions-{{$roundNumber}}" 73 73 + hx-swap="outerHtml" 67 74 {{ end }} 68 68 - <button id="resubmitBtn" 69 69 - {{ if not .Pull.IsPatchBased }} 70 70 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 71 71 - {{ else }} 72 72 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 73 73 - hx-target="#actions-{{$roundNumber}}" 74 74 - hx-swap="outerHtml" 75 75 - {{ end }} 76 75 77 77 - hx-disabled-elt="#resubmitBtn" 78 78 - class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 76 76 + hx-disabled-elt="#resubmitBtn" 77 77 + class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 79 78 80 80 - {{ if $disabled }} 81 81 - title="Update this branch to resubmit this pull request" 82 82 - {{ else }} 83 83 - title="Resubmit this pull request" 84 84 - {{ end }} 85 85 - > 86 86 - {{ i "rotate-ccw" "w-4 h-4" }} 87 87 - <span>resubmit</span> 88 88 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 89 89 - </button> 90 90 - {{ end }} 79 79 + {{ if $disabled }} 80 80 + title="Update this branch to resubmit this pull request" 81 81 + {{ else }} 82 82 + title="Resubmit this pull request" 83 83 + {{ end }} 84 84 + > 85 85 + {{ i "rotate-ccw" "w-4 h-4" }} 86 86 + <span>resubmit</span> 87 87 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 88 88 + </button> 89 89 + {{ end }} 91 90 92 92 - {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} 93 93 - <button 94 94 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 95 95 - hx-swap="none" 96 96 - class="btn p-2 flex items-center gap-2 group"> 97 97 - {{ i "ban" "w-4 h-4" }} 98 98 - <span>close</span> 99 99 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 100 100 - </button> 101 101 - {{ end }} 91 91 + {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} 92 92 + <button 93 93 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 94 94 + hx-swap="none" 95 95 + class="btn p-2 flex items-center gap-2 group"> 96 96 + {{ i "ban" "w-4 h-4" }} 97 97 + <span>close</span> 98 98 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 99 99 + </button> 100 100 + {{ end }} 102 101 103 103 - {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} 104 104 - <button 105 105 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 106 106 - hx-swap="none" 107 107 - class="btn p-2 flex items-center gap-2 group"> 108 108 - {{ i "refresh-ccw-dot" "w-4 h-4" }} 109 109 - <span>reopen</span> 110 110 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 111 111 - </button> 112 112 - {{ end }} 113 113 - </div> 102 102 + {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} 103 103 + <button 104 104 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 105 105 + hx-swap="none" 106 106 + class="btn p-2 flex items-center gap-2 group"> 107 107 + {{ i "refresh-ccw-dot" "w-4 h-4" }} 108 108 + <span>reopen</span> 109 109 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 110 110 + </button> 111 111 + {{ end }} 114 112 </div> 115 113 {{ end }} 116 114

+19 -23

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

··· 33 33 "Icon" "ban" 34 34 "Meta" (string .RepoInfo.Stats.IssueCount.Closed)) }} 35 35 {{ $values := list $open $merged $closed }} 36 36 - <div class="flex flex-col gap-2"> 37 37 - <div class="flex justify-between items-stretch gap-2"> 38 38 - <form class="flex flex-1 relative" method="GET"> 39 39 - <input type="hidden" name="state" value="{{ .FilteringBy.String }}"> 40 40 - <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none"> 41 41 - {{ i "search" "w-4 h-4" }} 42 42 - </div> 43 43 - <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" "> 44 44 - <a 45 45 - href="?state={{ .FilteringBy.String }}" 46 46 - class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block" 47 47 - > 48 48 - {{ i "x" "w-4 h-4" }} 49 49 - </a> 50 50 - </form> 51 51 - <div class="hidden sm:block"> 52 52 - {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }} 36 36 + <div class="grid gap-2 grid-cols-[auto_1fr_auto] grid-row-2"> 37 37 + <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET"> 38 38 + <input type="hidden" name="state" value="{{ .FilteringBy.String }}"> 39 39 + <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none"> 40 40 + {{ i "search" "w-4 h-4" }} 53 41 </div> 54 54 - <a href="/{{ .RepoInfo.FullName }}/pulls/new" 55 55 - class="btn-create text-sm flex items-center gap-2 no-underline hover:no-underline hover:text-white" 42 42 + <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" "> 43 43 + <a 44 44 + href="?state={{ .FilteringBy.String }}" 45 45 + class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block" 56 46 > 57 57 - {{ i "git-pull-request-create" "w-4 h-4" }} 58 58 - <span>new</span> 47 47 + {{ i "x" "w-4 h-4" }} 59 48 </a> 60 60 - </div> 61 61 - <div class="sm:hidden"> 49 49 + </form> 50 50 + <div class="sm:row-start-1"> 62 51 {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }} 63 52 </div> 53 53 + <a 54 54 + href="/{{ .RepoInfo.FullName }}/pulls/new" 55 55 + class="col-start-3 btn-create text-sm flex items-center gap-2 no-underline hover:no-underline hover:text-white" 56 56 + > 57 57 + {{ i "git-pull-request-create" "w-4 h-4" }} 58 58 + <span>new</span> 59 59 + </a> 64 60 </div> 65 61 <div class="error" id="pulls"></div> 66 62 {{ end }}

+17 -10

appview/pages/templates/repo/settings/access.html

··· 66 66 <div 67 67 id="add-collaborator-modal" 68 68 popover 69 69 - class="bg-white w-full md:w-96 dark:bg-gray-800 p-4 rounded border border-gray-200 dark:border-gray-700 drop-shadow dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50"> 69 69 + class=" 70 70 + bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 71 71 + dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50 72 72 + w-full md:w-96 p-4 rounded drop-shadow overflow-visible"> 70 73 {{ template "addCollaboratorModal" . }} 71 74 </div> 72 75 {{ end }} ··· 82 85 ADD COLLABORATOR 83 86 </label> 84 87 <p class="text-sm text-gray-500 dark:text-gray-400">Collaborators can push to this repository.</p> 85 85 - <input 86 86 - autocapitalize="none" 87 87 - autocorrect="off" 88 88 - type="text" 89 89 - id="add-collaborator" 90 90 - name="collaborator" 91 91 - required 92 92 - placeholder="foo.bsky.social" 93 93 - /> 88 88 + <actor-typeahead> 89 89 + <input 90 90 + autocapitalize="none" 91 91 + autocorrect="off" 92 92 + autocomplete="off" 93 93 + type="text" 94 94 + id="add-collaborator" 95 95 + name="collaborator" 96 96 + required 97 97 + placeholder="user.tngl.sh" 98 98 + class="w-full" 99 99 + /> 100 100 + </actor-typeahead> 94 101 <div class="flex gap-2 pt-2"> 95 102 <button 96 103 type="button"

+8

appview/pages/templates/repo/tree.html

··· 59 59 {{ $icon := "folder" }} 60 60 {{ $iconStyle := "size-4 fill-current" }} 61 61 62 62 + {{ if .IsSubmodule }} 63 63 + {{ $link = printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) $.TreePath .Name }} 64 64 + {{ $icon = "folder-input" }} 65 65 + {{ $iconStyle = "size-4" }} 66 66 + {{ end }} 67 67 + 62 68 {{ if .IsFile }} 69 69 + {{ $link = printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "blob" (urlquery $.Ref) $.TreePath .Name }} 63 70 {{ $icon = "file" }} 64 71 {{ $iconStyle = "size-4" }} 65 72 {{ end }} 73 73 + 66 74 <a href="{{ $link }}" class="{{ $linkstyle }}"> 67 75 <div class="flex items-center gap-2"> 68 76 {{ i $icon $iconStyle "flex-shrink-0" }}

+16 -11

appview/pages/templates/spindles/fragments/addMemberModal.html

··· 13 13 <div 14 14 id="add-member-{{ .Instance }}" 15 15 popover 16 16 - class="bg-white w-full md:w-96 dark:bg-gray-800 p-4 rounded border border-gray-200 dark:border-gray-700 drop-shadow dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50"> 16 16 + class=" 17 17 + bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50 18 18 + w-full md:w-96 p-4 rounded drop-shadow overflow-visible"> 17 19 {{ block "addSpindleMemberPopover" . }} {{ end }} 18 20 </div> 19 21 {{ end }} ··· 29 31 ADD MEMBER 30 32 </label> 31 33 <p class="text-sm text-gray-500 dark:text-gray-400">Members can register repositories and run workflows on this spindle.</p> 32 32 - <input 33 33 - autocapitalize="none" 34 34 - autocorrect="off" 35 35 - autocomplete="off" 36 36 - type="text" 37 37 - id="member-did-{{ .Id }}" 38 38 - name="member" 39 39 - required 40 40 - placeholder="foo.bsky.social" 41 41 - /> 34 34 + <actor-typeahead> 35 35 + <input 36 36 + autocapitalize="none" 37 37 + autocorrect="off" 38 38 + autocomplete="off" 39 39 + type="text" 40 40 + id="member-did-{{ .Id }}" 41 41 + name="member" 42 42 + required 43 43 + placeholder="user.tngl.sh" 44 44 + class="w-full" 45 45 + /> 46 46 + </actor-typeahead> 42 47 <div class="flex gap-2 pt-2"> 43 48 <button 44 49 type="button"

+2 -2

appview/pages/templates/strings/string.html

··· 75 75 </div> 76 76 <div class="overflow-x-auto overflow-y-hidden relative"> 77 77 {{ if .ShowRendered }} 78 78 - <div id="blob-contents" class="prose dark:prose-invert">{{ .RenderedContents }}</div> 78 78 + <div id="blob-contents" class="prose dark:prose-invert">{{ .String.Contents | readme }}</div> 79 79 {{ else }} 80 80 - <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ .String.Contents | escapeHtml }}</div> 80 80 + <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .String.Contents .String.Filename | escapeHtml }}</div> 81 81 {{ end }} 82 82 </div> 83 83 {{ template "fragments/multiline-select" }}

+14

appview/pages/templates/user/settings/notifications.html

··· 144 144 <div class="flex items-center justify-between p-2"> 145 145 <div class="flex items-center gap-2"> 146 146 <div class="flex flex-col gap-1"> 147 147 + <span class="font-bold">Mentions</span> 148 148 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 149 149 + <span>When someone mentions you.</span> 150 150 + </div> 151 151 + </div> 152 152 + </div> 153 153 + <label class="flex items-center gap-2"> 154 154 + <input type="checkbox" name="mentioned" {{if .Preferences.UserMentioned}}checked{{end}}> 155 155 + </label> 156 156 + </div> 157 157 + 158 158 + <div class="flex items-center justify-between p-2"> 159 159 + <div class="flex items-center gap-2"> 160 160 + <div class="flex flex-col gap-1"> 147 161 <span class="font-bold">Email notifications</span> 148 162 <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 149 163 <span>Receive notifications via email in addition to in-app notifications.</span>

+136 -64

appview/repo/blob.go

··· 1 1 package repo 2 2 3 3 import ( 4 4 + "encoding/base64" 4 5 "fmt" 5 6 "io" 6 7 "net/http" ··· 10 11 "strings" 11 12 12 13 "tangled.org/core/api/tangled" 14 14 + "tangled.org/core/appview/config" 15 15 + "tangled.org/core/appview/models" 13 16 "tangled.org/core/appview/pages" 14 17 "tangled.org/core/appview/pages/markup" 18 18 + "tangled.org/core/appview/reporesolver" 15 19 xrpcclient "tangled.org/core/appview/xrpcclient" 16 20 17 21 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 18 22 "github.com/go-chi/chi/v5" 19 23 ) 20 24 25 25 + // the content can be one of the following: 26 26 + // 27 27 + // - code : text | | raw 28 28 + // - markup : text | rendered | raw 29 29 + // - svg : text | rendered | raw 30 30 + // - png : | rendered | raw 31 31 + // - video : | rendered | raw 32 32 + // - submodule : | rendered | 33 33 + // - rest : | | 21 34 func (rp *Repo) Blob(w http.ResponseWriter, r *http.Request) { 22 35 l := rp.logger.With("handler", "RepoBlob") 36 36 + 23 37 f, err := rp.repoResolver.Resolve(r) 24 38 if err != nil { 25 39 l.Error("failed to get repo and knot", "err", err) 26 40 return 27 41 } 42 42 + 28 43 ref := chi.URLParam(r, "ref") 29 44 ref, _ = url.PathUnescape(ref) 45 45 + 30 46 filePath := chi.URLParam(r, "*") 31 47 filePath, _ = url.PathUnescape(filePath) 48 48 + 32 49 scheme := "http" 33 50 if !rp.config.Core.Dev { 34 51 scheme = "https" ··· 44 61 rp.pages.Error503(w) 45 62 return 46 63 } 64 64 + 47 65 // Use XRPC response directly instead of converting to internal types 48 66 var breadcrumbs [][]string 49 67 breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), url.PathEscape(ref))}) ··· 52 70 breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], url.PathEscape(elem))}) 53 71 } 54 72 } 55 55 - showRendered := false 56 56 - renderToggle := false 57 57 - if markup.GetFormat(resp.Path) == markup.FormatMarkdown { 58 58 - renderToggle = true 59 59 - showRendered = r.URL.Query().Get("code") != "true" 60 60 - } 61 61 - var unsupported bool 62 62 - var isImage bool 63 63 - var isVideo bool 64 64 - var contentSrc string 65 65 - if resp.IsBinary != nil && *resp.IsBinary { 66 66 - ext := strings.ToLower(filepath.Ext(resp.Path)) 67 67 - switch ext { 68 68 - case ".jpg", ".jpeg", ".png", ".gif", ".svg", ".webp": 69 69 - isImage = true 70 70 - case ".mp4", ".webm", ".ogg", ".mov", ".avi": 71 71 - isVideo = true 72 72 - default: 73 73 - unsupported = true 74 74 - } 75 75 - // fetch the raw binary content using sh.tangled.repo.blob xrpc 76 76 - repoName := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 77 77 - baseURL := &url.URL{ 78 78 - Scheme: scheme, 79 79 - Host: f.Knot, 80 80 - Path: "/xrpc/sh.tangled.repo.blob", 81 81 - } 82 82 - query := baseURL.Query() 83 83 - query.Set("repo", repoName) 84 84 - query.Set("ref", ref) 85 85 - query.Set("path", filePath) 86 86 - query.Set("raw", "true") 87 87 - baseURL.RawQuery = query.Encode() 88 88 - blobURL := baseURL.String() 89 89 - contentSrc = blobURL 90 90 - if !rp.config.Core.Dev { 91 91 - contentSrc = markup.GenerateCamoURL(rp.config.Camo.Host, rp.config.Camo.SharedSecret, blobURL) 92 92 - } 93 93 - } 94 94 - lines := 0 95 95 - if resp.IsBinary == nil || !*resp.IsBinary { 96 96 - lines = strings.Count(resp.Content, "\n") + 1 97 97 - } 98 98 - var sizeHint uint64 99 99 - if resp.Size != nil { 100 100 - sizeHint = uint64(*resp.Size) 101 101 - } else { 102 102 - sizeHint = uint64(len(resp.Content)) 103 103 - } 73 73 + 74 74 + // Create the blob view 75 75 + blobView := NewBlobView(resp, rp.config, f, ref, filePath, r.URL.Query()) 76 76 + 104 77 user := rp.oauth.GetUser(r) 105 105 - // Determine if content is binary (dereference pointer) 106 106 - isBinary := false 107 107 - if resp.IsBinary != nil { 108 108 - isBinary = *resp.IsBinary 109 109 - } 78 78 + 110 79 rp.pages.RepoBlob(w, pages.RepoBlobParams{ 111 80 LoggedInUser: user, 112 81 RepoInfo: f.RepoInfo(user), 113 82 BreadCrumbs: breadcrumbs, 114 114 - ShowRendered: showRendered, 115 115 - RenderToggle: renderToggle, 116 116 - Unsupported: unsupported, 117 117 - IsImage: isImage, 118 118 - IsVideo: isVideo, 119 119 - ContentSrc: contentSrc, 83 83 + BlobView: blobView, 120 84 RepoBlob_Output: resp, 121 121 - Contents: resp.Content, 122 122 - Lines: lines, 123 123 - SizeHint: sizeHint, 124 124 - IsBinary: isBinary, 125 85 }) 126 86 } 127 87 128 88 func (rp *Repo) RepoBlobRaw(w http.ResponseWriter, r *http.Request) { 129 89 l := rp.logger.With("handler", "RepoBlobRaw") 90 90 + 130 91 f, err := rp.repoResolver.Resolve(r) 131 92 if err != nil { 132 93 l.Error("failed to get repo and knot", "err", err) 133 94 w.WriteHeader(http.StatusBadRequest) 134 95 return 135 96 } 97 97 + 136 98 ref := chi.URLParam(r, "ref") 137 99 ref, _ = url.PathUnescape(ref) 100 100 + 138 101 filePath := chi.URLParam(r, "*") 139 102 filePath, _ = url.PathUnescape(filePath) 103 103 + 140 104 scheme := "http" 141 105 if !rp.config.Core.Dev { 142 106 scheme = "https" ··· 159 123 l.Error("failed to create request", "err", err) 160 124 return 161 125 } 126 126 + 162 127 // forward the If-None-Match header 163 128 if clientETag := r.Header.Get("If-None-Match"); clientETag != "" { 164 129 req.Header.Set("If-None-Match", clientETag) 165 130 } 166 131 client := &http.Client{} 132 132 + 167 133 resp, err := client.Do(req) 168 134 if err != nil { 169 135 l.Error("failed to reach knotserver", "err", err) 170 136 rp.pages.Error503(w) 171 137 return 172 138 } 139 139 + 173 140 defer resp.Body.Close() 141 141 + 174 142 // forward 304 not modified 175 143 if resp.StatusCode == http.StatusNotModified { 176 144 w.WriteHeader(http.StatusNotModified) 177 145 return 178 146 } 147 147 + 179 148 if resp.StatusCode != http.StatusOK { 180 149 l.Error("knotserver returned non-OK status for raw blob", "url", blobURL, "statuscode", resp.StatusCode) 181 150 w.WriteHeader(resp.StatusCode) 182 151 _, _ = io.Copy(w, resp.Body) 183 152 return 184 153 } 154 154 + 185 155 contentType := resp.Header.Get("Content-Type") 186 156 body, err := io.ReadAll(resp.Body) 187 157 if err != nil { ··· 189 159 w.WriteHeader(http.StatusInternalServerError) 190 160 return 191 161 } 162 162 + 192 163 if strings.HasPrefix(contentType, "text/") || isTextualMimeType(contentType) { 193 164 // serve all textual content as text/plain 194 165 w.Header().Set("Content-Type", "text/plain; charset=utf-8") ··· 202 173 w.Write([]byte("unsupported content type")) 203 174 return 204 175 } 176 176 + } 177 177 + 178 178 + // NewBlobView creates a BlobView from the XRPC response 179 179 + func NewBlobView(resp *tangled.RepoBlob_Output, config *config.Config, f *reporesolver.ResolvedRepo, ref, filePath string, queryParams url.Values) models.BlobView { 180 180 + view := models.BlobView{ 181 181 + Contents: "", 182 182 + Lines: 0, 183 183 + } 184 184 + 185 185 + // Set size 186 186 + if resp.Size != nil { 187 187 + view.SizeHint = uint64(*resp.Size) 188 188 + } else if resp.Content != nil { 189 189 + view.SizeHint = uint64(len(*resp.Content)) 190 190 + } 191 191 + 192 192 + if resp.Submodule != nil { 193 193 + view.ContentType = models.BlobContentTypeSubmodule 194 194 + view.HasRenderedView = true 195 195 + view.ContentSrc = resp.Submodule.Url 196 196 + return view 197 197 + } 198 198 + 199 199 + // Determine if binary 200 200 + if resp.IsBinary != nil && *resp.IsBinary { 201 201 + view.ContentSrc = generateBlobURL(config, f, ref, filePath) 202 202 + ext := strings.ToLower(filepath.Ext(resp.Path)) 203 203 + 204 204 + switch ext { 205 205 + case ".jpg", ".jpeg", ".png", ".gif", ".webp": 206 206 + view.ContentType = models.BlobContentTypeImage 207 207 + view.HasRawView = true 208 208 + view.HasRenderedView = true 209 209 + view.ShowingRendered = true 210 210 + 211 211 + case ".svg": 212 212 + view.ContentType = models.BlobContentTypeSvg 213 213 + view.HasRawView = true 214 214 + view.HasTextView = true 215 215 + view.HasRenderedView = true 216 216 + view.ShowingRendered = queryParams.Get("code") != "true" 217 217 + if resp.Content != nil { 218 218 + bytes, _ := base64.StdEncoding.DecodeString(*resp.Content) 219 219 + view.Contents = string(bytes) 220 220 + view.Lines = strings.Count(view.Contents, "\n") + 1 221 221 + } 222 222 + 223 223 + case ".mp4", ".webm", ".ogg", ".mov", ".avi": 224 224 + view.ContentType = models.BlobContentTypeVideo 225 225 + view.HasRawView = true 226 226 + view.HasRenderedView = true 227 227 + view.ShowingRendered = true 228 228 + } 229 229 + 230 230 + return view 231 231 + } 232 232 + 233 233 + // otherwise, we are dealing with text content 234 234 + view.HasRawView = true 235 235 + view.HasTextView = true 236 236 + 237 237 + if resp.Content != nil { 238 238 + view.Contents = *resp.Content 239 239 + view.Lines = strings.Count(view.Contents, "\n") + 1 240 240 + } 241 241 + 242 242 + // with text, we may be dealing with markdown 243 243 + format := markup.GetFormat(resp.Path) 244 244 + if format == markup.FormatMarkdown { 245 245 + view.ContentType = models.BlobContentTypeMarkup 246 246 + view.HasRenderedView = true 247 247 + view.ShowingRendered = queryParams.Get("code") != "true" 248 248 + } 249 249 + 250 250 + return view 251 251 + } 252 252 + 253 253 + func generateBlobURL(config *config.Config, f *reporesolver.ResolvedRepo, ref, filePath string) string { 254 254 + scheme := "http" 255 255 + if !config.Core.Dev { 256 256 + scheme = "https" 257 257 + } 258 258 + 259 259 + repoName := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 260 260 + baseURL := &url.URL{ 261 261 + Scheme: scheme, 262 262 + Host: f.Knot, 263 263 + Path: "/xrpc/sh.tangled.repo.blob", 264 264 + } 265 265 + query := baseURL.Query() 266 266 + query.Set("repo", repoName) 267 267 + query.Set("ref", ref) 268 268 + query.Set("path", filePath) 269 269 + query.Set("raw", "true") 270 270 + baseURL.RawQuery = query.Encode() 271 271 + blobURL := baseURL.String() 272 272 + 273 273 + if !config.Core.Dev { 274 274 + return markup.GenerateCamoURL(config.Camo.Host, config.Camo.SharedSecret, blobURL) 275 275 + } 276 276 + return blobURL 205 277 } 206 278 207 279 func isTextualMimeType(mimeType string) bool {

+4 -5

appview/repo/index.go

··· 351 351 if treeResp != nil && treeResp.Files != nil { 352 352 for _, file := range treeResp.Files { 353 353 niceFile := types.NiceTree{ 354 354 - IsFile: file.Is_file, 355 355 - IsSubtree: file.Is_subtree, 356 356 - Name: file.Name, 357 357 - Mode: file.Mode, 358 358 - Size: file.Size, 354 354 + Name: file.Name, 355 355 + Mode: file.Mode, 356 356 + Size: file.Size, 359 357 } 358 358 + 360 359 if file.Last_commit != nil { 361 360 when, _ := time.Parse(time.RFC3339, file.Last_commit.When) 362 361 niceFile.LastCommit = &types.LastCommitInfo{

-2

appview/repo/repo.go

··· 78 78 } 79 79 } 80 80 81 81 - // isTextualMimeType returns true if the MIME type represents textual content 82 82 - 83 81 // modify the spindle configured for this repo 84 82 func (rp *Repo) EditSpindle(w http.ResponseWriter, r *http.Request) { 85 83 user := rp.oauth.GetUser(r)

+2 -2

appview/repo/repo_util.go

··· 17 17 18 18 func sortFiles(files []types.NiceTree) { 19 19 sort.Slice(files, func(i, j int) bool { 20 20 - iIsFile := files[i].IsFile 21 21 - jIsFile := files[j].IsFile 20 20 + iIsFile := files[i].IsFile() 21 21 + jIsFile := files[j].IsFile() 22 22 if iIsFile != jIsFile { 23 23 return !iIsFile 24 24 }

+1 -1

appview/repo/settings.go

··· 374 374 ) 375 375 376 376 err = rp.validator.ValidateURI(website) 377 377 - if err != nil { 377 377 + if website != "" && err != nil { 378 378 l.Error("invalid uri", "err", err) 379 379 rp.pages.Notice(w, noticeId, err.Error()) 380 380 return

+4 -5

appview/repo/tree.go

··· 50 50 files := make([]types.NiceTree, len(xrpcResp.Files)) 51 51 for i, xrpcFile := range xrpcResp.Files { 52 52 file := types.NiceTree{ 53 53 - Name: xrpcFile.Name, 54 54 - Mode: xrpcFile.Mode, 55 55 - Size: int64(xrpcFile.Size), 56 56 - IsFile: xrpcFile.Is_file, 57 57 - IsSubtree: xrpcFile.Is_subtree, 53 53 + Name: xrpcFile.Name, 54 54 + Mode: xrpcFile.Mode, 55 55 + Size: int64(xrpcFile.Size), 58 56 } 59 57 // Convert last commit info if present 60 58 if xrpcFile.Last_commit != nil { ··· 97 95 } 98 96 } 99 97 sortFiles(result.Files) 98 98 + 100 99 rp.pages.RepoTree(w, pages.RepoTreeParams{ 101 100 LoggedInUser: user, 102 101 BreadCrumbs: breadcrumbs,

+1

appview/settings/settings.go

··· 120 120 PullCommented: r.FormValue("pull_commented") == "on", 121 121 PullMerged: r.FormValue("pull_merged") == "on", 122 122 Followed: r.FormValue("followed") == "on", 123 123 + UserMentioned: r.FormValue("user_mentioned") == "on", 123 124 EmailNotifications: r.FormValue("email_notifications") == "on", 124 125 } 125 126

+11 -8

appview/state/router.go

··· 57 57 if userutil.IsFlattenedDid(firstPart) { 58 58 unflattenedDid := userutil.UnflattenDid(firstPart) 59 59 redirectPath := strings.Join(append([]string{unflattenedDid}, pathParts[1:]...), "/") 60 60 - http.Redirect(w, r, "/"+redirectPath, http.StatusFound) 60 60 + 61 61 + redirectURL := *r.URL 62 62 + redirectURL.Path = "/" + redirectPath 63 63 + 64 64 + http.Redirect(w, r, redirectURL.String(), http.StatusFound) 61 65 return 62 66 } 63 67 64 68 // if using a handle with @, rewrite to work without @ 65 69 if normalized := strings.TrimPrefix(firstPart, "@"); userutil.IsHandle(normalized) { 66 70 redirectPath := strings.Join(append([]string{normalized}, pathParts[1:]...), "/") 67 67 - http.Redirect(w, r, "/"+redirectPath, http.StatusFound) 71 71 + 72 72 + redirectURL := *r.URL 73 73 + redirectURL.Path = "/" + redirectPath 74 74 + 75 75 + http.Redirect(w, r, redirectURL.String(), http.StatusFound) 68 76 return 69 77 } 78 78 + 70 79 } 71 80 72 81 standardRouter.ServeHTTP(w, r) ··· 81 90 r.With(mw.ResolveIdent()).Route("/{user}", func(r chi.Router) { 82 91 r.Get("/", s.Profile) 83 92 r.Get("/feed.atom", s.AtomFeedPage) 84 84 - 85 85 - // redirect /@handle/repo.git -> /@handle/repo 86 86 - r.Get("/{repo}.git", func(w http.ResponseWriter, r *http.Request) { 87 87 - nonDotGitPath := strings.TrimSuffix(r.URL.Path, ".git") 88 88 - http.Redirect(w, r, nonDotGitPath, http.StatusMovedPermanently) 89 89 - }) 90 93 91 94 r.With(mw.ResolveRepo()).Route("/{repo}", func(r chi.Router) { 92 95 r.Use(mw.GoImport())

+17

flake.lock

··· 1 1 { 2 2 "nodes": { 3 3 + "actor-typeahead-src": { 4 4 + "flake": false, 5 5 + "locked": { 6 6 + "lastModified": 1762835797, 7 7 + "narHash": "sha256-heizoWUKDdar6ymfZTnj3ytcEv/L4d4fzSmtr0HlXsQ=", 8 8 + "ref": "refs/heads/main", 9 9 + "rev": "677fe7f743050a4e7f09d4a6f87bbf1325a06f6b", 10 10 + "revCount": 6, 11 11 + "type": "git", 12 12 + "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead" 13 13 + }, 14 14 + "original": { 15 15 + "type": "git", 16 16 + "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead" 17 17 + } 18 18 + }, 3 19 "flake-compat": { 4 20 "flake": false, 5 21 "locked": { ··· 150 166 }, 151 167 "root": { 152 168 "inputs": { 169 169 + "actor-typeahead-src": "actor-typeahead-src", 153 170 "flake-compat": "flake-compat", 154 171 "gomod2nix": "gomod2nix", 155 172 "htmx-src": "htmx-src",

+6 -1

flake.nix

··· 33 33 url = "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"; 34 34 flake = false; 35 35 }; 36 36 + actor-typeahead-src = { 37 37 + url = "git+https://tangled.org/@jakelazaroff.com/actor-typeahead"; 38 38 + flake = false; 39 39 + }; 36 40 ibm-plex-mono-src = { 37 41 url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-mono%401.1.0/ibm-plex-mono.zip"; 38 42 flake = false; ··· 54 58 inter-fonts-src, 55 59 sqlite-lib-src, 56 60 ibm-plex-mono-src, 61 61 + actor-typeahead-src, 57 62 ... 58 63 }: let 59 64 supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; ··· 81 86 lexgen = self.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;}; 82 87 goat = self.callPackage ./nix/pkgs/goat.nix {inherit indigo;}; 83 88 appview-static-files = self.callPackage ./nix/pkgs/appview-static-files.nix { 84 84 - inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src; 89 89 + inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src actor-typeahead-src; 85 90 }; 86 91 appview = self.callPackage ./nix/pkgs/appview.nix {}; 87 92 spindle = self.callPackage ./nix/pkgs/spindle.nix {};

+4 -12

go.mod

··· 7 7 github.com/alecthomas/assert/v2 v2.11.0 8 8 github.com/alecthomas/chroma/v2 v2.15.0 9 9 github.com/avast/retry-go/v4 v4.6.1 10 10 + github.com/blevesearch/bleve/v2 v2.5.3 10 11 github.com/bluekeyes/go-gitdiff v0.8.1 11 12 github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e 12 13 github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 14 14 + github.com/bmatcuk/doublestar/v4 v4.9.1 13 15 github.com/carlmjohnson/versioninfo v0.22.5 14 16 github.com/casbin/casbin/v2 v2.103.0 17 17 + github.com/charmbracelet/log v0.4.2 15 18 github.com/cloudflare/cloudflare-go v0.115.0 16 19 github.com/cyphar/filepath-securejoin v0.4.1 17 20 github.com/dgraph-io/ristretto v0.2.0 ··· 29 32 github.com/hiddeco/sshsig v0.2.0 30 33 github.com/hpcloud/tail v1.0.0 31 34 github.com/ipfs/go-cid v0.5.0 32 32 - github.com/lestrrat-go/jwx/v2 v2.1.6 33 35 github.com/mattn/go-sqlite3 v1.14.24 34 36 github.com/microcosm-cc/bluemonday v1.0.27 35 37 github.com/openbao/openbao/api/v2 v2.3.0 ··· 45 47 github.com/wyatt915/goldmark-treeblood v0.0.1 46 48 github.com/yuin/goldmark v1.7.13 47 49 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc 50 50 + gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab 48 51 golang.org/x/crypto v0.40.0 49 52 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b 50 53 golang.org/x/image v0.31.0 ··· 65 68 github.com/aymerick/douceur v0.2.0 // indirect 66 69 github.com/beorn7/perks v1.0.1 // indirect 67 70 github.com/bits-and-blooms/bitset v1.22.0 // indirect 68 68 - github.com/blevesearch/bleve/v2 v2.5.3 // indirect 69 71 github.com/blevesearch/bleve_index_api v1.2.8 // indirect 70 72 github.com/blevesearch/geo v0.2.4 // indirect 71 73 github.com/blevesearch/go-faiss v1.0.25 // indirect ··· 83 85 github.com/blevesearch/zapx/v14 v14.4.2 // indirect 84 86 github.com/blevesearch/zapx/v15 v15.4.2 // indirect 85 87 github.com/blevesearch/zapx/v16 v16.2.4 // indirect 86 86 - github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect 87 88 github.com/casbin/govaluate v1.3.0 // indirect 88 89 github.com/cenkalti/backoff/v4 v4.3.0 // indirect 89 90 github.com/cespare/xxhash/v2 v2.3.0 // indirect 90 91 github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect 91 92 github.com/charmbracelet/lipgloss v1.1.0 // indirect 92 92 - github.com/charmbracelet/log v0.4.2 // indirect 93 93 github.com/charmbracelet/x/ansi v0.8.0 // indirect 94 94 github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect 95 95 github.com/charmbracelet/x/term v0.2.1 // indirect ··· 98 98 github.com/containerd/errdefs/pkg v0.3.0 // indirect 99 99 github.com/containerd/log v0.1.0 // indirect 100 100 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect 101 101 - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect 102 101 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect 103 102 github.com/distribution/reference v0.6.0 // indirect 104 103 github.com/dlclark/regexp2 v1.11.5 // indirect ··· 152 151 github.com/kevinburke/ssh_config v1.2.0 // indirect 153 152 github.com/klauspost/compress v1.18.0 // indirect 154 153 github.com/klauspost/cpuid/v2 v2.3.0 // indirect 155 155 - github.com/lestrrat-go/blackmagic v1.0.4 // indirect 156 156 - github.com/lestrrat-go/httpcc v1.0.1 // indirect 157 157 - github.com/lestrrat-go/httprc v1.0.6 // indirect 158 158 - github.com/lestrrat-go/iter v1.0.2 // indirect 159 159 - github.com/lestrrat-go/option v1.0.1 // indirect 160 154 github.com/lucasb-eyer/go-colorful v1.2.0 // indirect 161 155 github.com/mattn/go-isatty v0.0.20 // indirect 162 156 github.com/mattn/go-runewidth v0.0.16 // indirect ··· 191 185 github.com/prometheus/procfs v0.16.1 // indirect 192 186 github.com/rivo/uniseg v0.4.7 // indirect 193 187 github.com/ryanuber/go-glob v1.0.0 // indirect 194 194 - github.com/segmentio/asm v1.2.0 // indirect 195 188 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect 196 189 github.com/spaolacci/murmur3 v1.1.0 // indirect 197 190 github.com/vmihailenco/go-tinylfu v0.2.2 // indirect ··· 199 192 github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect 200 193 github.com/wyatt915/treeblood v0.1.16 // indirect 201 194 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect 202 202 - gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab // indirect 203 195 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect 204 196 gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect 205 197 go.etcd.io/bbolt v1.4.0 // indirect

-17

go.sum

··· 71 71 github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 h1:CFvRtYNSnWRAi/98M3O466t9dYuwtesNbu6FVPymRrA= 72 72 github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1/go.mod h1:WiYEeyJSdUwqoaZ71KJSpTblemUCpwJfh5oVXplK6T4= 73 73 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 74 74 - github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q= 75 74 github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= 76 75 github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE= 77 76 github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= ··· 126 125 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 127 126 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= 128 127 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 129 129 - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc= 130 130 - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= 131 128 github.com/dgraph-io/ristretto v0.2.0 h1:XAfl+7cmoUDWW/2Lx8TGZQjjxIQ2Ley9DSf52dru4WE= 132 129 github.com/dgraph-io/ristretto v0.2.0/go.mod h1:8uBHCU/PBV4Ag0CJrP47b9Ofby5dqWNh4FicAdoqFNU= 133 130 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= ··· 330 327 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 331 328 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= 332 329 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= 333 333 - github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA= 334 334 - github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw= 335 335 - github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= 336 336 - github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= 337 337 - github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k= 338 338 - github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= 339 339 - github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= 340 340 - github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= 341 341 - github.com/lestrrat-go/jwx/v2 v2.1.6 h1:hxM1gfDILk/l5ylers6BX/Eq1m/pnxe9NBwW6lVfecA= 342 342 - github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU= 343 343 - github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= 344 344 - github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= 345 330 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= 346 331 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= 347 332 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= ··· 466 451 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= 467 452 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= 468 453 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= 469 469 - github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= 470 470 - github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= 471 454 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= 472 455 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= 473 456 github.com/sethvargo/go-envconfig v1.1.0 h1:cWZiJxeTm7AlCvzGXrEXaSTCNgip5oJepekh/BOQuog=

+34

input.css

··· 245 245 details[data-callout] > summary::-webkit-details-marker { 246 246 display: none; 247 247 } 248 248 + 248 249 } 249 250 @layer utilities { 250 251 .error { ··· 928 929 text-decoration: underline; 929 930 } 930 931 } 932 932 + 933 933 + actor-typeahead { 934 934 + --color-background: #ffffff; 935 935 + --color-border: #d1d5db; 936 936 + --color-shadow: #000000; 937 937 + --color-hover: #f9fafb; 938 938 + --color-avatar-fallback: #e5e7eb; 939 939 + --radius: 0.0; 940 940 + --padding-menu: 0.0rem; 941 941 + z-index: 1000; 942 942 + } 943 943 + 944 944 + actor-typeahead::part(handle) { 945 945 + color: #111827; 946 946 + } 947 947 + 948 948 + actor-typeahead::part(menu) { 949 949 + box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); 950 950 + } 951 951 + 952 952 + @media (prefers-color-scheme: dark) { 953 953 + actor-typeahead { 954 954 + --color-background: #1f2937; 955 955 + --color-border: #4b5563; 956 956 + --color-shadow: #000000; 957 957 + --color-hover: #374151; 958 958 + --color-avatar-fallback: #4b5563; 959 959 + } 960 960 + 961 961 + actor-typeahead::part(handle) { 962 962 + color: #f9fafb; 963 963 + } 964 964 + }

+60 -2

knotserver/git/git.go

··· 3 3 import ( 4 4 "archive/tar" 5 5 "bytes" 6 6 + "errors" 6 7 "fmt" 7 8 "io" 8 9 "io/fs" ··· 12 13 "time" 13 14 14 15 "github.com/go-git/go-git/v5" 16 16 + "github.com/go-git/go-git/v5/config" 15 17 "github.com/go-git/go-git/v5/plumbing" 16 18 "github.com/go-git/go-git/v5/plumbing/object" 17 19 ) 18 20 19 21 var ( 20 20 - ErrBinaryFile = fmt.Errorf("binary file") 21 21 - ErrNotBinaryFile = fmt.Errorf("not binary file") 22 22 + ErrBinaryFile = errors.New("binary file") 23 23 + ErrNotBinaryFile = errors.New("not binary file") 24 24 + ErrMissingGitModules = errors.New("no .gitmodules file found") 25 25 + ErrInvalidGitModules = errors.New("invalid .gitmodules file") 26 26 + ErrNotSubmodule = errors.New("path is not a submodule") 22 27 ) 23 28 24 29 type GitRepo struct { ··· 188 193 defer reader.Close() 189 194 190 195 return io.ReadAll(reader) 196 196 + } 197 197 + 198 198 + // read and parse .gitmodules 199 199 + func (g *GitRepo) Submodules() (*config.Modules, error) { 200 200 + c, err := g.r.CommitObject(g.h) 201 201 + if err != nil { 202 202 + return nil, fmt.Errorf("commit object: %w", err) 203 203 + } 204 204 + 205 205 + tree, err := c.Tree() 206 206 + if err != nil { 207 207 + return nil, fmt.Errorf("tree: %w", err) 208 208 + } 209 209 + 210 210 + // read .gitmodules file 211 211 + modulesEntry, err := tree.FindEntry(".gitmodules") 212 212 + if err != nil { 213 213 + return nil, fmt.Errorf("%w: %w", ErrMissingGitModules, err) 214 214 + } 215 215 + 216 216 + modulesFile, err := tree.TreeEntryFile(modulesEntry) 217 217 + if err != nil { 218 218 + return nil, fmt.Errorf("%w: failed to read file: %w", ErrInvalidGitModules, err) 219 219 + } 220 220 + 221 221 + content, err := modulesFile.Contents() 222 222 + if err != nil { 223 223 + return nil, fmt.Errorf("%w: failed to read contents: %w", ErrInvalidGitModules, err) 224 224 + } 225 225 + 226 226 + // parse .gitmodules 227 227 + modules := config.NewModules() 228 228 + if err = modules.Unmarshal([]byte(content)); err != nil { 229 229 + return nil, fmt.Errorf("%w: failed to parse: %w", ErrInvalidGitModules, err) 230 230 + } 231 231 + 232 232 + return modules, nil 233 233 + } 234 234 + 235 235 + func (g *GitRepo) Submodule(path string) (*config.Submodule, error) { 236 236 + modules, err := g.Submodules() 237 237 + if err != nil { 238 238 + return nil, err 239 239 + } 240 240 + 241 241 + for _, submodule := range modules.Submodules { 242 242 + if submodule.Path == path { 243 243 + return submodule, nil 244 244 + } 245 245 + } 246 246 + 247 247 + // path is not a submodule 248 248 + return nil, ErrNotSubmodule 191 249 } 192 250 193 251 func (g *GitRepo) Branch(name string) (*plumbing.Reference, error) {

+4 -13

knotserver/git/tree.go

··· 7 7 "path" 8 8 "time" 9 9 10 10 + "github.com/go-git/go-git/v5/plumbing/filemode" 10 11 "github.com/go-git/go-git/v5/plumbing/object" 11 12 "tangled.org/core/types" 12 13 ) ··· 53 54 } 54 55 55 56 for _, e := range subtree.Entries { 56 56 - mode, _ := e.Mode.ToOSFileMode() 57 57 sz, _ := subtree.Size(e.Name) 58 58 - 59 58 fpath := path.Join(parent, e.Name) 60 59 61 60 var lastCommit *types.LastCommitInfo ··· 69 68 70 69 nts = append(nts, types.NiceTree{ 71 70 Name: e.Name, 72 72 - Mode: mode.String(), 73 73 - IsFile: e.Mode.IsFile(), 71 71 + Mode: e.Mode.String(), 74 72 Size: sz, 75 73 LastCommit: lastCommit, 76 74 }) ··· 126 124 default: 127 125 } 128 126 129 129 - mode, err := e.Mode.ToOSFileMode() 130 130 - if err != nil { 131 131 - // TODO: log this 132 132 - continue 133 133 - } 134 134 - 135 127 if e.Mode.IsFile() { 136 136 - err = cb(e, currentTree, root) 137 137 - if errors.Is(err, TerminateWalk) { 128 128 + if err := cb(e, currentTree, root); errors.Is(err, TerminateWalk) { 138 129 return err 139 130 } 140 131 } 141 132 142 133 // e is a directory 143 143 - if mode.IsDir() { 134 134 + if e.Mode == filemode.Dir { 144 135 subtree, err := currentTree.Tree(e.Name) 145 136 if err != nil { 146 137 return fmt.Errorf("sub tree %s: %w", e.Name, err)

+1 -1

knotserver/ingester.go

··· 161 161 162 162 var pipeline workflow.RawPipeline 163 163 for _, e := range workflowDir { 164 164 - if !e.IsFile { 164 164 + if !e.IsFile() { 165 165 continue 166 166 } 167 167

+1 -1

knotserver/internal.go

··· 277 277 278 278 var pipeline workflow.RawPipeline 279 279 for _, e := range workflowDir { 280 280 - if !e.IsFile { 280 280 + if !e.IsFile() { 281 281 continue 282 282 } 283 283

+21 -2

knotserver/xrpc/repo_blob.go

··· 42 42 return 43 43 } 44 44 45 45 + // first check if this path is a submodule 46 46 + submodule, err := gr.Submodule(treePath) 47 47 + if err != nil { 48 48 + // this is okay, continue and try to treat it as a regular file 49 49 + } else { 50 50 + response := tangled.RepoBlob_Output{ 51 51 + Ref: ref, 52 52 + Path: treePath, 53 53 + Submodule: &tangled.RepoBlob_Submodule{ 54 54 + Name: submodule.Name, 55 55 + Url: submodule.URL, 56 56 + Branch: &submodule.Branch, 57 57 + }, 58 58 + } 59 59 + writeJson(w, response) 60 60 + return 61 61 + } 62 62 + 45 63 contents, err := gr.RawContent(treePath) 46 64 if err != nil { 47 65 x.Logger.Error("file content", "error", err.Error(), "treePath", treePath) ··· 101 119 var encoding string 102 120 103 121 isBinary := !isTextual(mimeType) 122 122 + size := int64(len(contents)) 104 123 105 124 if isBinary { 106 125 content = base64.StdEncoding.EncodeToString(contents) ··· 113 132 response := tangled.RepoBlob_Output{ 114 133 Ref: ref, 115 134 Path: treePath, 116 116 - Content: content, 135 135 + Content: &content, 117 136 Encoding: &encoding, 118 118 - Size: &[]int64{int64(len(contents))}[0], 137 137 + Size: &size, 119 138 IsBinary: &isBinary, 120 139 } 121 140

+3 -5

knotserver/xrpc/repo_tree.go

··· 67 67 treeEntries := make([]*tangled.RepoTree_TreeEntry, len(files)) 68 68 for i, file := range files { 69 69 entry := &tangled.RepoTree_TreeEntry{ 70 70 - Name: file.Name, 71 71 - Mode: file.Mode, 72 72 - Size: file.Size, 73 73 - Is_file: file.IsFile, 74 74 - Is_subtree: file.IsSubtree, 70 70 + Name: file.Name, 71 71 + Mode: file.Mode, 72 72 + Size: file.Size, 75 73 } 76 74 77 75 if file.LastCommit != nil {

+49 -5

lexicons/repo/blob.json

··· 6 6 "type": "query", 7 7 "parameters": { 8 8 "type": "params", 9 9 - "required": ["repo", "ref", "path"], 9 9 + "required": [ 10 10 + "repo", 11 11 + "ref", 12 12 + "path" 13 13 + ], 10 14 "properties": { 11 15 "repo": { 12 16 "type": "string", ··· 31 35 "encoding": "application/json", 32 36 "schema": { 33 37 "type": "object", 34 34 - "required": ["ref", "path", "content"], 38 38 + "required": [ 39 39 + "ref", 40 40 + "path" 41 41 + ], 35 42 "properties": { 36 43 "ref": { 37 44 "type": "string", ··· 48 55 "encoding": { 49 56 "type": "string", 50 57 "description": "Content encoding", 51 51 - "enum": ["utf-8", "base64"] 58 58 + "enum": [ 59 59 + "utf-8", 60 60 + "base64" 61 61 + ] 52 62 }, 53 63 "size": { 54 64 "type": "integer", ··· 61 71 "mimeType": { 62 72 "type": "string", 63 73 "description": "MIME type of the file" 74 74 + }, 75 75 + "submodule": { 76 76 + "type": "ref", 77 77 + "ref": "#submodule", 78 78 + "description": "Submodule information if path is a submodule" 64 79 }, 65 80 "lastCommit": { 66 81 "type": "ref", ··· 90 105 }, 91 106 "lastCommit": { 92 107 "type": "object", 93 93 - "required": ["hash", "message", "when"], 108 108 + "required": [ 109 109 + "hash", 110 110 + "message", 111 111 + "when" 112 112 + ], 94 113 "properties": { 95 114 "hash": { 96 115 "type": "string", ··· 117 136 }, 118 137 "signature": { 119 138 "type": "object", 120 120 - "required": ["name", "email", "when"], 139 139 + "required": [ 140 140 + "name", 141 141 + "email", 142 142 + "when" 143 143 + ], 121 144 "properties": { 122 145 "name": { 123 146 "type": "string", ··· 131 154 "type": "string", 132 155 "format": "datetime", 133 156 "description": "Author timestamp" 157 157 + } 158 158 + } 159 159 + }, 160 160 + "submodule": { 161 161 + "type": "object", 162 162 + "required": [ 163 163 + "name", 164 164 + "url" 165 165 + ], 166 166 + "properties": { 167 167 + "name": { 168 168 + "type": "string", 169 169 + "description": "Submodule name" 170 170 + }, 171 171 + "url": { 172 172 + "type": "string", 173 173 + "description": "Submodule repository URL" 174 174 + }, 175 175 + "branch": { 176 176 + "type": "string", 177 177 + "description": "Branch to track in the submodule" 134 178 } 135 179 } 136 180 }

+1 -9

lexicons/repo/tree.json

··· 91 91 }, 92 92 "treeEntry": { 93 93 "type": "object", 94 94 - "required": ["name", "mode", "size", "is_file", "is_subtree"], 94 94 + "required": ["name", "mode", "size"], 95 95 "properties": { 96 96 "name": { 97 97 "type": "string", ··· 104 104 "size": { 105 105 "type": "integer", 106 106 "description": "File size in bytes" 107 107 - }, 108 108 - "is_file": { 109 109 - "type": "boolean", 110 110 - "description": "Whether this entry is a file" 111 111 - }, 112 112 - "is_subtree": { 113 113 - "type": "boolean", 114 114 - "description": "Whether this entry is a directory/subtree" 115 107 }, 116 108 "last_commit": { 117 109 "type": "ref",

+278 -12

nix/modules/appview.nix

··· 13 13 default = false; 14 14 description = "Enable tangled appview"; 15 15 }; 16 16 + 16 17 package = mkOption { 17 18 type = types.package; 18 19 description = "Package to use for the appview"; 19 20 }; 21 21 + 22 22 + # core configuration 20 23 port = mkOption { 21 21 - type = types.int; 24 24 + type = types.port; 22 25 default = 3000; 23 26 description = "Port to run the appview on"; 24 27 }; 28 28 + 29 29 + listenAddr = mkOption { 30 30 + type = types.str; 31 31 + default = "0.0.0.0:${toString cfg.port}"; 32 32 + description = "Listen address for the appview service"; 33 33 + }; 34 34 + 35 35 + dbPath = mkOption { 36 36 + type = types.str; 37 37 + default = "/var/lib/appview/appview.db"; 38 38 + description = "Path to the SQLite database file"; 39 39 + }; 40 40 + 41 41 + appviewHost = mkOption { 42 42 + type = types.str; 43 43 + default = "https://tangled.org"; 44 44 + example = "https://example.com"; 45 45 + description = "Public host URL for the appview instance"; 46 46 + }; 47 47 + 48 48 + appviewName = mkOption { 49 49 + type = types.str; 50 50 + default = "Tangled"; 51 51 + description = "Display name for the appview instance"; 52 52 + }; 53 53 + 54 54 + dev = mkOption { 55 55 + type = types.bool; 56 56 + default = false; 57 57 + description = "Enable development mode"; 58 58 + }; 59 59 + 60 60 + disallowedNicknamesFile = mkOption { 61 61 + type = types.nullOr types.path; 62 62 + default = null; 63 63 + description = "Path to file containing disallowed nicknames"; 64 64 + }; 65 65 + 66 66 + # redis configuration 67 67 + redis = { 68 68 + addr = mkOption { 69 69 + type = types.str; 70 70 + default = "localhost:6379"; 71 71 + description = "Redis server address"; 72 72 + }; 73 73 + 74 74 + db = mkOption { 75 75 + type = types.int; 76 76 + default = 0; 77 77 + description = "Redis database number"; 78 78 + }; 79 79 + }; 80 80 + 81 81 + # jetstream configuration 82 82 + jetstream = { 83 83 + endpoint = mkOption { 84 84 + type = types.str; 85 85 + default = "wss://jetstream1.us-east.bsky.network/subscribe"; 86 86 + description = "Jetstream WebSocket endpoint"; 87 87 + }; 88 88 + }; 89 89 + 90 90 + # knotstream consumer configuration 91 91 + knotstream = { 92 92 + retryInterval = mkOption { 93 93 + type = types.str; 94 94 + default = "60s"; 95 95 + description = "Initial retry interval for knotstream consumer"; 96 96 + }; 97 97 + 98 98 + maxRetryInterval = mkOption { 99 99 + type = types.str; 100 100 + default = "120m"; 101 101 + description = "Maximum retry interval for knotstream consumer"; 102 102 + }; 103 103 + 104 104 + connectionTimeout = mkOption { 105 105 + type = types.str; 106 106 + default = "5s"; 107 107 + description = "Connection timeout for knotstream consumer"; 108 108 + }; 109 109 + 110 110 + workerCount = mkOption { 111 111 + type = types.int; 112 112 + default = 64; 113 113 + description = "Number of workers for knotstream consumer"; 114 114 + }; 115 115 + 116 116 + queueSize = mkOption { 117 117 + type = types.int; 118 118 + default = 100; 119 119 + description = "Queue size for knotstream consumer"; 120 120 + }; 121 121 + }; 122 122 + 123 123 + # spindlestream consumer configuration 124 124 + spindlestream = { 125 125 + retryInterval = mkOption { 126 126 + type = types.str; 127 127 + default = "60s"; 128 128 + description = "Initial retry interval for spindlestream consumer"; 129 129 + }; 130 130 + 131 131 + maxRetryInterval = mkOption { 132 132 + type = types.str; 133 133 + default = "120m"; 134 134 + description = "Maximum retry interval for spindlestream consumer"; 135 135 + }; 136 136 + 137 137 + connectionTimeout = mkOption { 138 138 + type = types.str; 139 139 + default = "5s"; 140 140 + description = "Connection timeout for spindlestream consumer"; 141 141 + }; 142 142 + 143 143 + workerCount = mkOption { 144 144 + type = types.int; 145 145 + default = 64; 146 146 + description = "Number of workers for spindlestream consumer"; 147 147 + }; 148 148 + 149 149 + queueSize = mkOption { 150 150 + type = types.int; 151 151 + default = 100; 152 152 + description = "Queue size for spindlestream consumer"; 153 153 + }; 154 154 + }; 155 155 + 156 156 + # resend configuration 157 157 + resend = { 158 158 + sentFrom = mkOption { 159 159 + type = types.str; 160 160 + default = "noreply@notifs.tangled.sh"; 161 161 + description = "Email address to send notifications from"; 162 162 + }; 163 163 + }; 164 164 + 165 165 + # posthog configuration 166 166 + posthog = { 167 167 + endpoint = mkOption { 168 168 + type = types.str; 169 169 + default = "https://eu.i.posthog.com"; 170 170 + description = "PostHog API endpoint"; 171 171 + }; 172 172 + }; 173 173 + 174 174 + # camo configuration 175 175 + camo = { 176 176 + host = mkOption { 177 177 + type = types.str; 178 178 + default = "https://camo.tangled.sh"; 179 179 + description = "Camo proxy host URL"; 180 180 + }; 181 181 + }; 182 182 + 183 183 + # avatar configuration 184 184 + avatar = { 185 185 + host = mkOption { 186 186 + type = types.str; 187 187 + default = "https://avatar.tangled.sh"; 188 188 + description = "Avatar service host URL"; 189 189 + }; 190 190 + }; 191 191 + 192 192 + plc = { 193 193 + url = mkOption { 194 194 + type = types.str; 195 195 + default = "https://plc.directory"; 196 196 + description = "PLC directory URL"; 197 197 + }; 198 198 + }; 199 199 + 200 200 + pds = { 201 201 + host = mkOption { 202 202 + type = types.str; 203 203 + default = "https://tngl.sh"; 204 204 + description = "PDS host URL"; 205 205 + }; 206 206 + }; 207 207 + 208 208 + label = { 209 209 + defaults = mkOption { 210 210 + type = types.listOf types.str; 211 211 + default = [ 212 212 + "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.label.definition/wontfix" 213 213 + "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.label.definition/good-first-issue" 214 214 + "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.label.definition/duplicate" 215 215 + "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.label.definition/documentation" 216 216 + "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.label.definition/assignee" 217 217 + ]; 218 218 + description = "Default label definitions"; 219 219 + }; 220 220 + 221 221 + goodFirstIssue = mkOption { 222 222 + type = types.str; 223 223 + default = "at://did:plc:wshs7t2adsemcrrd4snkeqli/sh.tangled.label.definition/good-first-issue"; 224 224 + description = "Good first issue label definition"; 225 225 + }; 226 226 + }; 227 227 + 25 228 environmentFile = mkOption { 26 229 type = with types; nullOr path; 27 230 default = null; 28 28 - example = "/etc-/appview.env"; 231 231 + example = "/etc/appview.env"; 29 232 description = '' 30 233 Additional environment file as defined in {manpage}`systemd.exec(5)`. 31 234 32 32 - Sensitive secrets such as {env}`TANGLED_COOKIE_SECRET` may be 33 33 - passed to the service without makeing them world readable in the 34 34 - nix store. 35 35 - 235 235 + Sensitive secrets such as {env}`TANGLED_COOKIE_SECRET`, 236 236 + {env}`TANGLED_OAUTH_CLIENT_SECRET`, {env}`TANGLED_RESEND_API_KEY`, 237 237 + {env}`TANGLED_CAMO_SHARED_SECRET`, {env}`TANGLED_AVATAR_SHARED_SECRET`, 238 238 + {env}`TANGLED_REDIS_PASS`, {env}`TANGLED_PDS_ADMIN_SECRET`, 239 239 + {env}`TANGLED_CLOUDFLARE_API_TOKEN`, {env}`TANGLED_CLOUDFLARE_ZONE_ID`, 240 240 + {env}`TANGLED_CLOUDFLARE_TURNSTILE_SITE_KEY`, 241 241 + {env}`TANGLED_CLOUDFLARE_TURNSTILE_SECRET_KEY`, 242 242 + {env}`TANGLED_POSTHOG_API_KEY`, {env}`TANGLED_APP_PASSWORD`, 243 243 + and {env}`TANGLED_ALT_APP_PASSWORD` may be passed to the service 244 244 + without making them world readable in the nix store. 36 245 ''; 37 246 }; 38 247 }; ··· 47 256 systemd.services.appview = { 48 257 description = "tangled appview service"; 49 258 wantedBy = ["multi-user.target"]; 50 50 - after = ["redis-appview.service"]; 259 259 + after = ["redis-appview.service" "network-online.target"]; 51 260 requires = ["redis-appview.service"]; 261 261 + wants = ["network-online.target"]; 52 262 53 263 serviceConfig = { 54 54 - ListenStream = "0.0.0.0:${toString cfg.port}"; 264 264 + Type = "simple"; 55 265 ExecStart = "${cfg.package}/bin/appview"; 56 266 Restart = "always"; 57 57 - EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile; 58 58 - }; 267 267 + RestartSec = "10s"; 268 268 + EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; 269 269 + 270 270 + # state directory 271 271 + StateDirectory = "appview"; 272 272 + WorkingDirectory = "/var/lib/appview"; 59 273 60 60 - environment = { 61 61 - TANGLED_DB_PATH = "appview.db"; 274 274 + # security hardening 275 275 + NoNewPrivileges = true; 276 276 + PrivateTmp = true; 277 277 + ProtectSystem = "strict"; 278 278 + ProtectHome = true; 279 279 + ReadWritePaths = ["/var/lib/appview"]; 62 280 }; 281 281 + 282 282 + environment = 283 283 + { 284 284 + TANGLED_DB_PATH = cfg.dbPath; 285 285 + TANGLED_LISTEN_ADDR = cfg.listenAddr; 286 286 + TANGLED_APPVIEW_HOST = cfg.appviewHost; 287 287 + TANGLED_APPVIEW_NAME = cfg.appviewName; 288 288 + TANGLED_DEV = 289 289 + if cfg.dev 290 290 + then "true" 291 291 + else "false"; 292 292 + } 293 293 + // optionalAttrs (cfg.disallowedNicknamesFile != null) { 294 294 + TANGLED_DISALLOWED_NICKNAMES_FILE = cfg.disallowedNicknamesFile; 295 295 + } 296 296 + // { 297 297 + TANGLED_REDIS_ADDR = cfg.redis.addr; 298 298 + TANGLED_REDIS_DB = toString cfg.redis.db; 299 299 + 300 300 + TANGLED_JETSTREAM_ENDPOINT = cfg.jetstream.endpoint; 301 301 + 302 302 + TANGLED_KNOTSTREAM_RETRY_INTERVAL = cfg.knotstream.retryInterval; 303 303 + TANGLED_KNOTSTREAM_MAX_RETRY_INTERVAL = cfg.knotstream.maxRetryInterval; 304 304 + TANGLED_KNOTSTREAM_CONNECTION_TIMEOUT = cfg.knotstream.connectionTimeout; 305 305 + TANGLED_KNOTSTREAM_WORKER_COUNT = toString cfg.knotstream.workerCount; 306 306 + TANGLED_KNOTSTREAM_QUEUE_SIZE = toString cfg.knotstream.queueSize; 307 307 + 308 308 + TANGLED_SPINDLESTREAM_RETRY_INTERVAL = cfg.spindlestream.retryInterval; 309 309 + TANGLED_SPINDLESTREAM_MAX_RETRY_INTERVAL = cfg.spindlestream.maxRetryInterval; 310 310 + TANGLED_SPINDLESTREAM_CONNECTION_TIMEOUT = cfg.spindlestream.connectionTimeout; 311 311 + TANGLED_SPINDLESTREAM_WORKER_COUNT = toString cfg.spindlestream.workerCount; 312 312 + TANGLED_SPINDLESTREAM_QUEUE_SIZE = toString cfg.spindlestream.queueSize; 313 313 + 314 314 + TANGLED_RESEND_SENT_FROM = cfg.resend.sentFrom; 315 315 + 316 316 + TANGLED_POSTHOG_ENDPOINT = cfg.posthog.endpoint; 317 317 + 318 318 + TANGLED_CAMO_HOST = cfg.camo.host; 319 319 + 320 320 + TANGLED_AVATAR_HOST = cfg.avatar.host; 321 321 + 322 322 + TANGLED_PLC_URL = cfg.plc.url; 323 323 + 324 324 + TANGLED_PDS_HOST = cfg.pds.host; 325 325 + 326 326 + TANGLED_LABEL_DEFAULTS = concatStringsSep "," cfg.label.defaults; 327 327 + TANGLED_LABEL_GFI = cfg.label.goodFirstIssue; 328 328 + }; 63 329 }; 64 330 }; 65 331 }

+58 -2

nix/modules/knot.nix

··· 51 51 description = "Path where repositories are scanned from"; 52 52 }; 53 53 54 54 + readme = mkOption { 55 55 + type = types.listOf types.str; 56 56 + default = [ 57 57 + "README.md" 58 58 + "readme.md" 59 59 + "README" 60 60 + "readme" 61 61 + "README.markdown" 62 62 + "readme.markdown" 63 63 + "README.txt" 64 64 + "readme.txt" 65 65 + "README.rst" 66 66 + "readme.rst" 67 67 + "README.org" 68 68 + "readme.org" 69 69 + "README.asciidoc" 70 70 + "readme.asciidoc" 71 71 + ]; 72 72 + description = "List of README filenames to look for (in priority order)"; 73 73 + }; 74 74 + 54 75 mainBranch = mkOption { 55 76 type = types.str; 56 77 default = "main"; ··· 58 79 }; 59 80 }; 60 81 82 82 + git = { 83 83 + userName = mkOption { 84 84 + type = types.str; 85 85 + default = "Tangled"; 86 86 + description = "Git user name used as committer"; 87 87 + }; 88 88 + 89 89 + userEmail = mkOption { 90 90 + type = types.str; 91 91 + default = "noreply@tangled.org"; 92 92 + description = "Git user email used as committer"; 93 93 + }; 94 94 + }; 95 95 + 61 96 motd = mkOption { 62 97 type = types.nullOr types.str; 63 98 default = null; ··· 123 158 description = "Jetstream endpoint to subscribe to"; 124 159 }; 125 160 161 161 + logDids = mkOption { 162 162 + type = types.bool; 163 163 + default = true; 164 164 + description = "Enable logging of DIDs"; 165 165 + }; 166 166 + 126 167 dev = mkOption { 127 168 type = types.bool; 128 169 default = false; ··· 190 231 mkdir -p "${cfg.stateDir}/.config/git" 191 232 cat > "${cfg.stateDir}/.config/git/config" << EOF 192 233 [user] 193 193 - name = Git User 194 194 - email = git@example.com 234 234 + name = ${cfg.git.userName} 235 235 + email = ${cfg.git.userEmail} 195 236 [receive] 196 237 advertisePushOptions = true 238 238 + [uploadpack] 239 239 + allowFilter = true 197 240 EOF 198 241 ${setMotd} 199 242 chown -R ${cfg.gitUser}:${cfg.gitUser} "${cfg.stateDir}" ··· 205 248 WorkingDirectory = cfg.stateDir; 206 249 Environment = [ 207 250 "KNOT_REPO_SCAN_PATH=${cfg.repo.scanPath}" 251 251 + "KNOT_REPO_README=${concatStringsSep "," cfg.repo.readme}" 208 252 "KNOT_REPO_MAIN_BRANCH=${cfg.repo.mainBranch}" 253 253 + "KNOT_GIT_USER_NAME=${cfg.git.userName}" 254 254 + "KNOT_GIT_USER_EMAIL=${cfg.git.userEmail}" 209 255 "APPVIEW_ENDPOINT=${cfg.appviewEndpoint}" 210 256 "KNOT_SERVER_INTERNAL_LISTEN_ADDR=${cfg.server.internalListenAddr}" 211 257 "KNOT_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}" ··· 214 260 "KNOT_SERVER_PLC_URL=${cfg.server.plcUrl}" 215 261 "KNOT_SERVER_JETSTREAM_ENDPOINT=${cfg.server.jetstreamEndpoint}" 216 262 "KNOT_SERVER_OWNER=${cfg.server.owner}" 263 263 + "KNOT_SERVER_LOG_DIDS=${ 264 264 + if cfg.server.logDids 265 265 + then "true" 266 266 + else "false" 267 267 + }" 268 268 + "KNOT_SERVER_DEV=${ 269 269 + if cfg.server.dev 270 270 + then "true" 271 271 + else "false" 272 272 + }" 217 273 ]; 218 274 ExecStart = "${cfg.package}/bin/knot server"; 219 275 Restart = "always";

+2

nix/pkgs/appview-static-files.nix

··· 5 5 lucide-src, 6 6 inter-fonts-src, 7 7 ibm-plex-mono-src, 8 8 + actor-typeahead-src, 8 9 sqlite-lib, 9 10 tailwindcss, 10 11 src, ··· 24 25 cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 fonts/ 25 26 cp -f ${inter-fonts-src}/InterVariable*.ttf fonts/ 26 27 cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono*.woff2 fonts/ 28 28 + cp -f ${actor-typeahead-src}/actor-typeahead.js . 27 29 # tailwindcss -c $src/tailwind.config.js -i $src/input.css -o tw.css won't work 28 30 # for whatever reason (produces broken css), so we are doing this instead 29 31 cd ${src} && ${tailwindcss}/bin/tailwindcss -i input.css -o $out/tw.css

+1 -1

nix/vm.nix

··· 97 97 enable = true; 98 98 server = { 99 99 owner = envVar "TANGLED_VM_SPINDLE_OWNER"; 100 100 - hostname = envVarOr "TANGLED_VM_SPINDLE_OWNER" "localhost:6555"; 100 100 + hostname = envVarOr "TANGLED_VM_SPINDLE_HOST" "localhost:6555"; 101 101 plcUrl = plcUrl; 102 102 jetstreamEndpoint = jetstream; 103 103 listenAddr = "0.0.0.0:6555";

+1 -1

spindle/config/config.go

··· 13 13 DBPath string `env:"DB_PATH, default=spindle.db"` 14 14 Hostname string `env:"HOSTNAME, required"` 15 15 JetstreamEndpoint string `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"` 16 16 - PlcUrl string `env:"PLC_URL, default=plc.directory"` 16 16 + PlcUrl string `env:"PLC_URL, default=https://plc.directory"` 17 17 Dev bool `env:"DEV, default=false"` 18 18 Owner string `env:"OWNER, required"` 19 19 Secrets Secrets `env:",prefix=SECRETS_"`

+85 -40

spindle/server.go

··· 49 49 vault secrets.Manager 50 50 } 51 51 52 52 - func Run(ctx context.Context) error { 52 52 + // New creates a new Spindle server with the provided configuration and engines. 53 53 + func New(ctx context.Context, cfg *config.Config, engines map[string]models.Engine) (*Spindle, error) { 53 54 logger := log.FromContext(ctx) 54 54 - 55 55 - cfg, err := config.Load(ctx) 56 56 - if err != nil { 57 57 - return fmt.Errorf("failed to load config: %w", err) 58 58 - } 59 55 60 56 d, err := db.Make(cfg.Server.DBPath) 61 57 if err != nil { 62 62 - return fmt.Errorf("failed to setup db: %w", err) 58 58 + return nil, fmt.Errorf("failed to setup db: %w", err) 63 59 } 64 60 65 61 e, err := rbac.NewEnforcer(cfg.Server.DBPath) 66 62 if err != nil { 67 67 - return fmt.Errorf("failed to setup rbac enforcer: %w", err) 63 63 + return nil, fmt.Errorf("failed to setup rbac enforcer: %w", err) 68 64 } 69 65 e.E.EnableAutoSave(true) 70 66 ··· 74 70 switch cfg.Server.Secrets.Provider { 75 71 case "openbao": 76 72 if cfg.Server.Secrets.OpenBao.ProxyAddr == "" { 77 77 - return fmt.Errorf("openbao proxy address is required when using openbao secrets provider") 73 73 + return nil, fmt.Errorf("openbao proxy address is required when using openbao secrets provider") 78 74 } 79 75 vault, err = secrets.NewOpenBaoManager( 80 76 cfg.Server.Secrets.OpenBao.ProxyAddr, ··· 82 78 secrets.WithMountPath(cfg.Server.Secrets.OpenBao.Mount), 83 79 ) 84 80 if err != nil { 85 85 - return fmt.Errorf("failed to setup openbao secrets provider: %w", err) 81 81 + return nil, fmt.Errorf("failed to setup openbao secrets provider: %w", err) 86 82 } 87 83 logger.Info("using openbao secrets provider", "proxy_address", cfg.Server.Secrets.OpenBao.ProxyAddr, "mount", cfg.Server.Secrets.OpenBao.Mount) 88 84 case "sqlite", "": 89 85 vault, err = secrets.NewSQLiteManager(cfg.Server.DBPath, secrets.WithTableName("secrets")) 90 86 if err != nil { 91 91 - return fmt.Errorf("failed to setup sqlite secrets provider: %w", err) 87 87 + return nil, fmt.Errorf("failed to setup sqlite secrets provider: %w", err) 92 88 } 93 89 logger.Info("using sqlite secrets provider", "path", cfg.Server.DBPath) 94 90 default: 95 95 - return fmt.Errorf("unknown secrets provider: %s", cfg.Server.Secrets.Provider) 96 96 - } 97 97 - 98 98 - nixeryEng, err := nixery.New(ctx, cfg) 99 99 - if err != nil { 100 100 - return err 91 91 + return nil, fmt.Errorf("unknown secrets provider: %s", cfg.Server.Secrets.Provider) 101 92 } 102 93 103 94 jq := queue.NewQueue(cfg.Server.QueueSize, cfg.Server.MaxJobCount) ··· 110 101 } 111 102 jc, err := jetstream.NewJetstreamClient(cfg.Server.JetstreamEndpoint, "spindle", collections, nil, log.SubLogger(logger, "jetstream"), d, true, true) 112 103 if err != nil { 113 113 - return fmt.Errorf("failed to setup jetstream client: %w", err) 104 104 + return nil, fmt.Errorf("failed to setup jetstream client: %w", err) 114 105 } 115 106 jc.AddDid(cfg.Server.Owner) 116 107 117 108 // Check if the spindle knows about any Dids; 118 109 dids, err := d.GetAllDids() 119 110 if err != nil { 120 120 - return fmt.Errorf("failed to get all dids: %w", err) 111 111 + return nil, fmt.Errorf("failed to get all dids: %w", err) 121 112 } 122 113 for _, d := range dids { 123 114 jc.AddDid(d) ··· 125 116 126 117 resolver := idresolver.DefaultResolver(cfg.Server.PlcUrl) 127 118 128 128 - spindle := Spindle{ 119 119 + spindle := &Spindle{ 129 120 jc: jc, 130 121 e: e, 131 122 db: d, 132 123 l: logger, 133 124 n: &n, 134 134 - engs: map[string]models.Engine{"nixery": nixeryEng}, 125 125 + engs: engines, 135 126 jq: jq, 136 127 cfg: cfg, 137 128 res: resolver, ··· 140 131 141 132 err = e.AddSpindle(rbacDomain) 142 133 if err != nil { 143 143 - return fmt.Errorf("failed to set rbac domain: %w", err) 134 134 + return nil, fmt.Errorf("failed to set rbac domain: %w", err) 144 135 } 145 136 err = spindle.configureOwner() 146 137 if err != nil { 147 147 - return err 138 138 + return nil, err 148 139 } 149 140 logger.Info("owner set", "did", cfg.Server.Owner) 150 141 151 151 - // starts a job queue runner in the background 152 152 - jq.Start() 153 153 - defer jq.Stop() 154 154 - 155 155 - // Stop vault token renewal if it implements Stopper 156 156 - if stopper, ok := vault.(secrets.Stopper); ok { 157 157 - defer stopper.Stop() 158 158 - } 159 159 - 160 142 cursorStore, err := cursor.NewSQLiteStore(cfg.Server.DBPath) 161 143 if err != nil { 162 162 - return fmt.Errorf("failed to setup sqlite3 cursor store: %w", err) 144 144 + return nil, fmt.Errorf("failed to setup sqlite3 cursor store: %w", err) 163 145 } 164 146 165 147 err = jc.StartJetstream(ctx, spindle.ingest()) 166 148 if err != nil { 167 167 - return fmt.Errorf("failed to start jetstream consumer: %w", err) 149 149 + return nil, fmt.Errorf("failed to start jetstream consumer: %w", err) 168 150 } 169 151 170 152 // for each incoming sh.tangled.pipeline, we execute ··· 177 159 ccfg.CursorStore = cursorStore 178 160 knownKnots, err := d.Knots() 179 161 if err != nil { 180 180 - return err 162 162 + return nil, err 181 163 } 182 164 for _, knot := range knownKnots { 183 165 logger.Info("adding source start", "knot", knot) ··· 185 167 } 186 168 spindle.ks = eventconsumer.NewConsumer(*ccfg) 187 169 170 170 + return spindle, nil 171 171 + } 172 172 + 173 173 + // DB returns the database instance. 174 174 + func (s *Spindle) DB() *db.DB { 175 175 + return s.db 176 176 + } 177 177 + 178 178 + // Queue returns the job queue instance. 179 179 + func (s *Spindle) Queue() *queue.Queue { 180 180 + return s.jq 181 181 + } 182 182 + 183 183 + // Engines returns the map of available engines. 184 184 + func (s *Spindle) Engines() map[string]models.Engine { 185 185 + return s.engs 186 186 + } 187 187 + 188 188 + // Vault returns the secrets manager instance. 189 189 + func (s *Spindle) Vault() secrets.Manager { 190 190 + return s.vault 191 191 + } 192 192 + 193 193 + // Notifier returns the notifier instance. 194 194 + func (s *Spindle) Notifier() *notifier.Notifier { 195 195 + return s.n 196 196 + } 197 197 + 198 198 + // Enforcer returns the RBAC enforcer instance. 199 199 + func (s *Spindle) Enforcer() *rbac.Enforcer { 200 200 + return s.e 201 201 + } 202 202 + 203 203 + // Start starts the Spindle server (blocking). 204 204 + func (s *Spindle) Start(ctx context.Context) error { 205 205 + // starts a job queue runner in the background 206 206 + s.jq.Start() 207 207 + defer s.jq.Stop() 208 208 + 209 209 + // Stop vault token renewal if it implements Stopper 210 210 + if stopper, ok := s.vault.(secrets.Stopper); ok { 211 211 + defer stopper.Stop() 212 212 + } 213 213 + 188 214 go func() { 189 189 - logger.Info("starting knot event consumer") 190 190 - spindle.ks.Start(ctx) 215 215 + s.l.Info("starting knot event consumer") 216 216 + s.ks.Start(ctx) 191 217 }() 192 218 193 193 - logger.Info("starting spindle server", "address", cfg.Server.ListenAddr) 194 194 - logger.Error("server error", "error", http.ListenAndServe(cfg.Server.ListenAddr, spindle.Router())) 219 219 + s.l.Info("starting spindle server", "address", s.cfg.Server.ListenAddr) 220 220 + return http.ListenAndServe(s.cfg.Server.ListenAddr, s.Router()) 221 221 + } 222 222 + 223 223 + func Run(ctx context.Context) error { 224 224 + cfg, err := config.Load(ctx) 225 225 + if err != nil { 226 226 + return fmt.Errorf("failed to load config: %w", err) 227 227 + } 228 228 + 229 229 + nixeryEng, err := nixery.New(ctx, cfg) 230 230 + if err != nil { 231 231 + return err 232 232 + } 233 233 + 234 234 + s, err := New(ctx, cfg, map[string]models.Engine{ 235 235 + "nixery": nixeryEng, 236 236 + }) 237 237 + if err != nil { 238 238 + return err 239 239 + } 195 240 196 196 - return nil 241 241 + return s.Start(ctx) 197 242 } 198 243 199 244 func (s *Spindle) Router() http.Handler {

+5

spindle/stream.go

··· 213 213 if err := conn.WriteMessage(websocket.TextMessage, []byte(line.Text)); err != nil { 214 214 return fmt.Errorf("failed to write to websocket: %w", err) 215 215 } 216 216 + case <-time.After(30 * time.Second): 217 217 + // send a keep-alive 218 218 + if err := conn.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(time.Second)); err != nil { 219 219 + return fmt.Errorf("failed to write control: %w", err) 220 220 + } 216 221 } 217 222 } 218 223 }

+1 -1

types/repo.go

··· 66 66 type Branch struct { 67 67 Reference `json:"reference"` 68 68 Commit *object.Commit `json:"commit,omitempty"` 69 69 - IsDefault bool `json:"is_deafult,omitempty"` 69 69 + IsDefault bool `json:"is_default,omitempty"` 70 70 } 71 71 72 72 type RepoTagsResponse struct {

+28 -5

types/tree.go

··· 4 4 "time" 5 5 6 6 "github.com/go-git/go-git/v5/plumbing" 7 7 + "github.com/go-git/go-git/v5/plumbing/filemode" 7 8 ) 8 9 9 10 // A nicer git tree representation. 10 11 type NiceTree struct { 11 12 // Relative path 12 12 - Name string `json:"name"` 13 13 - Mode string `json:"mode"` 14 14 - Size int64 `json:"size"` 15 15 - IsFile bool `json:"is_file"` 16 16 - IsSubtree bool `json:"is_subtree"` 13 13 + Name string `json:"name"` 14 14 + Mode string `json:"mode"` 15 15 + Size int64 `json:"size"` 17 16 18 17 LastCommit *LastCommitInfo `json:"last_commit,omitempty"` 18 18 + } 19 19 + 20 20 + func (t *NiceTree) FileMode() (filemode.FileMode, error) { 21 21 + return filemode.New(t.Mode) 22 22 + } 23 23 + 24 24 + func (t *NiceTree) IsFile() bool { 25 25 + m, err := t.FileMode() 26 26 + 27 27 + if err != nil { 28 28 + return false 29 29 + } 30 30 + 31 31 + return m.IsFile() 32 32 + } 33 33 + 34 34 + func (t *NiceTree) IsSubmodule() bool { 35 35 + m, err := t.FileMode() 36 36 + 37 37 + if err != nil { 38 38 + return false 39 39 + } 40 40 + 41 41 + return m == filemode.Submodule 19 42 } 20 43 21 44 type LastCommitInfo struct {