Add record CIDs for creates/updates

ericvolp12 · Sep 9, 2024 · dd31d74 · dd31d74
1 parent 6be24d0
commit dd31d74
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -53,22 +53,23 @@ $ websocat "ws://localhost:6008/subscribe?wantedCollections=app.bsky.feed.post&w
 
 ```json
 {
-  "did": "did:plc:stk5dhwhpcjxtlwnhbknmfgx",
-  "time_us": 1725516666734038,
+  "did": "did:plc:eygmaihciaxprqvxpfvl6flk",
+  "time_us": 1725911162329308,
   "type": "com",
   "commit": {
-    "rev": "3l3f6nzhvkl2g",
+    "rev": "3l3qo2vutsw2b",
     "type": "c",
     "collection": "app.bsky.feed.like",
-    "rkey": "3l3f6nzhls32g",
+    "rkey": "3l3qo2vuowo2b",
     "record": {
       "$type": "app.bsky.feed.like",
-      "createdAt": "2024-09-05T06:11:06.451Z",
+      "createdAt": "2024-09-09T19:46:02.102Z",
       "subject": {
-        "cid": "bafyreihdlrrfxc4l5few7lso3u36zf655omeuso3y3dnersr5mm3r7mbyu",
-        "uri": "at://did:plc:ou4u4h3khiaym4a43r7uwp4f/app.bsky.feed.post/3l3e3vz53lu2d"
+        "cid": "bafyreidc6sydkkbchcyg62v77wbhzvb2mvytlmsychqgwf2xojjtirmzj4",
+        "uri": "at://did:plc:wa7b35aakoll7hugkrjtf3xf/app.bsky.feed.post/3l3pte3p2e325"
       }
-    }
+    },
+    "cid": "bafyreidwaivazkwu67xztlmuobx35hs2lnfh3kolmgfmucldvhd3sgzcqi"
   }
 }
 ```

diff --git a/pkg/consumer/consumer.go b/pkg/consumer/consumer.go
@@ -217,7 +217,8 @@ func (c *Consumer) HandleRepoCommit(ctx context.Context, evt *comatproto.SyncSub
 				break
 			}
 
-			if rcid.String() != op.Cid.String() {
+			recCid := rcid.String()
+			if recCid != op.Cid.String() {
 				log.Error("record cid mismatch", "expected", *op.Cid, "actual", rcid)
 				break
 			}
@@ -239,6 +240,7 @@ func (c *Consumer) HandleRepoCommit(ctx context.Context, evt *comatproto.SyncSub
 				Collection: collection,
 				RKey:       rkey,
 				Record:     recJSON,
+				CID:        recCid,
 			}
 		case repomgr.EvtKindUpdateRecord:
 			if op.Cid == nil {
@@ -252,7 +254,8 @@ func (c *Consumer) HandleRepoCommit(ctx context.Context, evt *comatproto.SyncSub
 				break
 			}
 
-			if rcid.String() != op.Cid.String() {
+			recCid := rcid.String()
+			if recCid != op.Cid.String() {
 				log.Error("record cid mismatch", "expected", *op.Cid, "actual", rcid)
 				break
 			}
@@ -274,6 +277,7 @@ func (c *Consumer) HandleRepoCommit(ctx context.Context, evt *comatproto.SyncSub
 				Collection: collection,
 				RKey:       rkey,
 				Record:     recJSON,
+				CID:        recCid,
 			}
 		case repomgr.EvtKindDeleteRecord:
 			// Emit the delete

diff --git a/pkg/models/models.go b/pkg/models/models.go
@@ -7,20 +7,21 @@ import (
 )
 
 type Event struct {
-	Did       string                                  `json:"did" cborgen:"did"`
-	TimeUS    int64                                   `json:"time_us" cborgen:"time_us"`
-	EventType string                                  `json:"type" cborgen:"type"`
-	Commit    *Commit                                 `json:"commit,omitempty" cborgen:"commit,omitempty"`
-	Account   *comatproto.SyncSubscribeRepos_Account  `json:"account,omitempty" cborgen:"account,omitempty"`
-	Identity  *comatproto.SyncSubscribeRepos_Identity `json:"identity,omitempty" cborgen:"identity,omitempty"`
+	Did       string                                  `json:"did"`
+	TimeUS    int64                                   `json:"time_us"`
+	EventType string                                  `json:"type"`
+	Commit    *Commit                                 `json:"commit,omitempty"`
+	Account   *comatproto.SyncSubscribeRepos_Account  `json:"account,omitempty"`
+	Identity  *comatproto.SyncSubscribeRepos_Identity `json:"identity,omitempty"`
 }
 
 type Commit struct {
-	Rev        string          `json:"rev,omitempty" cborgen:"rev"`
-	OpType     string          `json:"type" cborgen:"type"`
-	Collection string          `json:"collection,omitempty" cborgen:"collection"`
-	RKey       string          `json:"rkey,omitempty" cborgen:"rkey"`
-	Record     json.RawMessage `json:"record,omitempty" cborgen:"record,omitempty"`
+	Rev        string          `json:"rev,omitempty"`
+	OpType     string          `json:"type"`
+	Collection string          `json:"collection,omitempty"`
+	RKey       string          `json:"rkey,omitempty"`
+	Record     json.RawMessage `json:"record,omitempty"`
+	CID        string          `json:"cid,omitempty"`
 }
 
 var (