Merge pull request #3739 from withspectrum/alpha

Prod cut

Author: mxstbr

.circleci/config.yml

@@ -130,11 +130,11 @@ jobs:
           name: Deploy and alias API
           command: |
             cd build-api
-            npx now-cd --alias "alpha=api.alpha.spectrum.chat" --team spaceprogram
+            npx now-cd --alias "alpha=api.alpha.spectrum.chat" --team space-program
             cd ..
       - run:
           name: Deploy and alias Hyperion
-          command: npx now-cd --alias "alpha=hyperion.alpha.spectrum.chat" --team spaceprogram
+          command: npx now-cd --alias "alpha=hyperion.alpha.spectrum.chat" --team space-program
 
   # Run eslint, flow etc.
   test_static_js:

api/loaders/community.js

@@ -4,6 +4,7 @@ import {
   getCommunitiesBySlug,
   getCommunitiesMemberCounts,
   getCommunitiesChannelCounts,
+  getCommunitiesOnlineMemberCounts,
 } from '../models/community';
 import { getCommunitiesSettings } from '../models/communitySettings';
 import { getCommunitiesRecurringPayments } from '../models/recurringPayment';
@@ -33,6 +34,11 @@ export const __createCommunityChannelCountLoader = createLoader(
   'group'
 );
 
