Merge pull request #3819 from withspectrum/2.4.28

2.4.28

Author: brianlovin

api/models/thread.js

@@ -71,14 +71,27 @@ export const getThreadsByChannel = (channelId: string, options: PaginationOption
 };
 
 // prettier-ignore
-export const getThreadsByChannels = (channelIds: Array<string>, options: PaginationOptions): Promise<Array<DBThread>> => {
-  const { first, after } = options
-  
+type GetThreadsByChannelPaginationOptions = {
+  first: number,
+  after: number,
+  sort: 'latest' | 'trending'
+};
+
+export const getThreadsByChannels = (
+  channelIds: Array<string>,
+  options: GetThreadsByChannelPaginationOptions
+): Promise<Array<DBThread>> => {
+  const { first, after, sort = 'latest' } = options;
+
+  let order = [db.desc('lastActive'), db.desc('createdAt')];
+  // If we want the top threads, first sort by the score and then lastActive
+  if (sort === 'trending') order.unshift(db.desc('score'));
+
   return db
     .table('threads')
     .getAll(...channelIds, { index: 'channelId' })
     .filter(thread => db.not(thread.hasFields('deletedAt')))
-    .orderBy(db.desc('lastActive'), db.desc('createdAt'))
+    .orderBy(...order)
     .skip(after || 0)
     .limit(first || 999999)
     .run();
@@ -447,10 +460,10 @@ export const setThreadLock = (threadId: string, value: boolean, userId: string,
       .run()
       .then(async () => {
         const thread = await getThreadById(threadId)
-        
-        const event = value 
-          ? byModerator 
-            ? events.THREAD_LOCKED_BY_MODERATOR 
+
+        const event = value
+          ? byModerator
+            ? events.THREAD_LOCKED_BY_MODERATOR
             : events.THREAD_LOCKED
           : byModerator
             ? events.THREAD_UNLOCKED_BY_MODERATOR

api/models/usersChannels.js

@@ -465,7 +465,7 @@ const createMemberInDefaultChannels = (communityId: string, userId: string): Pro
 };
 
 // prettier-ignore
-const toggleUserChannelNotifications = (userId: string, channelId: string, value: boolean): Promise<DBChannel> => {
+const toggleUserChannelNotifications = async (userId: string, channelId: string, value: boolean): Promise<DBChannel> => {
   const event = value ? events.CHANNEL_NOTIFICATIONS_ENABLED : events.CHANNEL_NOTIFICATIONS_DISABLED
 
   trackQueue.add({
@@ -474,12 +474,25 @@ const toggleUserChannelNotifications = (userId: string, channelId: string, value
     context: { channelId }
   })
 
-  return db
+  const permissions = await db
     .table('usersChannels')
     .getAll(channelId, { index: 'channelId' })
     .filter({ userId })
-    .update({ receiveNotifications: value })
     .run();
+  
+  // permissions exist, this user is trying to toggle notifications for a channel where they
+  // are already a member
+  if (permissions && permissions.length > 0) {
+    return db
+      .table('usersChannels')
+      .getAll(channelId, { index: 'channelId' })
+      .filter({ userId })
+      .update({ receiveNotifications: value })
+      .run();
+  }
+
+  // if permissions don't exist, create a usersChannel relationship with notifications on
+  return createMemberInChannel(channelId, userId, false)
 };
 
 const removeUsersChannelMemberships = async (userId: string) => {

api/mutations/channel/toggleChannelNotifications.js

@@ -19,7 +19,8 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
     loaders.userPermissionsInChannel.load([user.id, channelId]),
   ]);
 
-  if (!permissions || permissions.isBlocked || !permissions.isMember) {
+  // only reject if the user is blocked in the channel
+  if (permissions && permissions.isBlocked) {
     let event = !permissions
       ? events.CHANNEL_NOTIFICATIONS_ENABLED_FAILED
       : permissions.receiveNotifications
@@ -37,7 +38,8 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
     return new UserError("You don't have permission to do that.");
   }
 
-  const value = !permissions.receiveNotifications;
+  // if the user hasn't joined the channel, they are trying to join it now
+  const value = permissions ? !permissions.receiveNotifications : true;
 
   return toggleUserChannelNotifications(user.id, channelId, value).then(
     () => channel

api/mutations/message/addMessage.js

@@ -13,7 +13,7 @@ import { trackUserThreadLastSeenQueue } from 'shared/bull/queues';
 import type { FileUpload } from 'shared/types';
 import { events } from 'shared/analytics';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
-import { trackQueue } from 'shared/bull/queues';
+import { trackQueue, calculateThreadScoreQueue } from 'shared/bull/queues';
 
 type Input = {
   message: {
@@ -344,6 +344,14 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
         timestamp: Date.now(),
       });
 
+      calculateThreadScoreQueue.add(
+        {
+          threadId: message.threadId,
+        },
+        {
+          jobId: message.threadId,
+        }
+      );
       return {
         ...dbMessage,
         contextPermissions,

api/mutations/message/deleteMessage.js

@@ -13,7 +13,7 @@ import { getUserPermissionsInChannel } from '../../models/usersChannels';
 import { getUserPermissionsInCommunity } from '../../models/usersCommunities';
 import { events } from 'shared/analytics';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
-import { trackQueue } from 'shared/bull/queues';
+import { trackQueue, calculateThreadScoreQueue } from 'shared/bull/queues';
 
 type Input = {
   id: string,
@@ -116,5 +116,15 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
         message.senderId
       );
     })
+    .then(() => {
+      return calculateThreadScoreQueue.add(
+        {
+          threadId: message.threadId,
+        },
+        {
+          jobId: message.threadId,
+        }
+      );
+    })
     .then(() => true);
 });

api/mutations/thread/addThreadReaction.js

@@ -3,6 +3,7 @@ import type { GraphQLContext } from '../../';
 import { addThreadReaction } from '../../models/threadReaction';
 import { getThreadById } from '../../models/thread';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
+import { calculateThreadScoreQueue } from 'shared/bull/queues';
 
 type Input = {
   input: {
@@ -13,8 +14,16 @@ type Input = {
 
 export default requireAuth(
   async (_: any, args: Input, { user, loaders }: GraphQLContext) => {
-    return await addThreadReaction(args.input, user.id).then(
-      async () => await getThreadById(args.input.threadId)
-    );
+    return await addThreadReaction(args.input, user.id).then(() => {
+      calculateThreadScoreQueue.add(
+        {
+          threadId: args.input.threadId,
+        },
+        {
+          jobId: args.input.threadId,
+        }
+      );
+      return getThreadById(args.input.threadId);
+    });
   }
 );

api/mutations/thread/removeThreadReaction.js

@@ -3,6 +3,7 @@ import type { GraphQLContext } from '../../';
 import { removeThreadReaction } from '../../models/threadReaction';
 import { getThreadById } from '../../models/thread';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
+import { calculateThreadScoreQueue } from 'shared/bull/queues';
 
 type Input = {
   input: {
@@ -12,8 +13,16 @@ type Input = {
 
 export default requireAuth(
   async (_: any, args: Input, { user, loaders }: GraphQLContext) => {
-    return await removeThreadReaction(args.input.threadId, user.id).then(
-      async () => await getThreadById(args.input.threadId)
-    );
+    return await removeThreadReaction(args.input.threadId, user.id).then(() => {
+      calculateThreadScoreQueue.add(
+        {
+          threadId: args.input.threadId,
+        },
+        {
+          jobId: args.input.threadId,
+        }
+      );
+      return getThreadById(args.input.threadId);
+    });
   }
 );

api/queries/community/threadConnection.js

@@ -10,9 +10,15 @@ import {
 import { getThreadsByChannels } from '../../models/thread';
 import { canViewCommunity } from '../../utils/permissions';
 
+export type CommunityThreadConnectionPaginationOptions = {
+  after: string,
+  first: number,
+  sort: 'latest' | 'trending',
+};
+
 // prettier-ignore
-export default async (root: DBCommunity, args: PaginationOptions, ctx: GraphQLContext) => {
-  const { first = 10, after } = args
+export default async (root: DBCommunity, args: CommunityThreadConnectionPaginationOptions, ctx: GraphQLContext) => {
+  const { first = 10, after, sort = 'latest' } = args
   const { user, loaders } = ctx
   const { id } = root
 
@@ -29,7 +35,7 @@ export default async (root: DBCommunity, args: PaginationOptions, ctx: GraphQLCo
   // Get the index from the encoded cursor, asdf234gsdf-2 => ["-2", "2"]
   const lastDigits = cursor.match(/-(\d+)$/);
   const lastThreadIndex =
-    lastDigits && lastDigits.length > 0 && parseInt(lastDigits[1], 10);
+    lastDigits && lastDigits.length > 0 && parseInt(lastDigits[1], 10) || 0;
   const currentUser = user;
 
   // if the user is signed in, only return stories for the channels
@@ -44,10 +50,10 @@ export default async (root: DBCommunity, args: PaginationOptions, ctx: GraphQLCo
     channels = await getPublicChannelsByCommunity(id);
   }
 
-  // $FlowFixMe
   const threads = await getThreadsByChannels(channels, {
     first,
     after: lastThreadIndex,
+    sort,
   });
 
   return {

api/queries/thread/rootThread.js

@@ -1,4 +1,5 @@
 // @flow
+import { calculateThreadScoreQueue } from 'shared/bull/queues';
 import type { GraphQLContext } from '../../';
 
 export default async (
@@ -50,6 +51,23 @@ export default async (
       (!communityPermissions || !communityPermissions.isMember)
     )
       return null;
+
+    // If the threads score hasn't been updated in the past
+    // 24 hours add a new job to the queue to update it
+    if (
+      (!thread.score && !thread.scoreUpdatedAt) ||
+      (thread.scoreUpdatedAt &&
+        Date.now() > new Date(thread.scoreUpdatedAt).getTime() + 86400000)
+    ) {
+      calculateThreadScoreQueue.add(
+        {
+          threadId: thread.id,
+        },
+        {
+          jobId: thread.id,
+        }
+      );
+    }
     return thread;
   }
 };

api/routes/auth/create-signin-routes.js

@@ -80,6 +80,11 @@ export const createSigninRoutes = (
         // to the old URL the next time around
         // $FlowIssue
         req.session.redirectUrl = undefined;
+        res.cookie('_now_no_cache', '1', {
+          maxAge: 315569260000, // 10 years
+          sameSite: 'lax',
+          secure: false,
+        });
         return res.redirect(redirectUrl.href);
       },
     ],