Merge pull request #5087 from withspectrum/fix-private-channel-joins

Fix private channel joins

Author: brianlovin

api/migrations/20190501021006-remove-all-private-channel-members.js

@@ -0,0 +1,75 @@
+exports.up = async function(r, conn) {
+  // get all private channels that haven't been deleted
+  const privateChannels = await r
+    .db('spectrum')
+    .table('channels')
+    .filter({ isPrivate: true })
+    .filter(row => row.hasFields('deletedAt').not())
+    .run(conn)
+    .then(cursor => cursor.toArray());
+
+  // for each channel, remove all members except the community owner
+  return Promise.all(
+    privateChannels.map(async channel => {
+      const community = await r
+        .db('spectrum')
+        .table('communities')
+        .get(channel.communityId)
+        .run(conn);
+
+      // ensure that the community owner also owns the channel
+      // to account for situations where a moderator created the channel
+      const communityOwnerChannelRecord = await r
+        .db('spectrum')
+        .table('usersChannels')
+        .getAll([community.creatorId, channel.id], {
+          index: 'userIdAndChannelId',
+        })
+        .run(conn)
+        .then(cursor => cursor.toArray());
+
+      if (
+        !communityOwnerChannelRecord ||
+        communityOwnerChannelRecord.length === 0
+      ) {
+        await r
+          .db('spectrum')
+          .table('usersChannels')
+          .insert({
+            channelId: channel.id,
+            userId: community.creatorId,
+            createdAt: new Date(),
+            isOwner: true,
+            isMember: true,
+            isModerator: false,
+            isBlocked: false,
+            isPending: false,
+            receiveNotifications: false,
+          })
+          .run(conn);
+      } else {
+        await r
+          .db('spectrum')
+          .table('usersChannels')
+          .getAll([community.creatorId, channel.id], {
+            index: 'userIdAndChannelId',
+          })
+          .update({ isOwner: true })
+          .run(conn);
+      }
+
+      return await r
+        .db('spectrum')
+        .table('usersChannels')
+        .getAll(channel.id, { index: 'channelId' })
+        .filter({ isMember: true })
+        .filter(row => row('userId').ne(community.creatorId))
+        .update({ isMember: false })
+        .run(conn);
+    })
+  );
+};
+
+exports.down = function(r, conn) {
+  return Promise.resolve();
+};

api/models/usersChannels.js

@@ -466,6 +466,11 @@ const toggleUserChannelNotifications = async (userId: string, channelId: string,
     .getAll([userId, channelId], { index: 'userIdAndChannelId' })
     .run();
 
+  const channel = await db
+    .table('channels')
+    .get(channelId)
+    .run()
+
   // permissions exist, this user is trying to toggle notifications for a channel where they
   // are already a member
   if (permissions && permissions.length > 0) {
@@ -476,8 +481,16 @@ const toggleUserChannelNotifications = async (userId: string, channelId: string,
       .run();
   }
 
-  // if permissions don't exist, create a usersChannel relationship with notifications on
-  return createMemberInChannel(channelId, userId, false)
+  // if the channel isn't private, it means the user is enabling notifications
+  // in a public channel that they have not yet joined - for example, if a user
+  // joins a community, then some time later the community creates a new channel,
+  // then again some time later the user wants notifications about that channel
+  if (!channel.isPrivate) {
+    // if permissions don't exist, create a usersChannel relationship with notifications on
+    return createMemberInChannel(channelId, userId, false)
+  }
+
+  return
 };
 
 const removeUsersChannelMemberships = async (userId: string) => {

api/routes/api/email.js

@@ -1,19 +1,19 @@
 // @flow
 require('now-env');
 const IS_PROD = process.env.NODE_ENV === 'production';
-const IS_TESTING = process.env.TEST_DB;
-import { BRIAN_ID } from '../../migrations/seed/default/constants';
 import { Router } from 'express';
 const jwt = require('jsonwebtoken');
 const emailRouter = Router();
 import { updateUserEmail } from 'shared/db/queries/user';
 import { unsubscribeUserFromEmailNotification } from '../../models/usersSettings';
 import { updateThreadNotificationStatusForUser } from '../../models/usersThreads';
 import { updateDirectMessageThreadNotificationStatusForUser } from '../../models/usersDirectMessageThreads';
-import { toggleUserChannelNotifications } from '../../models/usersChannels';
+import {
+  toggleUserChannelNotifications,
+  getUsersPermissionsInChannels,
+} from '../../models/usersChannels';
 import {
   updateCommunityAdministratorEmail,
-  resetCommunityAdministratorEmail,
   getCommunityById,
 } from '../../models/community';
 import { getChannelsByCommunity, getChannelById } from '../../models/channel';
@@ -89,18 +89,28 @@ emailRouter.get('/unsubscribe', async (req, res) => {
       }
       case 'muteCommunity': {
         const community = await getCommunityById(dataId);
-        return getChannelsByCommunity(dataId)
-          .then(channels => channels.map(c => c.id))
-          .then(channels =>
-            channels.map(c => toggleUserChannelNotifications(userId, c, false))
-          )
-          .then(() =>
-            res.redirect(
-              `${rootRedirect}/${
-                community.slug
-              }?toastType=success&toastMessage=You will no longer receive new thread emails from this community.`
-            )
-          );
+        const channels = await getChannelsByCommunity(dataId);
+        const channelIds = channels.map(channel => channel.id);
+        const usersChannels = await getUsersPermissionsInChannels(
+          channelIds.map(id => [userId, id])
+        );
+        const usersChannelsWithNotifications = usersChannels.filter(
+          usersChannel => usersChannel && usersChannel.receiveNotifications
+        );
+        const channelIdsWithNotifications = usersChannelsWithNotifications.map(
+          usersChannel => usersChannel.channelId
+        );
+
+        await channelIdsWithNotifications.map(
+          async channelId =>
+            await toggleUserChannelNotifications(userId, channelId, false)
+        );
+
+        return res.redirect(
+          `${rootRedirect}/${
+            community.slug
+          }?toastType=success&toastMessage=You will no longer receive new thread emails from this community.`
+        );
       }
       case 'muteThread':
         return updateThreadNotificationStatusForUser(