Specify recipient IDs for simple chat updates

signalapp · Sep 10, 2024 · 314fa13 · 314fa13
1 parent d659c25
commit 314fa13
Show file tree

Hide file tree

Showing 23 changed files with 127 additions and 21 deletions.
diff --git a/src/main/kotlin/tests/ChatItemSimpleUpdatesTestCase.kt b/src/main/kotlin/tests/ChatItemSimpleUpdatesTestCase.kt
@@ -18,18 +18,54 @@ object ChatItemSimpleUpdatesTestCase : TestCase("chat_item_simple_updates") {
     frames += StandardFrames.recipientAlice
     frames += StandardFrames.chatAlice
 
-    frames += Frame(
-      chatItem = ChatItem(
-        chatId = StandardFrames.chatAlice.chat!!.id,
-        authorId = StandardFrames.recipientAlice.recipient!!.id,
-        dateSent = someNonZeroTimestamp(),
-        directionless = ChatItem.DirectionlessMessageDetails(),
-        updateMessage = ChatUpdateMessage(
-          simpleUpdate = SimpleChatUpdate(
-            type = someEnum(SimpleChatUpdate.Type::class.java, excluding = SimpleChatUpdate.Type.UNKNOWN)
+    // Generate timestamps for as many frames as we might want to add depending
+    // on simpleChatUpdate. (We need to register the max number of generators
+    // we might eventually use, up-front.)
+    val dateSentTimestamps = listOf(someNonZeroTimestamp(), someNonZeroTimestamp())
+
+    val simpleChatUpdate = someEnum(SimpleChatUpdate.Type::class.java, excluding = SimpleChatUpdate.Type.UNKNOWN)
+
+    val selfRecipientId = StandardFrames.recipientSelf.recipient!!.id
+    val aliceRecipientId = StandardFrames.recipientAlice.recipient!!.id
+    val releaseNotesRecipientId = StandardFrames.recipientReleaseNotes.recipient!!.id
+
+    // Some simple chat updates can originate from the local user or a remote
+    // user, while some are necessarily from one or the other.
+    val authorIds: List<Long> = when (simpleChatUpdate) {
+      // ...and release note donation requests should come from the release
+      // notes recipient.
+      SimpleChatUpdate.Type.RELEASE_CHANNEL_DONATION_REQUEST -> listOf(releaseNotesRecipientId)
+      SimpleChatUpdate.Type.IDENTITY_UPDATE,
+      SimpleChatUpdate.Type.IDENTITY_VERIFIED,
+      SimpleChatUpdate.Type.IDENTITY_DEFAULT,
+      SimpleChatUpdate.Type.JOINED_SIGNAL,
+      SimpleChatUpdate.Type.CHANGE_NUMBER -> listOf(aliceRecipientId)
+      SimpleChatUpdate.Type.CHAT_SESSION_REFRESH,
+      SimpleChatUpdate.Type.REPORTED_SPAM,
+      SimpleChatUpdate.Type.BLOCKED,
+      SimpleChatUpdate.Type.UNBLOCKED,
+      SimpleChatUpdate.Type.MESSAGE_REQUEST_ACCEPTED -> listOf(selfRecipientId)
+      SimpleChatUpdate.Type.END_SESSION,
+      SimpleChatUpdate.Type.BAD_DECRYPT,
+      SimpleChatUpdate.Type.PAYMENTS_ACTIVATED,
+      SimpleChatUpdate.Type.PAYMENT_ACTIVATION_REQUEST,
+      SimpleChatUpdate.Type.UNSUPPORTED_PROTOCOL_MESSAGE -> listOf(selfRecipientId, aliceRecipientId)
+      // Impossible, checked above.
+      SimpleChatUpdate.Type.UNKNOWN -> listOf()
+    }
+
+    for ((idx, authorId) in authorIds.withIndex()) {
+      frames += Frame(
+        chatItem = ChatItem(
+          chatId = StandardFrames.chatAlice.chat!!.id,
+          authorId = authorId,
+          dateSent = dateSentTimestamps[idx],
+          directionless = ChatItem.DirectionlessMessageDetails(),
+          updateMessage = ChatUpdateMessage(
+            simpleUpdate = SimpleChatUpdate(type = simpleChatUpdate)
           )
         )
       )
-    )
+    }
   }
 }
diff --git a/test-cases/chat_item_simple_updates_05.binproto b/test-cases/chat_item_simple_updates_05.binproto
diff --git a/test-cases/chat_item_simple_updates_05.txtproto b/test-cases/chat_item_simple_updates_05.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 2
     chatId = 2
     dateSent = 1695248715439
     directionless = DirectionlessMessageDetails {}

diff --git a/test-cases/chat_item_simple_updates_06.binproto b/test-cases/chat_item_simple_updates_06.binproto
diff --git a/test-cases/chat_item_simple_updates_06.txtproto b/test-cases/chat_item_simple_updates_06.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1833527071192
     directionless = DirectionlessMessageDetails {}
@@ -124,4 +124,18 @@ Frame {
       }
     }
   }
