+16 -73

api/tangled/cbor_gen.go

··· 5898 5898 } 5899 5899 5900 5900 cw := cbg.NewCborWriter(w) 5901 5901 - fieldCount := 6 5902 5902 - 5903 5903 - if t.Owner == nil { 5904 5904 - fieldCount-- 5905 5905 - } 5901 5901 + fieldCount := 5 5906 5902 5907 5907 - if t.Repo == nil { 5903 5903 + if t.ReplyTo == nil { 5908 5904 fieldCount-- 5909 5905 } 5910 5906 ··· 5935 5931 return err 5936 5932 } 5937 5933 5938 5938 - // t.Repo (string) (string) 5939 5939 - if t.Repo != nil { 5940 5940 - 5941 5941 - if len("repo") > 1000000 { 5942 5942 - return xerrors.Errorf("Value in field \"repo\" was too long") 5943 5943 - } 5944 5944 - 5945 5945 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("repo"))); err != nil { 5946 5946 - return err 5947 5947 - } 5948 5948 - if _, err := cw.WriteString(string("repo")); err != nil { 5949 5949 - return err 5950 5950 - } 5951 5951 - 5952 5952 - if t.Repo == nil { 5953 5953 - if _, err := cw.Write(cbg.CborNull); err != nil { 5954 5954 - return err 5955 5955 - } 5956 5956 - } else { 5957 5957 - if len(*t.Repo) > 1000000 { 5958 5958 - return xerrors.Errorf("Value in field t.Repo was too long") 5959 5959 - } 5960 5960 - 5961 5961 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Repo))); err != nil { 5962 5962 - return err 5963 5963 - } 5964 5964 - if _, err := cw.WriteString(string(*t.Repo)); err != nil { 5965 5965 - return err 5966 5966 - } 5967 5967 - } 5968 5968 - } 5969 5969 - 5970 5934 // t.LexiconTypeID (string) (string) 5971 5935 if len("$type") > 1000000 { 5972 5936 return xerrors.Errorf("Value in field \"$type\" was too long") ··· 6009 5973 return err 6010 5974 } 6011 5975 6012 6012 - // t.Owner (string) (string) 6013 6013 - if t.Owner != nil { 5976 5976 + // t.ReplyTo (string) (string) 5977 5977 + if t.ReplyTo != nil { 6014 5978 6015 6015 - if len("owner") > 1000000 { 6016 6016 - return xerrors.Errorf("Value in field \"owner\" was too long") 5979 5979 + if len("replyTo") > 1000000 { 5980 5980 + return xerrors.Errorf("Value in field \"replyTo\" was too long") 6017 5981 } 6018 5982 6019 6019 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("owner"))); err != nil { 5983 5983 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("replyTo"))); err != nil { 6020 5984 return err 6021 5985 } 6022 6022 - if _, err := cw.WriteString(string("owner")); err != nil { 5986 5986 + if _, err := cw.WriteString(string("replyTo")); err != nil { 6023 5987 return err 6024 5988 } 6025 5989 6026 6026 - if t.Owner == nil { 5990 5990 + if t.ReplyTo == nil { 6027 5991 if _, err := cw.Write(cbg.CborNull); err != nil { 6028 5992 return err 6029 5993 } 6030 5994 } else { 6031 6031 - if len(*t.Owner) > 1000000 { 6032 6032 - return xerrors.Errorf("Value in field t.Owner was too long") 5995 5995 + if len(*t.ReplyTo) > 1000000 { 5996 5996 + return xerrors.Errorf("Value in field t.ReplyTo was too long") 6033 5997 } 6034 5998 6035 6035 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Owner))); err != nil { 5999 5999 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.ReplyTo))); err != nil { 6036 6000 return err 6037 6001 } 6038 6038 - if _, err := cw.WriteString(string(*t.Owner)); err != nil { 6002 6002 + if _, err := cw.WriteString(string(*t.ReplyTo)); err != nil { 6039 6003 return err 6040 6004 } 6041 6005 } ··· 6118 6082 6119 6083 t.Body = string(sval) 6120 6084 } 6121 6121 - // t.Repo (string) (string) 6122 6122 - case "repo": 6123 6123 - 6124 6124 - { 6125 6125 - b, err := cr.ReadByte() 6126 6126 - if err != nil { 6127 6127 - return err 6128 6128 - } 6129 6129 - if b != cbg.CborNull[0] { 6130 6130 - if err := cr.UnreadByte(); err != nil { 6131 6131 - return err 6132 6132 - } 6133 6133 - 6134 6134 - sval, err := cbg.ReadStringWithMax(cr, 1000000) 6135 6135 - if err != nil { 6136 6136 - return err 6137 6137 - } 6138 6138 - 6139 6139 - t.Repo = (*string)(&sval) 6140 6140 - } 6141 6141 - } 6142 6085 // t.LexiconTypeID (string) (string) 6143 6086 case "$type": 6144 6087 ··· 6161 6104 6162 6105 t.Issue = string(sval) 6163 6106 } 6164 6164 - // t.Owner (string) (string) 6165 6165 - case "owner": 6107 6107 + // t.ReplyTo (string) (string) 6108 6108 + case "replyTo": 6166 6109 6167 6110 { 6168 6111 b, err := cr.ReadByte() ··· 6179 6122 return err 6180 6123 } 6181 6124 6182 6182 - t.Owner = (*string)(&sval) 6125 6125 + t.ReplyTo = (*string)(&sval) 6183 6126 } 6184 6127 } 6185 6128 // t.CreatedAt (string) (string)

+1 -2

api/tangled/issuecomment.go

··· 21 21 Body string `json:"body" cborgen:"body"` 22 22 CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 Issue string `json:"issue" cborgen:"issue"` 24 24 - Owner *string `json:"owner,omitempty" cborgen:"owner,omitempty"` 25 25 - Repo *string `json:"repo,omitempty" cborgen:"repo,omitempty"` 24 24 + ReplyTo *string `json:"replyTo,omitempty" cborgen:"replyTo,omitempty"` 26 25 }

+30

api/tangled/knotversion.go

··· 1 1 + // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 + 3 3 + package tangled 4 4 + 5 5 + // schema: sh.tangled.knot.version 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + KnotVersionNSID = "sh.tangled.knot.version" 15 15 + ) 16 16 + 17 17 + // KnotVersion_Output is the output of a sh.tangled.knot.version call. 18 18 + type KnotVersion_Output struct { 19 19 + Version string `json:"version" cborgen:"version"` 20 20 + } 21 21 + 22 22 + // KnotVersion calls the XRPC method "sh.tangled.knot.version". 23 23 + func KnotVersion(ctx context.Context, c util.LexClient) (*KnotVersion_Output, error) { 24 24 + var out KnotVersion_Output 25 25 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.knot.version", nil, nil, &out); err != nil { 26 26 + return nil, err 27 27 + } 28 28 + 29 29 + return &out, nil 30 30 + }

+30

api/tangled/tangledowner.go

··· 1 1 + // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 + 3 3 + package tangled 4 4 + 5 5 + // schema: sh.tangled.owner 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + OwnerNSID = "sh.tangled.owner" 15 15 + ) 16 16 + 17 17 + // Owner_Output is the output of a sh.tangled.owner call. 18 18 + type Owner_Output struct { 19 19 + Owner string `json:"owner" cborgen:"owner"` 20 20 + } 21 21 + 22 22 + // Owner calls the XRPC method "sh.tangled.owner". 23 23 + func Owner(ctx context.Context, c util.LexClient) (*Owner_Output, error) { 24 24 + var out Owner_Output 25 25 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.owner", nil, nil, &out); err != nil { 26 26 + return nil, err 27 27 + } 28 28 + 29 29 + return &out, nil 30 30 + }

+169

appview/db/db.go

··· 703 703 return err 704 704 }) 705 705 706 706 + // repurpose the read-only column to "needs-upgrade" 707 707 + runMigration(conn, "rename-registrations-read-only-to-needs-upgrade", func(tx *sql.Tx) error { 708 708 + _, err := tx.Exec(` 709 709 + alter table registrations rename column read_only to needs_upgrade; 710 710 + `) 711 711 + return err 712 712 + }) 713 713 + 714 714 + // require all knots to upgrade after the release of total xrpc 715 715 + runMigration(conn, "migrate-knots-to-total-xrpc", func(tx *sql.Tx) error { 716 716 + _, err := tx.Exec(` 717 717 + update registrations set needs_upgrade = 1; 718 718 + `) 719 719 + return err 720 720 + }) 721 721 + 722 722 + // require all knots to upgrade after the release of total xrpc 723 723 + runMigration(conn, "migrate-spindles-to-xrpc-owner", func(tx *sql.Tx) error { 724 724 + _, err := tx.Exec(` 725 725 + alter table spindles add column needs_upgrade integer not null default 0; 726 726 + `) 727 727 + if err != nil { 728 728 + return err 729 729 + } 730 730 + 731 731 + _, err = tx.Exec(` 732 732 + update spindles set needs_upgrade = 1; 733 733 + `) 734 734 + return err 735 735 + }) 736 736 + 737 737 + // remove issue_at from issues and replace with generated column 738 738 + // 739 739 + // this requires a full table recreation because stored columns 740 740 + // cannot be added via alter 741 741 + // 742 742 + // couple other changes: 743 743 + // - columns renamed to be more consistent 744 744 + // - adds edited and deleted fields 745 745 + // 746 746 + // disable foreign-keys for the next migration 747 747 + conn.ExecContext(ctx, "pragma foreign_keys = off;") 748 748 + runMigration(conn, "remove-issue-at-from-issues", func(tx *sql.Tx) error { 749 749 + _, err := tx.Exec(` 750 750 + create table if not exists issues_new ( 751 751 + -- identifiers 752 752 + id integer primary key autoincrement, 753 753 + did text not null, 754 754 + rkey text not null, 755 755 + at_uri text generated always as ('at://' || did || '/' || 'sh.tangled.repo.issue' || '/' || rkey) stored, 756 756 + 757 757 + -- at identifiers 758 758 + repo_at text not null, 759 759 + 760 760 + -- content 761 761 + issue_id integer not null, 762 762 + title text not null, 763 763 + body text not null, 764 764 + open integer not null default 1, 765 765 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 766 766 + edited text, -- timestamp 767 767 + deleted text, -- timestamp 768 768 + 769 769 + unique(did, rkey), 770 770 + unique(repo_at, issue_id), 771 771 + unique(at_uri), 772 772 + foreign key (repo_at) references repos(at_uri) on delete cascade 773 773 + ); 774 774 + `) 775 775 + if err != nil { 776 776 + return err 777 777 + } 778 778 + 779 779 + // transfer data 780 780 + _, err = tx.Exec(` 781 781 + insert into issues_new (id, did, rkey, repo_at, issue_id, title, body, open, created) 782 782 + select 783 783 + i.id, 784 784 + i.owner_did, 785 785 + i.rkey, 786 786 + i.repo_at, 787 787 + i.issue_id, 788 788 + i.title, 789 789 + i.body, 790 790 + i.open, 791 791 + i.created 792 792 + from issues i; 793 793 + `) 794 794 + if err != nil { 795 795 + return err 796 796 + } 797 797 + 798 798 + // drop old table 799 799 + _, err = tx.Exec(`drop table issues`) 800 800 + if err != nil { 801 801 + return err 802 802 + } 803 803 + 804 804 + // rename new table 805 805 + _, err = tx.Exec(`alter table issues_new rename to issues`) 806 806 + return err 807 807 + }) 808 808 + conn.ExecContext(ctx, "pragma foreign_keys = on;") 809 809 + 810 810 + // - renames the comments table to 'issue_comments' 811 811 + // - rework issue comments to update constraints: 812 812 + // * unique(did, rkey) 813 813 + // * remove comment-id and just use the global ID 814 814 + // * foreign key (repo_at, issue_id) 815 815 + // - new columns 816 816 + // * column "reply_to" which can be any other comment 817 817 + // * column "at-uri" which is a generated column 818 818 + runMigration(conn, "rework-issue-comments", func(tx *sql.Tx) error { 819 819 + _, err := tx.Exec(` 820 820 + create table if not exists issue_comments ( 821 821 + -- identifiers 822 822 + id integer primary key autoincrement, 823 823 + did text not null, 824 824 + rkey text, 825 825 + at_uri text generated always as ('at://' || did || '/' || 'sh.tangled.repo.issue.comment' || '/' || rkey) stored, 826 826 + 827 827 + -- at identifiers 828 828 + issue_at text not null, 829 829 + reply_to text, -- at_uri of parent comment 830 830 + 831 831 + -- content 832 832 + body text not null, 833 833 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 834 834 + edited text, 835 835 + deleted text, 836 836 + 837 837 + -- constraints 838 838 + unique(did, rkey), 839 839 + unique(at_uri), 840 840 + foreign key (issue_at) references issues(at_uri) on delete cascade 841 841 + ); 842 842 + `) 843 843 + if err != nil { 844 844 + return err 845 845 + } 846 846 + 847 847 + // transfer data 848 848 + _, err = tx.Exec(` 849 849 + insert into issue_comments (id, did, rkey, issue_at, body, created, edited, deleted) 850 850 + select 851 851 + c.id, 852 852 + c.owner_did, 853 853 + c.rkey, 854 854 + i.at_uri, -- get at_uri from issues table 855 855 + c.body, 856 856 + c.created, 857 857 + c.edited, 858 858 + c.deleted 859 859 + from comments c 860 860 + join issues i on c.repo_at = i.repo_at and c.issue_id = i.issue_id; 861 861 + `) 862 862 + if err != nil { 863 863 + return err 864 864 + } 865 865 + 866 866 + // drop old table 867 867 + _, err = tx.Exec(`drop table comments`) 868 868 + return err 869 869 + }) 870 870 + 706 871 return &DB{db}, nil 707 872 } 708 873 ··· 747 912 } 748 913 749 914 return nil 915 915 + } 916 916 + 917 917 + func (d *DB) Close() error { 918 918 + return d.DB.Close() 750 919 } 751 920 752 921 type filter struct {

+410 -453

appview/db/issues.go

··· 3 3 import ( 4 4 "database/sql" 5 5 "fmt" 6 6 - mathrand "math/rand/v2" 6 6 + "maps" 7 7 + "slices" 8 8 + "sort" 7 9 "strings" 8 10 "time" 9 11 ··· 13 15 ) 14 16 15 17 type Issue struct { 16 16 - ID int64 17 17 - RepoAt syntax.ATURI 18 18 - OwnerDid string 19 19 - IssueId int 20 20 - Rkey string 21 21 - Created time.Time 22 22 - Title string 23 23 - Body string 24 24 - Open bool 18 18 + Id int64 19 19 + Did string 20 20 + Rkey string 21 21 + RepoAt syntax.ATURI 22 22 + IssueId int 23 23 + Created time.Time 24 24 + Edited *time.Time 25 25 + Deleted *time.Time 26 26 + Title string 27 27 + Body string 28 28 + Open bool 25 29 26 30 // optionally, populate this when querying for reverse mappings 27 31 // like comment counts, parent repo etc. 28 28 - Metadata *IssueMetadata 32 32 + Comments []IssueComment 33 33 + Repo *Repo 29 34 } 30 35 31 31 - type IssueMetadata struct { 32 32 - CommentCount int 33 33 - Repo *Repo 34 34 - // labels, assignee etc. 36 36 + func (i *Issue) AtUri() syntax.ATURI { 37 37 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", i.Did, tangled.RepoIssueNSID, i.Rkey)) 35 38 } 36 39 37 37 - type Comment struct { 38 38 - OwnerDid string 39 39 - RepoAt syntax.ATURI 40 40 - Rkey string 41 41 - Issue int 42 42 - CommentId int 43 43 - Body string 44 44 - Created *time.Time 45 45 - Deleted *time.Time 46 46 - Edited *time.Time 40 40 + func (i *Issue) AsRecord() tangled.RepoIssue { 41 41 + return tangled.RepoIssue{ 42 42 + Repo: i.RepoAt.String(), 43 43 + Title: i.Title, 44 44 + Body: &i.Body, 45 45 + CreatedAt: i.Created.Format(time.RFC3339), 46 46 + } 47 47 } 48 48 49 49 - func (i *Issue) AtUri() syntax.ATURI { 50 50 - return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", i.OwnerDid, tangled.RepoIssueNSID, i.Rkey)) 49 49 + func (i *Issue) State() string { 50 50 + if i.Open { 51 51 + return "open" 52 52 + } 53 53 + return "closed" 54 54 + } 55 55 + 56 56 + type CommentListItem struct { 57 57 + Self *IssueComment 58 58 + Replies []*IssueComment 59 59 + } 60 60 + 61 61 + func (i *Issue) CommentList() []CommentListItem { 62 62 + // Create a map to quickly find comments by their aturi 63 63 + toplevel := make(map[string]*CommentListItem) 64 64 + var replies []*IssueComment 65 65 + 66 66 + // collect top level comments into the map 67 67 + for _, comment := range i.Comments { 68 68 + if comment.IsTopLevel() { 69 69 + toplevel[comment.AtUri().String()] = &CommentListItem{ 70 70 + Self: &comment, 71 71 + } 72 72 + } else { 73 73 + replies = append(replies, &comment) 74 74 + } 75 75 + } 76 76 + 77 77 + for _, r := range replies { 78 78 + parentAt := *r.ReplyTo 79 79 + if parent, exists := toplevel[parentAt]; exists { 80 80 + parent.Replies = append(parent.Replies, r) 81 81 + } 82 82 + } 83 83 + 84 84 + var listing []CommentListItem 85 85 + for _, v := range toplevel { 86 86 + listing = append(listing, *v) 87 87 + } 88 88 + 89 89 + // sort everything 90 90 + sortFunc := func(a, b *IssueComment) bool { 91 91 + return a.Created.Before(b.Created) 92 92 + } 93 93 + sort.Slice(listing, func(i, j int) bool { 94 94 + return sortFunc(listing[i].Self, listing[j].Self) 95 95 + }) 96 96 + for _, r := range listing { 97 97 + sort.Slice(r.Replies, func(i, j int) bool { 98 98 + return sortFunc(r.Replies[i], r.Replies[j]) 99 99 + }) 100 100 + } 101 101 + 102 102 + return listing 51 103 } 52 104 53 105 func IssueFromRecord(did, rkey string, record tangled.RepoIssue) Issue { ··· 62 114 } 63 115 64 116 return Issue{ 65 65 - RepoAt: syntax.ATURI(record.Repo), 66 66 - OwnerDid: did, 67 67 - Rkey: rkey, 68 68 - Created: created, 69 69 - Title: record.Title, 70 70 - Body: body, 71 71 - Open: true, // new issues are open by default 117 117 + RepoAt: syntax.ATURI(record.Repo), 118 118 + Did: did, 119 119 + Rkey: rkey, 120 120 + Created: created, 121 121 + Title: record.Title, 122 122 + Body: body, 123 123 + Open: true, // new issues are open by default 72 124 } 73 125 } 74 126 75 75 - func ResolveIssueFromAtUri(e Execer, issueUri syntax.ATURI) (syntax.ATURI, int, error) { 76 76 - ownerDid := issueUri.Authority().String() 77 77 - issueRkey := issueUri.RecordKey().String() 127 127 + type IssueComment struct { 128 128 + Id int64 129 129 + Did string 130 130 + Rkey string 131 131 + IssueAt string 132 132 + ReplyTo *string 133 133 + Body string 134 134 + Created time.Time 135 135 + Edited *time.Time 136 136 + Deleted *time.Time 137 137 + } 78 138 79 79 - var repoAt string 80 80 - var issueId int 139 139 + func (i *IssueComment) AtUri() syntax.ATURI { 140 140 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", i.Did, tangled.RepoIssueCommentNSID, i.Rkey)) 141 141 + } 81 142 82 82 - query := `select repo_at, issue_id from issues where owner_did = ? and rkey = ?` 83 83 - err := e.QueryRow(query, ownerDid, issueRkey).Scan(&repoAt, &issueId) 84 84 - if err != nil { 85 85 - return "", 0, err 143 143 + func (i *IssueComment) AsRecord() tangled.RepoIssueComment { 144 144 + return tangled.RepoIssueComment{ 145 145 + Body: i.Body, 146 146 + Issue: i.IssueAt, 147 147 + CreatedAt: i.Created.Format(time.RFC3339), 148 148 + ReplyTo: i.ReplyTo, 86 149 } 150 150 + } 87 151 88 88 - return syntax.ATURI(repoAt), issueId, nil 152 152 + func (i *IssueComment) IsTopLevel() bool { 153 153 + return i.ReplyTo == nil 89 154 } 90 155 91 91 - func IssueCommentFromRecord(e Execer, did, rkey string, record tangled.RepoIssueComment) (Comment, error) { 156 156 + func IssueCommentFromRecord(e Execer, did, rkey string, record tangled.RepoIssueComment) (*IssueComment, error) { 92 157 created, err := time.Parse(time.RFC3339, record.CreatedAt) 93 158 if err != nil { 94 159 created = time.Now() 95 160 } 96 161 97 162 ownerDid := did 98 98 - if record.Owner != nil { 99 99 - ownerDid = *record.Owner 100 100 - } 101 163 102 102 - issueUri, err := syntax.ParseATURI(record.Issue) 103 103 - if err != nil { 104 104 - return Comment{}, err 105 105 - } 106 106 - 107 107 - repoAt, issueId, err := ResolveIssueFromAtUri(e, issueUri) 108 108 - if err != nil { 109 109 - return Comment{}, err 164 164 + if _, err = syntax.ParseATURI(record.Issue); err != nil { 165 165 + return nil, err 110 166 } 111 167 112 112 - comment := Comment{ 113 113 - OwnerDid: ownerDid, 114 114 - RepoAt: repoAt, 115 115 - Rkey: rkey, 116 116 - Body: record.Body, 117 117 - Issue: issueId, 118 118 - CommentId: mathrand.IntN(1000000), 119 119 - Created: &created, 168 168 + comment := IssueComment{ 169 169 + Did: ownerDid, 170 170 + Rkey: rkey, 171 171 + Body: record.Body, 172 172 + IssueAt: record.Issue, 173 173 + ReplyTo: record.ReplyTo, 174 174 + Created: created, 120 175 } 121 176 122 122 - return comment, nil 177 177 + return &comment, nil 123 178 } 124 179 125 125 - func NewIssue(tx *sql.Tx, issue *Issue) error { 126 126 - defer tx.Rollback() 127 127 - 180 180 + func PutIssue(tx *sql.Tx, issue *Issue) error { 181 181 + // ensure sequence exists 128 182 _, err := tx.Exec(` 129 183 insert or ignore into repo_issue_seqs (repo_at, next_issue_id) 130 184 values (?, 1) 131 131 - `, issue.RepoAt) 185 185 + `, issue.RepoAt) 132 186 if err != nil { 133 187 return err 134 188 } 135 189 136 136 - var nextId int 137 137 - err = tx.QueryRow(` 138 138 - update repo_issue_seqs 139 139 - set next_issue_id = next_issue_id + 1 140 140 - where repo_at = ? 141 141 - returning next_issue_id - 1 142 142 - `, issue.RepoAt).Scan(&nextId) 143 143 - if err != nil { 190 190 + issues, err := GetIssues( 191 191 + tx, 192 192 + FilterEq("did", issue.Did), 193 193 + FilterEq("rkey", issue.Rkey), 194 194 + ) 195 195 + switch { 196 196 + case err != nil: 144 197 return err 145 145 - } 146 146 - 147 147 - issue.IssueId = nextId 198 198 + case len(issues) == 0: 199 199 + return createNewIssue(tx, issue) 200 200 + case len(issues) != 1: // should be unreachable 201 201 + return fmt.Errorf("invalid number of issues returned: %d", len(issues)) 202 202 + default: 203 203 + // if content is identical, do not edit 204 204 + existingIssue := issues[0] 205 205 + if existingIssue.Title == issue.Title && existingIssue.Body == issue.Body { 206 206 + return nil 207 207 + } 148 208 149 149 - res, err := tx.Exec(` 150 150 - insert into issues (repo_at, owner_did, rkey, issue_at, issue_id, title, body) 151 151 - values (?, ?, ?, ?, ?, ?, ?) 152 152 - `, issue.RepoAt, issue.OwnerDid, issue.Rkey, issue.AtUri(), issue.IssueId, issue.Title, issue.Body) 153 153 - if err != nil { 154 154 - return err 209 209 + issue.Id = existingIssue.Id 210 210 + issue.IssueId = existingIssue.IssueId 211 211 + return updateIssue(tx, issue) 155 212 } 213 213 + } 156 214 157 157 - lastID, err := res.LastInsertId() 215 215 + func createNewIssue(tx *sql.Tx, issue *Issue) error { 216 216 + // get next issue_id 217 217 + var newIssueId int 218 218 + err := tx.QueryRow(` 219 219 + update repo_issue_seqs 220 220 + set next_issue_id = next_issue_id + 1 221 221 + where repo_at = ? 222 222 + returning next_issue_id - 1 223 223 + `, issue.RepoAt).Scan(&newIssueId) 158 224 if err != nil { 159 225 return err 160 226 } 161 161 - issue.ID = lastID 162 227 163 163 - if err := tx.Commit(); err != nil { 164 164 - return err 165 165 - } 228 228 + // insert new issue 229 229 + row := tx.QueryRow(` 230 230 + insert into issues (repo_at, did, rkey, issue_id, title, body) 231 231 + values (?, ?, ?, ?, ?, ?) 232 232 + returning rowid, issue_id 233 233 + `, issue.RepoAt, issue.Did, issue.Rkey, newIssueId, issue.Title, issue.Body) 166 234 167 167 - return nil 235 235 + return row.Scan(&issue.Id, &issue.IssueId) 168 236 } 169 237 170 170 - func GetIssueAt(e Execer, repoAt syntax.ATURI, issueId int) (string, error) { 171 171 - var issueAt string 172 172 - err := e.QueryRow(`select issue_at from issues where repo_at = ? and issue_id = ?`, repoAt, issueId).Scan(&issueAt) 173 173 - return issueAt, err 174 174 - } 175 175 - 176 176 - func GetIssueOwnerDid(e Execer, repoAt syntax.ATURI, issueId int) (string, error) { 177 177 - var ownerDid string 178 178 - err := e.QueryRow(`select owner_did from issues where repo_at = ? and issue_id = ?`, repoAt, issueId).Scan(&ownerDid) 179 179 - return ownerDid, err 180 180 - } 181 181 - 182 182 - func GetIssuesPaginated(e Execer, repoAt syntax.ATURI, isOpen bool, page pagination.Page) ([]Issue, error) { 183 183 - var issues []Issue 184 184 - openValue := 0 185 185 - if isOpen { 186 186 - openValue = 1 187 187 - } 188 188 - 189 189 - rows, err := e.Query( 190 190 - ` 191 191 - with numbered_issue as ( 192 192 - select 193 193 - i.id, 194 194 - i.owner_did, 195 195 - i.rkey, 196 196 - i.issue_id, 197 197 - i.created, 198 198 - i.title, 199 199 - i.body, 200 200 - i.open, 201 201 - count(c.id) as comment_count, 202 202 - row_number() over (order by i.created desc) as row_num 203 203 - from 204 204 - issues i 205 205 - left join 206 206 - comments c on i.repo_at = c.repo_at and i.issue_id = c.issue_id 207 207 - where 208 208 - i.repo_at = ? and i.open = ? 209 209 - group by 210 210 - i.id, i.owner_did, i.issue_id, i.created, i.title, i.body, i.open 211 211 - ) 212 212 - select 213 213 - id, 214 214 - owner_did, 215 215 - rkey, 216 216 - issue_id, 217 217 - created, 218 218 - title, 219 219 - body, 220 220 - open, 221 221 - comment_count 222 222 - from 223 223 - numbered_issue 224 224 - where 225 225 - row_num between ? and ?`, 226 226 - repoAt, openValue, page.Offset+1, page.Offset+page.Limit) 227 227 - if err != nil { 228 228 - return nil, err 229 229 - } 230 230 - defer rows.Close() 231 231 - 232 232 - for rows.Next() { 233 233 - var issue Issue 234 234 - var createdAt string 235 235 - var metadata IssueMetadata 236 236 - err := rows.Scan(&issue.ID, &issue.OwnerDid, &issue.Rkey, &issue.IssueId, &createdAt, &issue.Title, &issue.Body, &issue.Open, &metadata.CommentCount) 237 237 - if err != nil { 238 238 - return nil, err 239 239 - } 240 240 - 241 241 - createdTime, err := time.Parse(time.RFC3339, createdAt) 242 242 - if err != nil { 243 243 - return nil, err 244 244 - } 245 245 - issue.Created = createdTime 246 246 - issue.Metadata = &metadata 247 247 - 248 248 - issues = append(issues, issue) 249 249 - } 250 250 - 251 251 - if err := rows.Err(); err != nil { 252 252 - return nil, err 253 253 - } 254 254 - 255 255 - return issues, nil 238 238 + func updateIssue(tx *sql.Tx, issue *Issue) error { 239 239 + // update existing issue 240 240 + _, err := tx.Exec(` 241 241 + update issues 242 242 + set title = ?, body = ?, edited = ? 243 243 + where did = ? and rkey = ? 244 244 + `, issue.Title, issue.Body, time.Now().Format(time.RFC3339), issue.Did, issue.Rkey) 245 245 + return err 256 246 } 257 247 258 258 - func GetIssuesWithLimit(e Execer, limit int, filters ...filter) ([]Issue, error) { 259 259 - issues := make([]Issue, 0, limit) 248 248 + func GetIssuesPaginated(e Execer, page pagination.Page, filters ...filter) ([]Issue, error) { 249 249 + issueMap := make(map[string]*Issue) // at-uri -> issue 260 250 261 251 var conditions []string 262 252 var args []any 253 253 + 263 254 for _, filter := range filters { 264 255 conditions = append(conditions, filter.Condition()) 265 256 args = append(args, filter.Arg()...) ··· 269 260 if conditions != nil { 270 261 whereClause = " where " + strings.Join(conditions, " and ") 271 262 } 272 272 - limitClause := "" 273 273 - if limit != 0 { 274 274 - limitClause = fmt.Sprintf(" limit %d ", limit) 275 275 - } 263 263 + 264 264 + pLower := FilterGte("row_num", page.Offset+1) 265 265 + pUpper := FilterLte("row_num", page.Offset+page.Limit) 266 266 + 267 267 + args = append(args, pLower.Arg()...) 268 268 + args = append(args, pUpper.Arg()...) 269 269 + pagination := " where " + pLower.Condition() + " and " + pUpper.Condition() 276 270 277 271 query := fmt.Sprintf( 278 278 - `select 279 279 - i.id, 280 280 - i.owner_did, 281 281 - i.repo_at, 282 282 - i.issue_id, 283 283 - i.created, 284 284 - i.title, 285 285 - i.body, 286 286 - i.open 287 287 - from 288 288 - issues i 272 272 + ` 273 273 + select * from ( 274 274 + select 275 275 + id, 276 276 + did, 277 277 + rkey, 278 278 + repo_at, 279 279 + issue_id, 280 280 + title, 281 281 + body, 282 282 + open, 283 283 + created, 284 284 + edited, 285 285 + deleted, 286 286 + row_number() over (order by created desc) as row_num 287 287 + from 288 288 + issues 289 289 + %s 290 290 + ) ranked_issues 289 291 %s 290 290 - order by 291 291 - i.created desc 292 292 - %s`, 293 293 - whereClause, limitClause) 292 292 + `, 293 293 + whereClause, 294 294 + pagination, 295 295 + ) 294 296 295 297 rows, err := e.Query(query, args...) 296 298 if err != nil { 297 297 - return nil, err 299 299 + return nil, fmt.Errorf("failed to query issues table: %w", err) 298 300 } 299 301 defer rows.Close() 300 302 301 303 for rows.Next() { 302 304 var issue Issue 303 303 - var issueCreatedAt string 305 305 + var createdAt string 306 306 + var editedAt, deletedAt sql.Null[string] 307 307 + var rowNum int64 304 308 err := rows.Scan( 305 305 - &issue.ID, 306 306 - &issue.OwnerDid, 309 309 + &issue.Id, 310 310 + &issue.Did, 311 311 + &issue.Rkey, 307 312 &issue.RepoAt, 308 313 &issue.IssueId, 309 309 - &issueCreatedAt, 310 314 &issue.Title, 311 315 &issue.Body, 312 316 &issue.Open, 317 317 + &createdAt, 318 318 + &editedAt, 319 319 + &deletedAt, 320 320 + &rowNum, 313 321 ) 314 322 if err != nil { 315 315 - return nil, err 323 323 + return nil, fmt.Errorf("failed to scan issue: %w", err) 324 324 + } 325 325 + 326 326 + if t, err := time.Parse(time.RFC3339, createdAt); err == nil { 327 327 + issue.Created = t 328 328 + } 329 329 + 330 330 + if editedAt.Valid { 331 331 + if t, err := time.Parse(time.RFC3339, editedAt.V); err == nil { 332 332 + issue.Edited = &t 333 333 + } 316 334 } 317 335 318 318 - issueCreatedTime, err := time.Parse(time.RFC3339, issueCreatedAt) 319 319 - if err != nil { 320 320 - return nil, err 336 336 + if deletedAt.Valid { 337 337 + if t, err := time.Parse(time.RFC3339, deletedAt.V); err == nil { 338 338 + issue.Deleted = &t 339 339 + } 321 340 } 322 322 - issue.Created = issueCreatedTime 323 341 324 324 - issues = append(issues, issue) 342 342 + atUri := issue.AtUri().String() 343 343 + issueMap[atUri] = &issue 325 344 } 326 345 327 327 - if err := rows.Err(); err != nil { 328 328 - return nil, err 346 346 + // collect reverse repos 347 347 + repoAts := make([]string, 0, len(issueMap)) // or just []string{} 348 348 + for _, issue := range issueMap { 349 349 + repoAts = append(repoAts, string(issue.RepoAt)) 329 350 } 330 351 331 331 - return issues, nil 332 332 - } 333 333 - 334 334 - func GetIssues(e Execer, filters ...filter) ([]Issue, error) { 335 335 - return GetIssuesWithLimit(e, 0, filters...) 336 336 - } 337 337 - 338 338 - // timeframe here is directly passed into the sql query filter, and any 339 339 - // timeframe in the past should be negative; e.g.: "-3 months" 340 340 - func GetIssuesByOwnerDid(e Execer, ownerDid string, timeframe string) ([]Issue, error) { 341 341 - var issues []Issue 342 342 - 343 343 - rows, err := e.Query( 344 344 - `select 345 345 - i.id, 346 346 - i.owner_did, 347 347 - i.rkey, 348 348 - i.repo_at, 349 349 - i.issue_id, 350 350 - i.created, 351 351 - i.title, 352 352 - i.body, 353 353 - i.open, 354 354 - r.did, 355 355 - r.name, 356 356 - r.knot, 357 357 - r.rkey, 358 358 - r.created 359 359 - from 360 360 - issues i 361 361 - join 362 362 - repos r on i.repo_at = r.at_uri 363 363 - where 364 364 - i.owner_did = ? and i.created >= date ('now', ?) 365 365 - order by 366 366 - i.created desc`, 367 367 - ownerDid, timeframe) 352 352 + repos, err := GetRepos(e, 0, FilterIn("at_uri", repoAts)) 368 353 if err != nil { 369 369 - return nil, err 354 354 + return nil, fmt.Errorf("failed to build repo mappings: %w", err) 370 355 } 371 371 - defer rows.Close() 372 356 373 373 - for rows.Next() { 374 374 - var issue Issue 375 375 - var issueCreatedAt, repoCreatedAt string 376 376 - var repo Repo 377 377 - err := rows.Scan( 378 378 - &issue.ID, 379 379 - &issue.OwnerDid, 380 380 - &issue.Rkey, 381 381 - &issue.RepoAt, 382 382 - &issue.IssueId, 383 383 - &issueCreatedAt, 384 384 - &issue.Title, 385 385 - &issue.Body, 386 386 - &issue.Open, 387 387 - &repo.Did, 388 388 - &repo.Name, 389 389 - &repo.Knot, 390 390 - &repo.Rkey, 391 391 - &repoCreatedAt, 392 392 - ) 393 393 - if err != nil { 394 394 - return nil, err 395 395 - } 357 357 + repoMap := make(map[string]*Repo) 358 358 + for i := range repos { 359 359 + repoMap[string(repos[i].RepoAt())] = &repos[i] 360 360 + } 396 361 397 397 - issueCreatedTime, err := time.Parse(time.RFC3339, issueCreatedAt) 398 398 - if err != nil { 399 399 - return nil, err 362 362 + for issueAt, i := range issueMap { 363 363 + if r, ok := repoMap[string(i.RepoAt)]; ok { 364 364 + i.Repo = r 365 365 + } else { 366 366 + // do not show up the issue if the repo is deleted 367 367 + // TODO: foreign key where? 368 368 + delete(issueMap, issueAt) 400 369 } 401 401 - issue.Created = issueCreatedTime 370 370 + } 402 371 403 403 - repoCreatedTime, err := time.Parse(time.RFC3339, repoCreatedAt) 404 404 - if err != nil { 405 405 - return nil, err 406 406 - } 407 407 - repo.Created = repoCreatedTime 372 372 + // collect comments 373 373 + issueAts := slices.Collect(maps.Keys(issueMap)) 374 374 + comments, err := GetIssueComments(e, FilterIn("issue_at", issueAts)) 375 375 + if err != nil { 376 376 + return nil, fmt.Errorf("failed to query comments: %w", err) 377 377 + } 408 378 409 409 - issue.Metadata = &IssueMetadata{ 410 410 - Repo: &repo, 379 379 + for i := range comments { 380 380 + issueAt := comments[i].IssueAt 381 381 + if issue, ok := issueMap[issueAt]; ok { 382 382 + issue.Comments = append(issue.Comments, comments[i]) 411 383 } 412 412 - 413 413 - issues = append(issues, issue) 414 384 } 415 385 416 416 - if err := rows.Err(); err != nil { 417 417 - return nil, err 386 386 + var issues []Issue 387 387 + for _, i := range issueMap { 388 388 + issues = append(issues, *i) 418 389 } 419 390 391 391 + sort.Slice(issues, func(i, j int) bool { 392 392 + return issues[i].Created.After(issues[j].Created) 393 393 + }) 394 394 + 420 395 return issues, nil 421 396 } 422 397 398 398 + func GetIssues(e Execer, filters ...filter) ([]Issue, error) { 399 399 + return GetIssuesPaginated(e, pagination.FirstPage(), filters...) 400 400 + } 401 401 + 423 402 func GetIssue(e Execer, repoAt syntax.ATURI, issueId int) (*Issue, error) { 424 403 query := `select id, owner_did, rkey, created, title, body, open from issues where repo_at = ? and issue_id = ?` 425 404 row := e.QueryRow(query, repoAt, issueId) 426 405 427 406 var issue Issue 428 407 var createdAt string 429 429 - err := row.Scan(&issue.ID, &issue.OwnerDid, &issue.Rkey, &createdAt, &issue.Title, &issue.Body, &issue.Open) 408 408 + err := row.Scan(&issue.Id, &issue.Did, &issue.Rkey, &createdAt, &issue.Title, &issue.Body, &issue.Open) 430 409 if err != nil { 431 410 return nil, err 432 411 } ··· 440 419 return &issue, nil 441 420 } 442 421 443 443 - func GetIssueWithComments(e Execer, repoAt syntax.ATURI, issueId int) (*Issue, []Comment, error) { 444 444 - query := `select id, owner_did, rkey, issue_id, created, title, body, open from issues where repo_at = ? and issue_id = ?` 445 445 - row := e.QueryRow(query, repoAt, issueId) 446 446 - 447 447 - var issue Issue 448 448 - var createdAt string 449 449 - err := row.Scan(&issue.ID, &issue.OwnerDid, &issue.Rkey, &issue.IssueId, &createdAt, &issue.Title, &issue.Body, &issue.Open) 422 422 + func AddIssueComment(e Execer, c IssueComment) (int64, error) { 423 423 + result, err := e.Exec( 424 424 + `insert into issue_comments ( 425 425 + did, 426 426 + rkey, 427 427 + issue_at, 428 428 + body, 429 429 + reply_to, 430 430 + created, 431 431 + edited 432 432 + ) 433 433 + values (?, ?, ?, ?, ?, ?, null) 434 434 + on conflict(did, rkey) do update set 435 435 + issue_at = excluded.issue_at, 436 436 + body = excluded.body, 437 437 + edited = case 438 438 + when 439 439 + issue_comments.issue_at != excluded.issue_at 440 440 + or issue_comments.body != excluded.body 441 441 + or issue_comments.reply_to != excluded.reply_to 442 442 + then ? 443 443 + else issue_comments.edited 444 444 + end`, 445 445 + c.Did, 446 446 + c.Rkey, 447 447 + c.IssueAt, 448 448 + c.Body, 449 449 + c.ReplyTo, 450 450 + c.Created.Format(time.RFC3339), 451 451 + time.Now().Format(time.RFC3339), 452 452 + ) 450 453 if err != nil { 451 451 - return nil, nil, err 454 454 + return 0, err 452 455 } 453 456 454 454 - createdTime, err := time.Parse(time.RFC3339, createdAt) 457 457 + id, err := result.LastInsertId() 455 458 if err != nil { 456 456 - return nil, nil, err 459 459 + return 0, err 457 460 } 458 458 - issue.Created = createdTime 461 461 + 462 462 + return id, nil 463 463 + } 459 464 460 460 - comments, err := GetComments(e, repoAt, issueId) 461 461 - if err != nil { 462 462 - return nil, nil, err 465 465 + func DeleteIssueComments(e Execer, filters ...filter) error { 466 466 + var conditions []string 467 467 + var args []any 468 468 + for _, filter := range filters { 469 469 + conditions = append(conditions, filter.Condition()) 470 470 + args = append(args, filter.Arg()...) 463 471 } 464 472 465 465 - return &issue, comments, nil 466 466 - } 473 473 + whereClause := "" 474 474 + if conditions != nil { 475 475 + whereClause = " where " + strings.Join(conditions, " and ") 476 476 + } 467 477 468 468 - func NewIssueComment(e Execer, comment *Comment) error { 469 469 - query := `insert into comments (owner_did, repo_at, rkey, issue_id, comment_id, body) values (?, ?, ?, ?, ?, ?)` 470 470 - _, err := e.Exec( 471 471 - query, 472 472 - comment.OwnerDid, 473 473 - comment.RepoAt, 474 474 - comment.Rkey, 475 475 - comment.Issue, 476 476 - comment.CommentId, 477 477 - comment.Body, 478 478 - ) 478 478 + query := fmt.Sprintf(`update issue_comments set body = "", deleted = strftime('%%Y-%%m-%%dT%%H:%%M:%%SZ', 'now') %s`, whereClause) 479 479 + 480 480 + _, err := e.Exec(query, args...) 479 481 return err 480 482 } 481 483 482 482 - func GetComments(e Execer, repoAt syntax.ATURI, issueId int) ([]Comment, error) { 483 483 - var comments []Comment 484 484 + func GetIssueComments(e Execer, filters ...filter) ([]IssueComment, error) { 485 485 + var comments []IssueComment 486 486 + 487 487 + var conditions []string 488 488 + var args []any 489 489 + for _, filter := range filters { 490 490 + conditions = append(conditions, filter.Condition()) 491 491 + args = append(args, filter.Arg()...) 492 492 + } 493 493 + 494 494 + whereClause := "" 495 495 + if conditions != nil { 496 496 + whereClause = " where " + strings.Join(conditions, " and ") 497 497 + } 484 498 485 485 - rows, err := e.Query(` 499 499 + query := fmt.Sprintf(` 486 500 select 487 487 - owner_did, 488 488 - issue_id, 489 489 - comment_id, 501 501 + id, 502 502 + did, 490 503 rkey, 504 504 + issue_at, 505 505 + reply_to, 491 506 body, 492 507 created, 493 508 edited, 494 509 deleted 495 510 from 496 496 - comments 497 497 - where 498 498 - repo_at = ? and issue_id = ? 499 499 - order by 500 500 - created asc`, 501 501 - repoAt, 502 502 - issueId, 503 503 - ) 504 504 - if err == sql.ErrNoRows { 505 505 - return []Comment{}, nil 506 506 - } 511 511 + issue_comments 512 512 + %s 513 513 + `, whereClause) 514 514 + 515 515 + rows, err := e.Query(query, args...) 507 516 if err != nil { 508 517 return nil, err 509 518 } 510 510 - defer rows.Close() 511 519 512 520 for rows.Next() { 513 513 - var comment Comment 514 514 - var createdAt string 515 515 - var deletedAt, editedAt, rkey sql.NullString 516 516 - err := rows.Scan(&comment.OwnerDid, &comment.Issue, &comment.CommentId, &rkey, &comment.Body, &createdAt, &editedAt, &deletedAt) 521 521 + var comment IssueComment 522 522 + var created string 523 523 + var rkey, edited, deleted, replyTo sql.Null[string] 524 524 + err := rows.Scan( 525 525 + &comment.Id, 526 526 + &comment.Did, 527 527 + &rkey, 528 528 + &comment.IssueAt, 529 529 + &replyTo, 530 530 + &comment.Body, 531 531 + &created, 532 532 + &edited, 533 533 + &deleted, 534 534 + ) 517 535 if err != nil { 518 536 return nil, err 519 537 } 520 538 521 521 - createdAtTime, err := time.Parse(time.RFC3339, createdAt) 522 522 - if err != nil { 523 523 - return nil, err 539 539 + // this is a remnant from old times, newer comments always have rkey 540 540 + if rkey.Valid { 541 541 + comment.Rkey = rkey.V 524 542 } 525 525 - comment.Created = &createdAtTime 526 543 527 527 - if deletedAt.Valid { 528 528 - deletedTime, err := time.Parse(time.RFC3339, deletedAt.String) 529 529 - if err != nil { 530 530 - return nil, err 544 544 + if t, err := time.Parse(time.RFC3339, created); err == nil { 545 545 + comment.Created = t 546 546 + } 547 547 + 548 548 + if edited.Valid { 549 549 + if t, err := time.Parse(time.RFC3339, edited.V); err == nil { 550 550 + comment.Edited = &t 531 551 } 532 532 - comment.Deleted = &deletedTime 533 552 } 534 553 535 535 - if editedAt.Valid { 536 536 - editedTime, err := time.Parse(time.RFC3339, editedAt.String) 537 537 - if err != nil { 538 538 - return nil, err 554 554 + if deleted.Valid { 555 555 + if t, err := time.Parse(time.RFC3339, deleted.V); err == nil { 556 556 + comment.Deleted = &t 539 557 } 540 540 - comment.Edited = &editedTime 541 558 } 542 559 543 543 - if rkey.Valid { 544 544 - comment.Rkey = rkey.String 560 560 + if replyTo.Valid { 561 561 + comment.ReplyTo = &replyTo.V 545 562 } 546 563 547 564 comments = append(comments, comment) 548 565 } 549 566 550 550 - if err := rows.Err(); err != nil { 567 567 + if err = rows.Err(); err != nil { 551 568 return nil, err 552 569 } 553 570 554 571 return comments, nil 555 572 } 556 573 557 557 - func GetComment(e Execer, repoAt syntax.ATURI, issueId, commentId int) (*Comment, error) { 558 558 - query := ` 559 559 - select 560 560 - owner_did, body, rkey, created, deleted, edited 561 561 - from 562 562 - comments where repo_at = ? and issue_id = ? and comment_id = ? 563 563 - ` 564 564 - row := e.QueryRow(query, repoAt, issueId, commentId) 565 565 - 566 566 - var comment Comment 567 567 - var createdAt string 568 568 - var deletedAt, editedAt, rkey sql.NullString 569 569 - err := row.Scan(&comment.OwnerDid, &comment.Body, &rkey, &createdAt, &deletedAt, &editedAt) 570 570 - if err != nil { 571 571 - return nil, err 574 574 + func DeleteIssues(e Execer, filters ...filter) error { 575 575 + var conditions []string 576 576 + var args []any 577 577 + for _, filter := range filters { 578 578 + conditions = append(conditions, filter.Condition()) 579 579 + args = append(args, filter.Arg()...) 572 580 } 573 581 574 574 - createdTime, err := time.Parse(time.RFC3339, createdAt) 575 575 - if err != nil { 576 576 - return nil, err 582 582 + whereClause := "" 583 583 + if conditions != nil { 584 584 + whereClause = " where " + strings.Join(conditions, " and ") 577 585 } 578 578 - comment.Created = &createdTime 579 586 580 580 - if deletedAt.Valid { 581 581 - deletedTime, err := time.Parse(time.RFC3339, deletedAt.String) 582 582 - if err != nil { 583 583 - return nil, err 584 584 - } 585 585 - comment.Deleted = &deletedTime 586 586 - } 587 587 + query := fmt.Sprintf(`delete from issues %s`, whereClause) 588 588 + _, err := e.Exec(query, args...) 589 589 + return err 590 590 + } 587 591 588 588 - if editedAt.Valid { 589 589 - editedTime, err := time.Parse(time.RFC3339, editedAt.String) 590 590 - if err != nil { 591 591 - return nil, err 592 592 - } 593 593 - comment.Edited = &editedTime 592 592 + func CloseIssues(e Execer, filters ...filter) error { 593 593 + var conditions []string 594 594 + var args []any 595 595 + for _, filter := range filters { 596 596 + conditions = append(conditions, filter.Condition()) 597 597 + args = append(args, filter.Arg()...) 594 598 } 595 599 596 596 - if rkey.Valid { 597 597 - comment.Rkey = rkey.String 600 600 + whereClause := "" 601 601 + if conditions != nil { 602 602 + whereClause = " where " + strings.Join(conditions, " and ") 598 603 } 599 604 600 600 - comment.RepoAt = repoAt 601 601 - comment.Issue = issueId 602 602 - comment.CommentId = commentId 603 603 - 604 604 - return &comment, nil 605 605 - } 606 606 - 607 607 - func EditComment(e Execer, repoAt syntax.ATURI, issueId, commentId int, newBody string) error { 608 608 - _, err := e.Exec( 609 609 - ` 610 610 - update comments 611 611 - set body = ?, 612 612 - edited = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') 613 613 - where repo_at = ? and issue_id = ? and comment_id = ? 614 614 - `, newBody, repoAt, issueId, commentId) 605 605 + query := fmt.Sprintf(`update issues set open = 0 %s`, whereClause) 606 606 + _, err := e.Exec(query, args...) 615 607 return err 616 608 } 617 609 618 618 - func DeleteComment(e Execer, repoAt syntax.ATURI, issueId, commentId int) error { 619 619 - _, err := e.Exec( 620 620 - ` 621 621 - update comments 622 622 - set body = "", 623 623 - deleted = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') 624 624 - where repo_at = ? and issue_id = ? and comment_id = ? 625 625 - `, repoAt, issueId, commentId) 626 626 - return err 627 627 - } 610 610 + func ReopenIssues(e Execer, filters ...filter) error { 611 611 + var conditions []string 612 612 + var args []any 613 613 + for _, filter := range filters { 614 614 + conditions = append(conditions, filter.Condition()) 615 615 + args = append(args, filter.Arg()...) 616 616 + } 628 617 629 629 - func UpdateCommentByRkey(e Execer, ownerDid, rkey, newBody string) error { 630 630 - _, err := e.Exec( 631 631 - ` 632 632 - update comments 633 633 - set body = ?, 634 634 - edited = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') 635 635 - where owner_did = ? and rkey = ? 636 636 - `, newBody, ownerDid, rkey) 637 637 - return err 638 638 - } 618 618 + whereClause := "" 619 619 + if conditions != nil { 620 620 + whereClause = " where " + strings.Join(conditions, " and ") 621 621 + } 639 622 640 640 - func DeleteCommentByRkey(e Execer, ownerDid, rkey string) error { 641 641 - _, err := e.Exec( 642 642 - ` 643 643 - update comments 644 644 - set body = "", 645 645 - deleted = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') 646 646 - where owner_did = ? and rkey = ? 647 647 - `, ownerDid, rkey) 648 648 - return err 649 649 - } 650 650 - 651 651 - func UpdateIssueByRkey(e Execer, ownerDid, rkey, title, body string) error { 652 652 - _, err := e.Exec(`update issues set title = ?, body = ? where owner_did = ? and rkey = ?`, title, body, ownerDid, rkey) 653 653 - return err 654 654 - } 655 655 - 656 656 - func DeleteIssueByRkey(e Execer, ownerDid, rkey string) error { 657 657 - _, err := e.Exec(`delete from issues where owner_did = ? and rkey = ?`, ownerDid, rkey) 658 658 - return err 659 659 - } 660 660 - 661 661 - func CloseIssue(e Execer, repoAt syntax.ATURI, issueId int) error { 662 662 - _, err := e.Exec(`update issues set open = 0 where repo_at = ? and issue_id = ?`, repoAt, issueId) 663 663 - return err 664 664 - } 665 665 - 666 666 - func ReopenIssue(e Execer, repoAt syntax.ATURI, issueId int) error { 667 667 - _, err := e.Exec(`update issues set open = 1 where repo_at = ? and issue_id = ?`, repoAt, issueId) 623 623 + query := fmt.Sprintf(`update issues set open = 1 %s`, whereClause) 624 624 + _, err := e.Exec(query, args...) 668 625 return err 669 626 } 670 627

+9 -5

appview/db/profile.go

··· 132 132 *items = append(*items, &pull) 133 133 } 134 134 135 135 - issues, err := GetIssuesByOwnerDid(e, forDid, timeframe) 135 135 + issues, err := GetIssues( 136 136 + e, 137 137 + FilterEq("did", forDid), 138 138 + FilterGte("created", time.Now().AddDate(0, -TimeframeMonths, 0)), 139 139 + ) 136 140 if err != nil { 137 141 return nil, fmt.Errorf("error getting issues by owner did: %w", err) 138 142 } ··· 151 155 *items = append(*items, &issue) 152 156 } 153 157 154 154 - repos, err := GetAllReposByDid(e, forDid) 158 158 + repos, err := GetRepos(e, 0, FilterEq("did", forDid)) 155 159 if err != nil { 156 160 return nil, fmt.Errorf("error getting all repos by did: %w", err) 157 161 } ··· 549 553 query = `select count(id) from pulls where owner_did = ? and state = ?` 550 554 args = append(args, did, PullOpen) 551 555 case VanityStatOpenIssueCount: 552 552 - query = `select count(id) from issues where owner_did = ? and open = 1` 556 556 + query = `select count(id) from issues where did = ? and open = 1` 553 557 args = append(args, did) 554 558 case VanityStatClosedIssueCount: 555 555 - query = `select count(id) from issues where owner_did = ? and open = 0` 559 559 + query = `select count(id) from issues where did = ? and open = 0` 556 560 args = append(args, did) 557 561 case VanityStatRepositoryCount: 558 562 query = `select count(id) from repos where did = ?` ··· 586 590 } 587 591 588 592 // ensure all pinned repos are either own repos or collaborating repos 589 589 - repos, err := GetAllReposByDid(e, profile.Did) 593 593 + repos, err := GetRepos(e, 0, FilterEq("did", profile.Did)) 590 594 if err != nil { 591 595 log.Printf("getting repos for %s: %s", profile.Did, err) 592 596 }

