From 62825faa6119c1025c2a2b5a60e1bb05ac255cfd Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Mon, 10 Feb 2020 13:01:27 +1100
Subject: [PATCH] Don't perform admin check if it's a new group that we are
 creating

---
 js/models/messages.js | 56 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 4aef00b64..c9455c098 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1946,38 +1946,38 @@
             conversation.setFriendRequestStatus(
               window.friends.friendRequestStatusEnum.friends
             );
-          }
-
-        const fromAdmin = conversation
-          .get('groupAdmins')
-          .includes(primarySource);
-
-          if (!fromAdmin) {
-            // Make sure the message is not removing members / renaming the group
-            const nameChanged =
-              conversation.get('name') !== initialMessage.group.name;
-
-            if (nameChanged) {
-              window.log.warn(
-                'Non-admin attempts to change the name of the group'
-              );
-            }
+          } else {
+            const fromAdmin = conversation
+              .get('groupAdmins')
+              .includes(primarySource);
+
+            if (!fromAdmin) {
+              // Make sure the message is not removing members / renaming the group
+              const nameChanged =
+                conversation.get('name') !== initialMessage.group.name;
+
+              if (nameChanged) {
+                window.log.warn(
+                  'Non-admin attempts to change the name of the group'
+                );
+              }
 
-            const membersMissing =
-              _.difference(
-                conversation.get('members'),
-                initialMessage.group.members
-              ).length > 0;
+              const membersMissing =
+                _.difference(
+                  conversation.get('members'),
+                  initialMessage.group.members
+                ).length > 0;
 
-            if (membersMissing) {
-              window.log.warn('Non-admin attempts to remove group members');
-            }
+              if (membersMissing) {
+                window.log.warn('Non-admin attempts to remove group members');
+              }
 
-            const messageAllowed = !nameChanged && !membersMissing;
+              const messageAllowed = !nameChanged && !membersMissing;
 
-            if (!messageAllowed) {
-              confirm();
-              return null;
+              if (!messageAllowed) {
+                confirm();
+                return null;
+              }
             }
           }
           // For every member, see if we need to establish a session: