From 21e982e5c2c3afd92af74cc34ff0bd7d39df6fd0 Mon Sep 17 00:00:00 2001
From: Mikunj Varsani <mikunj@live.com.au>
Date: Thu, 6 Feb 2020 11:48:01 +1100
Subject: [PATCH] Fix open group joining.

---
 _locales/en/messages.json                        |  3 ++-
 js/background.js                                 |  3 ++-
 js/conversation_controller.js                    | 10 ++++++----
 js/modules/loki_app_dot_net_api.js               | 13 +++++++------
 ts/components/session/LeftPaneChannelSection.tsx | 10 +++++-----
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 35b03f94c..896892a4e 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1994,7 +1994,8 @@
       "Shown in the conversation history when someone updates the group"
   },
   "titleIsNow": {
-    "comment": "Do not add a period here, used as a fragment and will break unit test",
+    "comment":
+      "Do not add a period here, used as a fragment and will break unit test",
     "message": "Group name has been set to '$name$'",
     "description":
       "Shown in the conversation history when someone changes the title of the group",
diff --git a/js/background.js b/js/background.js
index 9f6b99e35..8d5ebd1f1 100644
--- a/js/background.js
+++ b/js/background.js
@@ -1100,7 +1100,8 @@
       await conversation.setPublicSource(sslServerURL, channelId);
       // set friend and appropriate SYNC messages for multidevice
       await conversation.setFriendRequestStatus(
-        window.friends.friendRequestStatusEnum.friends
+        window.friends.friendRequestStatusEnum.friends,
+        { blockSync: true }
       );
 
       // and finally activate it
diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index 3619f3e62..32b5e8e10 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -136,10 +136,12 @@
 
       conversation.initialPromise = create();
       conversation.initialPromise.then(() => {
-        Promise.all([
-          conversation.updateProfileAvatar(),
-          window.lokiSnodeAPI.refreshSwarmNodesForPubKey(id),
-        ]);
+        if (!conversation.isPublic() && !conversation.isRss()) {
+          Promise.all([
+            conversation.updateProfileAvatar(),
+            window.lokiSnodeAPI.refreshSwarmNodesForPubKey(id),
+          ]);
+        }
       });
 
       return conversation;
diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js
index 7f2a5dc56..38b229c73 100644
--- a/js/modules/loki_app_dot_net_api.js
+++ b/js/modules/loki_app_dot_net_api.js
@@ -1629,12 +1629,13 @@ class LokiPublicChannelAPI {
       if (slavePrimaryMap[slaveKey]) {
         // rewrite source, profile
         messageData.source = primaryPubKey;
-        const { name, avatar, profileKey } = this.primaryUserProfileName[
-          primaryPubKey
-        ];
-        messageData.message.profile.displayName = name;
-        messageData.message.profile.avatar = avatar;
-        messageData.message.profileKey = profileKey;
+        const primaryProfile = this.primaryUserProfileName[primaryPubKey];
+        if (primaryProfile) {
+          const { name, avatar, profileKey } = primaryProfile;
+          messageData.message.profile.displayName = name;
+          messageData.message.profile.avatar = avatar;
+          messageData.message.profileKey = profileKey;
+        }
       }
       /* eslint-enable no-param-reassign */
       this.chatAPI.emit('publicMessage', {
diff --git a/ts/components/session/LeftPaneChannelSection.tsx b/ts/components/session/LeftPaneChannelSection.tsx
index 917033d9d..f7a9cdd08 100644
--- a/ts/components/session/LeftPaneChannelSection.tsx
+++ b/ts/components/session/LeftPaneChannelSection.tsx
@@ -357,8 +357,8 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
     this.setState({ channelUrlPasted: value });
   }
 
-  private handleJoinChannelButtonClick() {
-    const { loading, channelUrlPasted } = this.state;
+  private handleJoinChannelButtonClick(groupUrl: string) {
+    const { loading } = this.state;
 
     if (loading) {
       return false;
@@ -366,7 +366,7 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
 
     const regexURL = /(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?/;
 
-    if (channelUrlPasted.length <= 0) {
+    if (groupUrl.length <= 0) {
       window.pushToast({
         title: window.i18n('noServerURL'),
         type: 'error',
@@ -376,7 +376,7 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
       return false;
     }
 
-    if (!regexURL.test(channelUrlPasted)) {
+    if (!regexURL.test(groupUrl)) {
       window.pushToast({
         title: window.i18n('noServerURL'),
         type: 'error',
@@ -386,7 +386,7 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
       return false;
     }
 
-    joinChannelStateManager(this, channelUrlPasted, () => {
+    joinChannelStateManager(this, groupUrl, () => {
       this.handleToggleOverlay(SessionGroupType.Open);
     });