+17 -17

appview/db/registration.go

··· 10 10 // Registration represents a knot registration. Knot would've been a better 11 11 // name but we're stuck with this for historical reasons. 12 12 type Registration struct { 13 13 - Id int64 14 14 - Domain string 15 15 - ByDid string 16 16 - Created *time.Time 17 17 - Registered *time.Time 18 18 - ReadOnly bool 13 13 + Id int64 14 14 + Domain string 15 15 + ByDid string 16 16 + Created *time.Time 17 17 + Registered *time.Time 18 18 + NeedsUpgrade bool 19 19 } 20 20 21 21 func (r *Registration) Status() Status { 22 22 - if r.ReadOnly { 23 23 - return ReadOnly 22 22 + if r.NeedsUpgrade { 23 23 + return NeedsUpgrade 24 24 } else if r.Registered != nil { 25 25 return Registered 26 26 } else { ··· 32 32 return r.Status() == Registered 33 33 } 34 34 35 35 - func (r *Registration) IsReadOnly() bool { 36 36 - return r.Status() == ReadOnly 35 35 + func (r *Registration) IsNeedsUpgrade() bool { 36 36 + return r.Status() == NeedsUpgrade 37 37 } 38 38 39 39 func (r *Registration) IsPending() bool { ··· 45 45 const ( 46 46 Registered Status = iota 47 47 Pending 48 48 - ReadOnly 48 48 + NeedsUpgrade 49 49 ) 50 50 51 51 func GetRegistrations(e Execer, filters ...filter) ([]Registration, error) { ··· 64 64 } 65 65 66 66 query := fmt.Sprintf(` 67 67 - select id, domain, did, created, registered, read_only 67 67 + select id, domain, did, created, registered, needs_upgrade 68 68 from registrations 69 69 %s 70 70 order by created ··· 80 80 for rows.Next() { 81 81 var createdAt string 82 82 var registeredAt sql.Null[string] 83 83 - var readOnly int 83 83 + var needsUpgrade int 84 84 var reg Registration 85 85 86 86 - err = rows.Scan(&reg.Id, &reg.Domain, &reg.ByDid, &createdAt, &registeredAt, &readOnly) 86 86 + err = rows.Scan(&reg.Id, &reg.Domain, &reg.ByDid, &createdAt, &registeredAt, &needsUpgrade) 87 87 if err != nil { 88 88 return nil, err 89 89 } ··· 98 98 } 99 99 } 100 100 101 101 - if readOnly != 0 { 102 102 - reg.ReadOnly = true 101 101 + if needsUpgrade != 0 { 102 102 + reg.NeedsUpgrade = true 103 103 } 104 104 105 105 registrations = append(registrations, reg) ··· 116 116 args = append(args, filter.Arg()...) 117 117 } 118 118 119 119 - query := "update registrations set registered = strftime('%Y-%m-%dT%H:%M:%SZ', 'now'), read_only = 0" 119 119 + query := "update registrations set registered = strftime('%Y-%m-%dT%H:%M:%SZ', 'now'), needs_upgrade = 0" 120 120 if len(conditions) > 0 { 121 121 query += " where " + strings.Join(conditions, " and ") 122 122 }

-67

appview/db/repos.go