+}
+
+Frame {
+  chatItem = ChatItem {
+    authorId = 4
+    chatId = 2
+    dateSent = 1829883016179
+    directionless = DirectionlessMessageDetails {}
+    updateMessage = ChatUpdateMessage {
+      simpleUpdate = SimpleChatUpdate {
+        type = Type.END_SESSION
+      }
+    }
+  }
 }
diff --git a/test-cases/chat_item_simple_updates_07.binproto b/test-cases/chat_item_simple_updates_07.binproto
diff --git a/test-cases/chat_item_simple_updates_07.txtproto b/test-cases/chat_item_simple_updates_07.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1695248715439
     directionless = DirectionlessMessageDetails {}

diff --git a/test-cases/chat_item_simple_updates_08.binproto b/test-cases/chat_item_simple_updates_08.binproto
diff --git a/test-cases/chat_item_simple_updates_08.txtproto b/test-cases/chat_item_simple_updates_08.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1833527071192
     directionless = DirectionlessMessageDetails {}
@@ -124,4 +124,18 @@ Frame {
       }
     }
   }
+}
+
+Frame {
+  chatItem = ChatItem {
+    authorId = 4
+    chatId = 2
+    dateSent = 1829883016179
+    directionless = DirectionlessMessageDetails {}
+    updateMessage = ChatUpdateMessage {
+      simpleUpdate = SimpleChatUpdate {
+        type = Type.BAD_DECRYPT
+      }
+    }
+  }
 }
diff --git a/test-cases/chat_item_simple_updates_09.binproto b/test-cases/chat_item_simple_updates_09.binproto
diff --git a/test-cases/chat_item_simple_updates_09.txtproto b/test-cases/chat_item_simple_updates_09.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1695248715439
     directionless = DirectionlessMessageDetails {}
@@ -124,4 +124,18 @@ Frame {
       }
     }
   }
+}
+
+Frame {
+  chatItem = ChatItem {
+    authorId = 4
+    chatId = 2
+    dateSent = 1739546236831
+    directionless = DirectionlessMessageDetails {}
+    updateMessage = ChatUpdateMessage {
+      simpleUpdate = SimpleChatUpdate {
+        type = Type.PAYMENTS_ACTIVATED
+      }
+    }
+  }
 }
diff --git a/test-cases/chat_item_simple_updates_10.binproto b/test-cases/chat_item_simple_updates_10.binproto
diff --git a/test-cases/chat_item_simple_updates_10.txtproto b/test-cases/chat_item_simple_updates_10.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1833527071192
     directionless = DirectionlessMessageDetails {}
@@ -124,4 +124,18 @@ Frame {
       }
     }
   }
+}
+
+Frame {
+  chatItem = ChatItem {
+    authorId = 4
+    chatId = 2
+    dateSent = 1829883016179
+    directionless = DirectionlessMessageDetails {}
+    updateMessage = ChatUpdateMessage {
+      simpleUpdate = SimpleChatUpdate {
+        type = Type.PAYMENT_ACTIVATION_REQUEST
+      }
+    }
+  }
 }
diff --git a/test-cases/chat_item_simple_updates_11.binproto b/test-cases/chat_item_simple_updates_11.binproto
diff --git a/test-cases/chat_item_simple_updates_11.txtproto b/test-cases/chat_item_simple_updates_11.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1695248715439
     directionless = DirectionlessMessageDetails {}
@@ -124,4 +124,18 @@ Frame {
       }
     }
   }
+}
+
+Frame {
+  chatItem = ChatItem {
+    authorId = 4
+    chatId = 2
+    dateSent = 1739546236831
+    directionless = DirectionlessMessageDetails {}
+    updateMessage = ChatUpdateMessage {
+      simpleUpdate = SimpleChatUpdate {
+        type = Type.UNSUPPORTED_PROTOCOL_MESSAGE
+      }
+    }
+  }
 }
diff --git a/test-cases/chat_item_simple_updates_12.binproto b/test-cases/chat_item_simple_updates_12.binproto
diff --git a/test-cases/chat_item_simple_updates_12.txtproto b/test-cases/chat_item_simple_updates_12.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1833527071192
     directionless = DirectionlessMessageDetails {}

diff --git a/test-cases/chat_item_simple_updates_13.binproto b/test-cases/chat_item_simple_updates_13.binproto
diff --git a/test-cases/chat_item_simple_updates_13.txtproto b/test-cases/chat_item_simple_updates_13.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1695248715439
     directionless = DirectionlessMessageDetails {}

diff --git a/test-cases/chat_item_simple_updates_14.binproto b/test-cases/chat_item_simple_updates_14.binproto
diff --git a/test-cases/chat_item_simple_updates_14.txtproto b/test-cases/chat_item_simple_updates_14.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1833527071192
     directionless = DirectionlessMessageDetails {}

diff --git a/test-cases/chat_item_simple_updates_15.binproto b/test-cases/chat_item_simple_updates_15.binproto
diff --git a/test-cases/chat_item_simple_updates_15.txtproto b/test-cases/chat_item_simple_updates_15.txtproto
@@ -114,7 +114,7 @@ Frame {
 
 Frame {
   chatItem = ChatItem {
-    authorId = 4
+    authorId = 1
     chatId = 2
     dateSent = 1695248715439
     directionless = DirectionlessMessageDetails {}