Merge pull request #4833 from withspectrum/2.8.3

2.8.3

Author: brianlovin

api/migrations/20190306125252-threads-watercooler-index.js

@@ -0,0 +1,16 @@
+exports.up = function(r, conn) {
+  return r
+    .table('threads')
+    .indexCreate('communityIdAndWatercooler', [
+      r.row('communityId'),
+      r.row('watercooler'),
+    ])
+    .run(conn);
+};
+
+exports.down = function(r, conn) {
+  return r
+    .table('threads')
+    .indexDrop('communityIdAndWatercooler')
+    .run(conn);
+};

api/models/community.js

@@ -212,6 +212,7 @@ export type EditCommunityInput = {
     coverFile: Object,
     coverPhoto: string,
     communityId: string,
+    watercoolerId?: boolean,
   },
 };
 
@@ -409,179 +410,92 @@ export const createCommunity = ({ input }: CreateCommunityInput, user: DBUser):
 };
 
 // prettier-ignore
-export const editCommunity = ({ input }: EditCommunityInput, userId: string): Promise<DBCommunity> => {
-  const { name, slug, description, website, file, coverFile, communityId } = input
-  let { coverPhoto } = input
-  
+export const editCommunity = async ({ input }: EditCommunityInput, userId: string): Promise<DBCommunity> => {
+  const { name, slug, description, website, watercoolerId, file, coverPhoto, coverFile, communityId } = input
+
+  let community = await db.table('communities').get(communityId).run()
+
+  // if the input comes in with a coverPhoto of length 0 (empty string), it means
+  // the user was trying to delete or reset their cover photo from the front end.
+  // in this case we can just set a new default. Otherwise, just keep their
+  // original cover photo
+  let updatedCoverPhoto = community.coverPhoto
+  if (input.coverPhoto.length === 0) {
+    ({ coverPhoto: updatedCoverPhoto } = getRandomDefaultPhoto())
+  }
+
   return db
     .table('communities')
     .get(communityId)
+    .update({
+      ...community,
+      name,
+      slug,
+      description,
+      website,
+      watercoolerId: watercoolerId || community.watercoolerId,
+      coverPhoto: coverFile 
+        ? await uploadImage(coverFile, 'communities', community.id) 
+        : updatedCoverPhoto,
+      profilePhoto: file 
+        ? await uploadImage(file, 'communities', community.id) 
+        : community.profilePhoto,
+      modifiedAt: new Date()
+    }, { returnChanges: 'always' })
     .run()
     .then(result => {
-      return Object.assign({}, result, {
-        name,
-        slug,
-        description,
-        website,
-        modifiedAt: new Date(),
-      });
-    })
-    .then(community => {
-      searchQueue.add({
-        id: community.id,
-        type: 'community',
-        event: 'edited'
-      })
-
-      // if no file was uploaded, update the community with new string values
-      if (!file && !coverFile) {
-        // if the coverPhoto was deleted, reset to default
-        if (!coverPhoto) { 
-          ({ coverPhoto } = getRandomDefaultPhoto())
-        }
-        return db
-          .table('communities')
-          .get(communityId)
-          .update({ ...community, coverPhoto }, { returnChanges: 'always' })
-          .run()  
-          .then(result => {
-            // if an update happened
-            if (result.replaced === 1) {
-              trackQueue.add({
-                userId,
-                event: events.COMMUNITY_EDITED,
-                context: { communityId }
-              })
-              return result.changes[0].new_val;
-            }
-
-            // an update was triggered from the client, but no data was changed
-            if (result.unchanged === 1) {
-              trackQueue.add({
-                userId,
-                event: events.COMMUNITY_EDITED_FAILED,
-                context: { communityId },
-                properties: {
-                  reason: 'no changes'
-                }
-              })
-              return result.changes[0].old_val;
-            }
-          });
+      if (result.replaced === 1) {
+        community = result.changes[0].new_val;
+        trackQueue.add({
+          userId,
+          event: events.COMMUNITY_EDITED,
+          context: { communityId }
+        })
       }
 
-      if (file || coverFile) {
-        if (file && !coverFile) {
-          // if the coverPhoto was deleted, reset to default
-          if (!coverPhoto) { 
-            ({ coverPhoto } = getRandomDefaultPhoto())
+      // an update was triggered from the client, but no data was changed
+      if (result.unchanged === 1) {
+        community = result.changes[0].old_val;
+        trackQueue.add({
+          userId,
+          event: events.COMMUNITY_EDITED_FAILED,
+          context: { communityId },
+          properties: {
+            reason: 'no changes'
           }
-          return uploadImage(file, 'communities', community.id).then(
-            profilePhoto => {
-              // update the community with the profilePhoto
-              return (
-                db
-                  .table('communities')
-                  .get(community.id)
-                  .update(
-                    {
-                      ...community,
-                      profilePhoto,
-                      coverPhoto
-                    },
-                    { returnChanges: 'always' }
-                  )
-                  .run()
-                  // return the resulting community with the profilePhoto set
-                  .then(result => {
-                    // if an update happened
-                    if (result.replaced === 1) {
-                      return result.changes[0].new_val;
-                    }
-
-                    // an update was triggered from the client, but no data was changed
-                    if (result.unchanged === 1) {
-                      return result.changes[0].old_val;
-                    }
-                  })
-              );
-            }
-          );
-        } else if (!file && coverFile) {
-          return uploadImage(coverFile, 'communities', community.id).then(
-            coverPhoto => {
-              // update the community with the profilePhoto
-              return (
-                db
-                  .table('communities')
-                  .get(community.id)
-                  .update(
-                    {
-                      ...community,
-                      coverPhoto,
-                    },
-                    { returnChanges: 'always' }
-                  )
-                  .run()
-                  // return the resulting community with the profilePhoto set
-                  .then(result => {
-                    // if an update happened
-                    if (result.replaced === 1) {
-                      return result.changes[0].new_val;
-                    }
-
-                    // an update was triggered from the client, but no data was changed
-                    if (result.unchanged === 1) {
-                      return result.changes[0].old_val;
-                    }
-                  })
-              );
-            }
-          );
-        } else if (file && coverFile) {
-          const uploadFile = file => {
-            return uploadImage(file, 'communities', community.id);
-          };
-
-          const uploadCoverFile = coverFile => {
-            return uploadImage(coverFile, 'communities', community.id);
-          };
+        })
+      }
 
-          return Promise.all([
-            uploadFile(file),
-            uploadCoverFile(coverFile),
-          ]).then(([profilePhoto, coverPhoto]) => {
-            return (
-              db
-                .table('communities')
-                .get(community.id)
-                .update(
-                  {
-                    ...community,
-                    coverPhoto,
-                    profilePhoto,
-                  },
-                  { returnChanges: 'always' }
-                )
-                .run()
-                // return the resulting community with the profilePhoto set
-                .then(result => {
-                  // if an update happened
-                  if (result.replaced === 1) {
-                    return result.changes[0].new_val;
-                  }
+      searchQueue.add({
+        id: communityId,
+        type: 'community',
+        event: 'edited'
+      })
 
-                  // an update was triggered from the client, but no data was changed
-                  if (result.unchanged === 1) {
-                    return result.changes[0].old_val;
-                  }
+      return community
+    })
+};
 
-                  return null;
-                })
-            );
-          });
-        }
+export const setCommunityWatercoolerId = (
+  communityId: string,
+  threadId: ?string
+) => {
+  return db
+    .table('communities')
+    .get(communityId)
+    .update(
+      {
+        watercoolerId: threadId,
+      },
+      {
+        returnChanges: true,
       }
+    )
+    .run()
+    .then(result => {
+      if (!Array.isArray(result.changes) || result.changes.length === 0)
+        return getCommunityById(communityId);
+      return result.changes[0].new_val;
     });
 };
 

api/models/thread.js

@@ -418,6 +418,19 @@ export const getPublicParticipantThreadsByUser = (evalUser: string, options: Pag
     });
 };
 
+export const getWatercoolerThread = (
+  communityId: string
+): Promise<?DBThread> => {
+  return db
+    .table('threads')
+    .getAll([communityId, true], { index: 'communityIdAndWatercooler' })
+    .run()
+    .then(result => {
+      if (!Array.isArray(result) || result.length === 0) return null;
+      return result[0];
+    });
+};
+
 export const publishThread = (
   // eslint-disable-next-line
   { filesToUpload, ...thread }: Object,

api/mutations/community/disableCommunityWatercooler.js

@@ -0,0 +1,43 @@
+// @flow
+import UserError from '../../utils/UserError';
+import {
+  isAuthedResolver as requireAuth,
+  canModerateCommunity,
+} from '../../utils/permissions';
+import { events } from 'shared/analytics';
+import { trackQueue } from 'shared/bull/queues';
+import { publishThread, getWatercoolerThread } from '../../models/thread';
+import { getChannelBySlug } from '../../models/channel';
+import { setCommunityWatercoolerId } from '../../models/community';
+import type { DBCommunity } from 'shared/types';
+import type { GraphQLContext } from '../../';
+
+type Args = {
+  input: {
+    id: string,
+  },
+};
+
+export default requireAuth(async (_: any, args: Args, ctx: GraphQLContext) => {
+  const { id: communityId } = args.input;
+  const { user, loaders } = ctx;
+
+  if (!(await canModerateCommunity(user.id, communityId, loaders))) {
+    trackQueue.add({
+      userId: user.id,
+      event: events.COMMUNITY_WATERCOOLER_DISABLED_FAILED,
+      context: { communityId },
+      properties: {
+        reason: 'no permission',
+      },
+    });
+
+    return new UserError("You don't have permission to do this.");
+  }
+
+  const community: DBCommunity = await loaders.community.load(communityId);
+
+  if (!community.watercoolerId) return community;
+
+  return setCommunityWatercoolerId(community.id, null);
+});