··· 309 309 return count, nil 310 310 } 311 311 312 312 - func GetAllReposByDid(e Execer, did string) ([]Repo, error) { 313 313 - var repos []Repo 314 314 - 315 315 - rows, err := e.Query( 316 316 - `select 317 317 - r.did, 318 318 - r.name, 319 319 - r.knot, 320 320 - r.rkey, 321 321 - r.description, 322 322 - r.created, 323 323 - count(s.id) as star_count, 324 324 - r.source 325 325 - from 326 326 - repos r 327 327 - left join 328 328 - stars s on r.at_uri = s.repo_at 329 329 - where 330 330 - r.did = ? 331 331 - group by 332 332 - r.at_uri 333 333 - order by r.created desc`, 334 334 - did) 335 335 - if err != nil { 336 336 - return nil, err 337 337 - } 338 338 - defer rows.Close() 339 339 - 340 340 - for rows.Next() { 341 341 - var repo Repo 342 342 - var repoStats RepoStats 343 343 - var createdAt string 344 344 - var nullableDescription sql.NullString 345 345 - var nullableSource sql.NullString 346 346 - 347 347 - err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &repoStats.StarCount, &nullableSource) 348 348 - if err != nil { 349 349 - return nil, err 350 350 - } 351 351 - 352 352 - if nullableDescription.Valid { 353 353 - repo.Description = nullableDescription.String 354 354 - } 355 355 - 356 356 - if nullableSource.Valid { 357 357 - repo.Source = nullableSource.String 358 358 - } 359 359 - 360 360 - createdAtTime, err := time.Parse(time.RFC3339, createdAt) 361 361 - if err != nil { 362 362 - repo.Created = time.Now() 363 363 - } else { 364 364 - repo.Created = createdAtTime 365 365 - } 366 366 - 367 367 - repo.RepoStats = &repoStats 368 368 - 369 369 - repos = append(repos, repo) 370 370 - } 371 371 - 372 372 - if err := rows.Err(); err != nil { 373 373 - return nil, err 374 374 - } 375 375 - 376 376 - return repos, nil 377 377 - } 378 378 - 379 312 func GetRepo(e Execer, did, name string) (*Repo, error) { 380 313 var repo Repo 381 314 var description, spindle sql.NullString

+14 -7

appview/db/spindle.go

··· 10 10 ) 11 11 12 12 type Spindle struct { 13 13 - Id int 14 14 - Owner syntax.DID 15 15 - Instance string 16 16 - Verified *time.Time 17 17 - Created time.Time 13 13 + Id int 14 14 + Owner syntax.DID 15 15 + Instance string 16 16 + Verified *time.Time 17 17 + Created time.Time 18 18 + NeedsUpgrade bool 18 19 } 19 20 20 21 type SpindleMember struct { ··· 42 43 } 43 44 44 45 query := fmt.Sprintf( 45 45 - `select id, owner, instance, verified, created 46 46 + `select id, owner, instance, verified, created, needs_upgrade 46 47 from spindles 47 48 %s 48 49 order by created ··· 61 62 var spindle Spindle 62 63 var createdAt string 63 64 var verified sql.NullString 65 65 + var needsUpgrade int 64 66 65 67 if err := rows.Scan( 66 68 &spindle.Id, ··· 68 70 &spindle.Instance, 69 71 &verified, 70 72 &createdAt, 73 73 + &needsUpgrade, 71 74 ); err != nil { 72 75 return nil, err 73 76 } ··· 86 89 spindle.Verified = &t 87 90 } 88 91 92 92 + if needsUpgrade != 0 { 93 93 + spindle.NeedsUpgrade = true 94 94 + } 95 95 + 89 96 spindles = append(spindles, spindle) 90 97 } 91 98 ··· 115 122 whereClause = " where " + strings.Join(conditions, " and ") 116 123 } 117 124 118 118 - query := fmt.Sprintf(`update spindles set verified = strftime('%%Y-%%m-%%dT%%H:%%M:%%SZ', 'now') %s`, whereClause) 125 125 + query := fmt.Sprintf(`update spindles set verified = strftime('%%Y-%%m-%%dT%%H:%%M:%%SZ', 'now'), needs_upgrade = 0 %s`, whereClause) 119 126 120 127 res, err := e.Exec(query, args...) 121 128 if err != nil {

+29 -74

appview/ingester.go

··· 5 5 "encoding/json" 6 6 "fmt" 7 7 "log/slog" 8 8 - "strings" 8 8 + 9 9 "time" 10 10 11 11 "github.com/bluesky-social/indigo/atproto/syntax" ··· 15 15 "tangled.sh/tangled.sh/core/api/tangled" 16 16 "tangled.sh/tangled.sh/core/appview/config" 17 17 "tangled.sh/tangled.sh/core/appview/db" 18 18 - "tangled.sh/tangled.sh/core/appview/pages/markup" 19 18 "tangled.sh/tangled.sh/core/appview/serververify" 19 19 + "tangled.sh/tangled.sh/core/appview/validator" 20 20 "tangled.sh/tangled.sh/core/idresolver" 21 21 "tangled.sh/tangled.sh/core/rbac" 22 22 ) ··· 27 27 IdResolver *idresolver.Resolver 28 28 Config *config.Config 29 29 Logger *slog.Logger 30 30 + Validator *validator.Validator 30 31 } 31 32 32 33 type processFunc func(ctx context.Context, e *models.Event) error ··· 790 791 } 791 792 792 793 switch e.Commit.Operation { 793 793 - case models.CommitOperationCreate: 794 794 + case models.CommitOperationCreate, models.CommitOperationUpdate: 794 795 raw := json.RawMessage(e.Commit.Record) 795 796 record := tangled.RepoIssue{} 796 797 err = json.Unmarshal(raw, &record) ··· 801 802 802 803 issue := db.IssueFromRecord(did, rkey, record) 803 804 804 804 - sanitizer := markup.NewSanitizer() 805 805 - if st := strings.TrimSpace(sanitizer.SanitizeDescription(issue.Title)); st == "" { 806 806 - return fmt.Errorf("title is empty after HTML sanitization") 807 807 - } 808 808 - if sb := strings.TrimSpace(sanitizer.SanitizeDefault(issue.Body)); sb == "" { 809 809 - return fmt.Errorf("body is empty after HTML sanitization") 805 805 + if err := i.Validator.ValidateIssue(&issue); err != nil { 806 806 + return fmt.Errorf("failed to validate issue: %w", err) 810 807 } 811 808 812 809 tx, err := ddb.BeginTx(ctx, nil) ··· 814 811 l.Error("failed to begin transaction", "err", err) 815 812 return err 816 813 } 814 814 + defer tx.Rollback() 817 815 818 818 - err = db.NewIssue(tx, &issue) 816 816 + err = db.PutIssue(tx, &issue) 819 817 if err != nil { 820 818 l.Error("failed to create issue", "err", err) 821 819 return err 822 820 } 823 821 824 824 - return nil 825 825 - 826 826 - case models.CommitOperationUpdate: 827 827 - raw := json.RawMessage(e.Commit.Record) 828 828 - record := tangled.RepoIssue{} 829 829 - err = json.Unmarshal(raw, &record) 822 822 + err = tx.Commit() 830 823 if err != nil { 831 831 - l.Error("invalid record", "err", err) 832 832 - return err 833 833 - } 834 834 - 835 835 - body := "" 836 836 - if record.Body != nil { 837 837 - body = *record.Body 838 838 - } 839 839 - 840 840 - sanitizer := markup.NewSanitizer() 841 841 - if st := strings.TrimSpace(sanitizer.SanitizeDescription(record.Title)); st == "" { 842 842 - return fmt.Errorf("title is empty after HTML sanitization") 843 843 - } 844 844 - if sb := strings.TrimSpace(sanitizer.SanitizeDefault(body)); sb == "" { 845 845 - return fmt.Errorf("body is empty after HTML sanitization") 846 846 - } 847 847 - 848 848 - err = db.UpdateIssueByRkey(ddb, did, rkey, record.Title, body) 849 849 - if err != nil { 850 850 - l.Error("failed to update issue", "err", err) 824 824 + l.Error("failed to commit txn", "err", err) 851 825 return err 852 826 } 853 827 854 828 return nil 855 829 856 830 case models.CommitOperationDelete: 857 857 - if err := db.DeleteIssueByRkey(ddb, did, rkey); err != nil { 831 831 + if err := db.DeleteIssues( 832 832 + ddb, 833 833 + db.FilterEq("did", did), 834 834 + db.FilterEq("rkey", rkey), 835 835 + ); err != nil { 858 836 l.Error("failed to delete", "err", err) 859 837 return fmt.Errorf("failed to delete issue record: %w", err) 860 838 } ··· 862 840 return nil 863 841 } 864 842 865 865 - return fmt.Errorf("unknown operation: %s", e.Commit.Operation) 843 843 + return nil 866 844 } 867 845 868 846 func (i *Ingester) ingestIssueComment(e *models.Event) error { ··· 880 858 } 881 859 882 860 switch e.Commit.Operation { 883 883 - case models.CommitOperationCreate: 861 861 + case models.CommitOperationCreate, models.CommitOperationUpdate: 884 862 raw := json.RawMessage(e.Commit.Record) 885 863 record := tangled.RepoIssueComment{} 886 864 err = json.Unmarshal(raw, &record) 887 865 if err != nil { 888 888 - l.Error("invalid record", "err", err) 889 889 - return err 866 866 + return fmt.Errorf("invalid record: %w", err) 890 867 } 891 868 892 869 comment, err := db.IssueCommentFromRecord(ddb, did, rkey, record) 893 870 if err != nil { 894 894 - l.Error("failed to parse comment from record", "err", err) 895 895 - return err 871 871 + return fmt.Errorf("failed to parse comment from record: %w", err) 896 872 } 897 873 898 898 - sanitizer := markup.NewSanitizer() 899 899 - if sb := strings.TrimSpace(sanitizer.SanitizeDefault(comment.Body)); sb == "" { 900 900 - return fmt.Errorf("body is empty after HTML sanitization") 874 874 + if err := i.Validator.ValidateIssueComment(comment); err != nil { 875 875 + return fmt.Errorf("failed to validate comment: %w", err) 901 876 } 902 877 903 903 - err = db.NewIssueComment(ddb, &comment) 878 878 + _, err = db.AddIssueComment(ddb, *comment) 904 879 if err != nil { 905 905 - l.Error("failed to create issue comment", "err", err) 906 906 - return err 907 907 - } 908 908 - 909 909 - return nil 910 910 - 911 911 - case models.CommitOperationUpdate: 912 912 - raw := json.RawMessage(e.Commit.Record) 913 913 - record := tangled.RepoIssueComment{} 914 914 - err = json.Unmarshal(raw, &record) 915 915 - if err != nil { 916 916 - l.Error("invalid record", "err", err) 917 917 - return err 918 918 - } 919 919 - 920 920 - sanitizer := markup.NewSanitizer() 921 921 - if sb := strings.TrimSpace(sanitizer.SanitizeDefault(record.Body)); sb == "" { 922 922 - return fmt.Errorf("body is empty after HTML sanitization") 923 923 - } 924 924 - 925 925 - err = db.UpdateCommentByRkey(ddb, did, rkey, record.Body) 926 926 - if err != nil { 927 927 - l.Error("failed to update issue comment", "err", err) 928 928 - return err 880 880 + return fmt.Errorf("failed to create issue comment: %w", err) 929 881 } 930 882 931 883 return nil 932 884 933 885 case models.CommitOperationDelete: 934 934 - if err := db.DeleteCommentByRkey(ddb, did, rkey); err != nil { 935 935 - l.Error("failed to delete", "err", err) 886 886 + if err := db.DeleteIssueComments( 887 887 + ddb, 888 888 + db.FilterEq("did", did), 889 889 + db.FilterEq("rkey", rkey), 890 890 + ); err != nil { 936 891 return fmt.Errorf("failed to delete issue comment record: %w", err) 937 892 } 938 893 939 894 return nil 940 895 } 941 896 942 942 - return fmt.Errorf("unknown operation: %s", e.Commit.Operation) 897 897 + return nil 943 898 }

+477 -280

appview/issues/issues.go

··· 1 1 package issues 2 2 3 3 import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "errors" 4 7 "fmt" 5 8 "log" 6 6 - mathrand "math/rand/v2" 9 9 + "log/slog" 7 10 "net/http" 8 11 "slices" 9 9 - "strconv" 10 10 - "strings" 11 12 "time" 12 13 13 14 comatproto "github.com/bluesky-social/indigo/api/atproto" 14 14 - "github.com/bluesky-social/indigo/atproto/data" 15 15 + "github.com/bluesky-social/indigo/atproto/syntax" 15 16 lexutil "github.com/bluesky-social/indigo/lex/util" 16 17 "github.com/go-chi/chi/v5" 17 18 ··· 21 22 "tangled.sh/tangled.sh/core/appview/notify" 22 23 "tangled.sh/tangled.sh/core/appview/oauth" 23 24 "tangled.sh/tangled.sh/core/appview/pages" 24 24 - "tangled.sh/tangled.sh/core/appview/pages/markup" 25 25 "tangled.sh/tangled.sh/core/appview/pagination" 26 26 "tangled.sh/tangled.sh/core/appview/reporesolver" 27 27 + "tangled.sh/tangled.sh/core/appview/validator" 28 28 + "tangled.sh/tangled.sh/core/appview/xrpcclient" 27 29 "tangled.sh/tangled.sh/core/idresolver" 30 30 + tlog "tangled.sh/tangled.sh/core/log" 28 31 "tangled.sh/tangled.sh/core/tid" 29 32 ) 30 33 ··· 36 39 db *db.DB 37 40 config *config.Config 38 41 notifier notify.Notifier 42 42 + logger *slog.Logger 43 43 + validator *validator.Validator 39 44 } 40 45 41 46 func New( ··· 46 51 db *db.DB, 47 52 config *config.Config, 48 53 notifier notify.Notifier, 54 54 + validator *validator.Validator, 49 55 ) *Issues { 50 56 return &Issues{ 51 57 oauth: oauth, ··· 55 61 db: db, 56 62 config: config, 57 63 notifier: notifier, 64 64 + logger: tlog.New("issues"), 65 65 + validator: validator, 58 66 } 59 67 } 60 68 61 69 func (rp *Issues) RepoSingleIssue(w http.ResponseWriter, r *http.Request) { 70 70 + l := rp.logger.With("handler", "RepoSingleIssue") 62 71 user := rp.oauth.GetUser(r) 63 72 f, err := rp.repoResolver.Resolve(r) 64 73 if err != nil { ··· 66 75 return 67 76 } 68 77 69 69 - issueId := chi.URLParam(r, "issue") 70 70 - issueIdInt, err := strconv.Atoi(issueId) 71 71 - if err != nil { 72 72 - http.Error(w, "bad issue id", http.StatusBadRequest) 73 73 - log.Println("failed to parse issue id", err) 74 74 - return 75 75 - } 76 76 - 77 77 - issue, comments, err := db.GetIssueWithComments(rp.db, f.RepoAt(), issueIdInt) 78 78 - if err != nil { 79 79 - log.Println("failed to get issue and comments", err) 80 80 - rp.pages.Notice(w, "issues", "Failed to load issue. Try again later.") 78 78 + issue, ok := r.Context().Value("issue").(*db.Issue) 79 79 + if !ok { 80 80 + l.Error("failed to get issue") 81 81 + rp.pages.Error404(w) 81 82 return 82 83 } 83 84 84 85 reactionCountMap, err := db.GetReactionCountMap(rp.db, issue.AtUri()) 85 86 if err != nil { 86 86 - log.Println("failed to get issue reactions") 87 87 - rp.pages.Notice(w, "issues", "Failed to load issue. Try again later.") 87 87 + l.Error("failed to get issue reactions", "err", err) 88 88 } 89 89 90 90 userReactions := map[db.ReactionKind]bool{} ··· 92 92 userReactions = db.GetReactionStatusMap(rp.db, user.Did, issue.AtUri()) 93 93 } 94 94 95 95 - issueOwnerIdent, err := rp.idResolver.ResolveIdent(r.Context(), issue.OwnerDid) 96 96 - if err != nil { 97 97 - log.Println("failed to resolve issue owner", err) 98 98 - } 99 99 - 100 95 rp.pages.RepoSingleIssue(w, pages.RepoSingleIssueParams{ 101 101 - LoggedInUser: user, 102 102 - RepoInfo: f.RepoInfo(user), 103 103 - Issue: issue, 104 104 - Comments: comments, 105 105 - 106 106 - IssueOwnerHandle: issueOwnerIdent.Handle.String(), 107 107 - 96 96 + LoggedInUser: user, 97 97 + RepoInfo: f.RepoInfo(user), 98 98 + Issue: issue, 99 99 + CommentList: issue.CommentList(), 108 100 OrderedReactionKinds: db.OrderedReactionKinds, 109 101 Reactions: reactionCountMap, 110 102 UserReacted: userReactions, 111 103 }) 112 112 - 113 104 } 114 105 115 115 - func (rp *Issues) CloseIssue(w http.ResponseWriter, r *http.Request) { 106 106 + func (rp *Issues) EditIssue(w http.ResponseWriter, r *http.Request) { 107 107 + l := rp.logger.With("handler", "EditIssue") 116 108 user := rp.oauth.GetUser(r) 117 109 f, err := rp.repoResolver.Resolve(r) 118 110 if err != nil { ··· 120 112 return 121 113 } 122 114 123 123 - issueId := chi.URLParam(r, "issue") 124 124 - issueIdInt, err := strconv.Atoi(issueId) 125 125 - if err != nil { 126 126 - http.Error(w, "bad issue id", http.StatusBadRequest) 127 127 - log.Println("failed to parse issue id", err) 115 115 + issue, ok := r.Context().Value("issue").(*db.Issue) 116 116 + if !ok { 117 117 + l.Error("failed to get issue") 118 118 + rp.pages.Error404(w) 128 119 return 129 120 } 130 121 131 131 - issue, err := db.GetIssue(rp.db, f.RepoAt(), issueIdInt) 132 132 - if err != nil { 133 133 - log.Println("failed to get issue", err) 134 134 - rp.pages.Notice(w, "issue-action", "Failed to close issue. Try again later.") 135 135 - return 136 136 - } 122 122 + switch r.Method { 123 123 + case http.MethodGet: 124 124 + rp.pages.EditIssueFragment(w, pages.EditIssueParams{ 125 125 + LoggedInUser: user, 126 126 + RepoInfo: f.RepoInfo(user), 127 127 + Issue: issue, 128 128 + }) 129 129 + case http.MethodPost: 130 130 + noticeId := "issues" 131 131 + newIssue := issue 132 132 + newIssue.Title = r.FormValue("title") 133 133 + newIssue.Body = r.FormValue("body") 137 134 138 138 - collaborators, err := f.Collaborators(r.Context()) 139 139 - if err != nil { 140 140 - log.Println("failed to fetch repo collaborators: %w", err) 141 141 - } 142 142 - isCollaborator := slices.ContainsFunc(collaborators, func(collab pages.Collaborator) bool { 143 143 - return user.Did == collab.Did 144 144 - }) 145 145 - isIssueOwner := user.Did == issue.OwnerDid 146 146 - 147 147 - // TODO: make this more granular 148 148 - if isIssueOwner || isCollaborator { 135 135 + if err := rp.validator.ValidateIssue(newIssue); err != nil { 136 136 + l.Error("validation error", "err", err) 137 137 + rp.pages.Notice(w, noticeId, fmt.Sprintf("Failed to edit issue: %s", err)) 138 138 + return 139 139 + } 149 140 150 150 - closed := tangled.RepoIssueStateClosed 141 141 + newRecord := newIssue.AsRecord() 151 142 143 143 + // edit an atproto record 152 144 client, err := rp.oauth.AuthorizedClient(r) 153 145 if err != nil { 154 154 - log.Println("failed to get authorized client", err) 146 146 + l.Error("failed to get authorized client", "err", err) 147 147 + rp.pages.Notice(w, noticeId, "Failed to edit issue.") 155 148 return 156 149 } 150 150 + 151 151 + ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoIssueNSID, user.Did, newIssue.Rkey) 152 152 + if err != nil { 153 153 + l.Error("failed to get record", "err", err) 154 154 + rp.pages.Notice(w, noticeId, "Failed to edit issue, no record found on PDS.") 155 155 + return 156 156 + } 157 157 + 157 158 _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 158 158 - Collection: tangled.RepoIssueStateNSID, 159 159 + Collection: tangled.RepoIssueNSID, 159 160 Repo: user.Did, 160 160 - Rkey: tid.TID(), 161 161 + Rkey: newIssue.Rkey, 162 162 + SwapRecord: ex.Cid, 161 163 Record: &lexutil.LexiconTypeDecoder{ 162 162 - Val: &tangled.RepoIssueState{ 163 163 - Issue: issue.AtUri().String(), 164 164 - State: closed, 165 165 - }, 164 164 + Val: &newRecord, 166 165 }, 167 166 }) 167 167 + if err != nil { 168 168 + l.Error("failed to edit record on PDS", "err", err) 169 169 + rp.pages.Notice(w, noticeId, "Failed to edit issue on PDS.") 170 170 + return 171 171 + } 168 172 173 173 + // modify on DB -- TODO: transact this cleverly 174 174 + tx, err := rp.db.Begin() 169 175 if err != nil { 170 170 - log.Println("failed to update issue state", err) 171 171 - rp.pages.Notice(w, "issue-action", "Failed to close issue. Try again later.") 176 176 + l.Error("failed to edit issue on DB", "err", err) 177 177 + rp.pages.Notice(w, noticeId, "Failed to edit issue.") 178 178 + return 179 179 + } 180 180 + defer tx.Rollback() 181 181 + 182 182 + err = db.PutIssue(tx, newIssue) 183 183 + if err != nil { 184 184 + log.Println("failed to edit issue", err) 185 185 + rp.pages.Notice(w, "issues", "Failed to edit issue.") 186 186 + return 187 187 + } 188 188 + 189 189 + if err = tx.Commit(); err != nil { 190 190 + l.Error("failed to edit issue", "err", err) 191 191 + rp.pages.Notice(w, "issues", "Failed to cedit issue.") 172 192 return 173 193 } 174 194 175 175 - err = db.CloseIssue(rp.db, f.RepoAt(), issueIdInt) 195 195 + rp.pages.HxRefresh(w) 196 196 + } 197 197 + } 198 198 + 199 199 + func (rp *Issues) DeleteIssue(w http.ResponseWriter, r *http.Request) { 200 200 + l := rp.logger.With("handler", "DeleteIssue") 201 201 + noticeId := "issue-actions-error" 202 202 + 203 203 + user := rp.oauth.GetUser(r) 204 204 + 205 205 + f, err := rp.repoResolver.Resolve(r) 206 206 + if err != nil { 207 207 + l.Error("failed to get repo and knot", "err", err) 208 208 + return 209 209 + } 210 210 + 211 211 + issue, ok := r.Context().Value("issue").(*db.Issue) 212 212 + if !ok { 213 213 + l.Error("failed to get issue") 214 214 + rp.pages.Notice(w, noticeId, "Failed to delete issue.") 215 215 + return 216 216 + } 217 217 + l = l.With("did", issue.Did, "rkey", issue.Rkey) 218 218 + 219 219 + // delete from PDS 220 220 + client, err := rp.oauth.AuthorizedClient(r) 221 221 + if err != nil { 222 222 + log.Println("failed to get authorized client", err) 223 223 + rp.pages.Notice(w, "issue-comment", "Failed to delete comment.") 224 224 + return 225 225 + } 226 226 + _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 227 227 + Collection: tangled.RepoIssueNSID, 228 228 + Repo: issue.Did, 229 229 + Rkey: issue.Rkey, 230 230 + }) 231 231 + if err != nil { 232 232 + // TODO: transact this better 233 233 + l.Error("failed to delete issue from PDS", "err", err) 234 234 + rp.pages.Notice(w, noticeId, "Failed to delete issue.") 235 235 + return 236 236 + } 237 237 + 238 238 + // delete from db 239 239 + if err := db.DeleteIssues(rp.db, db.FilterEq("id", issue.Id)); err != nil { 240 240 + l.Error("failed to delete issue", "err", err) 241 241 + rp.pages.Notice(w, noticeId, "Failed to delete issue.") 242 242 + return 243 243 + } 244 244 + 245 245 + // return to all issues page 246 246 + rp.pages.HxRedirect(w, "/"+f.RepoInfo(user).FullName()+"/issues") 247 247 + } 248 248 + 249 249 + func (rp *Issues) CloseIssue(w http.ResponseWriter, r *http.Request) { 250 250 + l := rp.logger.With("handler", "CloseIssue") 251 251 + user := rp.oauth.GetUser(r) 252 252 + f, err := rp.repoResolver.Resolve(r) 253 253 + if err != nil { 254 254 + l.Error("failed to get repo and knot", "err", err) 255 255 + return 256 256 + } 257 257 + 258 258 + issue, ok := r.Context().Value("issue").(*db.Issue) 259 259 + if !ok { 260 260 + l.Error("failed to get issue") 261 261 + rp.pages.Error404(w) 262 262 + return 263 263 + } 264 264 + 265 265 + collaborators, err := f.Collaborators(r.Context()) 266 266 + if err != nil { 267 267 + log.Println("failed to fetch repo collaborators: %w", err) 268 268 + } 269 269 + isCollaborator := slices.ContainsFunc(collaborators, func(collab pages.Collaborator) bool { 270 270 + return user.Did == collab.Did 271 271 + }) 272 272 + isIssueOwner := user.Did == issue.Did 273 273 + 274 274 + // TODO: make this more granular 275 275 + if isIssueOwner || isCollaborator { 276 276 + err = db.CloseIssues( 277 277 + rp.db, 278 278 + db.FilterEq("id", issue.Id), 279 279 + ) 176 280 if err != nil { 177 281 log.Println("failed to close issue", err) 178 282 rp.pages.Notice(w, "issue-action", "Failed to close issue. Try again later.") 179 283 return 180 284 } 181 285 182 182 - rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issueIdInt)) 286 286 + rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issue.IssueId)) 183 287 return 184 288 } else { 185 289 log.Println("user is not permitted to close issue") ··· 189 293 } 190 294 191 295 func (rp *Issues) ReopenIssue(w http.ResponseWriter, r *http.Request) { 296 296 + l := rp.logger.With("handler", "ReopenIssue") 192 297 user := rp.oauth.GetUser(r) 193 298 f, err := rp.repoResolver.Resolve(r) 194 299 if err != nil { ··· 196 301 return 197 302 } 198 303 199 199 - issueId := chi.URLParam(r, "issue") 200 200 - issueIdInt, err := strconv.Atoi(issueId) 201 201 - if err != nil { 202 202 - http.Error(w, "bad issue id", http.StatusBadRequest) 203 203 - log.Println("failed to parse issue id", err) 204 204 - return 205 205 - } 206 206 - 207 207 - issue, err := db.GetIssue(rp.db, f.RepoAt(), issueIdInt) 208 208 - if err != nil { 209 209 - log.Println("failed to get issue", err) 210 210 - rp.pages.Notice(w, "issue-action", "Failed to close issue. Try again later.") 304 304 + issue, ok := r.Context().Value("issue").(*db.Issue) 305 305 + if !ok { 306 306 + l.Error("failed to get issue") 307 307 + rp.pages.Error404(w) 211 308 return 212 309 } 213 310 ··· 218 315 isCollaborator := slices.ContainsFunc(collaborators, func(collab pages.Collaborator) bool { 219 316 return user.Did == collab.Did 220 317 }) 221 221 - isIssueOwner := user.Did == issue.OwnerDid 318 318 + isIssueOwner := user.Did == issue.Did 222 319 223 320 if isCollaborator || isIssueOwner { 224 224 - err := db.ReopenIssue(rp.db, f.RepoAt(), issueIdInt) 321 321 + err := db.ReopenIssues( 322 322 + rp.db, 323 323 + db.FilterEq("id", issue.Id), 324 324 + ) 225 325 if err != nil { 226 326 log.Println("failed to reopen issue", err) 227 327 rp.pages.Notice(w, "issue-action", "Failed to reopen issue. Try again later.") 228 328 return 229 329 } 230 230 - rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issueIdInt)) 330 330 + rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issue.IssueId)) 231 331 return 232 332 } else { 233 333 log.Println("user is not the owner of the repo") ··· 237 337 } 238 338 239 339 func (rp *Issues) NewIssueComment(w http.ResponseWriter, r *http.Request) { 340 340 + l := rp.logger.With("handler", "NewIssueComment") 240 341 user := rp.oauth.GetUser(r) 241 342 f, err := rp.repoResolver.Resolve(r) 242 343 if err != nil { 243 243 - log.Println("failed to get repo and knot", err) 344 344 + l.Error("failed to get repo and knot", "err", err) 244 345 return 245 346 } 246 347 247 247 - issueId := chi.URLParam(r, "issue") 248 248 - issueIdInt, err := strconv.Atoi(issueId) 249 249 - if err != nil { 250 250 - http.Error(w, "bad issue id", http.StatusBadRequest) 251 251 - log.Println("failed to parse issue id", err) 348 348 + issue, ok := r.Context().Value("issue").(*db.Issue) 349 349 + if !ok { 350 350 + l.Error("failed to get issue") 351 351 + rp.pages.Error404(w) 252 352 return 253 353 } 254 354 255 255 - switch r.Method { 256 256 - case http.MethodPost: 257 257 - body := r.FormValue("body") 258 258 - if body == "" { 259 259 - rp.pages.Notice(w, "issue", "Body is required") 260 260 - return 261 261 - } 355 355 + body := r.FormValue("body") 356 356 + if body == "" { 357 357 + rp.pages.Notice(w, "issue", "Body is required") 358 358 + return 359 359 + } 262 360 263 263 - commentId := mathrand.IntN(1000000) 264 264 - rkey := tid.TID() 361 361 + replyToUri := r.FormValue("reply-to") 362 362 + var replyTo *string 363 363 + if replyToUri != "" { 364 364 + replyTo = &replyToUri 365 365 + } 265 366 266 266 - err := db.NewIssueComment(rp.db, &db.Comment{ 267 267 - OwnerDid: user.Did, 268 268 - RepoAt: f.RepoAt(), 269 269 - Issue: issueIdInt, 270 270 - CommentId: commentId, 271 271 - Body: body, 272 272 - Rkey: rkey, 273 273 - }) 274 274 - if err != nil { 275 275 - log.Println("failed to create comment", err) 276 276 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 277 277 - return 278 278 - } 367 367 + comment := db.IssueComment{ 368 368 + Did: user.Did, 369 369 + Rkey: tid.TID(), 370 370 + IssueAt: issue.AtUri().String(), 371 371 + ReplyTo: replyTo, 372 372 + Body: body, 373 373 + Created: time.Now(), 374 374 + } 375 375 + if err = rp.validator.ValidateIssueComment(&comment); err != nil { 376 376 + l.Error("failed to validate comment", "err", err) 377 377 + rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 378 378 + return 379 379 + } 380 380 + record := comment.AsRecord() 279 381 280 280 - createdAt := time.Now().Format(time.RFC3339) 281 281 - ownerDid := user.Did 282 282 - issueAt, err := db.GetIssueAt(rp.db, f.RepoAt(), issueIdInt) 283 283 - if err != nil { 284 284 - log.Println("failed to get issue at", err) 285 285 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 286 286 - return 287 287 - } 382 382 + client, err := rp.oauth.AuthorizedClient(r) 383 383 + if err != nil { 384 384 + l.Error("failed to get authorized client", "err", err) 385 385 + rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 386 386 + return 387 387 + } 288 388 289 289 - atUri := f.RepoAt().String() 290 290 - client, err := rp.oauth.AuthorizedClient(r) 291 291 - if err != nil { 292 292 - log.Println("failed to get authorized client", err) 293 293 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 294 294 - return 389 389 + // create a record first 390 390 + resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 391 391 + Collection: tangled.RepoIssueCommentNSID, 392 392 + Repo: comment.Did, 393 393 + Rkey: comment.Rkey, 394 394 + Record: &lexutil.LexiconTypeDecoder{ 395 395 + Val: &record, 396 396 + }, 397 397 + }) 398 398 + if err != nil { 399 399 + l.Error("failed to create comment", "err", err) 400 400 + rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 401 401 + return 402 402 + } 403 403 + atUri := resp.Uri 404 404 + defer func() { 405 405 + if err := rollbackRecord(context.Background(), atUri, client); err != nil { 406 406 + l.Error("rollback failed", "err", err) 295 407 } 296 296 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 297 297 - Collection: tangled.RepoIssueCommentNSID, 298 298 - Repo: user.Did, 299 299 - Rkey: rkey, 300 300 - Record: &lexutil.LexiconTypeDecoder{ 301 301 - Val: &tangled.RepoIssueComment{ 302 302 - Repo: &atUri, 303 303 - Issue: issueAt, 304 304 - Owner: &ownerDid, 305 305 - Body: body, 306 306 - CreatedAt: createdAt, 307 307 - }, 308 308 - }, 309 309 - }) 310 310 - if err != nil { 311 311 - log.Println("failed to create comment", err) 312 312 - rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 313 313 - return 314 314 - } 408 408 + }() 315 409 316 316 - rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d#comment-%d", f.OwnerSlashRepo(), issueIdInt, commentId)) 410 410 + commentId, err := db.AddIssueComment(rp.db, comment) 411 411 + if err != nil { 412 412 + l.Error("failed to create comment", "err", err) 413 413 + rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 317 414 return 318 415 } 416 416 + 417 417 + // reset atUri to make rollback a no-op 418 418 + atUri = "" 419 419 + rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d#comment-%d", f.OwnerSlashRepo(), issue.IssueId, commentId)) 319 420 } 320 421 321 422 func (rp *Issues) IssueComment(w http.ResponseWriter, r *http.Request) { 423 423 + l := rp.logger.With("handler", "IssueComment") 322 424 user := rp.oauth.GetUser(r) 323 425 f, err := rp.repoResolver.Resolve(r) 324 426 if err != nil { 325 325 - log.Println("failed to get repo and knot", err) 427 427 + l.Error("failed to get repo and knot", "err", err) 326 428 return 327 429 } 328 430 329 329 - issueId := chi.URLParam(r, "issue") 330 330 - issueIdInt, err := strconv.Atoi(issueId) 331 331 - if err != nil { 332 332 - http.Error(w, "bad issue id", http.StatusBadRequest) 333 333 - log.Println("failed to parse issue id", err) 431 431 + issue, ok := r.Context().Value("issue").(*db.Issue) 432 432 + if !ok { 433 433 + l.Error("failed to get issue") 434 434 + rp.pages.Error404(w) 334 435 return 335 436 } 336 437 337 337 - commentId := chi.URLParam(r, "comment_id") 338 338 - commentIdInt, err := strconv.Atoi(commentId) 438 438 + commentId := chi.URLParam(r, "commentId") 439 439 + comments, err := db.GetIssueComments( 440 440 + rp.db, 441 441 + db.FilterEq("id", commentId), 442 442 + ) 339 443 if err != nil { 340 340 - http.Error(w, "bad comment id", http.StatusBadRequest) 341 341 - log.Println("failed to parse issue id", err) 444 444 + l.Error("failed to fetch comment", "id", commentId) 445 445 + http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 342 446 return 343 447 } 344 344 - 345 345 - issue, err := db.GetIssue(rp.db, f.RepoAt(), issueIdInt) 346 346 - if err != nil { 347 347 - log.Println("failed to get issue", err) 348 348 - rp.pages.Notice(w, "issues", "Failed to load issue. Try again later.") 448 448 + if len(comments) != 1 { 449 449 + l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 450 450 + http.Error(w, "invalid comment id", http.StatusBadRequest) 349 451 return 350 452 } 453 453 + comment := comments[0] 351 454 352 352 - comment, err := db.GetComment(rp.db, f.RepoAt(), issueIdInt, commentIdInt) 353 353 - if err != nil { 354 354 - http.Error(w, "bad comment id", http.StatusBadRequest) 355 355 - return 356 356 - } 357 357 - 358 358 - rp.pages.SingleIssueCommentFragment(w, pages.SingleIssueCommentParams{ 455 455 + rp.pages.IssueCommentBodyFragment(w, pages.IssueCommentBodyParams{ 359 456 LoggedInUser: user, 360 457 RepoInfo: f.RepoInfo(user), 361 458 Issue: issue, 362 362 - Comment: comment, 459 459 + Comment: &comment, 363 460 }) 364 461 } 365 462 366 463 func (rp *Issues) EditIssueComment(w http.ResponseWriter, r *http.Request) { 464 464 + l := rp.logger.With("handler", "EditIssueComment") 367 465 user := rp.oauth.GetUser(r) 368 466 f, err := rp.repoResolver.Resolve(r) 369 467 if err != nil { 370 370 - log.Println("failed to get repo and knot", err) 468 468 + l.Error("failed to get repo and knot", "err", err) 371 469 return 372 470 } 373 471 374 374 - issueId := chi.URLParam(r, "issue") 375 375 - issueIdInt, err := strconv.Atoi(issueId) 376 376 - if err != nil { 377 377 - http.Error(w, "bad issue id", http.StatusBadRequest) 378 378 - log.Println("failed to parse issue id", err) 472 472 + issue, ok := r.Context().Value("issue").(*db.Issue) 473 473 + if !ok { 474 474 + l.Error("failed to get issue") 475 475 + rp.pages.Error404(w) 379 476 return 380 477 } 381 478 382 382 - commentId := chi.URLParam(r, "comment_id") 383 383 - commentIdInt, err := strconv.Atoi(commentId) 479 479 + commentId := chi.URLParam(r, "commentId") 480 480 + comments, err := db.GetIssueComments( 481 481 + rp.db, 482 482 + db.FilterEq("id", commentId), 483 483 + ) 384 484 if err != nil { 385 385 - http.Error(w, "bad comment id", http.StatusBadRequest) 386 386 - log.Println("failed to parse issue id", err) 485 485 + l.Error("failed to fetch comment", "id", commentId) 486 486 + http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 387 487 return 388 488 } 389 389 - 390 390 - issue, err := db.GetIssue(rp.db, f.RepoAt(), issueIdInt) 391 391 - if err != nil { 392 392 - log.Println("failed to get issue", err) 393 393 - rp.pages.Notice(w, "issues", "Failed to load issue. Try again later.") 489 489 + if len(comments) != 1 { 490 490 + l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 491 491 + http.Error(w, "invalid comment id", http.StatusBadRequest) 394 492 return 395 493 } 494 494 + comment := comments[0] 396 495 397 397 - comment, err := db.GetComment(rp.db, f.RepoAt(), issueIdInt, commentIdInt) 398 398 - if err != nil { 399 399 - http.Error(w, "bad comment id", http.StatusBadRequest) 400 400 - return 401 401 - } 402 402 - 403 403 - if comment.OwnerDid != user.Did { 496 496 + if comment.Did != user.Did { 497 497 + l.Error("unauthorized comment edit", "expectedDid", comment.Did, "gotDid", user.Did) 404 498 http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 405 499 return 406 500 } ··· 411 505 LoggedInUser: user, 412 506 RepoInfo: f.RepoInfo(user), 413 507 Issue: issue, 414 414 - Comment: comment, 508 508 + Comment: &comment, 415 509 }) 416 510 case http.MethodPost: 417 511 // extract form value ··· 422 516 rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 423 517 return 424 518 } 425 425 - rkey := comment.Rkey 426 519 427 427 - // optimistic update 428 428 - edited := time.Now() 429 429 - err = db.EditComment(rp.db, comment.RepoAt, comment.Issue, comment.CommentId, newBody) 520 520 + now := time.Now() 521 521 + newComment := comment 522 522 + newComment.Body = newBody 523 523 + newComment.Edited = &now 524 524 + record := newComment.AsRecord() 525 525 + 526 526 + _, err = db.AddIssueComment(rp.db, newComment) 430 527 if err != nil { 431 528 log.Println("failed to perferom update-description query", err) 432 529 rp.pages.Notice(w, "repo-notice", "Failed to update description, try again later.") ··· 434 531 } 435 532 436 533 // rkey is optional, it was introduced later 437 437 - if comment.Rkey != "" { 534 534 + if newComment.Rkey != "" { 438 535 // update the record on pds 439 439 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoIssueCommentNSID, user.Did, rkey) 536 536 + ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoIssueCommentNSID, user.Did, comment.Rkey) 440 537 if err != nil { 441 441 - // failed to get record 442 442 - log.Println(err, rkey) 538 538 + log.Println("failed to get record", "err", err, "did", newComment.Did, "rkey", newComment.Rkey) 443 539 rp.pages.Notice(w, fmt.Sprintf("comment-%s-status", commentId), "Failed to update description, no record found on PDS.") 444 540 return 445 541 } 446 446 - value, _ := ex.Value.MarshalJSON() // we just did get record; it is valid json 447 447 - record, _ := data.UnmarshalJSON(value) 448 448 - 449 449 - repoAt := record["repo"].(string) 450 450 - issueAt := record["issue"].(string) 451 451 - createdAt := record["createdAt"].(string) 452 542 453 543 _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 454 544 Collection: tangled.RepoIssueCommentNSID, 455 545 Repo: user.Did, 456 456 - Rkey: rkey, 546 546 + Rkey: newComment.Rkey, 457 547 SwapRecord: ex.Cid, 458 548 Record: &lexutil.LexiconTypeDecoder{ 459 459 - Val: &tangled.RepoIssueComment{ 460 460 - Repo: &repoAt, 461 461 - Issue: issueAt, 462 462 - Owner: &comment.OwnerDid, 463 463 - Body: newBody, 464 464 - CreatedAt: createdAt, 465 465 - }, 549 549 + Val: &record, 466 550 }, 467 551 }) 468 552 if err != nil { 469 469 - log.Println(err) 553 553 + l.Error("failed to update record on PDS", "err", err) 470 554 } 471 555 } 472 556 473 473 - // optimistic update for htmx 474 474 - comment.Body = newBody 475 475 - comment.Edited = &edited 476 476 - 477 557 // return new comment body with htmx 478 478 - rp.pages.SingleIssueCommentFragment(w, pages.SingleIssueCommentParams{ 558 558 + rp.pages.IssueCommentBodyFragment(w, pages.IssueCommentBodyParams{ 479 559 LoggedInUser: user, 480 560 RepoInfo: f.RepoInfo(user), 481 561 Issue: issue, 482 482 - Comment: comment, 562 562 + Comment: &newComment, 483 563 }) 564 564 + } 565 565 + } 566 566 + 567 567 + func (rp *Issues) ReplyIssueCommentPlaceholder(w http.ResponseWriter, r *http.Request) { 568 568 + l := rp.logger.With("handler", "ReplyIssueCommentPlaceholder") 569 569 + user := rp.oauth.GetUser(r) 570 570 + f, err := rp.repoResolver.Resolve(r) 571 571 + if err != nil { 572 572 + l.Error("failed to get repo and knot", "err", err) 484 573 return 574 574 + } 485 575 576 576 + issue, ok := r.Context().Value("issue").(*db.Issue) 577 577 + if !ok { 578 578 + l.Error("failed to get issue") 579 579 + rp.pages.Error404(w) 580 580 + return 486 581 } 487 582 583 583 + commentId := chi.URLParam(r, "commentId") 584 584 + comments, err := db.GetIssueComments( 585 585 + rp.db, 586 586 + db.FilterEq("id", commentId), 587 587 + ) 588 588 + if err != nil { 589 589 + l.Error("failed to fetch comment", "id", commentId) 590 590 + http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 591 591 + return 592 592 + } 593 593 + if len(comments) != 1 { 594 594 + l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 595 595 + http.Error(w, "invalid comment id", http.StatusBadRequest) 596 596 + return 597 597 + } 598 598 + comment := comments[0] 599 599 + 600 600 + rp.pages.ReplyIssueCommentPlaceholderFragment(w, pages.ReplyIssueCommentPlaceholderParams{ 601 601 + LoggedInUser: user, 602 602 + RepoInfo: f.RepoInfo(user), 603 603 + Issue: issue, 604 604 + Comment: &comment, 605 605 + }) 488 606 } 489 607 490 490 - func (rp *Issues) DeleteIssueComment(w http.ResponseWriter, r *http.Request) { 608 608 + func (rp *Issues) ReplyIssueComment(w http.ResponseWriter, r *http.Request) { 609 609 + l := rp.logger.With("handler", "ReplyIssueComment") 491 610 user := rp.oauth.GetUser(r) 492 611 f, err := rp.repoResolver.Resolve(r) 493 612 if err != nil { 494 494 - log.Println("failed to get repo and knot", err) 613 613 + l.Error("failed to get repo and knot", "err", err) 495 614 return 496 615 } 497 616 498 498 - issueId := chi.URLParam(r, "issue") 499 499 - issueIdInt, err := strconv.Atoi(issueId) 500 500 - if err != nil { 501 501 - http.Error(w, "bad issue id", http.StatusBadRequest) 502 502 - log.Println("failed to parse issue id", err) 617 617 + issue, ok := r.Context().Value("issue").(*db.Issue) 618 618 + if !ok { 619 619 + l.Error("failed to get issue") 620 620 + rp.pages.Error404(w) 503 621 return 504 622 } 505 623 506 506 - issue, err := db.GetIssue(rp.db, f.RepoAt(), issueIdInt) 624 624 + commentId := chi.URLParam(r, "commentId") 625 625 + comments, err := db.GetIssueComments( 626 626 + rp.db, 627 627 + db.FilterEq("id", commentId), 628 628 + ) 507 629 if err != nil { 508 508 - log.Println("failed to get issue", err) 509 509 - rp.pages.Notice(w, "issues", "Failed to load issue. Try again later.") 630 630 + l.Error("failed to fetch comment", "id", commentId) 631 631 + http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 510 632 return 511 633 } 634 634 + if len(comments) != 1 { 635 635 + l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 636 636 + http.Error(w, "invalid comment id", http.StatusBadRequest) 637 637 + return 638 638 + } 639 639 + comment := comments[0] 512 640 513 513 - commentId := chi.URLParam(r, "comment_id") 514 514 - commentIdInt, err := strconv.Atoi(commentId) 641 641 + rp.pages.ReplyIssueCommentFragment(w, pages.ReplyIssueCommentParams{ 642 642 + LoggedInUser: user, 643 643 + RepoInfo: f.RepoInfo(user), 644 644 + Issue: issue, 645 645 + Comment: &comment, 646 646 + }) 647 647 + } 648 648 + 649 649 + func (rp *Issues) DeleteIssueComment(w http.ResponseWriter, r *http.Request) { 650 650 + l := rp.logger.With("handler", "DeleteIssueComment") 651 651 + user := rp.oauth.GetUser(r) 652 652 + f, err := rp.repoResolver.Resolve(r) 515 653 if err != nil { 516 516 - http.Error(w, "bad comment id", http.StatusBadRequest) 517 517 - log.Println("failed to parse issue id", err) 654 654 + l.Error("failed to get repo and knot", "err", err) 518 655 return 519 656 } 520 657 521 521 - comment, err := db.GetComment(rp.db, f.RepoAt(), issueIdInt, commentIdInt) 658 658 + issue, ok := r.Context().Value("issue").(*db.Issue) 659 659 + if !ok { 660 660 + l.Error("failed to get issue") 661 661 + rp.pages.Error404(w) 662 662 + return 663 663 + } 664 664 + 665 665 + commentId := chi.URLParam(r, "commentId") 666 666 + comments, err := db.GetIssueComments( 667 667 + rp.db, 668 668 + db.FilterEq("id", commentId), 669 669 + ) 522 670 if err != nil { 523 523 - http.Error(w, "bad comment id", http.StatusBadRequest) 671 671 + l.Error("failed to fetch comment", "id", commentId) 672 672 + http.Error(w, "failed to fetch comment id", http.StatusBadRequest) 524 673 return 525 674 } 675 675 + if len(comments) != 1 { 676 676 + l.Error("incorrect number of comments returned", "id", commentId, "len(comments)", len(comments)) 677 677 + http.Error(w, "invalid comment id", http.StatusBadRequest) 678 678 + return 679 679 + } 680 680 + comment := comments[0] 526 681 527 527 - if comment.OwnerDid != user.Did { 682 682 + if comment.Did != user.Did { 683 683 + l.Error("unauthorized action", "expectedDid", comment.Did, "gotDid", user.Did) 528 684 http.Error(w, "you are not the author of this comment", http.StatusUnauthorized) 529 685 return 530 686 } ··· 536 692 537 693 // optimistic deletion 538 694 deleted := time.Now() 539 539 - err = db.DeleteComment(rp.db, f.RepoAt(), issueIdInt, commentIdInt) 695 695 + err = db.DeleteIssueComments(rp.db, db.FilterEq("id", comment.Id)) 540 696 if err != nil { 541 541 - log.Println("failed to delete comment") 697 697 + l.Error("failed to delete comment", "err", err) 542 698 rp.pages.Notice(w, fmt.Sprintf("comment-%s-status", commentId), "failed to delete comment") 543 699 return 544 700 } ··· 552 708 return 553 709 } 554 710 _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 555 555 - Collection: tangled.GraphFollowNSID, 711 711 + Collection: tangled.RepoIssueCommentNSID, 556 712 Repo: user.Did, 557 713 Rkey: comment.Rkey, 558 714 }) ··· 566 722 comment.Deleted = &deleted 567 723 568 724 // htmx fragment of comment after deletion 569 569 - rp.pages.SingleIssueCommentFragment(w, pages.SingleIssueCommentParams{ 725 725 + rp.pages.IssueCommentBodyFragment(w, pages.IssueCommentBodyParams{ 570 726 LoggedInUser: user, 571 727 RepoInfo: f.RepoInfo(user), 572 728 Issue: issue, 573 573 - Comment: comment, 729 729 + Comment: &comment, 574 730 }) 575 731 } 576 732 ··· 600 756 return 601 757 } 602 758 603 603 - issues, err := db.GetIssuesPaginated(rp.db, f.RepoAt(), isOpen, page) 759 759 + openVal := 0 760 760 + if isOpen { 761 761 + openVal = 1 762 762 + } 763 763 + issues, err := db.GetIssuesPaginated( 764 764 + rp.db, 765 765 + page, 766 766 + db.FilterEq("repo_at", f.RepoAt()), 767 767 + db.FilterEq("open", openVal), 768 768 + ) 604 769 if err != nil { 605 770 log.Println("failed to get issues", err) 606 771 rp.pages.Notice(w, "issues", "Failed to load issues. Try again later.") ··· 617 782 } 618 783 619 784 func (rp *Issues) NewIssue(w http.ResponseWriter, r *http.Request) { 785 785 + l := rp.logger.With("handler", "NewIssue") 620 786 user := rp.oauth.GetUser(r) 621 787 622 788 f, err := rp.repoResolver.Resolve(r) 623 789 if err != nil { 624 624 - log.Println("failed to get repo and knot", err) 790 790 + l.Error("failed to get repo and knot", "err", err) 625 791 return 626 792 } 627 793 ··· 632 798 RepoInfo: f.RepoInfo(user), 633 799 }) 634 800 case http.MethodPost: 635 635 - title := r.FormValue("title") 636 636 - body := r.FormValue("body") 801 801 + issue := &db.Issue{ 802 802 + RepoAt: f.RepoAt(), 803 803 + Rkey: tid.TID(), 804 804 + Title: r.FormValue("title"), 805 805 + Body: r.FormValue("body"), 806 806 + Did: user.Did, 807 807 + Created: time.Now(), 808 808 + } 637 809 638 638 - if title == "" || body == "" { 639 639 - rp.pages.Notice(w, "issues", "Title and body are required") 810 810 + if err := rp.validator.ValidateIssue(issue); err != nil { 811 811 + l.Error("validation error", "err", err) 812 812 + rp.pages.Notice(w, "issues", fmt.Sprintf("Failed to create issue: %s", err)) 640 813 return 641 814 } 642 815 643 643 - sanitizer := markup.NewSanitizer() 644 644 - if st := strings.TrimSpace(sanitizer.SanitizeDescription(title)); st == "" { 645 645 - rp.pages.Notice(w, "issues", "Title is empty after HTML sanitization") 816 816 + record := issue.AsRecord() 817 817 + 818 818 + // create an atproto record 819 819 + client, err := rp.oauth.AuthorizedClient(r) 820 820 + if err != nil { 821 821 + l.Error("failed to get authorized client", "err", err) 822 822 + rp.pages.Notice(w, "issues", "Failed to create issue.") 646 823 return 647 824 } 648 648 - if sb := strings.TrimSpace(sanitizer.SanitizeDefault(body)); sb == "" { 649 649 - rp.pages.Notice(w, "issues", "Body is empty after HTML sanitization") 825 825 + resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 826 826 + Collection: tangled.RepoIssueNSID, 827 827 + Repo: user.Did, 828 828 + Rkey: issue.Rkey, 829 829 + Record: &lexutil.LexiconTypeDecoder{ 830 830 + Val: &record, 831 831 + }, 832 832 + }) 833 833 + if err != nil { 834 834 + l.Error("failed to create issue", "err", err) 835 835 + rp.pages.Notice(w, "issues", "Failed to create issue.") 650 836 return 651 837 } 838 838 + atUri := resp.Uri 652 839 653 840 tx, err := rp.db.BeginTx(r.Context(), nil) 654 841 if err != nil { 655 842 rp.pages.Notice(w, "issues", "Failed to create issue, try again later") 656 843 return 657 844 } 845 845 + rollback := func() { 846 846 + err1 := tx.Rollback() 847 847 + err2 := rollbackRecord(context.Background(), atUri, client) 658 848 659 659 - issue := &db.Issue{ 660 660 - RepoAt: f.RepoAt(), 661 661 - Rkey: tid.TID(), 662 662 - Title: title, 663 663 - Body: body, 664 664 - OwnerDid: user.Did, 849 849 + if errors.Is(err1, sql.ErrTxDone) { 850 850 + err1 = nil 851 851 + } 852 852 + 853 853 + if err := errors.Join(err1, err2); err != nil { 854 854 + l.Error("failed to rollback txn", "err", err) 855 855 + } 665 856 } 666 666 - err = db.NewIssue(tx, issue) 857 857 + defer rollback() 858 858 + 859 859 + err = db.PutIssue(tx, issue) 667 860 if err != nil { 668 861 log.Println("failed to create issue", err) 669 862 rp.pages.Notice(w, "issues", "Failed to create issue.") 670 863 return 671 864 } 672 865 673 673 - client, err := rp.oauth.AuthorizedClient(r) 674 674 - if err != nil { 675 675 - log.Println("failed to get authorized client", err) 676 676 - rp.pages.Notice(w, "issues", "Failed to create issue.") 677 677 - return 678 678 - } 679 679 - atUri := f.RepoAt().String() 680 680 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 681 681 - Collection: tangled.RepoIssueNSID, 682 682 - Repo: user.Did, 683 683 - Rkey: issue.Rkey, 684 684 - Record: &lexutil.LexiconTypeDecoder{ 685 685 - Val: &tangled.RepoIssue{ 686 686 - Repo: atUri, 687 687 - Title: title, 688 688 - Body: &body, 689 689 - }, 690 690 - }, 691 691 - }) 692 692 - if err != nil { 866 866 + if err = tx.Commit(); err != nil { 693 867 log.Println("failed to create issue", err) 694 868 rp.pages.Notice(w, "issues", "Failed to create issue.") 695 869 return 696 870 } 697 871 872 872 + // everything is successful, do not rollback the atproto record 873 873 + atUri = "" 698 874 rp.notifier.NewIssue(r.Context(), issue) 699 699 - 700 875 rp.pages.HxLocation(w, fmt.Sprintf("/%s/issues/%d", f.OwnerSlashRepo(), issue.IssueId)) 701 876 return 702 877 } 703 878 } 879 879 + 880 880 + // this is used to rollback changes made to the PDS 881 881 + // 882 882 + // it is a no-op if the provided ATURI is empty 883 883 + func rollbackRecord(ctx context.Context, aturi string, xrpcc *xrpcclient.Client) error { 884 884 + if aturi == "" { 885 885 + return nil 886 886 + } 887 887 + 888 888 + parsed := syntax.ATURI(aturi) 889 889 + 890 890 + collection := parsed.Collection().String() 891 891 + repo := parsed.Authority().String() 892 892 + rkey := parsed.RecordKey().String() 893 893 + 894 894 + _, err := xrpcc.RepoDeleteRecord(ctx, &comatproto.RepoDeleteRecord_Input{ 895 895 + Collection: collection, 896 896 + Repo: repo, 897 897 + Rkey: rkey, 898 898 + }) 899 899 + return err 900 900 + }

+24 -10

appview/issues/router.go

··· 12 12 13 13 r.Route("/", func(r chi.Router) { 14 14 r.With(middleware.Paginate).Get("/", i.RepoIssues) 15 15 - r.Get("/{issue}", i.RepoSingleIssue) 15 15 + 16 16 + r.Route("/{issue}", func(r chi.Router) { 17 17 + r.Use(mw.ResolveIssue()) 18 18 + r.Get("/", i.RepoSingleIssue) 19 19 + 20 20 + // authenticated routes 21 21 + r.Group(func(r chi.Router) { 22 22 + r.Use(middleware.AuthMiddleware(i.oauth)) 23 23 + r.Post("/comment", i.NewIssueComment) 24 24 + r.Route("/comment/{commentId}/", func(r chi.Router) { 25 25 + r.Get("/", i.IssueComment) 26 26 + r.Delete("/", i.DeleteIssueComment) 27 27 + r.Get("/edit", i.EditIssueComment) 28 28 + r.Post("/edit", i.EditIssueComment) 29 29 + r.Get("/reply", i.ReplyIssueComment) 30 30 + r.Get("/replyPlaceholder", i.ReplyIssueCommentPlaceholder) 31 31 + }) 32 32 + r.Get("/edit", i.EditIssue) 33 33 + r.Post("/edit", i.EditIssue) 34 34 + r.Delete("/", i.DeleteIssue) 35 35 + r.Post("/close", i.CloseIssue) 36 36 + r.Post("/reopen", i.ReopenIssue) 37 37 + }) 38 38 + }) 16 39 17 40 r.Group(func(r chi.Router) { 18 41 r.Use(middleware.AuthMiddleware(i.oauth)) 19 42 r.Get("/new", i.NewIssue) 20 43 r.Post("/new", i.NewIssue) 21 21 - r.Post("/{issue}/comment", i.NewIssueComment) 22 22 - r.Route("/{issue}/comment/{comment_id}/", func(r chi.Router) { 23 23 - r.Get("/", i.IssueComment) 24 24 - r.Delete("/", i.DeleteIssueComment) 25 25 - r.Get("/edit", i.EditIssueComment) 26 26 - r.Post("/edit", i.EditIssueComment) 27 27 - }) 28 28 - r.Post("/{issue}/close", i.CloseIssue) 29 29 - r.Post("/{issue}/reopen", i.ReopenIssue) 30 44 }) 31 45 }) 32 46

+5 -57

appview/knots/knots.go

··· 3 3 import ( 4 4 "errors" 5 5 "fmt" 6 6 - "log" 7 6 "log/slog" 8 7 "net/http" 9 8 "slices" ··· 17 16 "tangled.sh/tangled.sh/core/appview/oauth" 18 17 "tangled.sh/tangled.sh/core/appview/pages" 19 18 "tangled.sh/tangled.sh/core/appview/serververify" 19 19 + "tangled.sh/tangled.sh/core/appview/xrpcclient" 20 20 "tangled.sh/tangled.sh/core/eventconsumer" 21 21 "tangled.sh/tangled.sh/core/idresolver" 22 22 "tangled.sh/tangled.sh/core/rbac" ··· 49 49 r.With(middleware.AuthMiddleware(k.OAuth)).Post("/{domain}/retry", k.retry) 50 50 r.With(middleware.AuthMiddleware(k.OAuth)).Post("/{domain}/add", k.addMember) 51 51 r.With(middleware.AuthMiddleware(k.OAuth)).Post("/{domain}/remove", k.removeMember) 52 52 - 53 53 - r.With(middleware.AuthMiddleware(k.OAuth)).Get("/upgradeBanner", k.banner) 54 52 55 53 return r 56 54 } ··· 399 397 if err != nil { 400 398 l.Error("verification failed", "err", err) 401 399 402 402 - if errors.Is(err, serververify.FetchError) { 403 403 - k.Pages.Notice(w, noticeId, "Failed to verify knot, unable to fetch owner.") 400 400 + if errors.Is(err, xrpcclient.ErrXrpcUnsupported) { 401 401 + k.Pages.Notice(w, noticeId, "Failed to verify knot, XRPC queries are unsupported on this knot, consider upgrading!") 404 402 return 405 403 } 406 404 ··· 420 418 return 421 419 } 422 420 423 423 - // if this knot was previously read-only, then emit a record too 421 421 + // if this knot requires upgrade, then emit a record too 424 422 // 425 423 // this is part of migrating from the old knot system to the new one 426 426 - if registration.ReadOnly { 424 424 + if registration.NeedsUpgrade { 427 425 // re-announce by registering under same rkey 428 426 client, err := k.OAuth.AuthorizedClient(r) 429 427 if err != nil { ··· 484 482 return 485 483 } 486 484 updatedRegistration := registrations[0] 487 487 - 488 488 - log.Println(updatedRegistration) 489 485 490 486 w.Header().Set("HX-Reswap", "outerHTML") 491 487 k.Pages.KnotListing(w, pages.KnotListingParams{ ··· 678 674 // ok 679 675 k.Pages.HxRefresh(w) 680 676 } 681 681 - 682 682 - func (k *Knots) banner(w http.ResponseWriter, r *http.Request) { 683 683 - user := k.OAuth.GetUser(r) 684 684 - l := k.Logger.With("handler", "banner") 685 685 - l = l.With("did", user.Did) 686 686 - l = l.With("handle", user.Handle) 687 687 - 688 688 - allRegistrations, err := db.GetRegistrations( 689 689 - k.Db, 690 690 - db.FilterEq("did", user.Did), 691 691 - ) 692 692 - if err != nil { 693 693 - l.Error("non-fatal: failed to get registrations") 694 694 - return 695 695 - } 696 696 - 697 697 - httpClient := &http.Client{Timeout: 5 * time.Second} 698 698 - regs404 := []db.Registration{} 699 699 - for _, reg := range allRegistrations { 700 700 - healthURL := fmt.Sprintf("http://%s/xrpc/_health", reg.Domain) 701 701 - 702 702 - fmt.Println(healthURL) 703 703 - 704 704 - req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, healthURL, nil) 705 705 - if err != nil { 706 706 - l.Error("failed to create health check request", "domain", reg.Domain, "err", err) 707 707 - continue 708 708 - } 709 709 - 710 710 - resp, err := httpClient.Do(req) 711 711 - if err != nil { 712 712 - l.Error("failed to make health check request", "domain", reg.Domain, "err", err) 713 713 - continue 714 714 - } 715 715 - defer resp.Body.Close() 716 716 - 717 717 - if resp.StatusCode == http.StatusNotFound { 718 718 - regs404 = append(regs404, reg) 719 719 - } 720 720 - } 721 721 - if len(regs404) == 0 { 722 722 - return 723 723 - } 724 724 - 725 725 - k.Pages.KnotBanner(w, pages.KnotBannerParams{ 726 726 - Registrations: regs404, 727 727 - }) 728 728 - }

+40

appview/middleware/middleware.go

··· 275 275 } 276 276 } 277 277 278 278 + // middleware that is tacked on top of /{user}/{repo}/issues/{issue} 279 279 + func (mw Middleware) ResolveIssue() middlewareFunc { 280 280 + return func(next http.Handler) http.Handler { 281 281 + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 282 282 + f, err := mw.repoResolver.Resolve(r) 283 283 + if err != nil { 284 284 + log.Println("failed to fully resolve repo", err) 285 285 + mw.pages.ErrorKnot404(w) 286 286 + return 287 287 + } 288 288 + 289 289 + issueIdStr := chi.URLParam(r, "issue") 290 290 + issueId, err := strconv.Atoi(issueIdStr) 291 291 + if err != nil { 292 292 + log.Println("failed to fully resolve issue ID", err) 293 293 + mw.pages.ErrorKnot404(w) 294 294 + return 295 295 + } 296 296 + 297 297 + issues, err := db.GetIssues( 298 298 + mw.db, 299 299 + db.FilterEq("repo_at", f.RepoAt()), 300 300 + db.FilterEq("issue_id", issueId), 301 301 + ) 302 302 + if err != nil { 303 303 + log.Println("failed to get issues", "err", err) 304 304 + return 305 305 + } 306 306 + if len(issues) != 1 { 307 307 + log.Println("got incorrect number of issues", "len(issuse)", len(issues)) 308 308 + return 309 309 + } 310 310 + issue := issues[0] 311 311 + 312 312 + ctx := context.WithValue(r.Context(), "issue", &issue) 313 313 + next.ServeHTTP(w, r.WithContext(ctx)) 314 314 + }) 315 315 + } 316 316 + } 317 317 + 278 318 // this should serve the go-import meta tag even if the path is technically 279 319 // a 404 like tangled.sh/oppi.li/go-git/v5 280 320 func (mw Middleware) GoImport() middlewareFunc {

+18

appview/notify/merged_notifier.go

··· 66 66 notifier.UpdateProfile(ctx, profile) 67 67 } 68 68 } 69 69 + 70 70 + func (m *mergedNotifier) NewString(ctx context.Context, string *db.String) { 71 71 + for _, notifier := range m.notifiers { 72 72 + notifier.NewString(ctx, string) 73 73 + } 74 74 + } 75 75 + 76 76 + func (m *mergedNotifier) EditString(ctx context.Context, string *db.String) { 77 77 + for _, notifier := range m.notifiers { 78 78 + notifier.EditString(ctx, string) 79 79 + } 80 80 + } 81 81 + 82 82 + func (m *mergedNotifier) DeleteString(ctx context.Context, did, rkey string) { 83 83 + for _, notifier := range m.notifiers { 84 84 + notifier.DeleteString(ctx, did, rkey) 85 85 + } 86 86 + }

+8

appview/notify/notifier.go

··· 21 21 NewPullComment(ctx context.Context, comment *db.PullComment) 22 22 23 23 UpdateProfile(ctx context.Context, profile *db.Profile) 24 24 + 25 25 + NewString(ctx context.Context, s *db.String) 26 26 + EditString(ctx context.Context, s *db.String) 27 27 + DeleteString(ctx context.Context, did, rkey string) 24 28 } 25 29 26 30 // BaseNotifier is a listener that does nothing ··· 42 46 func (m *BaseNotifier) NewPullComment(ctx context.Context, comment *db.PullComment) {} 43 47 44 48 func (m *BaseNotifier) UpdateProfile(ctx context.Context, profile *db.Profile) {} 49 49 + 50 50 + func (m *BaseNotifier) NewString(ctx context.Context, s *db.String) {} 51 51 + func (m *BaseNotifier) EditString(ctx context.Context, s *db.String) {} 52 52 + func (m *BaseNotifier) DeleteString(ctx context.Context, did, rkey string) {}

+3

appview/pages/funcmap.go

··· 29 29 "split": func(s string) []string { 30 30 return strings.Split(s, "\n") 31 31 }, 32 32 + "contains": func(s string, target string) bool { 33 33 + return strings.Contains(s, target) 34 34 + }, 32 35 "resolve": func(s string) string { 33 36 identity, err := p.resolver.ResolveIdent(context.Background(), s) 34 37

+1 -1

appview/pages/markup/markdown.go

··· 235 235 repoName := fmt.Sprintf("%s/%s", rctx.RepoInfo.OwnerDid, rctx.RepoInfo.Name) 236 236 237 237 query := fmt.Sprintf("repo=%s&ref=%s&path=%s&raw=true", 238 238 - repoName, url.PathEscape(rctx.RepoInfo.Ref), actualPath) 238 238 + url.PathEscape(repoName), url.PathEscape(rctx.RepoInfo.Ref), actualPath) 239 239 240 240 parsedURL := &url.URL{ 241 241 Scheme: scheme,

+51 -49

appview/pages/pages.go

··· 117 117 return fragmentPaths, nil 118 118 } 119 119 120 120 - func (p *Pages) fragments() (*template.Template, error) { 121 121 - fragmentPaths, err := p.fragmentPaths() 122 122 - if err != nil { 123 123 - return nil, err 124 124 - } 125 125 - 126 126 - funcs := p.funcMap() 127 127 - 128 128 - // parse all fragments together 129 129 - allFragments := template.New("").Funcs(funcs) 130 130 - for _, f := range fragmentPaths { 131 131 - name := p.pathToName(f) 132 132 - 133 133 - pf, err := template.New(name). 134 134 - Funcs(funcs). 135 135 - ParseFS(p.embedFS, f) 136 136 - if err != nil { 137 137 - return nil, err 138 138 - } 139 139 - 140 140 - allFragments, err = allFragments.AddParseTree(name, pf.Tree) 141 141 - if err != nil { 142 142 - return nil, err 143 143 - } 144 144 - } 145 145 - 146 146 - return allFragments, nil 147 147 - } 148 148 - 149 120 // parse without memoization 150 121 func (p *Pages) rawParse(stack ...string) (*template.Template, error) { 151 122 paths, err := p.fragmentPaths() ··· 351 322 return p.execute("user/settings/emails", w, params) 352 323 } 353 324 354 354 - type KnotBannerParams struct { 325 325 + type UpgradeBannerParams struct { 355 326 Registrations []db.Registration 327 327 + Spindles []db.Spindle 356 328 } 357 329 358 358 - func (p *Pages) KnotBanner(w io.Writer, params KnotBannerParams) error { 359 359 - return p.executePlain("knots/fragments/bannerRequiresUpgrade", w, params) 330 330 + func (p *Pages) UpgradeBanner(w io.Writer, params UpgradeBannerParams) error { 331 331 + return p.executePlain("banner", w, params) 360 332 } 361 333 362 334 type KnotsParams struct { ··· 908 880 RepoInfo repoinfo.RepoInfo 909 881 Active string 910 882 Issue *db.Issue 911 911 - Comments []db.Comment 883 883 + CommentList []db.CommentListItem 912 884 IssueOwnerHandle string 913 885 914 886 OrderedReactionKinds []db.ReactionKind 915 887 Reactions map[db.ReactionKind]int 916 888 UserReacted map[db.ReactionKind]bool 889 889 + } 917 890 918 918 - State string 891 891 + func (p *Pages) RepoSingleIssue(w io.Writer, params RepoSingleIssueParams) error { 892 892 + params.Active = "issues" 893 893 + return p.executeRepo("repo/issues/issue", w, params) 894 894 + } 895 895 + 896 896 + type EditIssueParams struct { 897 897 + LoggedInUser *oauth.User 898 898 + RepoInfo repoinfo.RepoInfo 899 899 + Issue *db.Issue 900 900 + Action string 901 901 + } 902 902 + 903 903 + func (p *Pages) EditIssueFragment(w io.Writer, params EditIssueParams) error { 904 904 + params.Action = "edit" 905 905 + return p.executePlain("repo/issues/fragments/putIssue", w, params) 919 906 } 920 907 921 908 type ThreadReactionFragmentParams struct { ··· 929 916 return p.executePlain("repo/fragments/reaction", w, params) 930 917 } 931 918 932 932 - func (p *Pages) RepoSingleIssue(w io.Writer, params RepoSingleIssueParams) error { 933 933 - params.Active = "issues" 934 934 - if params.Issue.Open { 935 935 - params.State = "open" 936 936 - } else { 937 937 - params.State = "closed" 938 938 - } 939 939 - return p.executeRepo("repo/issues/issue", w, params) 940 940 - } 941 941 - 942 919 type RepoNewIssueParams struct { 943 920 LoggedInUser *oauth.User 944 921 RepoInfo repoinfo.RepoInfo 922 922 + Issue *db.Issue // existing issue if any -- passed when editing 945 923 Active string 924 924 + Action string 946 925 } 947 926 948 927 func (p *Pages) RepoNewIssue(w io.Writer, params RepoNewIssueParams) error { 949 928 params.Active = "issues" 929 929 + params.Action = "create" 950 930 return p.executeRepo("repo/issues/new", w, params) 951 931 } 952 932 ··· 954 934 LoggedInUser *oauth.User 955 935 RepoInfo repoinfo.RepoInfo 956 936 Issue *db.Issue 957 957 - Comment *db.Comment 937 937 + Comment *db.IssueComment 958 938 } 959 939 960 940 func (p *Pages) EditIssueCommentFragment(w io.Writer, params EditIssueCommentParams) error { 961 941 return p.executePlain("repo/issues/fragments/editIssueComment", w, params) 962 942 } 963 943 964 964 - type SingleIssueCommentParams struct { 944 944 + type ReplyIssueCommentPlaceholderParams struct { 965 945 LoggedInUser *oauth.User 966 946 RepoInfo repoinfo.RepoInfo 967 947 Issue *db.Issue 968 968 - Comment *db.Comment 948 948 + Comment *db.IssueComment 969 949 } 970 950 971 971 - func (p *Pages) SingleIssueCommentFragment(w io.Writer, params SingleIssueCommentParams) error { 972 972 - return p.executePlain("repo/issues/fragments/issueComment", w, params) 951 951 + func (p *Pages) ReplyIssueCommentPlaceholderFragment(w io.Writer, params ReplyIssueCommentPlaceholderParams) error { 952 952 + return p.executePlain("repo/issues/fragments/replyIssueCommentPlaceholder", w, params) 953 953 + } 954 954 + 955 955 + type ReplyIssueCommentParams struct { 956 956 + LoggedInUser *oauth.User 957 957 + RepoInfo repoinfo.RepoInfo 958 958 + Issue *db.Issue 959 959 + Comment *db.IssueComment 960 960 + } 961 961 + 962 962 + func (p *Pages) ReplyIssueCommentFragment(w io.Writer, params ReplyIssueCommentParams) error { 963 963 + return p.executePlain("repo/issues/fragments/replyComment", w, params) 964 964 + } 965 965 + 966 966 + type IssueCommentBodyParams struct { 967 967 + LoggedInUser *oauth.User 968 968 + RepoInfo repoinfo.RepoInfo 969 969 + Issue *db.Issue 970 970 + Comment *db.IssueComment 971 971 + } 972 972 + 973 973 + func (p *Pages) IssueCommentBodyFragment(w io.Writer, params IssueCommentBodyParams) error { 974 974 + return p.executePlain("repo/issues/fragments/issueCommentBody", w, params) 973 975 } 974 976 975 977 type RepoNewPullParams struct {

+38

appview/pages/templates/banner.html

··· 1 1 + {{ define "banner" }} 2 2 + <div class="flex items-center justify-center mx-auto w-full bg-red-100 dark:bg-red-900 border border-red-200 dark:border-red-800 rounded-b drop-shadow-sm text-red-800 dark:text-red-200"> 3 3 + <details class="group p-2"> 4 4 + <summary class="list-none cursor-pointer"> 5 5 + <div class="flex gap-4 items-center"> 6 6 + <span class="group-open:hidden inline">{{ i "triangle-alert" "w-4 h-4" }}</span> 7 7 + <span class="hidden group-open:inline">{{ i "x" "w-4 h-4" }}</span> 8 8 + 9 9 + <span class="group-open:hidden inline">Some services that you administer require an update. Click to show more.</span> 10 10 + <span class="hidden group-open:inline">Some services that you administer will have to be updated to be compatible with Tangled.</span> 11 11 + </div> 12 12 + </summary> 13 13 + 14 14 + {{ if .Registrations }} 15 15 + <ul class="list-disc mx-12 my-2"> 16 16 + {{range .Registrations}} 17 17 + <li>Knot: {{ .Domain }}</li> 18 18 + {{ end }} 19 19 + </ul> 20 20 + {{ end }} 21 21 + 22 22 + {{ if .Spindles }} 23 23 + <ul class="list-disc mx-12 my-2"> 24 24 + {{range .Spindles}} 25 25 + <li>Spindle: {{ .Instance }}</li> 26 26 + {{ end }} 27 27 + </ul> 28 28 + {{ end }} 29 29 + 30 30 + <div class="mx-6"> 31 31 + These services may not be fully accessible until upgraded. 32 32 + <a class="underline text-red-800 dark:text-red-200" 33 33 + href="https://tangled.sh/@tangled.sh/core/tree/master/docs/migrations.md"> 34 34 + Click to read the upgrade guide</a>. 35 35 + </div> 36 36 + </details> 37 37 + </div> 38 38 + {{ end }}

+8

appview/pages/templates/fragments/logotype.html

··· 1 1 + {{ define "fragments/logotype" }} 2 2 + <span class="flex items-center gap-2"> 3 3 + <span class="font-bold italic">tangled</span> 4 4 + <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1"> 5 5 + alpha 6 6 + </span> 7 7 + <span> 8 8 + {{ end }}

+90

appview/pages/templates/fragments/multiline-select.html

··· 1 1 + {{ define "fragments/multiline-select" }} 2 2 + <script> 3 3 + function highlight(scroll = false) { 4 4 + document.querySelectorAll(".hl").forEach(el => { 5 5 + el.classList.remove("hl"); 6 6 + }); 7 7 + 8 8 + const hash = window.location.hash; 9 9 + if (!hash || !hash.startsWith("#L")) { 10 10 + return; 11 11 + } 12 12 + 13 13 + const rangeStr = hash.substring(2); 14 14 + const parts = rangeStr.split("-"); 15 15 + let startLine, endLine; 16 16 + 17 17 + if (parts.length === 2) { 18 18 + startLine = parseInt(parts[0], 10); 19 19 + endLine = parseInt(parts[1], 10); 20 20 + } else { 21 21 + startLine = parseInt(parts[0], 10); 22 22 + endLine = startLine; 23 23 + } 24 24 + 25 25 + if (isNaN(startLine) || isNaN(endLine)) { 26 26 + console.log("nan"); 27 27 + console.log(startLine); 28 28 + console.log(endLine); 29 29 + return; 30 30 + } 31 31 + 32 32 + let target = null; 33 33 + 34 34 + for (let i = startLine; i<= endLine; i++) { 35 35 + const idEl = document.getElementById(`L${i}`); 36 36 + if (idEl) { 37 37 + const el = idEl.closest(".line"); 38 38 + if (el) { 39 39 + el.classList.add("hl"); 40 40 + target = el; 41 41 + } 42 42 + } 43 43 + } 44 44 + 45 45 + if (scroll && target) { 46 46 + target.scrollIntoView({ 47 47 + behavior: "smooth", 48 48 + block: "center", 49 49 + }); 50 50 + } 51 51 + } 52 52 + 53 53 + document.addEventListener("DOMContentLoaded", () => { 54 54 + console.log("DOMContentLoaded"); 55 55 + highlight(true); 56 56 + }); 57 57 + window.addEventListener("hashchange", () => { 58 58 + console.log("hashchange"); 59 59 + highlight(); 60 60 + }); 61 61 + window.addEventListener("popstate", () => { 62 62 + console.log("popstate"); 63 63 + highlight(); 64 64 + }); 65 65 + 66 66 + const lineNumbers = document.querySelectorAll('a[href^="#L"'); 67 67 + let startLine = null; 68 68 + 69 69 + lineNumbers.forEach(el => { 70 70 + el.addEventListener("click", (event) => { 71 71 + event.preventDefault(); 72 72 + const currentLine = parseInt(el.href.split("#L")[1]); 73 73 + 74 74 + if (event.shiftKey && startLine !== null) { 75 75 + const endLine = currentLine; 76 76 + const min = Math.min(startLine, endLine); 77 77 + const max = Math.max(startLine, endLine); 78 78 + const newHash = `#L${min}-${max}`; 79 79 + history.pushState(null, '', newHash); 80 80 + } else { 81 81 + const newHash = `#L${currentLine}`; 82 82 + history.pushState(null, '', newHash); 83 83 + startLine = currentLine; 84 84 + } 85 85 + 86 86 + highlight(); 87 87 + }); 88 88 + }); 89 89 + </script> 90 90 + {{ end }}

-8

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

··· 1 1 - {{ define "knots/fragments/bannerReadOnly" }} 2 2 - <div class="w-full px-6 py-2 -z-15 bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 border border-yellow-200 dark:border-yellow-800 rounded-b drop-shadow-sm"> 3 3 - A knot ({{range $i, $r := .Registrations}}{{if ne $i 0}}, {{end}}{{ $r.Domain }}{{ end }}) 4 4 - that you administer is presently read-only. Consider upgrading this knot to 5 5 - continue creating repositories on it. 6 6 - <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/migrations/knot-1.7.0.md">Click to read the upgrade guide</a>. 7 7 - </div> 8 8 - {{ end }}

-12

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

··· 1 1 - {{ define "knots/fragments/bannerRequiresUpgrade" }} 2 2 - <div class="prose mx-auto w-96 px-6 py-2 bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 border border-yellow-200 dark:border-yellow-800 rounded-b drop-shadow-sm"> 3 3 - The following knots that you administer require upgrade to be compatible with the latest version of Tangled: 4 4 - <ul> 5 5 - {{range $i, $r := .Registrations}} 6 6 - <li>{{ $r.Domain }}</li> 7 7 - {{ end }} 8 8 - </ul> 9 9 - Repositories hosted on these knots will not be accessible until upgraded. 10 10 - <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/migrations/knot-1.8.0.md">Click to read the upgrade guide</a>. 11 11 - </div> 12 12 - {{ end }}

+2 -2

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

··· 36 36 </span> 37 37 {{ template "knots/fragments/addMemberModal" . }} 38 38 {{ block "knotDeleteButton" . }} {{ end }} 39 39 - {{ else if .IsReadOnly }} 39 39 + {{ else if .IsNeedsUpgrade }} 40 40 <span class="bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 {{$style}}"> 41 41 - {{ i "shield-alert" "w-4 h-4" }} read-only 41 41 + {{ i "shield-alert" "w-4 h-4" }} needs upgrade 42 42 </span> 43 43 {{ block "knotRetryButton" . }} {{ end }} 44 44 {{ block "knotDeleteButton" . }} {{ end }}

+3 -6

appview/pages/templates/knots/index.html

··· 1 1 {{ define "title" }}knots{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-4 flex items-end justify-start gap-4 align-bottom"> 4 4 + <div class="px-6 py-4 flex items-center justify-between gap-4 align-bottom"> 5 5 <h1 class="text-xl font-bold dark:text-white">Knots</h1> 6 6 - 7 7 - <span class="flex items-center gap-1 text-sm"> 6 6 + <span class="flex items-center gap-1"> 8 7 {{ i "book" "w-3 h-3" }} 9 9 - <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/knot-hosting.md"> 10 10 - docs 11 11 - </a> 8 8 + <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/knot-hosting.md">docs</a> 12 9 </span> 13 10 </div> 14 11

+12 -4

appview/pages/templates/layouts/base.html

··· 21 21 <title>{{ block "title" . }}{{ end }} · tangled</title> 22 22 {{ block "extrameta" . }}{{ end }} 23 23 </head> 24 24 - <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 24 24 + <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-10 lg:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 25 25 {{ block "topbarLayout" . }} 26 26 - <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;"> 26 26 + <header class="px-1 col-span-1 md:col-start-2 md:col-span-8 lg:col-start-3" style="z-index: 20;"> 27 27 + 28 28 + {{ if .LoggedInUser }} 29 29 + <div id="upgrade-banner" 30 30 + hx-get="/upgradeBanner" 31 31 + hx-trigger="load" 32 32 + hx-swap="innerHTML"> 33 33 + </div> 34 34 + {{ end }} 27 35 {{ template "layouts/fragments/topbar" . }} 28 36 </header> 29 37 {{ end }} 30 38 31 39 {{ block "mainLayout" . }} 32 32 - <div class="px-1 col-span-1 md:col-start-3 md:col-span-8 flex flex-col gap-4"> 40 40 + <div class="px-1 col-span-1 md:col-start-2 md:col-span-8 lg:col-start-3 flex flex-col gap-4"> 33 41 {{ block "contentLayout" . }} 34 42 <main class="col-span-1 md:col-span-8"> 35 43 {{ block "content" . }}{{ end }} ··· 45 53 {{ end }} 46 54 47 55 {{ block "footerLayout" . }} 48 48 - <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12"> 56 56 + <footer class="px-1 col-span-1 md:col-start-2 md:col-span-8 lg:col-start-3 mt-12"> 49 57 {{ template "layouts/fragments/footer" . }} 50 58 </footer> 51 59 {{ end }}

+1 -10

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

··· 2 2 <nav class="space-x-4 px-6 py-2 rounded bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm"> 3 3 <div class="flex justify-between p-0 items-center"> 4 4 <div id="left-items"> 5 5 - <a href="/" hx-boost="true" class="flex gap-2 font-bold italic"> 6 6 - tangled_alpha 7 7 - </a> 5 5 + <a href="/" hx-boost="true" class="text-lg">{{ template "fragments/logotype" }}</a> 8 6 </div> 9 7 10 8 <div id="right-items" class="flex items-center gap-2"> ··· 21 19 </div> 22 20 </div> 23 21 </nav> 24 24 - {{ if .LoggedInUser }} 25 25 - <div id="upgrade-banner" 26 26 - hx-get="/knots/upgradeBanner" 27 27 - hx-trigger="load" 28 28 - hx-swap="innerHTML"> 29 29 - </div> 30 30 - {{ end }} 31 22 {{ end }} 32 23 33 24 {{ define "newButton" }}

+7 -2

appview/pages/templates/layouts/profilebase.html

··· 9 9 10 10 {{ define "content" }} 11 11 {{ template "profileTabs" . }} 12 12 - <section class="bg-white dark:bg-gray-800 p-6 rounded w-full dark:text-white drop-shadow-sm"> 12 12 + <section class="bg-white dark:bg-gray-800 px-2 py-6 md:p-6 rounded w-full dark:text-white drop-shadow-sm"> 13 13 <div class="grid grid-cols-1 md:grid-cols-11 gap-4"> 14 14 - <div class="md:col-span-3 order-1 md:order-1"> 14 14 + {{ $style := "hidden md:block md:col-span-3" }} 15 15 + {{ if eq $.Active "overview" }} 16 16 + {{ $style = "md:col-span-3" }} 17 17 + {{ end }} 18 18 + <div class="{{ $style }} order-1 order-1"> 15 19 <div class="flex flex-col gap-4"> 16 20 {{ template "user/fragments/profileCard" .Card }} 17 21 {{ block "punchcard" .Card.Punchcard }} {{ end }} 18 22 </div> 19 23 </div> 24 24 + 20 25 {{ block "profileContent" . }} {{ end }} 21 26 </div> 22 27 </section>

+2 -2

appview/pages/templates/layouts/repobase.html

··· 42 42 </section> 43 43 44 44 <section 45 45 - class="w-full flex flex-col drop-shadow-sm" 45 45 + class="w-full flex flex-col" 46 46 > 47 47 <nav class="w-full pl-4 overflow-auto"> 48 48 <div class="flex z-60"> ··· 81 81 </div> 82 82 </nav> 83 83 <section 84 84 - class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white" 84 84 + class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white" 85 85 > 86 86 {{ block "repoContent" . }}{{ end }} 87 87 </section>

+1

appview/pages/templates/repo/blob.html

··· 78 78 {{ end }} 79 79 </div> 80 80 {{ end }} 81 81 + {{ template "fragments/multiline-select" }} 81 82 {{ end }}

+6

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

··· 1 1 + {{ define "repo/fragments/languageBall" }} 2 2 + <div 3 3 + class="size-2 rounded-full" 4 4 + style="background: radial-gradient(circle at 35% 35%, color-mix(in srgb, {{ langColor . }} 70%, white), {{ langColor . }} 30%, color-mix(in srgb, {{ langColor . }} 85%, black));" 5 5 + ></div> 6 6 + {{ end }}

+6 -1

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

··· 1 1 {{ define "repo/fragments/shortTimeAgo" }} 2 2 - {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (print (. | shortRelTimeFmt) " ago")) }} 2 2 + {{ $formatted := shortRelTimeFmt . }} 3 3 + {{ $content := printf "%s ago" $formatted }} 4 4 + {{ if eq $formatted "now" }} 5 5 + {{ $content = "now" }} 6 6 + {{ end }} 7 7 + {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" $content) }} 3 8 {{ end }} 4 9

+2 -7

appview/pages/templates/repo/index.html

··· 44 44 ></div> 45 45 {{ end }} 46 46 </summary> 47 47 - <div class="px-4 py-2 bg-gray-50 dark:bg-gray-700 border-b border-gray-200 dark:border-gray-600 flex items-center gap-4 flex-wrap"> 47 47 + <div class="px-4 py-2 border-b border-gray-200 dark:border-gray-600 flex items-center gap-4 flex-wrap"> 48 48 {{ range $value := .Languages }} 49 49 <div 50 50 class="flex flex-grow items-center gap-2 text-xs align-items-center justify-center" 51 51 > 52 52 - <div 53 53 - class="rounded-full h-2 w-2" 54 54 - style="background: radial-gradient(circle at 35% 35%, color-mix(in srgb, {{ $value.Color }} 70%, white), {{ $value.Color }} 30%, color-mix(in srgb, {{ $value.Color }} 85%, black));" 55 55 - > 56 56 - </div> 52 52 + {{ template "repo/fragments/languageBall" $value.Name }} 57 53 <div>{{ or $value.Name "Other" }} 58 54 <span class="text-gray-500 dark:text-gray-400"> 59 55 {{ if lt $value.Percentage 0.05 }} ··· 67 63 </div> 68 64 </details> 69 65 {{ end }} 70 70 - 71 66 72 67 {{ define "branchSelector" }} 73 68 <div class="flex gap-2 items-center justify-between w-full">

+58

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

··· 1 1 + {{ define "repo/issues/fragments/commentList" }} 2 2 + <div class="flex flex-col gap-8"> 3 3 + {{ range $item := .CommentList }} 4 4 + {{ template "commentListing" (list $ .) }} 5 5 + {{ end }} 6 6 + <div> 7 7 + {{ end }} 8 8 + 9 9 + {{ define "commentListing" }} 10 10 + {{ $root := index . 0 }} 11 11 + {{ $comment := index . 1 }} 12 12 + {{ $params := 13 13 + (dict 14 14 + "RepoInfo" $root.RepoInfo 15 15 + "LoggedInUser" $root.LoggedInUser 16 16 + "Issue" $root.Issue 17 17 + "Comment" $comment.Self) }} 18 18 + 19 19 + <div class="rounded border border-gray-300 dark:border-gray-700 w-full overflow-hidden shadow-sm"> 20 20 + {{ template "topLevelComment" $params }} 21 21 + 22 22 + <div class="relative ml-4 border-l border-gray-300 dark:border-gray-700"> 23 23 + {{ range $index, $reply := $comment.Replies }} 24 24 + <div class="relative "> 25 25 + <!-- Horizontal connector --> 26 26 + <div class="absolute left-0 top-6 w-4 h-px bg-gray-300 dark:bg-gray-700"></div> 27 27 + 28 28 + <div class="pl-2"> 29 29 + {{ 30 30 + template "replyComment" 31 31 + (dict 32 32 + "RepoInfo" $root.RepoInfo 33 33 + "LoggedInUser" $root.LoggedInUser 34 34 + "Issue" $root.Issue 35 35 + "Comment" $reply) 36 36 + }} 37 37 + </div> 38 38 + </div> 39 39 + {{ end }} 40 40 + </div> 41 41 + 42 42 + {{ template "repo/issues/fragments/replyIssueCommentPlaceholder" $params }} 43 43 + </div> 44 44 + {{ end }} 45 45 + 46 46 + {{ define "topLevelComment" }} 47 47 + <div class="rounded px-6 py-4 bg-white dark:bg-gray-800"> 48 48 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 49 49 + {{ template "repo/issues/fragments/issueCommentBody" . }} 50 50 + </div> 51 51 + {{ end }} 52 52 + 53 53 + {{ define "replyComment" }} 54 54 + <div class="p-4 w-full mx-auto overflow-hidden"> 55 55 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 56 56 + {{ template "repo/issues/fragments/issueCommentBody" . }} 57 57 + </div> 58 58 + {{ end }}

+37 -45

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

··· 1 1 {{ define "repo/issues/fragments/editIssueComment" }} 2 2 - {{ with .Comment }} 3 3 - <div id="comment-container-{{.CommentId}}"> 4 4 - <div class="flex items-center gap-2 mb-2 text-gray-500 dark:text-gray-400 text-sm flex-wrap"> 5 5 - {{ $owner := didOrHandle $.LoggedInUser.Did $.LoggedInUser.Handle }} 6 6 - <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a> 2 2 + <div id="comment-body-{{.Comment.Id}}" class="pt-2"> 3 3 + <textarea 4 4 + id="edit-textarea-{{ .Comment.Id }}" 5 5 + name="body" 6 6 + class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 7 7 + rows="5" 8 8 + autofocus>{{ .Comment.Body }}</textarea> 7 9 8 8 - <!-- show user "hats" --> 9 9 - {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }} 10 10 - {{ if $isIssueAuthor }} 11 11 - <span class="before:content-['·']"></span> 12 12 - author 13 13 - {{ end }} 14 14 - 15 15 - <span class="before:content-['·']"></span> 16 16 - <a 17 17 - href="#{{ .CommentId }}" 18 18 - class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline" 19 19 - id="{{ .CommentId }}"> 20 20 - {{ template "repo/fragments/time" .Created }} 21 21 - </a> 22 22 - 23 23 - <button 24 24 - class="btn px-2 py-1 flex items-center gap-2 text-sm group" 25 25 - hx-post="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit" 26 26 - hx-include="#edit-textarea-{{ .CommentId }}" 27 27 - hx-target="#comment-container-{{ .CommentId }}" 28 28 - hx-swap="outerHTML"> 29 29 - {{ i "check" "w-4 h-4" }} 30 30 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 31 31 - </button> 32 32 - <button 33 33 - class="btn px-2 py-1 flex items-center gap-2 text-sm" 34 34 - hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/" 35 35 - hx-target="#comment-container-{{ .CommentId }}" 36 36 - hx-swap="outerHTML"> 37 37 - {{ i "x" "w-4 h-4" }} 38 38 - </button> 39 39 - <span id="comment-{{.CommentId}}-status"></span> 40 40 - </div> 10 10 + {{ template "editActions" $ }} 11 11 + </div> 12 12 + {{ end }} 41 13 42 42 - <div> 43 43 - <textarea 44 44 - id="edit-textarea-{{ .CommentId }}" 45 45 - name="body" 46 46 - class="w-full p-2 border rounded min-h-[100px]">{{ .Body }}</textarea> 47 47 - </div> 14 14 + {{ define "editActions" }} 15 15 + <div class="flex flex-wrap items-center justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm pt-2"> 16 16 + {{ template "cancel" . }} 17 17 + {{ template "save" . }} 48 18 </div> 49 49 - {{ end }} 19 19 + {{ end }} 20 20 + 21 21 + {{ define "save" }} 22 22 + <button 23 23 + class="btn-create py-0 flex gap-1 items-center group text-sm" 24 24 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/edit" 25 25 + hx-include="#edit-textarea-{{ .Comment.Id }}" 26 26 + hx-target="#comment-body-{{ .Comment.Id }}" 27 27 + hx-swap="outerHTML"> 28 28 + {{ i "check" "size-4" }} 29 29 + save 30 30 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 31 31 + </button> 50 32 {{ end }} 51 33 34 34 + {{ define "cancel" }} 35 35 + <button 36 36 + class="btn py-0 text-red-500 dark:text-red-400 flex gap-1 items-center group" 37 37 + hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/" 38 38 + hx-target="#comment-body-{{ .Comment.Id }}" 39 39 + hx-swap="outerHTML"> 40 40 + {{ i "x" "size-4" }} 41 41 + cancel 42 42 + </button> 43 43 + {{ end }}

-58

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

··· 1 1 - {{ define "repo/issues/fragments/issueComment" }} 2 2 - {{ with .Comment }} 3 3 - <div id="comment-container-{{.CommentId}}"> 4 4 - <div class="flex items-center gap-2 mb-2 text-gray-500 dark:text-gray-400 text-sm flex-wrap"> 5 5 - {{ template "user/fragments/picHandleLink" .OwnerDid }} 6 6 - 7 7 - <!-- show user "hats" --> 8 8 - {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }} 9 9 - {{ if $isIssueAuthor }} 10 10 - <span class="before:content-['·']"></span> 11 11 - author 12 12 - {{ end }} 13 13 - 14 14 - <span class="before:content-['·']"></span> 15 15 - <a 16 16 - href="#{{ .CommentId }}" 17 17 - class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline" 18 18 - id="{{ .CommentId }}"> 19 19 - {{ if .Deleted }} 20 20 - deleted {{ template "repo/fragments/time" .Deleted }} 21 21 - {{ else if .Edited }} 22 22 - edited {{ template "repo/fragments/time" .Edited }} 23 23 - {{ else }} 24 24 - {{ template "repo/fragments/time" .Created }} 25 25 - {{ end }} 26 26 - </a> 27 27 - 28 28 - {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }} 29 29 - {{ if and $isCommentOwner (not .Deleted) }} 30 30 - <button 31 31 - class="btn px-2 py-1 text-sm" 32 32 - hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit" 33 33 - hx-swap="outerHTML" 34 34 - hx-target="#comment-container-{{.CommentId}}" 35 35 - > 36 36 - {{ i "pencil" "w-4 h-4" }} 37 37 - </button> 38 38 - <button 39 39 - class="btn px-2 py-1 text-sm text-red-500 flex gap-2 items-center group" 40 40 - hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/" 41 41 - hx-confirm="Are you sure you want to delete your comment?" 42 42 - hx-swap="outerHTML" 43 43 - hx-target="#comment-container-{{.CommentId}}" 44 44 - > 45 45 - {{ i "trash-2" "w-4 h-4" }} 46 46 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 47 47 - </button> 48 48 - {{ end }} 49 49 - 50 50 - </div> 51 51 - {{ if not .Deleted }} 52 52 - <div class="prose dark:prose-invert"> 53 53 - {{ .Body | markdown }} 54 54 - </div> 55 55 - {{ end }} 56 56 - </div> 57 57 - {{ end }} 58 58 - {{ end }}

+34

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

··· 1 1 + {{ define "repo/issues/fragments/issueCommentActions" }} 2 2 + {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }} 3 3 + {{ if and $isCommentOwner (not .Comment.Deleted) }} 4 4 + <div class="flex flex-wrap items-center gap-4 text-gray-500 dark:text-gray-400 text-sm pt-2"> 5 5 + {{ template "edit" . }} 6 6 + {{ template "delete" . }} 7 7 + </div> 8 8 + {{ end }} 9 9 + {{ end }} 10 10 + 11 11 + {{ define "edit" }} 12 12 + <a 13 13 + class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group" 14 14 + hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/edit" 15 15 + hx-swap="outerHTML" 16 16 + hx-target="#comment-body-{{.Comment.Id}}"> 17 17 + {{ i "pencil" "size-3" }} 18 18 + edit 19 19 + </a> 20 20 + {{ end }} 21 21 + 22 22 + {{ define "delete" }} 23 23 + <a 24 24 + class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group" 25 25 + hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/" 26 26 + hx-confirm="Are you sure you want to delete your comment?" 27 27 + hx-swap="outerHTML" 28 28 + hx-target="#comment-body-{{.Comment.Id}}" 29 29 + > 30 30 + {{ i "trash-2" "size-3" }} 31 31 + delete 32 32 + {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 33 33 + </a> 34 34 + {{ end }}

+9

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

··· 1 1 + {{ define "repo/issues/fragments/issueCommentBody" }} 2 2 + <div id="comment-body-{{.Comment.Id}}"> 3 3 + {{ if not .Comment.Deleted }} 4 4 + <div class="prose dark:prose-invert">{{ .Comment.Body | markdown }}</div> 5 5 + {{ else }} 6 6 + <div class="prose dark:prose-invert italic text-gray-500 dark:text-gray-400">[deleted by author]</div> 7 7 + {{ end }} 8 8 + </div> 9 9 + {{ end }}

+56

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

··· 1 1 + {{ define "repo/issues/fragments/issueCommentHeader" }} 2 2 + <div class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 "> 3 3 + {{ template "user/fragments/picHandleLink" .Comment.Did }} 4 4 + {{ template "hats" $ }} 5 5 + {{ template "timestamp" . }} 6 6 + {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }} 7 7 + {{ if and $isCommentOwner (not .Comment.Deleted) }} 8 8 + {{ template "editIssueComment" . }} 9 9 + {{ template "deleteIssueComment" . }} 10 10 + {{ end }} 11 11 + </div> 12 12 + {{ end }} 13 13 + 14 14 + {{ define "hats" }} 15 15 + {{ $isIssueAuthor := eq .Comment.Did .Issue.Did }} 16 16 + {{ if $isIssueAuthor }} 17 17 + (author) 18 18 + {{ end }} 19 19 + {{ end }} 20 20 + 21 21 + {{ define "timestamp" }} 22 22 + <a href="#{{ .Comment.Id }}" 23 23 + class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline" 24 24 + id="{{ .Comment.Id }}"> 25 25 + {{ if .Comment.Deleted }} 26 26 + {{ template "repo/fragments/shortTimeAgo" .Comment.Deleted }} 27 27 + {{ else if .Comment.Edited }} 28 28 + edited {{ template "repo/fragments/shortTimeAgo" .Comment.Edited }} 29 29 + {{ else }} 30 30 + {{ template "repo/fragments/shortTimeAgo" .Comment.Created }} 31 31 + {{ end }} 32 32 + </a> 33 33 + {{ end }} 34 34 + 35 35 + {{ define "editIssueComment" }} 36 36 + <a 37 37 + class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group" 38 38 + hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/edit" 39 39 + hx-swap="outerHTML" 40 40 + hx-target="#comment-body-{{.Comment.Id}}"> 41 41 + {{ i "pencil" "size-3" }} 42 42 + </a> 43 43 + {{ end }} 44 44 + 45 45 + {{ define "deleteIssueComment" }} 46 46 + <a 47 47 + class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group" 48 48 + hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/" 49 49 + hx-confirm="Are you sure you want to delete your comment?" 50 50 + hx-swap="outerHTML" 51 51 + hx-target="#comment-body-{{.Comment.Id}}" 52 52 + > 53 53 + {{ i "trash-2" "size-3" }} 54 54 + {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 55 55 + </a> 56 56 + {{ end }}

+145

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

··· 1 1 + {{ define "repo/issues/fragments/newComment" }} 2 2 + {{ if .LoggedInUser }} 3 3 + <form 4 4 + id="comment-form" 5 5 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 6 6 + hx-on::after-request="if(event.detail.successful) this.reset()" 7 7 + > 8 8 + <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full"> 9 9 + <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 10 10 + {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 11 11 + </div> 12 12 + <textarea 13 13 + id="comment-textarea" 14 14 + name="body" 15 15 + class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 16 16 + placeholder="Add to the discussion. Markdown is supported." 17 17 + onkeyup="updateCommentForm()" 18 18 + rows="5" 19 19 + ></textarea> 20 20 + <div id="issue-comment"></div> 21 21 + <div id="issue-action" class="error"></div> 22 22 + </div> 23 23 + 24 24 + <div class="flex gap-2 mt-2"> 25 25 + <button 26 26 + id="comment-button" 27 27 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 28 28 + type="submit" 29 29 + hx-disabled-elt="#comment-button" 30 30 + class="btn-create p-2 flex items-center gap-2 no-underline hover:no-underline group" 31 31 + disabled 32 32 + > 33 33 + {{ i "message-square-plus" "w-4 h-4" }} 34 34 + comment 35 35 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 36 36 + </button> 37 37 + 38 38 + {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.Did) }} 39 39 + {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }} 40 40 + {{ $isRepoOwner := .RepoInfo.Roles.IsOwner }} 41 41 + {{ if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) .Issue.Open }} 42 42 + <button 43 43 + id="close-button" 44 44 + type="button" 45 45 + class="btn flex items-center gap-2" 46 46 + hx-indicator="#close-spinner" 47 47 + hx-trigger="click" 48 48 + > 49 49 + {{ i "ban" "w-4 h-4" }} 50 50 + close 51 51 + <span id="close-spinner" class="group"> 52 52 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 53 53 + </span> 54 54 + </button> 55 55 + <div 56 56 + id="close-with-comment" 57 57 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 58 58 + hx-trigger="click from:#close-button" 59 59 + hx-disabled-elt="#close-with-comment" 60 60 + hx-target="#issue-comment" 61 61 + hx-indicator="#close-spinner" 62 62 + hx-vals="js:{body: document.getElementById('comment-textarea').value.trim() !== '' ? document.getElementById('comment-textarea').value : ''}" 63 63 + hx-swap="none" 64 64 + > 65 65 + </div> 66 66 + <div 67 67 + id="close-issue" 68 68 + hx-disabled-elt="#close-issue" 69 69 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/close" 70 70 + hx-trigger="click from:#close-button" 71 71 + hx-target="#issue-action" 72 72 + hx-indicator="#close-spinner" 73 73 + hx-swap="none" 74 74 + > 75 75 + </div> 76 76 + <script> 77 77 + document.addEventListener('htmx:configRequest', function(evt) { 78 78 + if (evt.target.id === 'close-with-comment') { 79 79 + const commentText = document.getElementById('comment-textarea').value.trim(); 80 80 + if (commentText === '') { 81 81 + evt.detail.parameters = {}; 82 82 + evt.preventDefault(); 83 83 + } 84 84 + } 85 85 + }); 86 86 + </script> 87 87 + {{ else if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (not .Issue.Open) }} 88 88 + <button 89 89 + type="button" 90 90 + class="btn flex items-center gap-2" 91 91 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/reopen" 92 92 + hx-indicator="#reopen-spinner" 93 93 + hx-swap="none" 94 94 + > 95 95 + {{ i "refresh-ccw-dot" "w-4 h-4" }} 96 96 + reopen 97 97 + <span id="reopen-spinner" class="group"> 98 98 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 99 99 + </span> 100 100 + </button> 101 101 + {{ end }} 102 102 + 103 103 + <script> 104 104 + function updateCommentForm() { 105 105 + const textarea = document.getElementById('comment-textarea'); 106 106 + const commentButton = document.getElementById('comment-button'); 107 107 + const closeButton = document.getElementById('close-button'); 108 108 + 109 109 + if (textarea.value.trim() !== '') { 110 110 + commentButton.removeAttribute('disabled'); 111 111 + } else { 112 112 + commentButton.setAttribute('disabled', ''); 113 113 + } 114 114 + 115 115 + if (closeButton) { 116 116 + if (textarea.value.trim() !== '') { 117 117 + closeButton.innerHTML = ` 118 118 + {{ i "ban" "w-4 h-4" }} 119 119 + <span>close with comment</span> 120 120 + <span id="close-spinner" class="group"> 121 121 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 122 122 + </span>`; 123 123 + } else { 124 124 + closeButton.innerHTML = ` 125 125 + {{ i "ban" "w-4 h-4" }} 126 126 + <span>close</span> 127 127 + <span id="close-spinner" class="group"> 128 128 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 129 129 + </span>`; 130 130 + } 131 131 + } 132 132 + } 133 133 + 134 134 + document.addEventListener('DOMContentLoaded', function() { 135 135 + updateCommentForm(); 136 136 + }); 137 137 + </script> 138 138 + </div> 139 139 + </form> 140 140 + {{ else }} 141 141 + <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-fit"> 142 142 + <a href="/login" class="underline">login</a> to join the discussion 143 143 + </div> 144 144 + {{ end }} 145 145 + {{ end }}

+57

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

··· 1 1 + {{ define "repo/issues/fragments/putIssue" }} 2 2 + <!-- this form is used for new and edit, .Issue is passed when editing --> 3 3 + <form 4 4 + {{ if eq .Action "edit" }} 5 5 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/edit" 6 6 + {{ else }} 7 7 + hx-post="/{{ .RepoInfo.FullName }}/issues/new" 8 8 + {{ end }} 9 9 + hx-swap="none" 10 10 + hx-indicator="#spinner"> 11 11 + <div class="flex flex-col gap-2"> 12 12 + <div> 13 13 + <label for="title">title</label> 14 14 + <input type="text" name="title" id="title" class="w-full" value="{{ if .Issue }}{{ .Issue.Title }}{{ end }}" /> 15 15 + </div> 16 16 + <div> 17 17 + <label for="body">body</label> 18 18 + <textarea 19 19 + name="body" 20 20 + id="body" 21 21 + rows="6" 22 22 + class="w-full resize-y" 23 23 + placeholder="Describe your issue. Markdown is supported." 24 24 + >{{ if .Issue }}{{ .Issue.Body }}{{ end }}</textarea> 25 25 + </div> 26 26 + <div class="flex justify-between"> 27 27 + <div id="issues" class="error"></div> 28 28 + <div class="flex gap-2 items-center"> 29 29 + <a 30 30 + class="btn flex items-center gap-2 no-underline hover:no-underline" 31 31 + type="button" 32 32 + {{ if .Issue }} 33 33 + href="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}" 34 34 + {{ else }} 35 35 + href="/{{ .RepoInfo.FullName }}/issues" 36 36 + {{ end }} 37 37 + > 38 38 + {{ i "x" "w-4 h-4" }} 39 39 + cancel 40 40 + </a> 41 41 + <button type="submit" class="btn-create flex items-center gap-2"> 42 42 + {{ if eq .Action "edit" }} 43 43 + {{ i "pencil" "w-4 h-4" }} 44 44 + {{ .Action }} issue 45 45 + {{ else }} 46 46 + {{ i "circle-plus" "w-4 h-4" }} 47 47 + {{ .Action }} issue 48 48 + {{ end }} 49 49 + <span id="spinner" class="group"> 50 50 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 51 51 + </span> 52 52 + </button> 53 53 + </div> 54 54 + </div> 55 55 + </div> 56 56 + </form> 57 57 + {{ end }}

+61

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

··· 1 1 + {{ define "repo/issues/fragments/replyComment" }} 2 2 + <form 3 3 + class="p-2 group w-full border-t border-gray-200 dark:border-gray-700 flex flex-col gap-2" 4 4 + id="reply-form-{{ .Comment.Id }}" 5 5 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 6 6 + hx-on::after-request="if(event.detail.successful) this.reset()" 7 7 + hx-disabled-elt="#reply-{{ .Comment.Id }}" 8 8 + > 9 9 + {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 10 10 + <textarea 11 11 + id="reply-{{.Comment.Id}}-textarea" 12 12 + name="body" 13 13 + class="w-full p-2" 14 14 + placeholder="Leave a reply..." 15 15 + autofocus 16 16 + rows="3" 17 17 + hx-trigger="keydown[ctrlKey&&key=='Enter']" 18 18 + hx-target="#reply-form-{{ .Comment.Id }}" 19 19 + hx-get="#" 20 20 + hx-on:htmx:before-request="event.preventDefault(); document.getElementById('reply-form-{{ .Comment.Id }}').requestSubmit()"></textarea> 21 21 + 22 22 + <input 23 23 + type="text" 24 24 + id="reply-to" 25 25 + name="reply-to" 26 26 + required 27 27 + value="{{ .Comment.AtUri }}" 28 28 + class="hidden" 29 29 + /> 30 30 + {{ template "replyActions" . }} 31 31 + </form> 32 32 + {{ end }} 33 33 + 34 34 + {{ define "replyActions" }} 35 35 + <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm"> 36 36 + {{ template "cancel" . }} 37 37 + {{ template "reply" . }} 38 38 + </div> 39 39 + {{ end }} 40 40 + 41 41 + {{ define "cancel" }} 42 42 + <button 43 43 + class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 44 44 + hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/replyPlaceholder" 45 45 + hx-target="#reply-form-{{ .Comment.Id }}" 46 46 + hx-swap="outerHTML"> 47 47 + {{ i "x" "size-4" }} 48 48 + cancel 49 49 + </button> 50 50 + {{ end }} 51 51 + 52 52 + {{ define "reply" }} 53 53 + <button 54 54 + id="reply-{{ .Comment.Id }}" 55 55 + type="submit" 56 56 + class="btn-create flex items-center gap-2 no-underline hover:no-underline"> 57 57 + {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 58 58 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 59 59 + reply 60 60 + </button> 61 61 + {{ end }}

+20

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

··· 1 1 + {{ define "repo/issues/fragments/replyIssueCommentPlaceholder" }} 2 2 + <div class="p-2 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 3 + {{ if .LoggedInUser }} 4 4 + <img 5 5 + src="{{ tinyAvatar .LoggedInUser.Did }}" 6 6 + alt="" 7 7 + class="rounded-full h-6 w-6 mr-1 border border-gray-300 dark:border-gray-700" 8 8 + /> 9 9 + {{ end }} 10 10 + <input 11 11 + class="w-full py-2 border-none focus:outline-none" 12 12 + placeholder="Leave a reply..." 13 13 + hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/reply" 14 14 + hx-trigger="focus" 15 15 + hx-target="closest div" 16 16 + hx-swap="outerHTML" 17 17 + > 18 18 + </input> 19 19 + </div> 20 20 + {{ end }}

+95 -202

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

··· 9 9 {{ end }} 10 10 11 11 {{ define "repoContent" }} 12 12 - <header class="pb-4"> 13 13 - <h1 class="text-2xl"> 14 14 - {{ .Issue.Title | description }} 15 15 - <span class="text-gray-500 dark:text-gray-400">#{{ .Issue.IssueId }}</span> 16 16 - </h1> 17 17 - </header> 12 12 + <section id="issue-{{ .Issue.IssueId }}"> 13 13 + {{ template "issueHeader" .Issue }} 14 14 + {{ template "issueInfo" . }} 15 15 + {{ if .Issue.Body }} 16 16 + <article id="body" class="mt-4 prose dark:prose-invert">{{ .Issue.Body | markdown }}</article> 17 17 + {{ end }} 18 18 + {{ template "issueReactions" . }} 19 19 + </section> 20 20 + {{ end }} 18 21 19 19 - {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 20 20 - {{ $icon := "ban" }} 21 21 - {{ if eq .State "open" }} 22 22 - {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 23 23 - {{ $icon = "circle-dot" }} 24 24 - {{ end }} 22 22 + {{ define "issueHeader" }} 23 23 + <header class="pb-2"> 24 24 + <h1 class="text-2xl"> 25 25 + {{ .Title | description }} 26 26 + <span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span> 27 27 + </h1> 28 28 + </header> 29 29 + {{ end }} 25 30 26 26 - <section class="mt-2"> 27 27 - <div class="inline-flex items-center gap-2"> 28 28 - <div id="state" 29 29 - class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"> 30 30 - {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 31 31 - <span class="text-white">{{ .State }}</span> 32 32 - </div> 33 33 - <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 34 34 - opened by 35 35 - {{ $owner := didOrHandle .Issue.OwnerDid .IssueOwnerHandle }} 36 36 - {{ template "user/fragments/picHandleLink" $owner }} 37 37 - <span class="select-none before:content-['\00B7']"></span> 38 38 - {{ template "repo/fragments/time" .Issue.Created }} 39 39 - </span> 40 40 - </div> 31 31 + {{ define "issueInfo" }} 32 32 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 33 33 + {{ $icon := "ban" }} 34 34 + {{ if eq .Issue.State "open" }} 35 35 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 36 36 + {{ $icon = "circle-dot" }} 37 37 + {{ end }} 38 38 + <div class="inline-flex items-center gap-2"> 39 39 + <div id="state" 40 40 + class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"> 41 41 + {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 42 42 + <span class="text-white">{{ .Issue.State }}</span> 43 43 + </div> 44 44 + <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 45 45 + opened by 46 46 + {{ template "user/fragments/picHandleLink" .Issue.Did }} 47 47 + <span class="select-none before:content-['\00B7']"></span> 48 48 + {{ if .Issue.Edited }} 49 49 + edited {{ template "repo/fragments/time" .Issue.Edited }} 50 50 + {{ else }} 51 51 + {{ template "repo/fragments/time" .Issue.Created }} 52 52 + {{ end }} 53 53 + </span> 41 54 42 42 - {{ if .Issue.Body }} 43 43 - <article id="body" class="mt-8 prose dark:prose-invert"> 44 44 - {{ .Issue.Body | markdown }} 45 45 - </article> 46 46 - {{ end }} 55 55 + {{ if and .LoggedInUser (eq .LoggedInUser.Did .Issue.Did) }} 56 56 + {{ template "issueActions" . }} 57 57 + {{ end }} 58 58 + </div> 59 59 + <div id="issue-actions-error" class="error"></div> 60 60 + {{ end }} 47 61 48 48 - <div class="flex items-center gap-2 mt-2"> 49 49 - {{ template "repo/fragments/reactionsPopUp" .OrderedReactionKinds }} 50 50 - {{ range $kind := .OrderedReactionKinds }} 51 51 - {{ 52 52 - template "repo/fragments/reaction" 53 53 - (dict 54 54 - "Kind" $kind 55 55 - "Count" (index $.Reactions $kind) 56 56 - "IsReacted" (index $.UserReacted $kind) 57 57 - "ThreadAt" $.Issue.AtUri) 58 58 - }} 59 59 - {{ end }} 60 60 - </div> 61 61 - </section> 62 62 + {{ define "issueActions" }} 63 63 + {{ template "editIssue" . }} 64 64 + {{ template "deleteIssue" . }} 62 65 {{ end }} 63 66 64 64 - {{ define "repoAfter" }} 65 65 - <section id="comments" class="my-2 mt-2 space-y-2 relative"> 66 66 - {{ range $index, $comment := .Comments }} 67 67 - <div 68 68 - id="comment-{{ .CommentId }}" 69 69 - class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit"> 70 70 - {{ if gt $index 0 }} 71 71 - <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 72 72 - {{ end }} 73 73 - {{ template "repo/issues/fragments/issueComment" (dict "RepoInfo" $.RepoInfo "LoggedInUser" $.LoggedInUser "Issue" $.Issue "Comment" .)}} 74 74 - </div> 75 75 - {{ end }} 76 76 - </section> 67 67 + {{ define "editIssue" }} 68 68 + <a 69 69 + class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group" 70 70 + hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/edit" 71 71 + hx-swap="innerHTML" 72 72 + hx-target="#issue-{{.Issue.IssueId}}"> 73 73 + {{ i "pencil" "size-3" }} 74 74 + </a> 75 75 + {{ end }} 77 76 78 78 - {{ block "newComment" . }} {{ end }} 77 77 + {{ define "deleteIssue" }} 78 78 + <a 79 79 + class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group" 80 80 + hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/" 81 81 + hx-confirm="Are you sure you want to delete your issue?" 82 82 + hx-swap="none"> 83 83 + {{ i "trash-2" "size-3" }} 84 84 + {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 85 85 + </a> 86 86 + {{ end }} 79 87 88 88 + {{ define "issueReactions" }} 89 89 + <div class="flex items-center gap-2 mt-2"> 90 90 + {{ template "repo/fragments/reactionsPopUp" .OrderedReactionKinds }} 91 91 + {{ range $kind := .OrderedReactionKinds }} 92 92 + {{ 93 93 + template "repo/fragments/reaction" 94 94 + (dict 95 95 + "Kind" $kind 96 96 + "Count" (index $.Reactions $kind) 97 97 + "IsReacted" (index $.UserReacted $kind) 98 98 + "ThreadAt" $.Issue.AtUri) 99 99 + }} 100 100 + {{ end }} 101 101 + </div> 80 102 {{ end }} 81 103 82 82 - {{ define "newComment" }} 83 83 - {{ if .LoggedInUser }} 84 84 - <form 85 85 - id="comment-form" 86 86 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 87 87 - hx-on::after-request="if(event.detail.successful) this.reset()" 88 88 - > 89 89 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full md:w-3/5"> 90 90 - <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 91 91 - {{ template "user/fragments/picHandleLink" (didOrHandle .LoggedInUser.Did .LoggedInUser.Handle) }} 92 92 - </div> 93 93 - <textarea 94 94 - id="comment-textarea" 95 95 - name="body" 96 96 - class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 97 97 - placeholder="Add to the discussion. Markdown is supported." 98 98 - onkeyup="updateCommentForm()" 99 99 - ></textarea> 100 100 - <div id="issue-comment"></div> 101 101 - <div id="issue-action" class="error"></div> 102 102 - </div> 103 103 - 104 104 - <div class="flex gap-2 mt-2"> 105 105 - <button 106 106 - id="comment-button" 107 107 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 108 108 - type="submit" 109 109 - hx-disabled-elt="#comment-button" 110 110 - class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group" 111 111 - disabled 112 112 - > 113 113 - {{ i "message-square-plus" "w-4 h-4" }} 114 114 - comment 115 115 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 116 116 - </button> 117 117 - 118 118 - {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.OwnerDid) }} 119 119 - {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }} 120 120 - {{ $isRepoOwner := .RepoInfo.Roles.IsOwner }} 121 121 - {{ if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (eq .State "open") }} 122 122 - <button 123 123 - id="close-button" 124 124 - type="button" 125 125 - class="btn flex items-center gap-2" 126 126 - hx-indicator="#close-spinner" 127 127 - hx-trigger="click" 128 128 - > 129 129 - {{ i "ban" "w-4 h-4" }} 130 130 - close 131 131 - <span id="close-spinner" class="group"> 132 132 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 133 133 - </span> 134 134 - </button> 135 135 - <div 136 136 - id="close-with-comment" 137 137 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 138 138 - hx-trigger="click from:#close-button" 139 139 - hx-disabled-elt="#close-with-comment" 140 140 - hx-target="#issue-comment" 141 141 - hx-indicator="#close-spinner" 142 142 - hx-vals="js:{body: document.getElementById('comment-textarea').value.trim() !== '' ? document.getElementById('comment-textarea').value : ''}" 143 143 - hx-swap="none" 144 144 - > 145 145 - </div> 146 146 - <div 147 147 - id="close-issue" 148 148 - hx-disabled-elt="#close-issue" 149 149 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/close" 150 150 - hx-trigger="click from:#close-button" 151 151 - hx-target="#issue-action" 152 152 - hx-indicator="#close-spinner" 153 153 - hx-swap="none" 154 154 - > 155 155 - </div> 156 156 - <script> 157 157 - document.addEventListener('htmx:configRequest', function(evt) { 158 158 - if (evt.target.id === 'close-with-comment') { 159 159 - const commentText = document.getElementById('comment-textarea').value.trim(); 160 160 - if (commentText === '') { 161 161 - evt.detail.parameters = {}; 162 162 - evt.preventDefault(); 163 163 - } 164 164 - } 165 165 - }); 166 166 - </script> 167 167 - {{ else if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (eq .State "closed") }} 168 168 - <button 169 169 - type="button" 170 170 - class="btn flex items-center gap-2" 171 171 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/reopen" 172 172 - hx-indicator="#reopen-spinner" 173 173 - hx-swap="none" 174 174 - > 175 175 - {{ i "refresh-ccw-dot" "w-4 h-4" }} 176 176 - reopen 177 177 - <span id="reopen-spinner" class="group"> 178 178 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 179 179 - </span> 180 180 - </button> 181 181 - {{ end }} 182 182 - 183 183 - <script> 184 184 - function updateCommentForm() { 185 185 - const textarea = document.getElementById('comment-textarea'); 186 186 - const commentButton = document.getElementById('comment-button'); 187 187 - const closeButton = document.getElementById('close-button'); 188 188 - 189 189 - if (textarea.value.trim() !== '') { 190 190 - commentButton.removeAttribute('disabled'); 191 191 - } else { 192 192 - commentButton.setAttribute('disabled', ''); 193 193 - } 104 104 + {{ define "repoAfter" }} 105 105 + <div class="flex flex-col gap-4 mt-4"> 106 106 + {{ 107 107 + template "repo/issues/fragments/commentList" 108 108 + (dict 109 109 + "RepoInfo" $.RepoInfo 110 110 + "LoggedInUser" $.LoggedInUser 111 111 + "Issue" $.Issue 112 112 + "CommentList" $.Issue.CommentList) 113 113 + }} 194 114 195 195 - if (closeButton) { 196 196 - if (textarea.value.trim() !== '') { 197 197 - closeButton.innerHTML = ` 198 198 - {{ i "ban" "w-4 h-4" }} 199 199 - <span>close with comment</span> 200 200 - <span id="close-spinner" class="group"> 201 201 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 202 202 - </span>`; 203 203 - } else { 204 204 - closeButton.innerHTML = ` 205 205 - {{ i "ban" "w-4 h-4" }} 206 206 - <span>close</span> 207 207 - <span id="close-spinner" class="group"> 208 208 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 209 209 - </span>`; 210 210 - } 211 211 - } 212 212 - } 115 115 + {{ template "repo/issues/fragments/newComment" . }} 116 116 + <div> 117 117 + {{ end }} 213 118 214 214 - document.addEventListener('DOMContentLoaded', function() { 215 215 - updateCommentForm(); 216 216 - }); 217 217 - </script> 218 218 - </div> 219 219 - </form> 220 220 - {{ else }} 221 221 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-fit"> 222 222 - <a href="/login" class="underline">login</a> to join the discussion 223 223 - </div> 224 224 - {{ end }} 225 225 - {{ end }}

+42 -44

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

··· 37 37 {{ end }} 38 38 39 39 {{ define "repoAfter" }} 40 40 - <div class="flex flex-col gap-2 mt-2"> 41 41 - {{ range .Issues }} 42 42 - <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 43 43 - <div class="pb-2"> 44 44 - <a 45 45 - href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" 46 46 - class="no-underline hover:underline" 47 47 - > 48 48 - {{ .Title | description }} 49 49 - <span class="text-gray-500">#{{ .IssueId }}</span> 50 50 - </a> 51 51 - </div> 52 52 - <p class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 53 53 - {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 54 54 - {{ $icon := "ban" }} 55 55 - {{ $state := "closed" }} 56 56 - {{ if .Open }} 57 57 - {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 58 58 - {{ $icon = "circle-dot" }} 59 59 - {{ $state = "open" }} 60 60 - {{ end }} 40 40 + <div class="flex flex-col gap-2 mt-2"> 41 41 + {{ range .Issues }} 42 42 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 43 43 + <div class="pb-2"> 44 44 + <a 45 45 + href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" 46 46 + class="no-underline hover:underline" 47 47 + > 48 48 + {{ .Title | description }} 49 49 + <span class="text-gray-500">#{{ .IssueId }}</span> 50 50 + </a> 51 51 + </div> 52 52 + <p class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 53 53 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 54 54 + {{ $icon := "ban" }} 55 55 + {{ $state := "closed" }} 56 56 + {{ if .Open }} 57 57 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 58 58 + {{ $icon = "circle-dot" }} 59 59 + {{ $state = "open" }} 60 60 + {{ end }} 61 61 62 62 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 63 63 - {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 64 64 - <span class="text-white dark:text-white">{{ $state }}</span> 65 65 - </span> 62 62 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 63 63 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 64 64 + <span class="text-white dark:text-white">{{ $state }}</span> 65 65 + </span> 66 66 67 67 - <span class="ml-1"> 68 68 - {{ template "user/fragments/picHandleLink" .OwnerDid }} 69 69 - </span> 67 67 + <span class="ml-1"> 68 68 + {{ template "user/fragments/picHandleLink" .Did }} 69 69 + </span> 70 70 71 71 - <span class="before:content-['·']"> 72 72 - {{ template "repo/fragments/time" .Created }} 73 73 - </span> 71 71 + <span class="before:content-['·']"> 72 72 + {{ template "repo/fragments/time" .Created }} 73 73 + </span> 74 74 75 75 - <span class="before:content-['·']"> 76 76 - {{ $s := "s" }} 77 77 - {{ if eq .Metadata.CommentCount 1 }} 78 78 - {{ $s = "" }} 79 79 - {{ end }} 80 80 - <a href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ .Metadata.CommentCount }} comment{{$s}}</a> 81 81 - </span> 82 82 - </p> 75 75 + <span class="before:content-['·']"> 76 76 + {{ $s := "s" }} 77 77 + {{ if eq (len .Comments) 1 }} 78 78 + {{ $s = "" }} 79 79 + {{ end }} 80 80 + <a href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 81 81 + </span> 82 82 + </p> 83 83 + </div> 84 84 + {{ end }} 83 85 </div> 84 84 - {{ end }} 85 85 - </div> 86 86 - 87 87 - {{ block "pagination" . }} {{ end }} 88 88 - 86 86 + {{ block "pagination" . }} {{ end }} 89 87 {{ end }} 90 88 91 89 {{ define "pagination" }}

+1 -33

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

··· 1 1 {{ define "title" }}new issue &middot; {{ .RepoInfo.FullName }}{{ end }} 2 2 3 3 {{ define "repoContent" }} 4 4 - <form 5 5 - hx-post="/{{ .RepoInfo.FullName }}/issues/new" 6 6 - class="mt-6 space-y-6" 7 7 - hx-swap="none" 8 8 - hx-indicator="#spinner" 9 9 - > 10 10 - <div class="flex flex-col gap-4"> 11 11 - <div> 12 12 - <label for="title">title</label> 13 13 - <input type="text" name="title" id="title" class="w-full" /> 14 14 - </div> 15 15 - <div> 16 16 - <label for="body">body</label> 17 17 - <textarea 18 18 - name="body" 19 19 - id="body" 20 20 - rows="6" 21 21 - class="w-full resize-y" 22 22 - placeholder="Describe your issue. Markdown is supported." 23 23 - ></textarea> 24 24 - </div> 25 25 - <div> 26 26 - <button type="submit" class="btn-create flex items-center gap-2"> 27 27 - {{ i "circle-plus" "w-4 h-4" }} 28 28 - create issue 29 29 - <span id="create-pull-spinner" class="group"> 30 30 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 31 31 - </span> 32 32 - </button> 33 33 - </div> 34 34 - </div> 35 35 - <div id="issues" class="error"></div> 36 36 - </form> 4 4 + {{ template "repo/issues/fragments/putIssue" . }} 37 5 {{ end }}

+48 -12

appview/pages/templates/repo/needsUpgrade.html

··· 1 1 {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} 2 2 - 3 2 {{ define "extrameta" }} 4 3 {{ template "repo/fragments/meta" . }} 5 4 {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }} 6 5 {{ end }} 7 7 - 8 6 {{ define "repoContent" }} 9 7 <main> 10 10 - <div class="w-full h-full flex place-content-center {{ if .LoggedInUser }} bg-yellow-100 dark:bg-yellow-900 {{ end }}"> 11 11 - <div class="py-6 w-fit flex flex-col gap-4 text-center"> 12 12 - {{ if .LoggedInUser }} 13 13 - <p class=" text-yellow-800 dark:text-yellow-200 text-center"> 14 14 - Your knot needs an upgrade. This repository is currently unavailable to users. 15 15 - </p> 8 8 + <div class="relative w-full h-96 flex items-center justify-center"> 9 9 + <div class="w-full h-full grid grid-cols-1 md:grid-cols-2 gap-4 md:divide-x divide-gray-300 dark:divide-gray-600 text-gray-300 dark:text-gray-600"> 10 10 + <!-- mimic the repo view here, placeholders are LLM generated --> 11 11 + <div id="file-list" class="flex flex-col gap-2 col-span-1 w-full h-full p-4 items-start justify-start text-left"> 12 12 + {{ $files := 13 13 + (list 14 14 + "src" 15 15 + "docs" 16 16 + "config" 17 17 + "lib" 18 18 + "index.html" 19 19 + "log.html" 20 20 + "needsUpgrade.html" 21 21 + "new.html" 22 22 + "tags.html" 23 23 + "tree.html") 24 24 + }} 25 25 + {{ range $files }} 26 26 + <span> 27 27 + {{ if (contains . ".") }} 28 28 + {{ i "file" "size-4 inline-flex" }} 16 29 {{ else }} 17 17 - <p class="text-gray-400 dark:text-gray-500 py-6 text-center"> 18 18 - The knot hosting this repository needs an upgrade. This repository is currently unavailable. 19 19 - </p> 30 30 + {{ i "folder" "size-4 inline-flex fill-current" }} 20 31 {{ end }} 21 21 - </div> 32 32 + 33 33 + {{ . }} 34 34 + </span> 35 35 + {{ end }} 36 36 + </div> 37 37 + <div id="commit-list" class="hidden md:flex md:flex-col gap-4 col-span-1 w-full h-full p-4 items-start justify-start text-left"> 38 38 + {{ $commits := 39 39 + (list 40 40 + "Fix authentication bug in login flow" 41 41 + "Add new dashboard widgets for metrics" 42 42 + "Implement real-time notifications system") 43 43 + }} 44 44 + {{ range $commits }} 45 45 + <div class="flex flex-col"> 46 46 + <span>{{ . }}</span> 47 47 + <span class="text-xs">{{ . }}</span> 48 48 + </div> 49 49 + {{ end }} 50 50 + </div> 22 51 </div> 52 52 + <div class="absolute inset-0 flex items-center justify-center py-12 text-red-500 dark:text-red-400 backdrop-blur"> 53 53 + <div class="text-center"> 54 54 + {{ i "triangle-alert" "size-5 inline-flex items-center align-middle" }} 55 55 + The knot hosting this repository needs an upgrade. This repository is currently unavailable. 56 56 + </div> 57 57 + </div> 58 58 + </div> 23 59 </main> 24 60 {{ end }}

+3 -3

appview/pages/templates/repo/tree.html

··· 25 25 <div class="flex flex-col md:flex-row md:justify-between gap-2"> 26 26 <div id="breadcrumbs" class="overflow-x-auto whitespace-nowrap text-gray-400 dark:text-gray-500"> 27 27 {{ range .BreadCrumbs }} 28 28 - <a href="{{ index . 1}}" class="text-bold text-gray-500 dark:text-gray-400 {{ $linkstyle }}">{{ pathUnescape (index . 0) }}</a> / 28 28 + <a href="{{ index . 1 }}" class="text-bold text-gray-500 dark:text-gray-400 {{ $linkstyle }}">{{ pathUnescape (index . 0) }}</a> / 29 29 {{ end }} 30 30 </div> 31 31 <div id="dir-info" class="text-gray-500 dark:text-gray-400 text-xs md:text-sm flex flex-wrap items-center gap-1 md:gap-0"> 32 32 {{ $stats := .TreeStats }} 33 33 34 34 - <span>at <a href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref }}">{{ $.Ref }}</a></span> 34 34 + <span>at <a href="/{{ $.RepoInfo.FullName }}/tree/{{ pathEscape $.Ref }}">{{ $.Ref }}</a></span> 35 35 {{ if eq $stats.NumFolders 1 }} 36 36 <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 37 37 <span>{{ $stats.NumFolders }} folder</span> ··· 55 55 {{ range .Files }} 56 56 <div class="grid grid-cols-12 gap-4 items-center py-1"> 57 57 <div class="col-span-8 md:col-span-4"> 58 58 - {{ $link := printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "tree" (urlquery $.Ref) $.TreePath .Name }} 58 58 + {{ $link := printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "tree" (pathEscape $.Ref) $.TreePath .Name }} 59 59 {{ $icon := "folder" }} 60 60 {{ $iconStyle := "size-4 fill-current" }} 61 61

+6 -1

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

··· 30 30 {{ define "spindleRightSide" }} 31 31 <div id="right-side" class="flex gap-2"> 32 32 {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2 text-sm" }} 33 33 - {{ if .Verified }} 33 33 + 34 34 + {{ if .NeedsUpgrade }} 35 35 + <span class="bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 {{$style}}"> {{ i "shield-alert" "w-4 h-4" }} needs upgrade </span> 36 36 + {{ block "spindleRetryButton" . }} {{ end }} 37 37 + {{ else if .Verified }} 34 38 <span class="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 {{$style}}">{{ i "shield-check" "w-4 h-4" }} verified</span> 35 39 {{ template "spindles/fragments/addMemberModal" . }} 36 40 {{ else }} 37 41 <span class="bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200 {{$style}}">{{ i "shield-off" "w-4 h-4" }} unverified</span> 38 42 {{ block "spindleRetryButton" . }} {{ end }} 39 43 {{ end }} 44 44 + 40 45 {{ block "spindleDeleteButton" . }} {{ end }} 41 46 </div> 42 47 {{ end }}

+3 -7

appview/pages/templates/spindles/index.html

··· 1 1 {{ define "title" }}spindles{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-4 flex items-end justify-start gap-4 align-bottom"> 4 4 + <div class="px-6 py-4 flex items-center justify-between gap-4 align-bottom"> 5 5 <h1 class="text-xl font-bold dark:text-white">Spindles</h1> 6 6 - 7 7 - 8 8 - <span class="flex items-center gap-1 text-sm"> 6 6 + <span class="flex items-center gap-1"> 9 7 {{ i "book" "w-3 h-3" }} 10 10 - <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md"> 11 11 - docs 12 12 - </a> 8 8 + <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md">docs</a> 13 9 </span> 14 10 </div> 15 11

+3 -2

appview/pages/templates/strings/string.html

··· 23 23 hx-boost="true" 24 24 href="/strings/{{ .String.Did }}/{{ .String.Rkey }}/edit"> 25 25 {{ i "pencil" "size-4" }} 26 26 - <span class="hidden md:inline">edit</span> 26 26 + <span class="hidden md:inline">edit</span> 27 27 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 28 28 </a> 29 29 <button ··· 34 34 hx-confirm="Are you sure you want to delete the string `{{ .String.Filename }}`?" 35 35 > 36 36 {{ i "trash-2" "size-4" }} 37 37 - <span class="hidden md:inline">delete</span> 37 37 + <span class="hidden md:inline">delete</span> 38 38 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 39 39 </button> 40 40 </div> ··· 80 80 <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ .String.Contents | escapeHtml }}</div> 81 81 {{ end }} 82 82 </div> 83 83 + {{ template "fragments/multiline-select" }} 83 84 </section> 84 85 {{ end }}

+1 -1

appview/pages/templates/timeline/fragments/hero.html

··· 23 23 24 24 <figure class="w-full hidden md:block md:w-auto"> 25 25 <a href="https://tangled.sh/@tangled.sh/core" class="block"> 26 26 - <img src="https://assets.tangled.network/hero-repo.png" alt="Screenshot of the Tangled monorepo." class="max-w-md mx-auto md:max-w-none w-full md:w-[30vw] h-auto shadow-sm rounded hover:shadow-md transition-shadow" /> 26 26 + <img src="https://assets.tangled.network/hero-repo.png" alt="Screenshot of the Tangled monorepo." class="max-w-md mx-auto md:max-w-none w-full md:w-[30vw] h-auto shadow-sm rounded" /> 27 27 </a> 28 28 <figcaption class="text-sm text-gray-600 dark:text-gray-400 mt-2 text-center"> 29 29 Monorepo for Tangled, built in the open with the community.

+3 -3

appview/pages/templates/timeline/home.html

··· 27 27 {{ define "feature" }} 28 28 {{ $info := index . 0 }} 29 29 {{ $bullets := index . 1 }} 30 30 - <div class="flex flex-col items-top gap-6 md:flex-row md:gap-12"> 30 30 + <div class="flex flex-col items-center gap-6 md:flex-row md:items-top"> 31 31 <div class="flex-1"> 32 32 <h2 class="text-2xl font-bold text-black dark:text-white mb-6">{{ $info.title }}</h2> 33 33 <ul class="leading-normal"> ··· 38 38 </div> 39 39 <div class="flex-shrink-0 w-96 md:w-1/3"> 40 40 <a href="{{ $info.image }}"> 41 41 - <img src="{{ $info.image }}" alt="{{ $info.alt }}" class="w-full h-auto rounded" /> 41 41 + <img src="{{ $info.image }}" alt="{{ $info.alt }}" class="w-full h-auto rounded shadow-sm" /> 42 42 </a> 43 43 </div> 44 44 </div> 45 45 {{ end }} 46 46 47 47 {{ define "features" }} 48 48 - <div class="prose dark:text-gray-200 space-y-12 px-6 py-4"> 48 48 + <div class="prose dark:text-gray-200 space-y-12 px-6 py-4 bg-white dark:bg-gray-800 rounded drop-shadow-sm"> 49 49 {{ template "feature" (list 50 50 (dict 51 51 "title" "lightweight git repo hosting"

+2 -4

appview/pages/templates/user/completeSignup.html

··· 29 29 </head> 30 30 <body class="flex items-center justify-center min-h-screen"> 31 31 <main class="max-w-md px-6 -mt-4"> 32 32 - <h1 33 33 - class="text-center text-2xl font-semibold italic dark:text-white" 34 34 - > 35 35 - tangled 32 32 + <h1 class="flex place-content-center text-2xl font-semibold italic dark:text-white" > 33 33 + {{ template "fragments/logotype" }} 36 34 </h1> 37 35 <h2 class="text-center text-xl italic dark:text-white"> 38 36 tightly-knit social coding.

+1 -2

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

··· 36 36 <div class="text-gray-400 text-sm font-mono inline-flex gap-4 mt-auto"> 37 37 {{ with .Language }} 38 38 <div class="flex gap-2 items-center text-sm"> 39 39 - <div class="size-2 rounded-full" 40 40 - style="background: radial-gradient(circle at 35% 35%, color-mix(in srgb, {{ langColor . }} 70%, white), {{ langColor . }} 30%, color-mix(in srgb, {{ langColor . }} 85%, black));"></div> 39 39 + {{ template "repo/fragments/languageBall" . }} 41 40 <span>{{ . }}</span> 42 41 </div> 43 42 {{ end }}

+2 -2

appview/pages/templates/user/login.html

··· 13 13 </head> 14 14 <body class="flex items-center justify-center min-h-screen"> 15 15 <main class="max-w-md px-6 -mt-4"> 16 16 - <h1 class="text-center text-2xl font-semibold italic dark:text-white" > 17 17 - tangled 16 16 + <h1 class="flex place-content-center text-2xl font-semibold italic dark:text-white" > 17 17 + {{ template "fragments/logotype" }} 18 18 </h1> 19 19 <h2 class="text-center text-xl italic dark:text-white"> 20 20 tightly-knit social coding.

+21 -10

appview/pages/templates/user/overview.html

··· 56 56 </summary> 57 57 <div class="py-2 text-sm flex flex-col gap-3 mb-2"> 58 58 {{ range . }} 59 59 - <div class="flex flex-wrap items-center gap-2"> 60 60 - <span class="text-gray-500 dark:text-gray-400"> 61 61 - {{ if .Source }} 59 59 + <div class="flex flex-wrap items-center justify-between gap-2"> 60 60 + <span class="flex items-center gap-2"> 61 61 + <span class="text-gray-500 dark:text-gray-400"> 62 62 + {{ if .Source }} 62 63 {{ i "git-fork" "w-4 h-4" }} 63 63 - {{ else }} 64 64 + {{ else }} 64 65 {{ i "book-plus" "w-4 h-4" }} 65 65 - {{ end }} 66 66 + {{ end }} 67 67 + </span> 68 68 + <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline"> 69 69 + {{- .Repo.Name -}} 70 70 + </a> 66 71 </span> 67 67 - <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline"> 68 68 - {{- .Repo.Name -}} 69 69 - </a> 72 72 + 73 73 + {{ with .Repo.RepoStats }} 74 74 + {{ with .Language }} 75 75 + <div class="flex gap-2 items-center text-xs font-mono text-gray-400 "> 76 76 + {{ template "repo/fragments/languageBall" . }} 77 77 + <span>{{ . }}</span> 78 78 + </div> 79 79 + {{end }} 80 80 + {{end }} 70 81 </div> 71 82 {{ end }} 72 83 </div> ··· 104 115 </summary> 105 116 <div class="py-2 text-sm flex flex-col gap-3 mb-2"> 106 117 {{ range $items }} 107 107 - {{ $repoOwner := resolve .Metadata.Repo.Did }} 108 108 - {{ $repoName := .Metadata.Repo.Name }} 118 118 + {{ $repoOwner := resolve .Repo.Did }} 119 119 + {{ $repoName := .Repo.Name }} 109 120 {{ $repoUrl := printf "%s/%s" $repoOwner $repoName }} 110 121 111 122 <div class="flex gap-2 text-gray-600 dark:text-gray-300">

+3 -1

appview/pages/templates/user/signup.html

··· 13 13 </head> 14 14 <body class="flex items-center justify-center min-h-screen"> 15 15 <main class="max-w-md px-6 -mt-4"> 16 16 - <h1 class="text-center text-2xl font-semibold italic dark:text-white" >tangled</h1> 16 16 + <h1 class="flex place-content-center text-2xl font-semibold italic dark:text-white" > 17 17 + {{ template "fragments/logotype" }} 18 18 + </h1> 17 19 <h2 class="text-center text-xl italic dark:text-white">tightly-knit social coding.</h2> 18 20 <form 19 21 class="mt-4 max-w-sm mx-auto"

+34 -1

appview/posthog/notifier.go

··· 58 58 59 59 func (n *posthogNotifier) NewIssue(ctx context.Context, issue *db.Issue) { 60 60 err := n.client.Enqueue(posthog.Capture{ 61 61 - DistinctId: issue.OwnerDid, 61 61 + DistinctId: issue.Did, 62 62 Event: "new_issue", 63 63 Properties: posthog.Properties{ 64 64 "repo_at": issue.RepoAt.String(), ··· 129 129 log.Println("failed to enqueue posthog event:", err) 130 130 } 131 131 } 132 132 + 133 133 + func (n *posthogNotifier) DeleteString(ctx context.Context, did, rkey string) { 134 134 + err := n.client.Enqueue(posthog.Capture{ 135 135 + DistinctId: did, 136 136 + Event: "delete_string", 137 137 + Properties: posthog.Properties{"rkey": rkey}, 138 138 + }) 139 139 + if err != nil { 140 140 + log.Println("failed to enqueue posthog event:", err) 141 141 + } 142 142 + } 143 143 + 144 144 + func (n *posthogNotifier) EditString(ctx context.Context, string *db.String) { 145 145 + err := n.client.Enqueue(posthog.Capture{ 146 146 + DistinctId: string.Did.String(), 147 147 + Event: "edit_string", 148 148 + Properties: posthog.Properties{"rkey": string.Rkey}, 149 149 + }) 150 150 + if err != nil { 151 151 + log.Println("failed to enqueue posthog event:", err) 152 152 + } 153 153 + } 154 154 + 155 155 + func (n *posthogNotifier) CreateString(ctx context.Context, string *db.String) { 156 156 + err := n.client.Enqueue(posthog.Capture{ 157 157 + DistinctId: string.Did.String(), 158 158 + Event: "create_string", 159 159 + Properties: posthog.Properties{"rkey": string.Rkey}, 160 160 + }) 161 161 + if err != nil { 162 162 + log.Println("failed to enqueue posthog event:", err) 163 163 + } 164 164 + }

+7 -2

appview/repo/feed.go

··· 9 9 "time" 10 10 11 11 "tangled.sh/tangled.sh/core/appview/db" 12 12 + "tangled.sh/tangled.sh/core/appview/pagination" 12 13 "tangled.sh/tangled.sh/core/appview/reporesolver" 13 14 14 15 "github.com/bluesky-social/indigo/atproto/syntax" ··· 23 24 return nil, err 24 25 } 25 26 26 26 - issues, err := db.GetIssuesWithLimit(rp.db, feedLimitPerType, db.FilterEq("repo_at", f.RepoAt())) 27 27 + issues, err := db.GetIssuesPaginated( 28 28 + rp.db, 29 29 + pagination.Page{Limit: feedLimitPerType}, 30 30 + db.FilterEq("repo_at", f.RepoAt()), 31 31 + ) 27 32 if err != nil { 28 33 return nil, err 29 34 } ··· 104 109 } 105 110 106 111 func (rp *Repo) createIssueItem(ctx context.Context, issue db.Issue, f *reporesolver.ResolvedRepo) (*feeds.Item, error) { 107 107 - owner, err := rp.idResolver.ResolveIdent(ctx, issue.OwnerDid) 112 112 + owner, err := rp.idResolver.ResolveIdent(ctx, issue.Did) 108 113 if err != nil { 109 114 return nil, err 110 115 }

+25 -54

appview/repo/index.go

··· 5 5 "fmt" 6 6 "log" 7 7 "net/http" 8 8 + "net/url" 8 9 "slices" 9 10 "sort" 10 11 "strings" ··· 31 32 32 33 func (rp *Repo) RepoIndex(w http.ResponseWriter, r *http.Request) { 33 34 ref := chi.URLParam(r, "ref") 35 35 + ref, _ = url.PathUnescape(ref) 34 36 35 37 f, err := rp.repoResolver.Resolve(r) 36 38 if err != nil { ··· 47 49 Host: host, 48 50 } 49 51 50 50 - var needsKnotUpgrade bool 52 52 + user := rp.oauth.GetUser(r) 53 53 + repoInfo := f.RepoInfo(user) 54 54 + 51 55 // Build index response from multiple XRPC calls 52 56 result, err := rp.buildIndexResponse(r.Context(), xrpcc, f, ref) 53 53 - if err != nil { 54 54 - if errors.Is(err, xrpcclient.ErrXrpcUnsupported) { 57 57 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 58 58 + if errors.Is(xrpcerr, xrpcclient.ErrXrpcUnsupported) { 55 59 log.Println("failed to call XRPC repo.index", err) 56 56 - needsKnotUpgrade = true 60 60 + rp.pages.RepoIndexPage(w, pages.RepoIndexParams{ 61 61 + LoggedInUser: user, 62 62 + NeedsKnotUpgrade: true, 63 63 + RepoInfo: repoInfo, 64 64 + }) 57 65 return 58 66 } 59 67 ··· 119 127 log.Println(err) 120 128 } 121 129 122 122 - user := rp.oauth.GetUser(r) 123 123 - repoInfo := f.RepoInfo(user) 124 124 - 125 130 // TODO: a bit dirty 126 131 languageInfo, err := rp.getLanguageInfo(r.Context(), f, xrpcc, result.Ref, ref == "") 127 132 if err != nil { ··· 141 146 142 147 rp.pages.RepoIndexPage(w, pages.RepoIndexParams{ 143 148 LoggedInUser: user, 144 144 - NeedsKnotUpgrade: needsKnotUpgrade, 145 149 RepoInfo: repoInfo, 146 150 TagMap: tagMap, 147 151 RepoIndexResponse: *result, ··· 243 247 // first get branches to determine the ref if not specified 244 248 branchesBytes, err := tangled.RepoBranches(ctx, xrpcc, "", 0, repo) 245 249 if err != nil { 246 246 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 247 247 - log.Println("failed to call XRPC repo.branches", xrpcerr) 248 248 - return nil, xrpcerr 249 249 - } 250 250 - return nil, err 250 250 + return nil, fmt.Errorf("failed to call repoBranches: %w", err) 251 251 } 252 252 253 253 var branchesResp types.RepoBranchesResponse 254 254 if err := json.Unmarshal(branchesBytes, &branchesResp); err != nil { 255 255 - return nil, err 255 255 + return nil, fmt.Errorf("failed to unmarshal branches response: %w", err) 256 256 } 257 257 258 258 // if no ref specified, use default branch or first available 259 259 - if ref == "" && len(branchesResp.Branches) > 0 { 259 259 + if ref == "" { 260 260 for _, branch := range branchesResp.Branches { 261 261 if branch.IsDefault { 262 262 ref = branch.Name 263 263 break 264 264 } 265 265 } 266 266 - if ref == "" { 267 267 - ref = branchesResp.Branches[0].Name 268 268 - } 269 266 } 270 267 271 271 - // check if repo is empty 272 272 - if len(branchesResp.Branches) == 0 { 268 268 + // if ref is still empty, this means the default branch is not set 269 269 + if ref == "" { 273 270 return &types.RepoIndexResponse{ 274 271 IsEmpty: true, 275 272 Branches: branchesResp.Branches, ··· 278 275 279 276 // now run the remaining queries in parallel 280 277 var wg sync.WaitGroup 281 281 - var mu sync.Mutex 282 282 - var errs []error 278 278 + var errs error 283 279 284 280 var ( 285 281 tagsResp types.RepoTagsResponse ··· 295 291 defer wg.Done() 296 292 tagsBytes, err := tangled.RepoTags(ctx, xrpcc, "", 0, repo) 297 293 if err != nil { 298 298 - mu.Lock() 299 299 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 300 300 - log.Println("failed to call XRPC repo.tags", xrpcerr) 301 301 - errs = append(errs, xrpcerr) 302 302 - } else { 303 303 - errs = append(errs, err) 304 304 - } 305 305 - mu.Unlock() 294 294 + errs = errors.Join(errs, fmt.Errorf("failed to call repoTags: %w", err)) 306 295 return 307 296 } 308 297 309 298 if err := json.Unmarshal(tagsBytes, &tagsResp); err != nil { 310 310 - mu.Lock() 311 311 - errs = append(errs, err) 312 312 - mu.Unlock() 299 299 + errs = errors.Join(errs, fmt.Errorf("failed to unmarshal repoTags: %w", err)) 313 300 } 314 301 }() 315 302 ··· 319 306 defer wg.Done() 320 307 resp, err := tangled.RepoTree(ctx, xrpcc, "", ref, repo) 321 308 if err != nil { 322 322 - mu.Lock() 323 323 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 324 324 - log.Println("failed to call XRPC repo.tree", xrpcerr) 325 325 - errs = append(errs, xrpcerr) 326 326 - } else { 327 327 - errs = append(errs, err) 328 328 - } 329 329 - mu.Unlock() 309 309 + errs = errors.Join(errs, fmt.Errorf("failed to call repoTree: %w", err)) 330 310 return 331 311 } 332 312 treeResp = resp ··· 338 318 defer wg.Done() 339 319 logBytes, err := tangled.RepoLog(ctx, xrpcc, "", 50, "", ref, repo) 340 320 if err != nil { 341 341 - mu.Lock() 342 342 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 343 343 - log.Println("failed to call XRPC repo.log", xrpcerr) 344 344 - errs = append(errs, xrpcerr) 345 345 - } else { 346 346 - errs = append(errs, err) 347 347 - } 348 348 - mu.Unlock() 321 321 + errs = errors.Join(errs, fmt.Errorf("failed to call repoLog: %w", err)) 349 322 return 350 323 } 351 324 352 325 if err := json.Unmarshal(logBytes, &logResp); err != nil { 353 353 - mu.Lock() 354 354 - errs = append(errs, err) 355 355 - mu.Unlock() 326 326 + errs = errors.Join(errs, fmt.Errorf("failed to unmarshal repoLog: %w", err)) 356 327 } 357 328 }() 358 329 ··· 378 349 379 350 wg.Wait() 380 351 381 381 - if len(errs) > 0 { 382 382 - return nil, errs[0] // return first error 352 352 + if errs != nil { 353 353 + return nil, errs 383 354 } 384 355 385 356 var files []types.NiceTree

+98 -120

appview/repo/repo.go

··· 11 11 "log/slog" 12 12 "net/http" 13 13 "net/url" 14 14 - "path" 15 14 "path/filepath" 16 15 "slices" 17 16 "strconv" ··· 86 85 } 87 86 88 87 func (rp *Repo) DownloadArchive(w http.ResponseWriter, r *http.Request) { 89 89 - refParam := chi.URLParam(r, "ref") 88 88 + ref := chi.URLParam(r, "ref") 89 89 + ref, _ = url.PathUnescape(ref) 90 90 + 90 91 f, err := rp.repoResolver.Resolve(r) 91 92 if err != nil { 92 93 log.Println("failed to get repo and knot", err) ··· 103 104 } 104 105 105 106 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 106 106 - archiveBytes, err := tangled.RepoArchive(r.Context(), xrpcc, "tar.gz", "", refParam, repo) 107 107 - if err != nil { 108 108 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 109 109 - log.Println("failed to call XRPC repo.archive", xrpcerr) 110 110 - rp.pages.Error503(w) 111 111 - return 112 112 - } 113 113 - rp.pages.Error404(w) 107 107 + archiveBytes, err := tangled.RepoArchive(r.Context(), xrpcc, "tar.gz", "", ref, repo) 108 108 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 109 109 + log.Println("failed to call XRPC repo.archive", xrpcerr) 110 110 + rp.pages.Error503(w) 114 111 return 115 112 } 116 113 117 117 - // Set headers for file download 118 118 - filename := fmt.Sprintf("%s-%s.tar.gz", f.Name, refParam) 114 114 + // Set headers for file download, just pass along whatever the knot specifies 115 115 + safeRefFilename := strings.ReplaceAll(plumbing.ReferenceName(ref).Short(), "/", "-") 116 116 + filename := fmt.Sprintf("%s-%s.tar.gz", f.Name, safeRefFilename) 119 117 w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename)) 120 118 w.Header().Set("Content-Type", "application/gzip") 121 119 w.Header().Set("Content-Length", fmt.Sprintf("%d", len(archiveBytes))) ··· 140 138 } 141 139 142 140 ref := chi.URLParam(r, "ref") 141 141 + ref, _ = url.PathUnescape(ref) 143 142 144 143 scheme := "http" 145 144 if !rp.config.Core.Dev { ··· 160 159 161 160 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 162 161 xrpcBytes, err := tangled.RepoLog(r.Context(), xrpcc, cursor, limit, "", ref, repo) 163 163 - if err != nil { 164 164 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 165 165 - log.Println("failed to call XRPC repo.log", xrpcerr) 166 166 - rp.pages.Error503(w) 167 167 - return 168 168 - } 169 169 - rp.pages.Error404(w) 162 162 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 163 163 + log.Println("failed to call XRPC repo.log", xrpcerr) 164 164 + rp.pages.Error503(w) 170 165 return 171 166 } 172 167 ··· 178 173 } 179 174 180 175 tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo) 181 181 - if err != nil { 182 182 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 183 183 - log.Println("failed to call XRPC repo.tags", xrpcerr) 184 184 - rp.pages.Error503(w) 185 185 - return 186 186 - } 176 176 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 177 177 + log.Println("failed to call XRPC repo.tags", xrpcerr) 178 178 + rp.pages.Error503(w) 179 179 + return 187 180 } 188 181 189 182 tagMap := make(map[string][]string) ··· 197 190 } 198 191 199 192 branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 200 200 - if err != nil { 201 201 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 202 202 - log.Println("failed to call XRPC repo.branches", xrpcerr) 203 203 - rp.pages.Error503(w) 204 204 - return 205 205 - } 193 193 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 194 194 + log.Println("failed to call XRPC repo.branches", xrpcerr) 195 195 + rp.pages.Error503(w) 196 196 + return 206 197 } 207 198 208 199 if branchBytes != nil { ··· 354 345 return 355 346 } 356 347 ref := chi.URLParam(r, "ref") 348 348 + ref, _ = url.PathUnescape(ref) 357 349 358 350 var diffOpts types.DiffOpts 359 351 if d := r.URL.Query().Get("diff"); d == "split" { ··· 376 368 377 369 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 378 370 xrpcBytes, err := tangled.RepoDiff(r.Context(), xrpcc, ref, repo) 379 379 - if err != nil { 380 380 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 381 381 - log.Println("failed to call XRPC repo.diff", xrpcerr) 382 382 - rp.pages.Error503(w) 383 383 - return 384 384 - } 385 385 - rp.pages.Error404(w) 371 371 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 372 372 + log.Println("failed to call XRPC repo.diff", xrpcerr) 373 373 + rp.pages.Error503(w) 386 374 return 387 375 } 388 376 ··· 434 422 } 435 423 436 424 ref := chi.URLParam(r, "ref") 437 437 - treePath := chi.URLParam(r, "*") 425 425 + ref, _ = url.PathUnescape(ref) 438 426 439 427 // if the tree path has a trailing slash, let's strip it 440 428 // so we don't 404 429 429 + treePath := chi.URLParam(r, "*") 430 430 + treePath, _ = url.PathUnescape(treePath) 441 431 treePath = strings.TrimSuffix(treePath, "/") 442 432 443 433 scheme := "http" ··· 451 441 452 442 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 453 443 xrpcResp, err := tangled.RepoTree(r.Context(), xrpcc, treePath, ref, repo) 454 454 - if err != nil { 455 455 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 456 456 - log.Println("failed to call XRPC repo.tree", xrpcerr) 457 457 - rp.pages.Error503(w) 458 458 - return 459 459 - } 460 460 - rp.pages.Error404(w) 444 444 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 445 445 + log.Println("failed to call XRPC repo.tree", xrpcerr) 446 446 + rp.pages.Error503(w) 461 447 return 462 448 } 463 449 ··· 499 485 500 486 // redirects tree paths trying to access a blob; in this case the result.Files is unpopulated, 501 487 // so we can safely redirect to the "parent" (which is the same file). 502 502 - unescapedTreePath, _ := url.PathUnescape(treePath) 503 503 - if len(result.Files) == 0 && result.Parent == unescapedTreePath { 504 504 - http.Redirect(w, r, fmt.Sprintf("/%s/blob/%s/%s", f.OwnerSlashRepo(), ref, result.Parent), http.StatusFound) 488 488 + if len(result.Files) == 0 && result.Parent == treePath { 489 489 + redirectTo := fmt.Sprintf("/%s/blob/%s/%s", f.OwnerSlashRepo(), url.PathEscape(ref), result.Parent) 490 490 + http.Redirect(w, r, redirectTo, http.StatusFound) 505 491 return 506 492 } 507 493 508 494 user := rp.oauth.GetUser(r) 509 495 510 496 var breadcrumbs [][]string 511 511 - breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), ref)}) 497 497 + breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), url.PathEscape(ref))}) 512 498 if treePath != "" { 513 499 for idx, elem := range strings.Split(treePath, "/") { 514 514 - breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], elem)}) 500 500 + breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], url.PathEscape(elem))}) 515 501 } 516 502 } 517 503 ··· 544 530 545 531 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 546 532 xrpcBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo) 547 547 - if err != nil { 548 548 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 549 549 - log.Println("failed to call XRPC repo.tags", xrpcerr) 550 550 - rp.pages.Error503(w) 551 551 - return 552 552 - } 553 553 - rp.pages.Error404(w) 533 533 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 534 534 + log.Println("failed to call XRPC repo.tags", xrpcerr) 535 535 + rp.pages.Error503(w) 554 536 return 555 537 } 556 538 ··· 617 599 618 600 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 619 601 xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 620 620 - if err != nil { 621 621 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 622 622 - log.Println("failed to call XRPC repo.branches", xrpcerr) 623 623 - rp.pages.Error503(w) 624 624 - return 625 625 - } 626 626 - rp.pages.Error404(w) 602 602 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 603 603 + log.Println("failed to call XRPC repo.branches", xrpcerr) 604 604 + rp.pages.Error503(w) 627 605 return 628 606 } 629 607 ··· 652 630 } 653 631 654 632 ref := chi.URLParam(r, "ref") 633 633 + ref, _ = url.PathUnescape(ref) 634 634 + 655 635 filePath := chi.URLParam(r, "*") 636 636 + filePath, _ = url.PathUnescape(filePath) 656 637 657 638 scheme := "http" 658 639 if !rp.config.Core.Dev { ··· 665 646 666 647 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Repo.Name) 667 648 resp, err := tangled.RepoBlob(r.Context(), xrpcc, filePath, false, ref, repo) 668 668 - if err != nil { 669 669 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 670 670 - log.Println("failed to call XRPC repo.blob", xrpcerr) 671 671 - rp.pages.Error503(w) 672 672 - return 673 673 - } 674 674 - rp.pages.Error404(w) 649 649 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 650 650 + log.Println("failed to call XRPC repo.blob", xrpcerr) 651 651 + rp.pages.Error503(w) 675 652 return 676 653 } 677 654 678 655 // Use XRPC response directly instead of converting to internal types 679 656 680 657 var breadcrumbs [][]string 681 681 - breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), ref)}) 658 658 + breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), url.PathEscape(ref))}) 682 659 if filePath != "" { 683 660 for idx, elem := range strings.Split(filePath, "/") { 684 684 - breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], elem)}) 661 661 + breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], url.PathEscape(elem))}) 685 662 } 686 663 } 687 664 ··· 710 687 } 711 688 712 689 // fetch the raw binary content using sh.tangled.repo.blob xrpc 713 713 - repoName := path.Join("%s/%s", f.OwnerDid(), f.Name) 714 714 - blobURL := fmt.Sprintf("%s://%s/xrpc/sh.tangled.repo.blob?repo=%s&ref=%s&path=%s&raw=true", 715 715 - scheme, f.Knot, url.QueryEscape(repoName), url.QueryEscape(ref), url.QueryEscape(filePath)) 690 690 + repoName := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 691 691 + 692 692 + baseURL := &url.URL{ 693 693 + Scheme: scheme, 694 694 + Host: f.Knot, 695 695 + Path: "/xrpc/sh.tangled.repo.blob", 696 696 + } 697 697 + query := baseURL.Query() 698 698 + query.Set("repo", repoName) 699 699 + query.Set("ref", ref) 700 700 + query.Set("path", filePath) 701 701 + query.Set("raw", "true") 702 702 + baseURL.RawQuery = query.Encode() 703 703 + blobURL := baseURL.String() 716 704 717 705 contentSrc = blobURL 718 706 if !rp.config.Core.Dev { ··· 767 755 } 768 756 769 757 ref := chi.URLParam(r, "ref") 758 758 + ref, _ = url.PathUnescape(ref) 759 759 + 770 760 filePath := chi.URLParam(r, "*") 761 761 + filePath, _ = url.PathUnescape(filePath) 771 762 772 763 scheme := "http" 773 764 if !rp.config.Core.Dev { ··· 775 766 } 776 767 777 768 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Repo.Name) 778 778 - blobURL := fmt.Sprintf("%s://%s/xrpc/sh.tangled.repo.blob?repo=%s&ref=%s&path=%s&raw=true", 779 779 - scheme, f.Knot, url.QueryEscape(repo), url.QueryEscape(ref), url.QueryEscape(filePath)) 769 769 + baseURL := &url.URL{ 770 770 + Scheme: scheme, 771 771 + Host: f.Knot, 772 772 + Path: "/xrpc/sh.tangled.repo.blob", 773 773 + } 774 774 + query := baseURL.Query() 775 775 + query.Set("repo", repo) 776 776 + query.Set("ref", ref) 777 777 + query.Set("path", filePath) 778 778 + query.Set("raw", "true") 779 779 + baseURL.RawQuery = query.Encode() 780 780 + blobURL := baseURL.String() 780 781 781 782 req, err := http.NewRequest("GET", blobURL, nil) 782 783 if err != nil { ··· 1365 1366 1366 1367 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 1367 1368 xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 1368 1368 - if err != nil { 1369 1369 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1370 1370 - log.Println("failed to call XRPC repo.branches", xrpcerr) 1371 1371 - rp.pages.Error503(w) 1372 1372 - return 1373 1373 - } 1369 1369 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1370 1370 + log.Println("failed to call XRPC repo.branches", xrpcerr) 1374 1371 rp.pages.Error503(w) 1375 1372 return 1376 1373 } ··· 1472 1469 1473 1470 func (rp *Repo) SyncRepoFork(w http.ResponseWriter, r *http.Request) { 1474 1471 ref := chi.URLParam(r, "ref") 1472 1472 + ref, _ = url.PathUnescape(ref) 1475 1473 1476 1474 user := rp.oauth.GetUser(r) 1477 1475 f, err := rp.repoResolver.Resolve(r) ··· 1760 1758 1761 1759 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 1762 1760 branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 1763 1763 - if err != nil { 1764 1764 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1765 1765 - log.Println("failed to call XRPC repo.branches", xrpcerr) 1766 1766 - rp.pages.Error503(w) 1767 1767 - return 1768 1768 - } 1769 1769 - rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.") 1761 1761 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1762 1762 + log.Println("failed to call XRPC repo.branches", xrpcerr) 1763 1763 + rp.pages.Error503(w) 1770 1764 return 1771 1765 } 1772 1766 ··· 1801 1795 } 1802 1796 1803 1797 tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo) 1804 1804 - if err != nil { 1805 1805 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1806 1806 - log.Println("failed to call XRPC repo.tags", xrpcerr) 1807 1807 - rp.pages.Error503(w) 1808 1808 - return 1809 1809 - } 1810 1810 - rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.") 1798 1798 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1799 1799 + log.Println("failed to call XRPC repo.tags", xrpcerr) 1800 1800 + rp.pages.Error503(w) 1811 1801 return 1812 1802 } 1813 1803 ··· 1878 1868 repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name) 1879 1869 1880 1870 branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 1881 1881 - if err != nil { 1882 1882 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1883 1883 - log.Println("failed to call XRPC repo.branches", xrpcerr) 1884 1884 - rp.pages.Error503(w) 1885 1885 - return 1886 1886 - } 1887 1887 - rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.") 1871 1871 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1872 1872 + log.Println("failed to call XRPC repo.branches", xrpcerr) 1873 1873 + rp.pages.Error503(w) 1888 1874 return 1889 1875 } 1890 1876 ··· 1896 1882 } 1897 1883 1898 1884 tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo) 1899 1899 - if err != nil { 1900 1900 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1901 1901 - log.Println("failed to call XRPC repo.tags", xrpcerr) 1902 1902 - rp.pages.Error503(w) 1903 1903 - return 1904 1904 - } 1905 1905 - rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.") 1885 1885 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1886 1886 + log.Println("failed to call XRPC repo.tags", xrpcerr) 1887 1887 + rp.pages.Error503(w) 1906 1888 return 1907 1889 } 1908 1890 ··· 1914 1896 } 1915 1897 1916 1898 compareBytes, err := tangled.RepoCompare(r.Context(), xrpcc, repo, base, head) 1917 1917 - if err != nil { 1918 1918 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1919 1919 - log.Println("failed to call XRPC repo.compare", xrpcerr) 1920 1920 - rp.pages.Error503(w) 1921 1921 - return 1922 1922 - } 1923 1923 - rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.") 1899 1899 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1900 1900 + log.Println("failed to call XRPC repo.compare", xrpcerr) 1901 1901 + rp.pages.Error503(w) 1924 1902 return 1925 1903 } 1926 1904

+11 -27

appview/serververify/verify.go

··· 4 4 "context" 5 5 "errors" 6 6 "fmt" 7 7 - "io" 8 8 - "net/http" 9 9 - "strings" 10 10 - "time" 11 7 8 8 + indigoxrpc "github.com/bluesky-social/indigo/xrpc" 9 9 + "tangled.sh/tangled.sh/core/api/tangled" 12 10 "tangled.sh/tangled.sh/core/appview/db" 11 11 + "tangled.sh/tangled.sh/core/appview/xrpcclient" 13 12 "tangled.sh/tangled.sh/core/rbac" 14 13 ) 15 14 ··· 24 23 scheme = "http" 25 24 } 26 25 27 27 - url := fmt.Sprintf("%s://%s/owner", scheme, domain) 28 28 - req, err := http.NewRequest("GET", url, nil) 29 29 - if err != nil { 30 30 - return "", err 31 31 - } 32 32 - 33 33 - client := &http.Client{ 34 34 - Timeout: 1 * time.Second, 35 35 - } 36 36 - 37 37 - resp, err := client.Do(req.WithContext(ctx)) 38 38 - if err != nil || resp.StatusCode != 200 { 39 39 - return "", fmt.Errorf("failed to fetch /owner") 26 26 + host := fmt.Sprintf("%s://%s", scheme, domain) 27 27 + xrpcc := &indigoxrpc.Client{ 28 28 + Host: host, 40 29 } 41 30 42 42 - body, err := io.ReadAll(io.LimitReader(resp.Body, 1024)) // read atmost 1kb of data 43 43 - if err != nil { 44 44 - return "", fmt.Errorf("failed to read /owner response: %w", err) 31 31 + res, err := tangled.Owner(ctx, xrpcc) 32 32 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 33 33 + return "", xrpcerr 45 34 } 46 35 47 47 - did := strings.TrimSpace(string(body)) 48 48 - if did == "" { 49 49 - return "", fmt.Errorf("empty DID in /owner response") 50 50 - } 51 51 - 52 52 - return did, nil 36 36 + return res.Owner, nil 53 37 } 54 38 55 39 type OwnerMismatch struct { ··· 65 49 func RunVerification(ctx context.Context, domain, expectedOwner string, dev bool) error { 66 50 observedOwner, err := fetchOwner(ctx, domain, dev) 67 51 if err != nil { 68 68 - return fmt.Errorf("%w: %w", FetchError, err) 52 52 + return err 69 53 } 70 54 71 55 if observedOwner != expectedOwner {

+4 -3

appview/spindles/spindles.go

··· 16 16 "tangled.sh/tangled.sh/core/appview/oauth" 17 17 "tangled.sh/tangled.sh/core/appview/pages" 18 18 "tangled.sh/tangled.sh/core/appview/serververify" 19 19 + "tangled.sh/tangled.sh/core/appview/xrpcclient" 19 20 "tangled.sh/tangled.sh/core/idresolver" 20 21 "tangled.sh/tangled.sh/core/rbac" 21 22 "tangled.sh/tangled.sh/core/tid" ··· 404 405 if err != nil { 405 406 l.Error("verification failed", "err", err) 406 407 407 407 - if errors.Is(err, serververify.FetchError) { 408 408 - s.Pages.Notice(w, noticeId, "Failed to verify knot, unable to fetch owner.") 408 408 + if errors.Is(err, xrpcclient.ErrXrpcUnsupported) { 409 409 + s.Pages.Notice(w, noticeId, "Failed to verify spindle, XRPC queries are unsupported on this spindle, consider upgrading!") 409 410 return 410 411 } 411 412 ··· 442 443 } 443 444 444 445 w.Header().Set("HX-Reswap", "outerHTML") 445 445 - s.Pages.SpindleListing(w, pages.SpindleListingParams{verifiedSpindle[0]}) 446 446 + s.Pages.SpindleListing(w, pages.SpindleListingParams{Spindle: verifiedSpindle[0]}) 446 447 } 447 448 448 449 func (s *Spindles) addMember(w http.ResponseWriter, r *http.Request) {

+14 -13

appview/state/profile.go

··· 17 17 "github.com/gorilla/feeds" 18 18 "tangled.sh/tangled.sh/core/api/tangled" 19 19 "tangled.sh/tangled.sh/core/appview/db" 20 20 - // "tangled.sh/tangled.sh/core/appview/oauth" 21 20 "tangled.sh/tangled.sh/core/appview/pages" 22 21 ) 23 22 ··· 284 283 l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle) 285 284 286 285 loggedInUser := s.oauth.GetUser(r) 286 286 + params := FollowsPageParams{ 287 287 + Card: profile, 288 288 + } 287 289 288 290 follows, err := fetchFollows(s.db, profile.UserDid) 289 291 if err != nil { 290 292 l.Error("failed to fetch follows", "err", err) 291 291 - return nil, err 293 293 + return &params, err 292 294 } 293 295 294 296 if len(follows) == 0 { 295 295 - return nil, nil 297 297 + return &params, nil 296 298 } 297 299 298 300 followDids := make([]string, 0, len(follows)) ··· 303 305 profiles, err := db.GetProfiles(s.db, db.FilterIn("did", followDids)) 304 306 if err != nil { 305 307 l.Error("failed to get profiles", "followDids", followDids, "err", err) 306 306 - return nil, err 308 308 + return &params, err 307 309 } 308 310 309 311 followStatsMap, err := db.GetFollowerFollowingCounts(s.db, followDids) ··· 316 318 following, err := db.GetFollowing(s.db, loggedInUser.Did) 317 319 if err != nil { 318 320 l.Error("failed to get follow list", "err", err, "loggedInUser", loggedInUser.Did) 319 319 - return nil, err 321 321 + return &params, err 320 322 } 321 323 loggedInUserFollowing = make(map[string]struct{}, len(following)) 322 324 for _, follow := range following { ··· 350 352 } 351 353 } 352 354 353 353 - return &FollowsPageParams{ 354 354 - Follows: followCards, 355 355 - Card: profile, 356 356 - }, nil 355 355 + params.Follows = followCards 356 356 + 357 357 + return &params, nil 357 358 } 358 359 359 360 func (s *State) followersPage(w http.ResponseWriter, r *http.Request) { ··· 467 468 468 469 func (s *State) addIssueItems(ctx context.Context, feed *feeds.Feed, issues []*db.Issue, author *feeds.Author) error { 469 470 for _, issue := range issues { 470 470 - owner, err := s.idResolver.ResolveIdent(ctx, issue.Metadata.Repo.Did) 471 471 + owner, err := s.idResolver.ResolveIdent(ctx, issue.Repo.Did) 471 472 if err != nil { 472 473 return err 473 474 } ··· 499 500 500 501 func (s *State) createIssueItem(issue *db.Issue, owner *identity.Identity, author *feeds.Author) *feeds.Item { 501 502 return &feeds.Item{ 502 502 - Title: fmt.Sprintf("%s created issue '%s' in @%s/%s", author.Name, issue.Title, owner.Handle, issue.Metadata.Repo.Name), 503 503 - Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s/issues/%d", s.config.Core.AppviewHost, owner.Handle, issue.Metadata.Repo.Name, issue.IssueId), Type: "text/html", Rel: "alternate"}, 503 503 + Title: fmt.Sprintf("%s created issue '%s' in @%s/%s", author.Name, issue.Title, owner.Handle, issue.Repo.Name), 504 504 + Link: &feeds.Link{Href: fmt.Sprintf("%s/@%s/%s/issues/%d", s.config.Core.AppviewHost, owner.Handle, issue.Repo.Name, issue.IssueId), Type: "text/html", Rel: "alternate"}, 504 505 Created: issue.Created, 505 506 Author: author, 506 507 } ··· 701 702 log.Printf("getting profile data for %s: %s", user.Did, err) 702 703 } 703 704 704 704 - repos, err := db.GetAllReposByDid(s.db, user.Did) 705 705 + repos, err := db.GetRepos(s.db, 0, db.FilterEq("did", user.Did)) 705 706 if err != nil { 706 707 log.Printf("getting repos for %s: %s", user.Did, err) 707 708 }

+2 -1

appview/state/router.go

··· 113 113 114 114 r.Get("/", s.HomeOrTimeline) 115 115 r.Get("/timeline", s.Timeline) 116 116 + r.With(middleware.AuthMiddleware(s.oauth)).Get("/upgradeBanner", s.UpgradeBanner) 116 117 117 118 r.Route("/repo", func(r chi.Router) { 118 119 r.Route("/new", func(r chi.Router) { ··· 231 232 } 232 233 233 234 func (s *State) IssuesRouter(mw *middleware.Middleware) http.Handler { 234 234 - issues := issues.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.notifier) 235 235 + issues := issues.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.notifier, s.validator) 235 236 return issues.Router(mw) 236 237 } 237 238

+46 -6

appview/state/state.go

··· 28 28 "tangled.sh/tangled.sh/core/appview/pages" 29 29 posthogService "tangled.sh/tangled.sh/core/appview/posthog" 30 30 "tangled.sh/tangled.sh/core/appview/reporesolver" 31 31 + "tangled.sh/tangled.sh/core/appview/validator" 31 32 xrpcclient "tangled.sh/tangled.sh/core/appview/xrpcclient" 32 33 "tangled.sh/tangled.sh/core/eventconsumer" 33 34 "tangled.sh/tangled.sh/core/idresolver" ··· 53 54 knotstream *eventconsumer.Consumer 54 55 spindlestream *eventconsumer.Consumer 55 56 logger *slog.Logger 57 57 + validator *validator.Validator 56 58 } 57 59 58 60 func Make(ctx context.Context, config *config.Config) (*State, error) { ··· 73 75 } 74 76 75 77 pgs := pages.NewPages(config, res) 76 76 - 77 78 cache := cache.New(config.Redis.Addr) 78 79 sess := session.New(cache) 79 79 - 80 80 oauth := oauth.NewOAuth(config, sess) 81 81 + validator := validator.New(d) 81 82 82 83 posthog, err := posthog.NewWithConfig(config.Posthog.ApiKey, posthog.Config{Endpoint: config.Posthog.Endpoint}) 83 84 if err != nil { ··· 121 122 IdResolver: res, 122 123 Config: config, 123 124 Logger: tlog.New("ingester"), 125 125 + Validator: validator, 124 126 } 125 127 err = jc.StartJetstream(ctx, ingester.Ingest()) 126 128 if err != nil { ··· 160 162 knotstream, 161 163 spindlestream, 162 164 slog.Default(), 165 165 + validator, 163 166 } 164 167 165 168 return state, nil 166 169 } 167 170 171 171 + func (s *State) Close() error { 172 172 + // other close up logic goes here 173 173 + return s.db.Close() 174 174 + } 175 175 + 168 176 func (s *State) Favicon(w http.ResponseWriter, r *http.Request) { 169 177 w.Header().Set("Content-Type", "image/svg+xml") 170 178 w.Header().Set("Cache-Control", "public, max-age=31536000") // one year ··· 223 231 }) 224 232 } 225 233 234 234 + func (s *State) UpgradeBanner(w http.ResponseWriter, r *http.Request) { 235 235 + user := s.oauth.GetUser(r) 236 236 + l := s.logger.With("handler", "UpgradeBanner") 237 237 + l = l.With("did", user.Did) 238 238 + l = l.With("handle", user.Handle) 239 239 + 240 240 + regs, err := db.GetRegistrations( 241 241 + s.db, 242 242 + db.FilterEq("did", user.Did), 243 243 + db.FilterEq("needs_upgrade", 1), 244 244 + ) 245 245 + if err != nil { 246 246 + l.Error("non-fatal: failed to get registrations", "err", err) 247 247 + } 248 248 + 249 249 + spindles, err := db.GetSpindles( 250 250 + s.db, 251 251 + db.FilterEq("owner", user.Did), 252 252 + db.FilterEq("needs_upgrade", 1), 253 253 + ) 254 254 + if err != nil { 255 255 + l.Error("non-fatal: failed to get spindles", "err", err) 256 256 + } 257 257 + 258 258 + if regs == nil && spindles == nil { 259 259 + return 260 260 + } 261 261 + 262 262 + s.pages.UpgradeBanner(w, pages.UpgradeBannerParams{ 263 263 + Registrations: regs, 264 264 + Spindles: spindles, 265 265 + }) 266 266 + } 267 267 + 226 268 func (s *State) Home(w http.ResponseWriter, r *http.Request) { 227 227 - timeline, err := db.MakeTimeline(s.db, 15) 269 269 + timeline, err := db.MakeTimeline(s.db, 5) 228 270 if err != nil { 229 271 log.Println(err) 230 272 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.") ··· 237 279 s.pages.Notice(w, "topstarredrepos", "Unable to load.") 238 280 return 239 281 } 240 240 - 241 241 - timeline = timeline[:5] 242 282 243 283 s.pages.Home(w, pages.TimelineParams{ 244 284 LoggedInUser: nil, ··· 275 315 276 316 for _, k := range pubKeys { 277 317 key := strings.TrimRight(k.Key, "\n") 278 278 - w.Write([]byte(fmt.Sprintln(key))) 318 318 + fmt.Fprintln(w, key) 279 319 } 280 320 } 281 321

+8

appview/strings/strings.go

··· 12 12 "tangled.sh/tangled.sh/core/appview/config" 13 13 "tangled.sh/tangled.sh/core/appview/db" 14 14 "tangled.sh/tangled.sh/core/appview/middleware" 15 15 + "tangled.sh/tangled.sh/core/appview/notify" 15 16 "tangled.sh/tangled.sh/core/appview/oauth" 16 17 "tangled.sh/tangled.sh/core/appview/pages" 17 18 "tangled.sh/tangled.sh/core/appview/pages/markup" ··· 36 37 IdResolver *idresolver.Resolver 37 38 Logger *slog.Logger 38 39 Knotstream *eventconsumer.Consumer 40 40 + Notifier notify.Notifier 39 41 } 40 42 41 43 func (s *Strings) Router(mw *middleware.Middleware) http.Handler { ··· 284 286 return 285 287 } 286 288 289 289 + s.Notifier.EditString(r.Context(), &entry) 290 290 + 287 291 // if that went okay, redir to the string 288 292 s.Pages.HxRedirect(w, "/strings/"+user.Handle+"/"+entry.Rkey) 289 293 } ··· 358 362 return 359 363 } 360 364 365 365 + s.Notifier.NewString(r.Context(), &string) 366 366 + 361 367 // successful 362 368 s.Pages.HxRedirect(w, "/strings/"+user.Handle+"/"+string.Rkey) 363 369 } ··· 399 405 fail("Failed to delete string.", err) 400 406 return 401 407 } 408 408 + 409 409 + s.Notifier.DeleteString(r.Context(), user.Did, rkey) 402 410 403 411 s.Pages.HxRedirect(w, "/strings/"+user.Handle) 404 412 }

+53

appview/validator/issue.go

··· 1 1 + package validator 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "strings" 6 6 + 7 7 + "tangled.sh/tangled.sh/core/appview/db" 8 8 + ) 9 9 + 10 10 + func (v *Validator) ValidateIssueComment(comment *db.IssueComment) error { 11 11 + // if comments have parents, only ingest ones that are 1 level deep 12 12 + if comment.ReplyTo != nil { 13 13 + parents, err := db.GetIssueComments(v.db, db.FilterEq("at_uri", *comment.ReplyTo)) 14 14 + if err != nil { 15 15 + return fmt.Errorf("failed to fetch parent comment: %w", err) 16 16 + } 17 17 + if len(parents) != 1 { 18 18 + return fmt.Errorf("incorrect number of parent comments returned: %d", len(parents)) 19 19 + } 20 20 + 21 21 + // depth check 22 22 + parent := parents[0] 23 23 + if parent.ReplyTo != nil { 24 24 + return fmt.Errorf("incorrect depth, this comment is replying at depth >1") 25 25 + } 26 26 + } 27 27 + 28 28 + if sb := strings.TrimSpace(v.sanitizer.SanitizeDefault(comment.Body)); sb == "" { 29 29 + return fmt.Errorf("body is empty after HTML sanitization") 30 30 + } 31 31 + 32 32 + return nil 33 33 + } 34 34 + 35 35 + func (v *Validator) ValidateIssue(issue *db.Issue) error { 36 36 + if issue.Title == "" { 37 37 + return fmt.Errorf("issue title is empty") 38 38 + } 39 39 + 40 40 + if issue.Body == "" { 41 41 + return fmt.Errorf("issue body is empty") 42 42 + } 43 43 + 44 44 + if st := strings.TrimSpace(v.sanitizer.SanitizeDescription(issue.Title)); st == "" { 45 45 + return fmt.Errorf("title is empty after HTML sanitization") 46 46 + } 47 47 + 48 48 + if sb := strings.TrimSpace(v.sanitizer.SanitizeDefault(issue.Body)); sb == "" { 49 49 + return fmt.Errorf("body is empty after HTML sanitization") 50 50 + } 51 51 + 52 52 + return nil 53 53 + }

+18

appview/validator/validator.go

··· 1 1 + package validator 2 2 + 3 3 + import ( 4 4 + "tangled.sh/tangled.sh/core/appview/db" 5 5 + "tangled.sh/tangled.sh/core/appview/pages/markup" 6 6 + ) 7 7 + 8 8 + type Validator struct { 9 9 + db *db.DB 10 10 + sanitizer markup.Sanitizer 11 11 + } 12 12 + 13 13 + func New(db *db.DB) *Validator { 14 14 + return &Validator{ 15 15 + db: db, 16 16 + sanitizer: markup.NewSanitizer(), 17 17 + } 18 18 + }

+3

cmd/appview/main.go

··· 23 23 } 24 24 25 25 state, err := state.Make(ctx, c) 26 26 + defer func() { 27 27 + log.Println(state.Close()) 28 28 + }() 26 29 27 30 if err != nil { 28 31 log.Fatal(err)

+44

contrib/Tiltfile

··· 1 1 + common_env = { 2 2 + "TANGLED_VM_SPINDLE_OWNER": os.getenv("TANGLED_VM_SPINDLE_OWNER", default=""), 3 3 + "TANGLED_VM_KNOT_OWNER": os.getenv("TANGLED_VM_KNOT_OWNER", default=""), 4 4 + "TANGLED_DB_PATH": os.getenv("TANGLED_DB_PATH", default="dev.db"), 5 5 + "TANGLED_DEV": os.getenv("TANGLED_DEV", default="true"), 6 6 + } 7 7 + 8 8 + nix_globs = ["nix/**", "flake.nix", "flake.lock"] 9 9 + 10 10 + local_resource( 11 11 + name="appview", 12 12 + serve_cmd="nix run .#watch-appview", 13 13 + serve_dir="..", 14 14 + deps=nix_globs, 15 15 + env=common_env, 16 16 + allow_parallel=True, 17 17 + ) 18 18 + 19 19 + local_resource( 20 20 + name="tailwind", 21 21 + serve_cmd="nix run .#watch-tailwind", 22 22 + serve_dir="..", 23 23 + deps=nix_globs, 24 24 + env=common_env, 25 25 + allow_parallel=True, 26 26 + ) 27 27 + 28 28 + local_resource( 29 29 + name="redis", 30 30 + serve_cmd="redis-server", 31 31 + serve_dir="..", 32 32 + deps=nix_globs, 33 33 + env=common_env, 34 34 + allow_parallel=True, 35 35 + ) 36 36 + 37 37 + local_resource( 38 38 + name="vm", 39 39 + serve_cmd="nix run --impure .#vm", 40 40 + serve_dir="..", 41 41 + deps=nix_globs, 42 42 + env=common_env, 43 43 + allow_parallel=True, 44 44 + )

+16

default.nix

··· 1 1 + # Default setup from https://git.lix.systems/lix-project/flake-compat 2 2 + let 3 3 + lockFile = builtins.fromJSON (builtins.readFile ./flake.lock); 4 4 + flake-compat-node = lockFile.nodes.${lockFile.nodes.root.inputs.flake-compat}; 5 5 + flake-compat = builtins.fetchTarball { 6 6 + inherit (flake-compat-node.locked) url; 7 7 + sha256 = flake-compat-node.locked.narHash; 8 8 + }; 9 9 + 10 10 + flake = ( 11 11 + import flake-compat { 12 12 + src = ./.; 13 13 + } 14 14 + ); 15 15 + in 16 16 + flake.defaultNix

-35

docs/migrations/knot-1.7.0.md

··· 1 1 - # Upgrading from v1.7.0 2 2 - 3 3 - After v1.7.0, knot secrets have been deprecated. You no 4 4 - longer need a secret from the appview to run a knot. All 5 5 - authorized commands to knots are managed via [Inter-Service 6 6 - Authentication](https://atproto.com/specs/xrpc#inter-service-authentication-jwt). 7 7 - Knots will be read-only until upgraded. 8 8 - 9 9 - Upgrading is quite easy, in essence: 10 10 - 11 11 - - `KNOT_SERVER_SECRET` is no more, you can remove this 12 12 - environment variable entirely 13 13 - - `KNOT_SERVER_OWNER` is now required on boot, set this to 14 14 - your DID. You can find your DID in the 15 15 - [settings](https://tangled.sh/settings) page. 16 16 - - Restart your knot once you have replaced the environment 17 17 - variable 18 18 - - Head to the [knot dashboard](https://tangled.sh/knots) and 19 19 - hit the "retry" button to verify your knot. This simply 20 20 - writes a `sh.tangled.knot` record to your PDS. 21 21 - 22 22 - ## Nix 23 23 - 24 24 - If you use the nix module, simply bump the flake to the 25 25 - latest revision, and change your config block like so: 26 26 - 27 27 - ```diff 28 28 - services.tangled-knot = { 29 29 - enable = true; 30 30 - server = { 31 31 - - secretFile = /path/to/secret; 32 32 - + owner = "did:plc:foo"; 33 33 - }; 34 34 - }; 35 35 - ```

+60

docs/migrations.md

··· 1 1 + # Migrations 2 2 + 3 3 + This document is laid out in reverse-chronological order. 4 4 + Newer migration guides are listed first, and older guides 5 5 + are further down the page. 6 6 + 7 7 + ## Upgrading from v1.8.x 8 8 + 9 9 + After v1.8.2, the HTTP API for knot and spindles have been 10 10 + deprecated and replaced with XRPC. Repositories on outdated 11 11 + knots will not be viewable from the appview. Upgrading is 12 12 + straightforward however. 13 13 + 14 14 + For knots: 15 15 + 16 16 + - Upgrade to latest tag (v1.9.0 or above) 17 17 + - Head to the [knot dashboard](https://tangled.sh/knots) and 18 18 + hit the "retry" button to verify your knot 19 19 + 20 20 + For spindles: 21 21 + 22 22 + - Upgrade to latest tag (v1.9.0 or above) 23 23 + - Head to the [spindle 24 24 + dashboard](https://tangled.sh/spindles) and hit the 25 25 + "retry" button to verify your spindle 26 26 + 27 27 + ## Upgrading from v1.7.x 28 28 + 29 29 + After v1.7.0, knot secrets have been deprecated. You no 30 30 + longer need a secret from the appview to run a knot. All 31 31 + authorized commands to knots are managed via [Inter-Service 32 32 + Authentication](https://atproto.com/specs/xrpc#inter-service-authentication-jwt). 33 33 + Knots will be read-only until upgraded. 34 34 + 35 35 + Upgrading is quite easy, in essence: 36 36 + 37 37 + - `KNOT_SERVER_SECRET` is no more, you can remove this 38 38 + environment variable entirely 39 39 + - `KNOT_SERVER_OWNER` is now required on boot, set this to 40 40 + your DID. You can find your DID in the 41 41 + [settings](https://tangled.sh/settings) page. 42 42 + - Restart your knot once you have replaced the environment 43 43 + variable 44 44 + - Head to the [knot dashboard](https://tangled.sh/knots) and 45 45 + hit the "retry" button to verify your knot. This simply 46 46 + writes a `sh.tangled.knot` record to your PDS. 47 47 + 48 48 + If you use the nix module, simply bump the flake to the 49 49 + latest revision, and change your config block like so: 50 50 + 51 51 + ```diff 52 52 + services.tangled-knot = { 53 53 + enable = true; 54 54 + server = { 55 55 + - secretFile = /path/to/secret; 56 56 + + owner = "did:plc:foo"; 57 57 + }; 58 58 + }; 59 59 + ``` 60 60 +

+15

flake.lock

··· 1 1 { 2 2 "nodes": { 3 3 + "flake-compat": { 4 4 + "flake": false, 5 5 + "locked": { 6 6 + "lastModified": 1751685974, 7 7 + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", 8 8 + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", 9 9 + "type": "tarball", 10 10 + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" 11 11 + }, 12 12 + "original": { 13 13 + "type": "tarball", 14 14 + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" 15 15 + } 16 16 + }, 3 17 "flake-utils": { 4 18 "inputs": { 5 19 "systems": "systems" ··· 136 150 }, 137 151 "root": { 138 152 "inputs": { 153 153 + "flake-compat": "flake-compat", 139 154 "gomod2nix": "gomod2nix", 140 155 "htmx-src": "htmx-src", 141 156 "htmx-ws-src": "htmx-ws-src",

+7 -1

flake.nix

··· 7 7 url = "github:nix-community/gomod2nix"; 8 8 inputs.nixpkgs.follows = "nixpkgs"; 9 9 }; 10 10 + flake-compat = { 11 11 + url = "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"; 12 12 + flake = false; 13 13 + }; 10 14 indigo = { 11 15 url = "github:oppiliappan/indigo"; 12 16 flake = false; ··· 50 54 inter-fonts-src, 51 55 sqlite-lib-src, 52 56 ibm-plex-mono-src, 57 57 + ... 53 58 }: let 54 59 supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; 55 60 forAllSystems = nixpkgs.lib.genAttrs supportedSystems; ··· 146 151 nativeBuildInputs = [ 147 152 pkgs.go 148 153 pkgs.air 154 154 + pkgs.tilt 149 155 pkgs.gopls 150 156 pkgs.httpie 151 157 pkgs.litecli ··· 182 188 tailwind-watcher = 183 189 pkgs.writeShellScriptBin "run" 184 190 '' 185 185 - ${pkgs.tailwindcss}/bin/tailwindcss -w -i input.css -o ./appview/pages/static/tw.css 191 191 + ${pkgs.tailwindcss}/bin/tailwindcss --watch=always -i input.css -o ./appview/pages/static/tw.css 186 192 ''; 187 193 in { 188 194 fmt = {

+3 -6

input.css

··· 90 90 } 91 91 92 92 label { 93 93 - @apply block mb-2 text-gray-900 text-sm font-bold py-2 uppercase dark:text-gray-100; 93 93 + @apply block text-gray-900 text-sm font-bold py-2 uppercase dark:text-gray-100; 94 94 } 95 95 input { 96 96 @apply border border-gray-400 block rounded bg-gray-50 focus:ring-black p-3 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:focus:ring-gray-400; ··· 228 228 } 229 229 /* LineHighlight */ 230 230 .chroma .hl { 231 231 - background-color: #bcc0cc; 231 231 + @apply bg-amber-400/30 dark:bg-amber-500/20; 232 232 } 233 233 + 233 234 /* LineNumbersTable */ 234 235 .chroma .lnt { 235 236 white-space: pre; ··· 864 865 text-decoration: underline; 865 866 } 866 867 } 867 867 - 868 868 - .chroma .line:has(.ln:target) { 869 869 - @apply bg-amber-400/30 dark:bg-amber-500/20; 870 870 - }

+4 -1

knotserver/git/language.go

··· 3 3 import ( 4 4 "context" 5 5 "path" 6 6 + "strings" 6 7 7 8 "github.com/go-enry/go-enry/v2" 8 9 "github.com/go-git/go-git/v5/plumbing/object" ··· 20 21 return nil 21 22 } 22 23 23 23 - if enry.IsGenerated(filepath, content) { 24 24 + if enry.IsGenerated(filepath, content) || 25 25 + enry.IsBinary(content) || 26 26 + strings.HasSuffix(filepath, "bun.lock") { 24 27 return nil 25 28 } 26 29

+1 -60

knotserver/router.go

··· 5 5 "fmt" 6 6 "log/slog" 7 7 "net/http" 8 8 - "runtime/debug" 9 8 10 9 "github.com/go-chi/chi/v5" 11 10 "tangled.sh/tangled.sh/core/idresolver" ··· 72 71 w.Write([]byte("This is a knot server. More info at https://tangled.sh")) 73 72 }) 74 73 75 75 - owner := func(w http.ResponseWriter, r *http.Request) { 76 76 - w.Write([]byte(h.c.Server.Owner)) 77 77 - } 78 78 - // Deprecated: the sh.tangled.knot.owner xrpc call should be used instead 79 79 - r.Get("/owner", owner) 80 80 - 81 74 r.Route("/{did}", func(r chi.Router) { 82 75 r.Route("/{name}", func(r chi.Router) { 83 76 // routes for git operations ··· 88 81 }) 89 82 90 83 // xrpc apis 91 91 - r.Route("/xrpc", func(r chi.Router) { 92 92 - r.Get("/_health", h.Version) 93 93 - r.Get("/sh.tangled.knot.owner", owner) 94 94 - r.Mount("/", h.XrpcRouter()) 95 95 - }) 84 84 + r.Mount("/xrpc", h.XrpcRouter()) 96 85 97 86 // Socket that streams git oplogs 98 87 r.Get("/events", h.Events) ··· 116 105 ServiceAuth: serviceAuth, 117 106 } 118 107 return xrpc.Router() 119 119 - } 120 120 - 121 121 - // version is set during build time. 122 122 - var version string 123 123 - 124 124 - func (h *Knot) Version(w http.ResponseWriter, r *http.Request) { 125 125 - if version == "" { 126 126 - info, ok := debug.ReadBuildInfo() 127 127 - if !ok { 128 128 - http.Error(w, "failed to read build info", http.StatusInternalServerError) 129 129 - return 130 130 - } 131 131 - 132 132 - var modVer string 133 133 - var sha string 134 134 - var modified bool 135 135 - 136 136 - for _, mod := range info.Deps { 137 137 - if mod.Path == "tangled.sh/tangled.sh/knotserver" { 138 138 - modVer = mod.Version 139 139 - break 140 140 - } 141 141 - } 142 142 - 143 143 - for _, setting := range info.Settings { 144 144 - switch setting.Key { 145 145 - case "vcs.revision": 146 146 - sha = setting.Value 147 147 - case "vcs.modified": 148 148 - modified = setting.Value == "true" 149 149 - } 150 150 - } 151 151 - 152 152 - if modVer == "" { 153 153 - modVer = "unknown" 154 154 - } 155 155 - 156 156 - if sha == "" { 157 157 - version = modVer 158 158 - } else if modified { 159 159 - version = fmt.Sprintf("%s (%s with modifications)", modVer, sha) 160 160 - } else { 161 161 - version = fmt.Sprintf("%s (%s)", modVer, sha) 162 162 - } 163 163 - } 164 164 - 165 165 - w.Header().Set("Content-Type", "text/plain; charset=utf-8") 166 166 - fmt.Fprintf(w, "knotserver/%s", version) 167 108 } 168 109 169 110 func (h *Knot) configureOwner() error {

+1 -10

knotserver/xrpc/list_keys.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 6 5 "strconv" 7 6 ··· 46 45 response.Cursor = &nextCursor 47 46 } 48 47 49 49 - w.Header().Set("Content-Type", "application/json") 50 50 - if err := json.NewEncoder(w).Encode(response); err != nil { 51 51 - x.Logger.Error("failed to encode response", "error", err) 52 52 - writeError(w, xrpcerr.NewXrpcError( 53 53 - xrpcerr.WithTag("InternalServerError"), 54 54 - xrpcerr.WithMessage("failed to encode response"), 55 55 - ), http.StatusInternalServerError) 56 56 - return 57 57 - } 48 48 + writeJson(w, response) 58 49 }

+22

knotserver/xrpc/owner.go

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "net/http" 5 5 + 6 6 + "tangled.sh/tangled.sh/core/api/tangled" 7 7 + xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 8 8 + ) 9 9 + 10 10 + func (x *Xrpc) Owner(w http.ResponseWriter, r *http.Request) { 11 11 + owner := x.Config.Server.Owner 12 12 + if owner == "" { 13 13 + writeError(w, xrpcerr.OwnerNotFoundError, http.StatusInternalServerError) 14 14 + return 15 15 + } 16 16 + 17 17 + response := tangled.Owner_Output{ 18 18 + Owner: owner, 19 19 + } 20 20 + 21 21 + writeJson(w, response) 22 22 + }

+8 -7

knotserver/xrpc/repo_archive.go

··· 13 13 ) 14 14 15 15 func (x *Xrpc) RepoArchive(w http.ResponseWriter, r *http.Request) { 16 16 - repo, repoPath, unescapedRef, err := x.parseStandardParams(r) 16 16 + repo := r.URL.Query().Get("repo") 17 17 + repoPath, err := x.parseRepoParam(repo) 17 18 if err != nil { 18 19 writeError(w, err.(xrpcerr.XrpcError), http.StatusBadRequest) 19 20 return 20 21 } 22 22 + 23 23 + ref := r.URL.Query().Get("ref") 24 24 + // ref can be empty (git.Open handles this) 21 25 22 26 format := r.URL.Query().Get("format") 23 27 if format == "" { ··· 34 38 return 35 39 } 36 40 37 37 - gr, err := git.Open(repoPath, unescapedRef) 41 41 + gr, err := git.Open(repoPath, ref) 38 42 if err != nil { 39 39 - writeError(w, xrpcerr.NewXrpcError( 40 40 - xrpcerr.WithTag("RefNotFound"), 41 41 - xrpcerr.WithMessage("repository or ref not found"), 42 42 - ), http.StatusNotFound) 43 43 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 43 44 return 44 45 } 45 46 46 47 repoParts := strings.Split(repo, "/") 47 48 repoName := repoParts[len(repoParts)-1] 48 49 49 49 - safeRefFilename := strings.ReplaceAll(plumbing.ReferenceName(unescapedRef).Short(), "/", "-") 50 50 + safeRefFilename := strings.ReplaceAll(plumbing.ReferenceName(ref).Short(), "/", "-") 50 51 51 52 var archivePrefix string 52 53 if prefix != "" {

+8 -15

knotserver/xrpc/repo_blob.go

··· 3 3 import ( 4 4 "crypto/sha256" 5 5 "encoding/base64" 6 6 - "encoding/json" 7 6 "fmt" 8 7 "net/http" 9 8 "path/filepath" ··· 16 15 ) 17 16 18 17 func (x *Xrpc) RepoBlob(w http.ResponseWriter, r *http.Request) { 19 19 - _, repoPath, ref, err := x.parseStandardParams(r) 18 18 + repo := r.URL.Query().Get("repo") 19 19 + repoPath, err := x.parseRepoParam(repo) 20 20 if err != nil { 21 21 writeError(w, err.(xrpcerr.XrpcError), http.StatusBadRequest) 22 22 return 23 23 } 24 24 25 25 + ref := r.URL.Query().Get("ref") 26 26 + // ref can be empty (git.Open handles this) 27 27 + 25 28 treePath := r.URL.Query().Get("path") 26 29 if treePath == "" { 27 30 writeError(w, xrpcerr.NewXrpcError( ··· 35 38 36 39 gr, err := git.Open(repoPath, ref) 37 40 if err != nil { 38 38 - writeError(w, xrpcerr.NewXrpcError( 39 39 - xrpcerr.WithTag("RefNotFound"), 40 40 - xrpcerr.WithMessage("repository or ref not found"), 41 41 - ), http.StatusNotFound) 41 41 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 42 42 return 43 43 } 44 44 ··· 69 69 return 70 70 } 71 71 w.Header().Set("ETag", eTag) 72 72 + w.Header().Set("Content-Type", mimeType) 72 73 73 74 case strings.HasPrefix(mimeType, "text/"): 74 75 w.Header().Set("Cache-Control", "public, no-cache") ··· 122 123 response.MimeType = &mimeType 123 124 } 124 125 125 125 - w.Header().Set("Content-Type", "application/json") 126 126 - if err := json.NewEncoder(w).Encode(response); err != nil { 127 127 - x.Logger.Error("failed to encode response", "error", err) 128 128 - writeError(w, xrpcerr.NewXrpcError( 129 129 - xrpcerr.WithTag("InternalServerError"), 130 130 - xrpcerr.WithMessage("failed to encode response"), 131 131 - ), http.StatusInternalServerError) 132 132 - return 133 133 - } 126 126 + writeJson(w, response) 134 127 } 135 128 136 129 // isTextualMimeType returns true if the MIME type represents textual content

+5 -16

knotserver/xrpc/repo_branch.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 6 5 "net/url" 6 6 + "time" 7 7 8 8 "tangled.sh/tangled.sh/core/api/tangled" 9 9 "tangled.sh/tangled.sh/core/knotserver/git" ··· 31 31 32 32 gr, err := git.PlainOpen(repoPath) 33 33 if err != nil { 34 34 - writeError(w, xrpcerr.NewXrpcError( 35 35 - xrpcerr.WithTag("RepoNotFound"), 36 36 - xrpcerr.WithMessage("repository not found"), 37 37 - ), http.StatusNotFound) 34 34 + writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent) 38 35 return 39 36 } 40 37 ··· 70 67 Name: ref.Name().Short(), 71 68 Hash: ref.Hash().String(), 72 69 ShortHash: &[]string{ref.Hash().String()[:7]}[0], 73 73 - When: commit.Author.When.Format("2006-01-02T15:04:05.000Z"), 70 70 + When: commit.Author.When.Format(time.RFC3339), 74 71 IsDefault: &isDefault, 75 72 } 76 73 ··· 81 78 response.Author = &tangled.RepoBranch_Signature{ 82 79 Name: commit.Author.Name, 83 80 Email: commit.Author.Email, 84 84 - When: commit.Author.When.Format("2006-01-02T15:04:05.000Z"), 81 81 + When: commit.Author.When.Format(time.RFC3339), 85 82 } 86 83 87 87 - w.Header().Set("Content-Type", "application/json") 88 88 - if err := json.NewEncoder(w).Encode(response); err != nil { 89 89 - x.Logger.Error("failed to encode response", "error", err) 90 90 - writeError(w, xrpcerr.NewXrpcError( 91 91 - xrpcerr.WithTag("InternalServerError"), 92 92 - xrpcerr.WithMessage("failed to encode response"), 93 93 - ), http.StatusInternalServerError) 94 94 - return 95 95 - } 84 84 + writeJson(w, response) 96 85 }

+11 -25

knotserver/xrpc/repo_branches.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 6 5 "strconv" 7 6 ··· 20 19 21 20 cursor := r.URL.Query().Get("cursor") 22 21 23 23 - limit := 50 // default 24 24 - if limitStr := r.URL.Query().Get("limit"); limitStr != "" { 25 25 - if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 { 26 26 - limit = l 27 27 - } 28 28 - } 22 22 + // limit := 50 // default 23 23 + // if limitStr := r.URL.Query().Get("limit"); limitStr != "" { 24 24 + // if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 { 25 25 + // limit = l 26 26 + // } 27 27 + // } 28 28 + 29 29 + limit := 500 29 30 30 31 gr, err := git.PlainOpen(repoPath) 31 32 if err != nil { 32 32 - writeError(w, xrpcerr.NewXrpcError( 33 33 - xrpcerr.WithTag("RepoNotFound"), 34 34 - xrpcerr.WithMessage("repository not found"), 35 35 - ), http.StatusNotFound) 33 33 + writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent) 36 34 return 37 35 } 38 36 ··· 45 43 } 46 44 } 47 45 48 48 - end := offset + limit 49 49 - if end > len(branches) { 50 50 - end = len(branches) 51 51 - } 46 46 + end := min(offset+limit, len(branches)) 52 47 53 48 paginatedBranches := branches[offset:end] 54 49 ··· 57 52 Branches: paginatedBranches, 58 53 } 59 54 60 60 - // Write JSON response directly 61 61 - w.Header().Set("Content-Type", "application/json") 62 62 - if err := json.NewEncoder(w).Encode(response); err != nil { 63 63 - x.Logger.Error("failed to encode response", "error", err) 64 64 - writeError(w, xrpcerr.NewXrpcError( 65 65 - xrpcerr.WithTag("InternalServerError"), 66 66 - xrpcerr.WithMessage("failed to encode response"), 67 67 - ), http.StatusInternalServerError) 68 68 - return 69 69 - } 55 55 + writeJson(w, response) 70 56 }

+7 -23

knotserver/xrpc/repo_compare.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "fmt" 6 5 "net/http" 7 7 - "net/url" 8 6 9 7 "tangled.sh/tangled.sh/core/knotserver/git" 10 8 "tangled.sh/tangled.sh/core/types" ··· 19 17 return 20 18 } 21 19 22 22 - rev1Param := r.URL.Query().Get("rev1") 23 23 - if rev1Param == "" { 20 20 + rev1 := r.URL.Query().Get("rev1") 21 21 + if rev1 == "" { 24 22 writeError(w, xrpcerr.NewXrpcError( 25 23 xrpcerr.WithTag("InvalidRequest"), 26 24 xrpcerr.WithMessage("missing rev1 parameter"), ··· 28 26 return 29 27 } 30 28 31 31 - rev2Param := r.URL.Query().Get("rev2") 32 32 - if rev2Param == "" { 29 29 + rev2 := r.URL.Query().Get("rev2") 30 30 + if rev2 == "" { 33 31 writeError(w, xrpcerr.NewXrpcError( 34 32 xrpcerr.WithTag("InvalidRequest"), 35 33 xrpcerr.WithMessage("missing rev2 parameter"), ··· 37 35 return 38 36 } 39 37 40 40 - rev1, _ := url.PathUnescape(rev1Param) 41 41 - rev2, _ := url.PathUnescape(rev2Param) 42 42 - 43 38 gr, err := git.PlainOpen(repoPath) 44 39 if err != nil { 45 45 - writeError(w, xrpcerr.NewXrpcError( 46 46 - xrpcerr.WithTag("RepoNotFound"), 47 47 - xrpcerr.WithMessage("repository not found"), 48 48 - ), http.StatusNotFound) 40 40 + writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent) 49 41 return 50 42 } 51 43 ··· 79 71 return 80 72 } 81 73 82 82 - resp := types.RepoFormatPatchResponse{ 74 74 + response := types.RepoFormatPatchResponse{ 83 75 Rev1: commit1.Hash.String(), 84 76 Rev2: commit2.Hash.String(), 85 77 FormatPatch: formatPatch, 86 78 Patch: rawPatch, 87 79 } 88 80 89 89 - w.Header().Set("Content-Type", "application/json") 90 90 - if err := json.NewEncoder(w).Encode(resp); err != nil { 91 91 - x.Logger.Error("failed to encode response", "error", err) 92 92 - writeError(w, xrpcerr.NewXrpcError( 93 93 - xrpcerr.WithTag("InternalServerError"), 94 94 - xrpcerr.WithMessage("failed to encode response"), 95 95 - ), http.StatusInternalServerError) 96 96 - return 97 97 - } 81 81 + writeJson(w, response) 98 82 }

+6 -30

knotserver/xrpc/repo_diff.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 6 6 - "net/url" 7 5 8 6 "tangled.sh/tangled.sh/core/knotserver/git" 9 7 "tangled.sh/tangled.sh/core/types" ··· 18 16 return 19 17 } 20 18 21 21 - refParam := r.URL.Query().Get("ref") 22 22 - if refParam == "" { 23 23 - writeError(w, xrpcerr.NewXrpcError( 24 24 - xrpcerr.WithTag("InvalidRequest"), 25 25 - xrpcerr.WithMessage("missing ref parameter"), 26 26 - ), http.StatusBadRequest) 27 27 - return 28 28 - } 29 29 - 30 30 - ref, _ := url.QueryUnescape(refParam) 19 19 + ref := r.URL.Query().Get("ref") 20 20 + // ref can be empty (git.Open handles this) 31 21 32 22 gr, err := git.Open(repoPath, ref) 33 23 if err != nil { 34 34 - writeError(w, xrpcerr.NewXrpcError( 35 35 - xrpcerr.WithTag("RefNotFound"), 36 36 - xrpcerr.WithMessage("repository or ref not found"), 37 37 - ), http.StatusNotFound) 24 24 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 38 25 return 39 26 } 40 27 41 28 diff, err := gr.Diff() 42 29 if err != nil { 43 30 x.Logger.Error("getting diff", "error", err.Error()) 44 44 - writeError(w, xrpcerr.NewXrpcError( 45 45 - xrpcerr.WithTag("RefNotFound"), 46 46 - xrpcerr.WithMessage("failed to generate diff"), 47 47 - ), http.StatusInternalServerError) 31 31 + writeError(w, xrpcerr.RefNotFoundError, http.StatusInternalServerError) 48 32 return 49 33 } 50 34 51 51 - resp := types.RepoCommitResponse{ 35 35 + response := types.RepoCommitResponse{ 52 36 Ref: ref, 53 37 Diff: diff, 54 38 } 55 39 56 56 - w.Header().Set("Content-Type", "application/json") 57 57 - if err := json.NewEncoder(w).Encode(resp); err != nil { 58 58 - x.Logger.Error("failed to encode response", "error", err) 59 59 - writeError(w, xrpcerr.NewXrpcError( 60 60 - xrpcerr.WithTag("InternalServerError"), 61 61 - xrpcerr.WithMessage("failed to encode response"), 62 62 - ), http.StatusInternalServerError) 63 63 - return 64 64 - } 40 40 + writeJson(w, response) 65 41 }

+4 -19

knotserver/xrpc/repo_get_default_branch.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 5 5 + "time" 6 6 7 7 "tangled.sh/tangled.sh/core/api/tangled" 8 8 "tangled.sh/tangled.sh/core/knotserver/git" ··· 17 17 return 18 18 } 19 19 20 20 - gr, err := git.Open(repoPath, "") 21 21 - if err != nil { 22 22 - writeError(w, xrpcerr.NewXrpcError( 23 23 - xrpcerr.WithTag("RepoNotFound"), 24 24 - xrpcerr.WithMessage("repository not found"), 25 25 - ), http.StatusNotFound) 26 26 - return 27 27 - } 20 20 + gr, err := git.PlainOpen(repoPath) 28 21 29 22 branch, err := gr.FindMainBranch() 30 23 if err != nil { ··· 39 32 response := tangled.RepoGetDefaultBranch_Output{ 40 33 Name: branch, 41 34 Hash: "", 42 42 - When: "1970-01-01T00:00:00.000Z", 35 35 + When: time.UnixMicro(0).Format(time.RFC3339), 43 36 } 44 37 45 45 - w.Header().Set("Content-Type", "application/json") 46 46 - if err := json.NewEncoder(w).Encode(response); err != nil { 47 47 - x.Logger.Error("failed to encode response", "error", err) 48 48 - writeError(w, xrpcerr.NewXrpcError( 49 49 - xrpcerr.WithTag("InternalServerError"), 50 50 - xrpcerr.WithMessage("failed to encode response"), 51 51 - ), http.StatusInternalServerError) 52 52 - return 53 53 - } 38 38 + writeJson(w, response) 54 39 }

+4 -21

knotserver/xrpc/repo_languages.go

··· 2 2 3 3 import ( 4 4 "context" 5 5 - "encoding/json" 6 5 "math" 7 6 "net/http" 8 8 - "net/url" 9 7 "time" 10 8 11 9 "tangled.sh/tangled.sh/core/api/tangled" ··· 14 12 ) 15 13 16 14 func (x *Xrpc) RepoLanguages(w http.ResponseWriter, r *http.Request) { 17 17 - refParam := r.URL.Query().Get("ref") 18 18 - if refParam == "" { 19 19 - refParam = "HEAD" // default 20 20 - } 21 21 - ref, _ := url.PathUnescape(refParam) 22 22 - 23 15 repo := r.URL.Query().Get("repo") 24 16 repoPath, err := x.parseRepoParam(repo) 25 17 if err != nil { ··· 27 19 return 28 20 } 29 21 22 22 + ref := r.URL.Query().Get("ref") 23 23 + 30 24 gr, err := git.Open(repoPath, ref) 31 25 if err != nil { 32 26 x.Logger.Error("opening repo", "error", err.Error()) 33 33 - writeError(w, xrpcerr.NewXrpcError( 34 34 - xrpcerr.WithTag("RefNotFound"), 35 35 - xrpcerr.WithMessage("repository or ref not found"), 36 36 - ), http.StatusNotFound) 27 27 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 37 28 return 38 29 } 39 30 ··· 81 72 response.TotalFiles = &totalFiles 82 73 } 83 74 84 84 - w.Header().Set("Content-Type", "application/json") 85 85 - if err := json.NewEncoder(w).Encode(response); err != nil { 86 86 - x.Logger.Error("failed to encode response", "error", err) 87 87 - writeError(w, xrpcerr.NewXrpcError( 88 88 - xrpcerr.WithTag("InternalServerError"), 89 89 - xrpcerr.WithMessage("failed to encode response"), 90 90 - ), http.StatusInternalServerError) 91 91 - return 92 92 - } 75 75 + writeJson(w, response) 93 76 }

+14 -34

knotserver/xrpc/repo_log.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 6 6 - "net/url" 7 5 "strconv" 8 6 9 7 "tangled.sh/tangled.sh/core/knotserver/git" ··· 19 17 return 20 18 } 21 19 22 22 - refParam := r.URL.Query().Get("ref") 23 23 - if refParam == "" { 24 24 - writeError(w, xrpcerr.NewXrpcError( 25 25 - xrpcerr.WithTag("InvalidRequest"), 26 26 - xrpcerr.WithMessage("missing ref parameter"), 27 27 - ), http.StatusBadRequest) 28 28 - return 29 29 - } 20 20 + ref := r.URL.Query().Get("ref") 30 21 31 22 path := r.URL.Query().Get("path") 32 23 cursor := r.URL.Query().Get("cursor") ··· 38 29 } 39 30 } 40 31 41 41 - ref, err := url.QueryUnescape(refParam) 42 42 - if err != nil { 43 43 - writeError(w, xrpcerr.NewXrpcError( 44 44 - xrpcerr.WithTag("InvalidRequest"), 45 45 - xrpcerr.WithMessage("invalid ref parameter"), 46 46 - ), http.StatusBadRequest) 47 47 - return 48 48 - } 49 49 - 50 32 gr, err := git.Open(repoPath, ref) 51 33 if err != nil { 52 52 - writeError(w, xrpcerr.NewXrpcError( 53 53 - xrpcerr.WithTag("RefNotFound"), 54 54 - xrpcerr.WithMessage("repository or ref not found"), 55 55 - ), http.StatusNotFound) 34 34 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 56 35 return 57 36 } 58 37 ··· 73 52 return 74 53 } 75 54 55 55 + total, err := gr.TotalCommits() 56 56 + if err != nil { 57 57 + x.Logger.Error("fetching total commits", "error", err.Error()) 58 58 + writeError(w, xrpcerr.NewXrpcError( 59 59 + xrpcerr.WithTag("InternalServerError"), 60 60 + xrpcerr.WithMessage("failed to fetch total commits"), 61 61 + ), http.StatusNotFound) 62 62 + return 63 63 + } 64 64 + 76 65 // Create response using existing types.RepoLogResponse 77 66 response := types.RepoLogResponse{ 78 67 Commits: commits, 79 68 Ref: ref, 80 69 Page: (offset / limit) + 1, 81 70 PerPage: limit, 82 82 - Total: len(commits), // This is not accurate for pagination, but matches existing behavior 71 71 + Total: total, 83 72 } 84 73 85 74 if path != "" { ··· 88 77 89 78 response.Log = true 90 79 91 91 - // Write JSON response directly 92 92 - w.Header().Set("Content-Type", "application/json") 93 93 - if err := json.NewEncoder(w).Encode(response); err != nil { 94 94 - x.Logger.Error("failed to encode response", "error", err) 95 95 - writeError(w, xrpcerr.NewXrpcError( 96 96 - xrpcerr.WithTag("InternalServerError"), 97 97 - xrpcerr.WithMessage("failed to encode response"), 98 98 - ), http.StatusInternalServerError) 99 99 - return 100 100 - } 80 80 + writeJson(w, response) 101 81 }

+3 -16

knotserver/xrpc/repo_tags.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 6 5 "strconv" 7 6 ··· 30 29 } 31 30 } 32 31 33 33 - gr, err := git.Open(repoPath, "") 32 32 + gr, err := git.PlainOpen(repoPath) 34 33 if err != nil { 35 34 x.Logger.Error("failed to open", "error", err) 36 36 - writeError(w, xrpcerr.NewXrpcError( 37 37 - xrpcerr.WithTag("RepoNotFound"), 38 38 - xrpcerr.WithMessage("repository not found"), 39 39 - ), http.StatusNotFound) 35 35 + writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent) 40 36 return 41 37 } 42 38 ··· 86 82 Tags: paginatedTags, 87 83 } 88 84 89 89 - // Write JSON response directly 90 90 - w.Header().Set("Content-Type", "application/json") 91 91 - if err := json.NewEncoder(w).Encode(response); err != nil { 92 92 - x.Logger.Error("failed to encode response", "error", err) 93 93 - writeError(w, xrpcerr.NewXrpcError( 94 94 - xrpcerr.WithTag("InternalServerError"), 95 95 - xrpcerr.WithMessage("failed to encode response"), 96 96 - ), http.StatusInternalServerError) 97 97 - return 98 98 - } 85 85 + writeJson(w, response) 99 86 }

+6 -33

knotserver/xrpc/repo_tree.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 - "encoding/json" 5 4 "net/http" 6 6 - "net/url" 7 5 "path/filepath" 6 6 + "time" 8 7 9 8 "tangled.sh/tangled.sh/core/api/tangled" 10 9 "tangled.sh/tangled.sh/core/knotserver/git" ··· 21 20 return 22 21 } 23 22 24 24 - refParam := r.URL.Query().Get("ref") 25 25 - if refParam == "" { 26 26 - writeError(w, xrpcerr.NewXrpcError( 27 27 - xrpcerr.WithTag("InvalidRequest"), 28 28 - xrpcerr.WithMessage("missing ref parameter"), 29 29 - ), http.StatusBadRequest) 30 30 - return 31 31 - } 23 23 + ref := r.URL.Query().Get("ref") 24 24 + // ref can be empty (git.Open handles this) 32 25 33 26 path := r.URL.Query().Get("path") 34 27 // path can be empty (defaults to root) 35 28 36 36 - ref, err := url.QueryUnescape(refParam) 37 37 - if err != nil { 38 38 - writeError(w, xrpcerr.NewXrpcError( 39 39 - xrpcerr.WithTag("InvalidRequest"), 40 40 - xrpcerr.WithMessage("invalid ref parameter"), 41 41 - ), http.StatusBadRequest) 42 42 - return 43 43 - } 44 44 - 45 29 gr, err := git.Open(repoPath, ref) 46 30 if err != nil { 47 31 x.Logger.Error("failed to open git repository", "error", err, "path", repoPath, "ref", ref) 48 48 - writeError(w, xrpcerr.NewXrpcError( 49 49 - xrpcerr.WithTag("RefNotFound"), 50 50 - xrpcerr.WithMessage("repository or ref not found"), 51 51 - ), http.StatusNotFound) 32 32 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 52 33 return 53 34 } 54 35 ··· 77 58 entry.Last_commit = &tangled.RepoTree_LastCommit{ 78 59 Hash: file.LastCommit.Hash.String(), 79 60 Message: file.LastCommit.Message, 80 80 - When: file.LastCommit.When.Format("2006-01-02T15:04:05.000Z"), 61 61 + When: file.LastCommit.When.Format(time.RFC3339), 81 62 } 82 63 } 83 64 ··· 104 85 Files: treeEntries, 105 86 } 106 87 107 107 - w.Header().Set("Content-Type", "application/json") 108 108 - if err := json.NewEncoder(w).Encode(response); err != nil { 109 109 - x.Logger.Error("failed to encode response", "error", err) 110 110 - writeError(w, xrpcerr.NewXrpcError( 111 111 - xrpcerr.WithTag("InternalServerError"), 112 112 - xrpcerr.WithMessage("failed to encode response"), 113 113 - ), http.StatusInternalServerError) 114 114 - return 115 115 - } 88 88 + writeJson(w, response) 116 89 }

+60

knotserver/xrpc/version.go

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "net/http" 6 6 + "runtime/debug" 7 7 + 8 8 + "tangled.sh/tangled.sh/core/api/tangled" 9 9 + ) 10 10 + 11 11 + // version is set during build time. 12 12 + var version string 13 13 + 14 14 + func (x *Xrpc) Version(w http.ResponseWriter, r *http.Request) { 15 15 + if version == "" { 16 16 + info, ok := debug.ReadBuildInfo() 17 17 + if !ok { 18 18 + http.Error(w, "failed to read build info", http.StatusInternalServerError) 19 19 + return 20 20 + } 21 21 + 22 22 + var modVer string 23 23 + var sha string 24 24 + var modified bool 25 25 + 26 26 + for _, mod := range info.Deps { 27 27 + if mod.Path == "tangled.sh/tangled.sh/knotserver/xrpc" { 28 28 + modVer = mod.Version 29 29 + break 30 30 + } 31 31 + } 32 32 + 33 33 + for _, setting := range info.Settings { 34 34 + switch setting.Key { 35 35 + case "vcs.revision": 36 36 + sha = setting.Value 37 37 + case "vcs.modified": 38 38 + modified = setting.Value == "true" 39 39 + } 40 40 + } 41 41 + 42 42 + if modVer == "" { 43 43 + modVer = "unknown" 44 44 + } 45 45 + 46 46 + if sha == "" { 47 47 + version = modVer 48 48 + } else if modified { 49 49 + version = fmt.Sprintf("%s (%s with modifications)", modVer, sha) 50 50 + } else { 51 51 + version = fmt.Sprintf("%s (%s)", modVer, sha) 52 52 + } 53 53 + } 54 54 + 55 55 + response := tangled.KnotVersion_Output{ 56 56 + Version: version, 57 57 + } 58 58 + 59 59 + writeJson(w, response) 60 60 + }

