From 6c945a173d819f04f34f0d457b11a91916984175 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Thu, 24 Oct 2024 19:46:53 +1100
Subject: [PATCH] fix: groupv2 control message join/remove are now correctly
 used

---
 ts/models/groupUpdate.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts
index 3384e67e3..dc04e6052 100644
--- a/ts/models/groupUpdate.ts
+++ b/ts/models/groupUpdate.ts
@@ -32,7 +32,7 @@ export function getKickedGroupUpdateStr(
 
   switch (othersNames.length) {
     case 0:
-      return { token: 'groupUpdated' }
+      return { token: 'groupUpdated' };
     case 1:
       return { token: 'groupRemoved', args: { name: othersNames[0] } };
     case 2:
@@ -88,7 +88,7 @@ export function getJoinedGroupUpdateChangeStr(
         case 1:
           return addedWithHistory
             ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } }
-            : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } };
+            : { token: 'groupInviteYouAndOtherNew', args: { other_name: othersNames[0] } };
         default:
           return addedWithHistory
             ? { token: 'groupMemberNewYouHistoryMultiple', args: { count: othersNames.length } }
@@ -97,11 +97,15 @@ export function getJoinedGroupUpdateChangeStr(
     }
     switch (othersNames.length) {
       case 0:
-        return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' };
+        return { token: 'groupUpdated' }; // this is an invalid case, but well.
       case 1:
         return addedWithHistory
-          ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } }
-          : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } };
+          ? { token: 'groupMemberNewHistory', args: { name: othersNames[0] } }
+          : { token: 'groupMemberNew', args: { name: othersNames[0] } };
+      case 2:
+        return addedWithHistory
+          ? { token: 'groupMemberNewHistoryTwo', args: { name: othersNames[0], other_name: othersNames[1]  } }
+          : { token: 'groupMemberNewTwo', args: { name: othersNames[0], other_name: othersNames[1] } };
       default:
         return addedWithHistory
           ? {
@@ -115,6 +119,7 @@ export function getJoinedGroupUpdateChangeStr(
     }
   }
 
+  // legacy groups
   if (us) {
     switch (othersNames.length) {
       case 0:
@@ -127,7 +132,7 @@ export function getJoinedGroupUpdateChangeStr(
   }
   switch (othersNames.length) {
     case 0:
-      return { token: 'groupUpdated' }
+      return { token: 'groupUpdated' };
     case 1:
       return { token: 'legacyGroupMemberNew', args: { name: othersNames[0] } };
     case 2:
@@ -167,7 +172,7 @@ export function getPromotedGroupUpdateChangeStr(
   }
   switch (othersNames.length) {
     case 0:
-      return { token: 'groupUpdated' }
+      return { token: 'groupUpdated' };
     case 1:
       return { token: 'adminPromotedToAdmin', args: { name: othersNames[0] } };
     case 2: