From 703193ad888e31c234bb4be47c0acdf865200541 Mon Sep 17 00:00:00 2001
From: Roscoe Rubin-Rottenberg <roscoe@knotbin.com>
Date: Sun, 12 Apr 2026 16:27:39 -0400
Subject: [PATCH] revert "feat: reply notification root uris"

---
 data-plane/indexing/plugins/reply.ts |  4 ----
 data-plane/indexing/processor.ts     |  2 --
 utils/push.ts                        | 26 +++-----------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/data-plane/indexing/plugins/reply.ts b/data-plane/indexing/plugins/reply.ts
index 70451cc..fdac905 100644
--- a/data-plane/indexing/plugins/reply.ts
+++ b/data-plane/indexing/plugins/reply.ts
@@ -167,7 +167,6 @@ const notifsForInsert = (obj: IndexedReply) => {
     recordCid: string;
     sortAt: string;
     reasonSubject?: string;
-    threadRootUri?: string;
   }> = [];
   const notified = new Set([obj.reply.authorDid]);
   const maybeNotify = (notif: {
@@ -178,7 +177,6 @@ const notifsForInsert = (obj: IndexedReply) => {
     recordCid: string;
     sortAt: string;
     reasonSubject?: string;
-    threadRootUri?: string;
   }) => {
     if (!notified.has(notif.did)) {
       notified.add(notif.did);
@@ -213,7 +211,6 @@ const notifsForInsert = (obj: IndexedReply) => {
         recordUri: obj.reply.uri,
         recordCid: obj.reply.cid,
         sortAt: obj.reply.createdAt,
-        threadRootUri: obj.reply.reply?.root.uri,
       });
       // found hidden reply, don't notify any higher ancestors
       if (threadgateHiddenReplies.includes(ancestorUri.toString())) break;
@@ -235,7 +232,6 @@ const notifsForInsert = (obj: IndexedReply) => {
           recordUri: descendent.uri,
           recordCid: descendent.cid,
           sortAt: descendent.sortAt,
-          threadRootUri: obj.reply.reply?.root.uri,
         });
       }
     }
diff --git a/data-plane/indexing/processor.ts b/data-plane/indexing/processor.ts
index 58eabb0..d0d466e 100644
--- a/data-plane/indexing/processor.ts
+++ b/data-plane/indexing/processor.ts
@@ -41,7 +41,6 @@ type Notif = {
   recordCid: string;
   sortAt: string;
   reasonSubject?: string;
-  threadRootUri?: string;
 };
 
 export class RecordProcessor<T, S> {
@@ -375,7 +374,6 @@ export class RecordProcessor<T, S> {
             author: notif.author,
             recordUri: notif.recordUri,
             reasonSubject: notif.reasonSubject,
-            threadRootUri: notif.threadRootUri,
           });
         });
       }
diff --git a/utils/push.ts b/utils/push.ts
index 4020ea3..f9856ea 100644
--- a/utils/push.ts
+++ b/utils/push.ts
@@ -8,7 +8,6 @@ export interface PushPayload {
   author: string;
   recordUri: string;
   reasonSubject?: string;
-  threadRootUri?: string;
 }
 
 export interface PushConfig {
@@ -255,15 +254,13 @@ export class PushService {
           recordUri: payload.recordUri,
           ...(payload.reasonSubject &&
             { reasonSubject: payload.reasonSubject }),
-          ...(payload.threadRootUri &&
-            { threadRootUri: payload.threadRootUri }),
         },
       },
     };
 
     // Add platform-specific options
     if (token.platform === "ios") {
-      const threadId = this.getIosThreadId(payload);
+      const threadId = this.getThreadId(payload);
       message.message.apns = {
         headers: {
           "apns-priority": "10",
@@ -277,7 +274,7 @@ export class PushService {
         },
       };
     } else if (token.platform === "android") {
-      const threadId = this.getAndroidTag(payload);
+      const threadId = this.getThreadId(payload);
       message.message.android = {
         priority: "high",
         notification: {
@@ -513,27 +510,10 @@ export class PushService {
     return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
   }
 
-  private getIosThreadId(payload: PushPayload): string {
+  private getThreadId(payload: PushPayload): string {
     if (payload.reason === "follow") {
       return "follows";
     }
-    if (payload.reason === "reply") {
-      return payload.threadRootUri ?? payload.reasonSubject ??
-        payload.recordUri;
-    }
-    if (payload.reasonSubject) {
-      return payload.reasonSubject;
-    }
-    return payload.recordUri;
-  }
-
-  private getAndroidTag(payload: PushPayload): string {
-    if (payload.reason === "follow") {
-      return "follows";
-    }
-    if (payload.reason === "reply") {
-      return payload.reasonSubject ?? payload.recordUri;
-    }
     if (payload.reasonSubject) {
       return payload.reasonSubject;
     }
-- 
2.51.2