appview: replace PullComment to Comment #865

+14 -10

appview/db/comments.go

··· 10 10 "time" 11 11 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 + "tangled.org/core/api/tangled" 13 14 "tangled.org/core/appview/models" 14 15 "tangled.org/core/orm" 15 16 ) 16 17 17 18 func PutComment(tx *sql.Tx, c *models.Comment) error { 19 19 + if c.Collection == "" { 20 20 + c.Collection = tangled.CommentNSID 21 21 + } 18 22 result, err := tx.Exec( 19 23 `insert into comments ( 20 24 did, 25 25 + collection, 21 26 rkey, 22 27 subject_at, 23 28 reply_to, ··· 25 30 pull_submission_id, 26 31 created 27 32 ) 28 28 - values (?, ?, ?, ?, ?, ?, ?) 29 29 - on conflict(did, rkey) do update set 33 33 + values (?, ?, ?, ?, ?, ?, ?, ?) 34 34 + on conflict(did, collection, rkey) do update set 30 35 subject_at = excluded.subject_at, 31 36 reply_to = excluded.reply_to, 32 37 body = excluded.body, ··· 39 44 else comments.edited 40 45 end`, 41 46 c.Did, 47 47 + c.Collection, 42 48 c.Rkey, 43 49 c.Subject, 44 50 c.ReplyTo, ··· 101 107 select 102 108 id, 103 109 did, 110 110 + collection, 104 111 rkey, 105 112 subject_at, 106 113 reply_to, ··· 122 129 for rows.Next() { 123 130 var comment models.Comment 124 131 var created string 125 125 - var rkey, edited, deleted, replyTo sql.Null[string] 132 132 + var edited, deleted, replyTo sql.Null[string] 126 133 err := rows.Scan( 127 134 &comment.Id, 128 135 &comment.Did, 129 129 - &rkey, 136 136 + &comment.Collection, 137 137 + &comment.Rkey, 130 138 &comment.Subject, 131 139 &replyTo, 132 140 &comment.Body, ··· 139 147 return nil, err 140 148 } 141 149 142 142 - // this is a remnant from old times, newer comments always have rkey 143 143 - if rkey.Valid { 144 144 - comment.Rkey = rkey.V 145 145 - } 146 146 - 147 150 if t, err := time.Parse(time.RFC3339, created); err == nil { 148 151 comment.Created = t 149 152 } ··· 172 175 if err := rows.Err(); err != nil { 173 176 return nil, err 174 177 } 178 178 + defer rows.Close() 175 179 176 180 // collect references from each comments 177 181 commentAts := slices.Collect(maps.Keys(commentMap)) ··· 191 195 } 192 196 193 197 sort.Slice(comments, func(i, j int) bool { 194 194 - return comments[i].Created.After(comments[j].Created) 198 198 + return comments[i].Created.Before(comments[j].Created) 195 199 }) 196 200 197 201 return comments, nil

+1 -1

appview/db/db.go

··· 1198 1198 deleted text, 1199 1199 1200 1200 -- constraints 1201 1201 - unique(did, rkey) 1201 1201 + unique(did, collection, rkey) 1202 1202 ); 1203 1203 1204 1204 insert into comments (

appview/db/pulls.go

This file has not been changed.

appview/db/reference.go

This file has not been changed.

+35 -14

appview/models/comment.go

··· 6 6 "time" 7 7 8 8 "github.com/bluesky-social/indigo/atproto/syntax" 9 9 + "github.com/whyrusleeping/cbor-gen" 9 10 "tangled.org/core/api/tangled" 10 11 ) 11 12 12 13 type Comment struct { 13 14 Id int64 14 15 Did syntax.DID 16 16 + Collection syntax.NSID 15 17 Rkey string 16 18 Subject syntax.ATURI 17 19 ReplyTo *syntax.ATURI ··· 25 27 } 26 28 27 29 func (c *Comment) AtUri() syntax.ATURI { 28 28 - return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", c.Did, tangled.CommentNSID, c.Rkey)) 30 30 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", c.Did, c.Collection, c.Rkey)) 29 31 } 30 32 31 31 - func (c *Comment) AsRecord() tangled.Comment { 33 33 + func (c *Comment) AsRecord() typegen.CBORMarshaler { 32 34 mentions := make([]string, len(c.Mentions)) 33 35 for i, did := range c.Mentions { 34 36 mentions[i] = string(did) ··· 42 44 replyToStr := c.ReplyTo.String() 43 45 replyTo = &replyToStr 44 46 } 45 45 - return tangled.Comment{ 46 46 - Subject: c.Subject.String(), 47 47 - Body: c.Body, 48 48 - CreatedAt: c.Created.Format(time.RFC3339), 49 49 - ReplyTo: replyTo, 50 50 - Mentions: mentions, 51 51 - References: references, 47 47 + switch c.Collection { 48 48 + case tangled.RepoIssueCommentNSID: 49 49 + return &tangled.RepoIssueComment{ 50 50 + Issue: c.Subject.String(), 51 51 + Body: c.Body, 52 52 + CreatedAt: c.Created.Format(time.RFC3339), 53 53 + ReplyTo: replyTo, 54 54 + Mentions: mentions, 55 55 + References: references, 56 56 + } 57 57 + case tangled.RepoPullCommentNSID: 58 58 + return &tangled.RepoPullComment{ 59 59 + Pull: c.Subject.String(), 60 60 + Body: c.Body, 61 61 + CreatedAt: c.Created.Format(time.RFC3339), 62 62 + Mentions: mentions, 63 63 + References: references, 64 64 + } 65 65 + default: // default to CommentNSID 66 66 + return &tangled.Comment{ 67 67 + Subject: c.Subject.String(), 68 68 + Body: c.Body, 69 69 + CreatedAt: c.Created.Format(time.RFC3339), 70 70 + ReplyTo: replyTo, 71 71 + Mentions: mentions, 72 72 + References: references, 73 73 + } 52 74 } 53 75 } 54 76 ··· 75 97 return nil 76 98 } 77 99 78 78 - func CommentFromRecord(did, rkey string, record tangled.Comment) (*Comment, error) { 100 100 + func CommentFromRecord(did syntax.DID, rkey syntax.RecordKey, record tangled.Comment) (*Comment, error) { 79 101 created, err := time.Parse(time.RFC3339, record.CreatedAt) 80 102 if err != nil { 81 103 created = time.Now() 82 104 } 83 105 84 84 - ownerDid := did 85 85 - 86 106 if _, err = syntax.ParseATURI(record.Subject); err != nil { 87 107 return nil, err 88 108 } ··· 103 123 } 104 124 105 125 comment := Comment{ 106 106 - Did: syntax.DID(ownerDid), 107 107 - Rkey: rkey, 126 126 + Did: did, 127 127 + Collection: tangled.CommentNSID, 128 128 + Rkey: rkey.String(), 108 129 Body: record.Body, 109 130 Subject: syntax.ATURI(record.Subject), 110 131 ReplyTo: replyTo,

appview/models/pull.go

This file has not been changed.

appview/notify/db/db.go

This file has not been changed.

appview/notify/merged_notifier.go

This file has not been changed.

appview/notify/notifier.go

This file has not been changed.

appview/notify/posthog/notifier.go

This file has not been changed.

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

This file has not been changed.

appview/pulls/opengraph.go

This file has not been changed.

+4 -3

appview/pulls/pulls.go

··· 724 724 725 725 comment := models.Comment{ 726 726 Did: syntax.DID(user.Active.Did), 727 727 + Collection: tangled.CommentNSID, 727 728 Rkey: tid.TID(), 728 729 Subject: pull.AtUri(), 729 730 ReplyTo: nil, ··· 738 739 s.pages.Notice(w, "pull-comment", "Failed to create comment.") 739 740 return 740 741 } 741 741 - record := comment.AsRecord() 742 742 743 743 client, err := s.oauth.AuthorizedClient(r) 744 744 if err != nil { ··· 746 746 s.pages.Notice(w, "pull-comment", "Failed to create comment.") 747 747 return 748 748 } 749 749 + 749 750 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 750 750 - Collection: tangled.CommentNSID, 751 751 + Collection: comment.Collection.String(), 751 752 Repo: comment.Did.String(), 752 753 Rkey: comment.Rkey, 753 754 Record: &lexutil.LexiconTypeDecoder{ 754 754 - Val: &record, 755 755 + Val: comment.AsRecord(), 755 756 }, 756 757 }) 757 758 if err != nil {

+71

appview/ingester.go

··· 79 79 err = i.ingestString(e) 80 80 case tangled.RepoIssueNSID: 81 81 err = i.ingestIssue(ctx, e) 82 82 + case tangled.CommentNSID: 83 83 + err = i.ingestComment(e) 82 84 case tangled.RepoIssueCommentNSID: 83 85 err = i.ingestIssueComment(e) 84 86 case tangled.LabelDefinitionNSID: ··· 928 930 return nil 929 931 } 930 932 933 933 + func (i *Ingester) ingestComment(e *jmodels.Event) error { 934 934 + did := e.Did 935 935 + rkey := e.Commit.RKey 936 936 + 937 937 + var err error 938 938 + 939 939 + l := i.Logger.With("handler", "ingestComment", "nsid", e.Commit.Collection, "did", did, "rkey", rkey) 940 940 + l.Info("ingesting record") 941 941 + 942 942 + ddb, ok := i.Db.Execer.(*db.DB) 943 943 + if !ok { 944 944 + return fmt.Errorf("failed to index issue comment record, invalid db cast") 945 945 + } 946 946 + 947 947 + switch e.Commit.Operation { 948 948 + case jmodels.CommitOperationCreate, jmodels.CommitOperationUpdate: 949 949 + raw := json.RawMessage(e.Commit.Record) 950 950 + record := tangled.Comment{} 951 951 + err = json.Unmarshal(raw, &record) 952 952 + if err != nil { 953 953 + return fmt.Errorf("invalid record: %w", err) 954 954 + } 955 955 + 956 956 + comment, err := models.CommentFromRecord(syntax.DID(did), syntax.RecordKey(rkey), record) 957 957 + if err != nil { 958 958 + return fmt.Errorf("failed to parse comment from record: %w", err) 959 959 + } 960 960 + 961 961 + // TODO: ingest pull comments 962 962 + // we aren't ingesting pull comments yet because pull itself isn't fully atprotated. 963 963 + // so we cannot know which round this comment is pointing to 964 964 + if comment.Subject.Collection().String() == tangled.RepoPullNSID { 965 965 + l.Info("skip ingesting pull comments") 966 966 + return nil 967 967 + } 968 968 + 969 969 + if err := comment.Validate(); err != nil { 970 970 + return fmt.Errorf("failed to validate comment: %w", err) 971 971 + } 972 972 + 973 973 + tx, err := ddb.Begin() 974 974 + if err != nil { 975 975 + return fmt.Errorf("failed to start transaction: %w", err) 976 976 + } 977 977 + defer tx.Rollback() 978 978 + 979 979 + err = db.PutComment(tx, comment) 980 980 + if err != nil { 981 981 + return fmt.Errorf("failed to create comment: %w", err) 982 982 + } 983 983 + 984 984 + return tx.Commit() 985 985 + 986 986 + case jmodels.CommitOperationDelete: 987 987 + if err := db.DeleteComments( 988 988 + ddb, 989 989 + orm.FilterEq("did", did), 990 990 + orm.FilterEq("collection", e.Commit.Collection), 991 991 + orm.FilterEq("rkey", rkey), 992 992 + ); err != nil { 993 993 + return fmt.Errorf("failed to delete comment record: %w", err) 994 994 + } 995 995 + 996 996 + return nil 997 997 + } 998 998 + 999 999 + return nil 1000 1000 + } 1001 1001 + 931 1002 func (i *Ingester) ingestLabelDefinition(e *jmodels.Event) error { 932 1003 did := e.Did 933 1004 rkey := e.Commit.RKey

+1

appview/state/state.go

··· 118 118 tangled.StringNSID, 119 119 tangled.RepoIssueNSID, 120 120 tangled.RepoIssueCommentNSID, 121 121 + tangled.CommentNSID, 121 122 tangled.LabelDefinitionNSID, 122 123 tangled.LabelOpNSID, 123 124 },