+export const __createCommunityOnlineMemberCountLoader = createLoader(
+  communityIds => getCommunitiesOnlineMemberCounts(communityIds),
+  'group'
+);
+
 export const __createCommunitySettingsLoader = createLoader(
   communityIds => getCommunitiesSettings(communityIds),
   key => key.communityId

api/loaders/index.js

@@ -29,6 +29,7 @@ import {
   __createCommunityMemberCountLoader,
   __createCommunityChannelCountLoader,
   __createCommunitySettingsLoader,
+  __createCommunityOnlineMemberCountLoader,
 } from './community';
 import {
   __createDirectMessageThreadLoader,
@@ -71,6 +72,7 @@ const createLoaders = (options?: DataLoaderOptions) => ({
   stripeCustomers: __createStripeCustomersLoader(options),
   communityChannelCount: __createCommunityChannelCountLoader(options),
   communityMemberCount: __createCommunityMemberCountLoader(options),
+  communityOnlineMemberCount: __createCommunityOnlineMemberCountLoader(options),
   communitySettings: __createCommunitySettingsLoader(options),
   directMessageThread: __createDirectMessageThreadLoader(options),
   directMessageParticipants: __createDirectMessageParticipantsLoader(options),

api/models/community.js

@@ -118,7 +118,7 @@ export const getVisibleCommunitiesByUser = async (evaluatingUserId: string, curr
   const overlappingMemberships = intersection(evaluatingUserCommunityIds, currentUserCommunityIds)
   const allVisibleCommunityIds = [...publicCommunityIds, ...overlappingMemberships]
   const distinctCommunityIds = allVisibleCommunityIds.filter((x, i, a) => a.indexOf(x) === i)
-  
+
   return await db
     .table('communities')
     .getAll(...distinctCommunityIds)
@@ -165,6 +165,38 @@ export const getCommunitiesMemberCounts = (communityIds: Array<string>) => {
     .run();
 };
 
+export const getCommunitiesOnlineMemberCounts = (
+  communityIds: Array<string>
+) => {
+  return db
+    .table('usersCommunities')
+    .getAll(...communityIds, {
+      index: 'communityId',
+    })
+    .filter({ isBlocked: false, isMember: true })
+    .pluck(['communityId', 'userId'])
+    .eqJoin('userId', db.table('users'))
+    .pluck('left', { right: ['lastSeen', 'isOnline'] })
+    .zip()
+    .filter(rec =>
+      rec('isOnline')
+        .eq(true)
+        .or(
+          rec('lastSeen')
+            .toEpochTime()
+            .ge(
+              db
+                .now()
+                .toEpochTime()
+                .sub(86400)
+            )
+        )
+    )
+    .group('communityId')
+    .count()
+    .run();
+};
+
 // prettier-ignore
 export const getCommunityMetaData = (communityId: string): Promise<Array<number>> => {
   const getChannelCount = db

api/models/reputationEvents.js

@@ -13,7 +13,7 @@ export const getTopMembersInCommunity = (communityId: string): Promise<Array<str
     .group('userId')
     .run()
     .then(results => {
-      if (!results) return null;
+      if (!results) return [];
       const sorted = results
         .map(c => ({
           userId: c.group,

api/models/user.js

@@ -480,11 +480,7 @@ const setUserOnline = (id: string, isOnline: boolean): DBUser => {
   let data = {};
 
   data.isOnline = isOnline;
-
-  // If a user is going offline, store their lastSeen
-  if (isOnline === false) {
-    data.lastSeen = new Date();
-  }
+  data.lastSeen = new Date();
   return db
     .table('users')
     .get(id)

api/package.json

@@ -55,7 +55,7 @@
     "hoist-non-react-statics": "^2.5.5",
     "host-validation": "^1.1.0",
     "hpp": "^0.2.2",
-    "imgix-core-js": "^1.0.6",
+    "imgix-core-js": "^1.2.0",
     "immutability-helper": "^2.7.1",
     "isomorphic-fetch": "^2.2.1",
     "iterall": "^1.2.2",
@@ -108,7 +108,7 @@
     "redux-thunk": "^2.3.0",
     "rethinkdb-changefeed-reconnect": "^0.3.2",
     "rethinkdb-inspector": "^0.3.3",
-    "rethinkdb-migrate": "^1.3.0",
+    "rethinkdb-migrate": "^1.4.0",
     "rethinkdbdash": "^2.3.29",
     "sanitize-filename": "^1.6.1",
     "serialize-javascript": "^1.5.0",

api/queries/community/conversationGrowth.js

@@ -2,6 +2,7 @@
 import type { DBCommunity } from 'shared/types';
 import type { GraphQLContext } from '../../';
 import UserError from '../../utils/UserError';
+import { canAdministerCommunity } from '../../utils/permissions';
 const {
   getThreadCount,
   getCommunityGrowth,
@@ -18,36 +19,28 @@ export default async (
     return new UserError('You must be signed in to continue.');
   }
 
-  const { isOwner } = await loaders.userPermissionsInCommunity.load([
-    currentUser.id,
-    id,
-  ]);
-
-  if (!isOwner) {
+  if (!await canAdministerCommunity(currentUser.id, id, loaders)) {
     return new UserError(
-      'You must be the owner of this community to view analytics.'
+      'You must be a team member to view community analytics.'
     );
   }
 
+  const [
+    count,
+    weeklyGrowth,
+    monthlyGrowth,
+    quarterlyGrowth,
+  ] = await Promise.all([
+    getThreadCount(id),
+    getCommunityGrowth('threads', 'weekly', 'createdAt', id),
+    getCommunityGrowth('threads', 'monthly', 'createdAt', id),
+    getCommunityGrowth('threads', 'quarterly', 'createdAt', id),
+  ]);
+
   return {
-    count: await getThreadCount(id),
-    weeklyGrowth: await getCommunityGrowth(
-      'threads',
-      'weekly',
-      'createdAt',
-      id
-    ),
-    monthlyGrowth: await getCommunityGrowth(
-      'threads',
-      'monthly',
-      'createdAt',
-      id
-    ),
-    quarterlyGrowth: await getCommunityGrowth(
-      'threads',
-      'quarterly',
-      'createdAt',
-      id
-    ),
+    count,
+    weeklyGrowth,
+    monthlyGrowth,
+    quarterlyGrowth,
   };
 };

api/queries/community/metaData.js

@@ -7,20 +7,22 @@ export default async (root: DBCommunity, _: any, ctx: GraphQLContext) => {
   const { user, loaders } = ctx;
   const { id } = root;
 
-  if (!await canViewCommunity(user, id, loaders)) {
+  if (!(await canViewCommunity(user, id, loaders))) {
     return {
       channels: 0,
       members: 0,
     };
   }
 
-  const [channelCount, memberCount] = await Promise.all([
+  const [channelCount, memberCount, onlineMemberCount] = await Promise.all([
     loaders.communityChannelCount.load(id),
     loaders.communityMemberCount.load(id),
+    loaders.communityOnlineMemberCount.load(id),
   ]);
 
   return {
     channels: channelCount ? channelCount.reduction : 0,
     members: memberCount ? memberCount.reduction : 0,
+    onlineMembers: onlineMemberCount ? onlineMemberCount.reduction : 0,
   };
 };

api/queries/community/topAndNewThreads.js

@@ -2,47 +2,60 @@
 import type { DBCommunity } from 'shared/types';
 import type { GraphQLContext } from '../../';
 import UserError from '../../utils/UserError';
+import { canAdministerCommunity } from '../../utils/permissions';
 import { getMessageCount } from '../../models/message';
 import {
   getThreads,
   getThreadsByCommunityInTimeframe,
 } from '../../models/thread';
 
-export default ({ id }: DBCommunity, __: any, { user }: GraphQLContext) => {
+export default async (
+  { id }: DBCommunity,
+  __: any,
+  { user, loaders }: GraphQLContext
+) => {
   const currentUser = user;
 
   if (!currentUser) {
     return new UserError('You must be signed in to continue.');
   }
 
-  return getThreadsByCommunityInTimeframe(id, 'weekly').then(async threads => {
-    if (!threads) return { topThreads: [], newThreads: [] };
-
-    const messageCountPromises = threads.map(async ({ id }) => ({
-      id,
-      messageCount: await getMessageCount(id),
-    }));
-
-    // promise all the active threads and message counts
-    const threadsWithMessageCounts = await Promise.all(messageCountPromises);
-
-    const topThreads = threadsWithMessageCounts
-      .filter(t => t.messageCount > 0)
-      .sort((a, b) => {
-        const bc = parseInt(b.messageCount, 10);
-        const ac = parseInt(a.messageCount, 10);
-        return bc <= ac ? -1 : 1;
-      })
-      .slice(0, 10)
-      .map(t => t.id);
-
-    const newThreads = threadsWithMessageCounts
-      .filter(t => t.messageCount === 0)
-      .map(t => t.id);
-
-    return {
-      topThreads: await getThreads([...topThreads]),
-      newThreads: await getThreads([...newThreads]),
-    };
-  });
+  if (!await canAdministerCommunity(currentUser.id, id, loaders)) {
+    return new UserError(
+      'You must be a team member to view community analytics.'
+    );
+  }
+
+  const threads = await getThreadsByCommunityInTimeframe(id, 'weekly');
+
+  if (!threads || threads.length === 0)
+    return { topThreads: [], newThreads: [] };
+
+  const threadsWithMessageCounts = await Promise.all(
+    threads.map(({ id }) =>
+      getMessageCount(id).then(messageCount => ({
+        id,
+        messageCount,
+      }))
+    )
+  );
+
+  const topThreads = threadsWithMessageCounts
+    .filter(t => t.messageCount > 0)
+    .sort((a, b) => {
+      const bc = parseInt(b.messageCount, 10);
+      const ac = parseInt(a.messageCount, 10);
+      return bc <= ac ? -1 : 1;
+    })
+    .slice(0, 10)
+    .map(t => t.id);
+
+  const newThreads = threadsWithMessageCounts
+    .filter(t => t.messageCount === 0)
+    .map(t => t.id);
+
+  return {
+    topThreads: await getThreads([...topThreads]),
+    newThreads: await getThreads([...newThreads]),
+  };
 };