+18 -35

knotserver/xrpc/xrpc.go

··· 4 4 "encoding/json" 5 5 "log/slog" 6 6 "net/http" 7 7 - "net/url" 8 7 "strings" 9 8 10 9 securejoin "github.com/cyphar/filepath-securejoin" ··· 69 68 70 69 // knot query endpoints (no auth required) 71 70 r.Get("/"+tangled.KnotListKeysNSID, x.ListKeys) 71 71 + r.Get("/"+tangled.KnotVersionNSID, x.Version) 72 72 + 73 73 + // service query endpoints (no auth required) 74 74 + r.Get("/"+tangled.OwnerNSID, x.Owner) 72 75 73 76 return r 74 77 } ··· 84 87 } 85 88 86 89 // Parse repo string (did/repoName format) 87 87 - parts := strings.Split(repo, "/") 88 88 - if len(parts) < 2 { 90 90 + parts := strings.SplitN(repo, "/", 2) 91 91 + if len(parts) != 2 { 89 92 return "", xrpcerr.NewXrpcError( 90 93 xrpcerr.WithTag("InvalidRequest"), 91 94 xrpcerr.WithMessage("invalid repo format, expected 'did/repoName'"), 92 95 ) 93 96 } 94 97 95 95 - did := strings.Join(parts[:len(parts)-1], "/") 96 96 - repoName := parts[len(parts)-1] 98 98 + did := parts[0] 99 99 + repoName := parts[1] 97 100 98 101 // Construct repository path using the same logic as didPath 99 102 didRepoPath, err := securejoin.SecureJoin(did, repoName) 100 103 if err != nil { 101 101 - return "", xrpcerr.NewXrpcError( 102 102 - xrpcerr.WithTag("RepoNotFound"), 103 103 - xrpcerr.WithMessage("failed to access repository"), 104 104 - ) 104 104 + return "", xrpcerr.RepoNotFoundError 105 105 } 106 106 107 107 repoPath, err := securejoin.SecureJoin(x.Config.Repo.ScanPath, didRepoPath) 108 108 if err != nil { 109 109 - return "", xrpcerr.NewXrpcError( 110 110 - xrpcerr.WithTag("RepoNotFound"), 111 111 - xrpcerr.WithMessage("failed to access repository"), 112 112 - ) 109 109 + return "", xrpcerr.RepoNotFoundError 113 110 } 114 111 115 112 return repoPath, nil 116 113 } 117 114 118 118 - // parseStandardParams parses common query parameters used by most handlers 119 119 - func (x *Xrpc) parseStandardParams(r *http.Request) (repo, repoPath, ref string, err error) { 120 120 - // Parse repo parameter 121 121 - repo = r.URL.Query().Get("repo") 122 122 - repoPath, err = x.parseRepoParam(repo) 123 123 - if err != nil { 124 124 - return "", "", "", err 125 125 - } 126 126 - 127 127 - // Parse and unescape ref parameter 128 128 - refParam := r.URL.Query().Get("ref") 129 129 - if refParam == "" { 130 130 - return "", "", "", xrpcerr.NewXrpcError( 131 131 - xrpcerr.WithTag("InvalidRequest"), 132 132 - xrpcerr.WithMessage("missing ref parameter"), 133 133 - ) 134 134 - } 135 135 - 136 136 - ref, _ = url.QueryUnescape(refParam) 137 137 - return repo, repoPath, ref, nil 138 138 - } 139 139 - 140 115 func writeError(w http.ResponseWriter, e xrpcerr.XrpcError, status int) { 141 116 w.Header().Set("Content-Type", "application/json") 142 117 w.WriteHeader(status) 143 118 json.NewEncoder(w).Encode(e) 144 119 } 120 120 + 121 121 + func writeJson(w http.ResponseWriter, response any) { 122 122 + w.Header().Set("Content-Type", "application/json") 123 123 + if err := json.NewEncoder(w).Encode(response); err != nil { 124 124 + writeError(w, xrpcerr.GenericError(err), http.StatusInternalServerError) 125 125 + return 126 126 + } 127 127 + }

