From 89e5e919f27fc0e2a7f7095e5a667f4bfdf75432 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Mon, 25 Nov 2019 12:02:03 +1100
Subject: [PATCH] Address more review comments

---
 _locales/en/messages.json                          | 2 +-
 js/background.js                                   | 2 +-
 js/models/conversations.js                         | 2 +-
 js/models/messages.js                              | 9 +++++----
 protos/SignalService.proto                         | 2 +-
 ts/components/conversation/InviteFriendsDialog.tsx | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 3807a75f8..9e1a9346c 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2236,7 +2236,7 @@
   "groupInvitation": {
     "message": "Group Invitation"
   },
-  "add-friends": {
+  "addingFriends": {
     "message": "Adding friends to"
   }
 }
diff --git a/js/background.js b/js/background.js
index 9c8ac20ef..32c207f7f 100644
--- a/js/background.js
+++ b/js/background.js
@@ -835,7 +835,7 @@
     });
 
     Whisper.events.on(
-      'invitationAccepted',
+      'publicChatInvitationAccepted',
       async (serverAddress, channelId) => {
         // To some degree this has been copy-pasted
         // form connection_to_server_dialog_view.js:
diff --git a/js/models/conversations.js b/js/models/conversations.js
index b2fde98ee..96df55e7a 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1516,7 +1516,7 @@
         }
         const attributes = {
           ...messageWithSchema,
-          group_invitation: groupInvitation,
+          groupInvitation,
           id: window.getGuid(),
         };
 
diff --git a/js/models/messages.js b/js/models/messages.js
index a63aa42f4..9a80b428a 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -267,7 +267,7 @@
       return this.get('type') === 'friend-request';
     },
     isGroupInvitation() {
-      return !!this.get('group_invitation');
+      return !!this.get('groupInvitation');
     },
     getNotificationText() {
       const description = this.getDescription();
@@ -447,7 +447,7 @@
       };
     },
     getPropsForGroupInvitation() {
-      const invitation = this.get('group_invitation');
+      const invitation = this.get('groupInvitation');
 
       let direction = this.get('direction');
       if (!direction) {
@@ -460,7 +460,7 @@
         direction,
         onClick: () => {
           Whisper.events.trigger(
-            'invitationAccepted',
+            'publicChatInvitationAccepted',
             invitation.serverAddress,
             invitation.channelId
           );
@@ -1938,6 +1938,7 @@
         window.log.info(
           `Starting handleDataMessage for message ${message.idForLogging()} in conversation ${conversation.idForLogging()}`
         );
+
         const withQuoteReference = await this.copyFromQuotedMessage(
           initialMessage
         );
@@ -2021,7 +2022,7 @@
           }
 
           if (initialMessage.groupInvitation) {
-            message.set({ group_invitation: initialMessage.groupInvitation });
+            message.set({ groupInvitation: initialMessage.groupInvitation });
           }
 
           const urls = window.Signal.LinkPreviews.findLinks(dataMessage.body);
diff --git a/protos/SignalService.proto b/protos/SignalService.proto
index 9c0000ede..0f78ebc05 100644
--- a/protos/SignalService.proto
+++ b/protos/SignalService.proto
@@ -202,7 +202,7 @@ message DataMessage {
 
   message GroupInvitation {
     optional string serverAddress = 1;
-    optional string channelId = 2;
+    optional uint32 channelId = 2;
     optional string serverName = 3;
   }
 
diff --git a/ts/components/conversation/InviteFriendsDialog.tsx b/ts/components/conversation/InviteFriendsDialog.tsx
index fa502ea43..a624dc118 100644
--- a/ts/components/conversation/InviteFriendsDialog.tsx
+++ b/ts/components/conversation/InviteFriendsDialog.tsx
@@ -55,7 +55,7 @@ export class InviteFriendsDialog extends React.Component<Props, State> {
   }
 
   public render() {
-    const titleText = `${window.i18n('add-friends')} ${this.props.chatName}`;
+    const titleText = `${window.i18n('addingFriends')} ${this.props.chatName}`;
     const cancelText = window.i18n('cancel');
     const okText = window.i18n('ok');