+9 -9

lexicons/issue/comment.json

··· 9 9 "key": "tid", 10 10 "record": { 11 11 "type": "object", 12 12 - "required": ["issue", "body", "createdAt"], 12 12 + "required": [ 13 13 + "issue", 14 14 + "body", 15 15 + "createdAt" 16 16 + ], 13 17 "properties": { 14 18 "issue": { 15 19 "type": "string", 16 20 "format": "at-uri" 17 21 }, 18 18 - "repo": { 19 19 - "type": "string", 20 20 - "format": "at-uri" 21 21 - }, 22 22 - "owner": { 23 23 - "type": "string", 24 24 - "format": "did" 25 25 - }, 26 22 "body": { 27 23 "type": "string" 28 24 }, 29 25 "createdAt": { 30 26 "type": "string", 31 27 "format": "datetime" 28 28 + }, 29 29 + "replyTo": { 30 30 + "type": "string", 31 31 + "format": "at-uri" 32 32 } 33 33 } 34 34 }

+25

lexicons/knot/version.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.knot.version", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "Get the version of a knot", 8 8 + "output": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "version" 14 14 + ], 15 15 + "properties": { 16 16 + "version": { 17 17 + "type": "string" 18 18 + } 19 19 + } 20 20 + } 21 21 + }, 22 22 + "errors": [] 23 23 + } 24 24 + } 25 25 + }

+31

lexicons/owner.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.owner", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "Get the owner of a service", 8 8 + "output": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "owner" 14 14 + ], 15 15 + "properties": { 16 16 + "owner": { 17 17 + "type": "string", 18 18 + "format": "did" 19 19 + } 20 20 + } 21 21 + } 22 22 + }, 23 23 + "errors": [ 24 24 + { 25 25 + "name": "OwnerNotFound", 26 26 + "description": "Owner is not set for this service" 27 27 + } 28 28 + ] 29 29 + } 30 30 + } 31 31 + }

-1

lexicons/repo/repo.json

··· 34 34 }, 35 35 "description": { 36 36 "type": "string", 37 37 - "format": "datetime", 38 37 "minGraphemes": 1, 39 38 "maxGraphemes": 140 40 39 },

+8 -2

nix/gomod2nix.toml

··· 425 425 [mod."github.com/whyrusleeping/cbor-gen"] 426 426 version = "v0.3.1" 427 427 hash = "sha256-PAd8M2Z8t6rVRBII+Rg8Bz+QaJIwbW64bfyqsv31kgc=" 428 428 + [mod."github.com/wyatt915/goldmark-treeblood"] 429 429 + version = "v0.0.0-20250825231212-5dcbdb2f4b57" 430 430 + hash = "sha256-IZEsUXTBTsNgWoD7vqRUc9aFCCHNjzk1IUmI9O+NCnM=" 431 431 + [mod."github.com/wyatt915/treeblood"] 432 432 + version = "v0.1.15" 433 433 + hash = "sha256-hb99exdkoY2Qv8WdDxhwgPXGbEYimUr6wFtPXEvcO9g=" 428 434 [mod."github.com/yuin/goldmark"] 429 429 - version = "v1.4.15" 430 430 - hash = "sha256-MvSOT6dwf5hVYkIg4MnqMpsy5ZtWZ7amAE7Zo9HkEa0=" 435 435 + version = "v1.7.12" 436 436 + hash = "sha256-thLYBS4woL2X5qRdo7vP+xCvjlGRDU0jXtDCUt6vvWM=" 431 437 [mod."github.com/yuin/goldmark-highlighting/v2"] 432 438 version = "v2.0.0-20230729083705-37449abec8cc" 433 439 hash = "sha256-HpiwU7jIeDUAg2zOpTIiviQir8dpRPuXYh2nqFFccpg="

+17 -12

nix/pkgs/knot-unwrapped.nix

··· 3 3 modules, 4 4 sqlite-lib, 5 5 src, 6 6 - }: 7 7 - buildGoApplication { 8 8 - pname = "knot"; 9 9 - version = "0.1.0"; 10 10 - inherit src modules; 6 6 + }: let 7 7 + version = "1.9.0-alpha"; 8 8 + in 9 9 + buildGoApplication { 10 10 + pname = "knot"; 11 11 + inherit src version modules; 12 12 + 13 13 + doCheck = false; 11 14 12 12 - doCheck = false; 15 15 + subPackages = ["cmd/knot"]; 16 16 + tags = ["libsqlite3"]; 13 17 14 14 - subPackages = ["cmd/knot"]; 15 15 - tags = ["libsqlite3"]; 18 18 + ldflags = [ 19 19 + "-X tangled.sh/tangled.sh/core/knotserver/xrpc.version=${version}" 20 20 + ]; 16 21 17 17 - env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; 18 18 - env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; 19 19 - CGO_ENABLED = 1; 20 20 - } 22 22 + env.CGO_CFLAGS = "-I ${sqlite-lib}/include "; 23 23 + env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib"; 24 24 + CGO_ENABLED = 1; 25 25 + }

-3

spindle/server.go

··· 203 203 w.Write(motd) 204 204 }) 205 205 mux.HandleFunc("/events", s.Events) 206 206 - mux.HandleFunc("/owner", func(w http.ResponseWriter, r *http.Request) { 207 207 - w.Write([]byte(s.cfg.Server.Owner)) 208 208 - }) 209 206 mux.HandleFunc("/logs/{knot}/{rkey}/{name}", s.Logs) 210 207 211 208 mux.Mount("/xrpc", s.XrpcRouter())

+31

spindle/xrpc/owner.go

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "encoding/json" 5 5 + "net/http" 6 6 + 7 7 + "tangled.sh/tangled.sh/core/api/tangled" 8 8 + xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 9 9 + ) 10 10 + 11 11 + func (x *Xrpc) Owner(w http.ResponseWriter, r *http.Request) { 12 12 + owner := x.Config.Server.Owner 13 13 + if owner == "" { 14 14 + writeError(w, xrpcerr.OwnerNotFoundError, http.StatusInternalServerError) 15 15 + return 16 16 + } 17 17 + 18 18 + response := tangled.Owner_Output{ 19 19 + Owner: owner, 20 20 + } 21 21 + 22 22 + w.Header().Set("Content-Type", "application/json") 23 23 + if err := json.NewEncoder(w).Encode(response); err != nil { 24 24 + x.Logger.Error("failed to encode response", "error", err) 25 25 + writeError(w, xrpcerr.NewXrpcError( 26 26 + xrpcerr.WithTag("InternalServerError"), 27 27 + xrpcerr.WithMessage("failed to encode response"), 28 28 + ), http.StatusInternalServerError) 29 29 + return 30 30 + } 31 31 + }

+10 -3

spindle/xrpc/xrpc.go

··· 35 35 func (x *Xrpc) Router() http.Handler { 36 36 r := chi.NewRouter() 37 37 38 38 - r.With(x.ServiceAuth.VerifyServiceAuth).Post("/"+tangled.RepoAddSecretNSID, x.AddSecret) 39 39 - r.With(x.ServiceAuth.VerifyServiceAuth).Post("/"+tangled.RepoRemoveSecretNSID, x.RemoveSecret) 40 40 - r.With(x.ServiceAuth.VerifyServiceAuth).Get("/"+tangled.RepoListSecretsNSID, x.ListSecrets) 38 38 + r.Group(func(r chi.Router) { 39 39 + r.Use(x.ServiceAuth.VerifyServiceAuth) 40 40 + 41 41 + r.Post("/"+tangled.RepoAddSecretNSID, x.AddSecret) 42 42 + r.Post("/"+tangled.RepoRemoveSecretNSID, x.RemoveSecret) 43 43 + r.Get("/"+tangled.RepoListSecretsNSID, x.ListSecrets) 44 44 + }) 45 45 + 46 46 + // service query endpoints (no auth required) 47 47 + r.Get("/"+tangled.OwnerNSID, x.Owner) 41 48 42 49 return r 43 50 }

+15

xrpc/errors/errors.go

··· 51 51 WithMessage("actor DID not supplied"), 52 52 ) 53 53 54 54 + var OwnerNotFoundError = NewXrpcError( 55 55 + WithTag("OwnerNotFound"), 56 56 + WithMessage("owner not set for this service"), 57 57 + ) 58 58 + 59 59 + var RepoNotFoundError = NewXrpcError( 60 60 + WithTag("RepoNotFound"), 61 61 + WithMessage("failed to access repository"), 62 62 + ) 63 63 + 64 64 + var RefNotFoundError = NewXrpcError( 65 65 + WithTag("RefNotFound"), 66 66 + WithMessage("failed to access ref"), 67 67 + ) 68 68 + 54 69 var AuthError = func(err error) XrpcError { 55 70 return NewXrpcError( 56 71 WithTag("Auth"),