Merge pull request #4320 from withspectrum/2.4.74

2.4.74

Author: brianlovin

api/apollo-server.js

@@ -141,8 +141,8 @@ const server = new ProtectedApolloServer({
   },
   maxFileSize: 25 * 1024 * 1024, // 25MB
   engine: false,
-  tracing: true,
-  cacheControl: true,
+  tracing: false,
+  cacheControl: false,
   validationRules: [depthLimit(10)],
 });
 

api/index.js

@@ -75,34 +75,7 @@ app.use(errorHandler);
 const httpServer = createServer(app);
 apolloServer.installSubscriptionHandlers(httpServer);
 
-// Start API wrapped in Apollo Engine
-const engine = new ApolloEngine({
-  logging: {
-    level: 'WARN',
-  },
-  apiKey: process.env.APOLLO_ENGINE_API_KEY,
-  // Only send perf data to the remote server in production
-  reporting: {
-    disabled: process.env.NODE_ENV !== 'production',
-    hostname: process.env.NOW_URL || undefined,
-    privateHeaders: ['authorization', 'Authorization', 'AUTHORIZATION'],
-  },
-  queryCache: {
-    // Don't cache logged-in user responses
-    privateFullQueryStore: 'disabled',
-  },
-  sessionAuth: {
-    cookie: 'session',
-    // TODO(@mxstbr): Ping Apollo to note that we need both of those
-    // header: 'Authorization'
-  },
-});
-
-engine.listen({
-  port: PORT,
-  httpServer: httpServer,
-  graphqlPaths: ['/api'],
-});
+httpServer.listen(PORT);
 
 debug(`GraphQL API running at http://localhost:${PORT}/api`);
 

api/loaders/channel.js

@@ -3,6 +3,7 @@ import {
   getChannels,
   getChannelsThreadCounts,
   getChannelsMemberCounts,
+  getChannelsOnlineMemberCounts,
 } from '../models/channel';
 import { getChannelsSettings } from '../models/channelSettings';
 import createLoader from './create-loader';
@@ -27,6 +28,11 @@ export const __createChannelMemberCountLoader = createLoader(
   'group'
 );
 
+export const __createChannelOnlineMemberCountLoader = createLoader(
+  channelIds => getChannelsOnlineMemberCounts(channelIds),
+  'group'
+);
+
 export const __createChannelSettingsLoader = createLoader(
   channelIds => getChannelsSettings(channelIds),
   key => key.channelId

api/loaders/index.js

@@ -17,6 +17,7 @@ import {
   __createChannelLoader,
   __createChannelThreadCountLoader,
   __createChannelMemberCountLoader,
+  __createChannelOnlineMemberCountLoader,
   __createChannelPendingMembersLoader,
   __createChannelSettingsLoader,
 } from './channel';
@@ -57,6 +58,7 @@ const createLoaders = (options?: DataLoaderOptions) => ({
   notification: __createNotificationLoader(options),
   channel: __createChannelLoader(options),
   channelMemberCount: __createChannelMemberCountLoader(options),
+  channelOnlineMemberCount: __createChannelOnlineMemberCountLoader(options),
   channelThreadCount: __createChannelThreadCountLoader(options),
   channelPendingUsers: __createChannelPendingMembersLoader(options),
   channelSettings: __createChannelSettingsLoader(options),

api/migrations/20181121054300-resync-community-member-counts.js

@@ -0,0 +1,39 @@
+exports.up = function(r, conn) {
+  return Promise.all([
+    r
+      .table('communities')
+      .update(
+        {
+          memberCount: r
+            .table('usersCommunities')
+            .getAll(r.row('id'), { index: 'communityId' })
+            .filter(row => row('isMember').eq(true))
+            .count()
+            .default(1),
+        },
+        {
+          nonAtomic: true,
+        }
+      )
+      .run(conn),
+    r
+      .table('channels')
+      .update(
+        {
+          memberCount: r
+            .table('usersChannels')
+            .getAll(r.row('id'), { index: 'channelId' })
+            .filter(row => row('isMember').eq(true))
+            .count()
+            .default(1),
+        },
+        {
+          nonAtomic: true,
+        }
+      )
+      .run(conn),
+  ]).catch(err => console.error(err));
+};
+exports.down = function(r, conn) {
+  return Promise.resolve();
+};

api/migrations/20181122162921-users-communities-useridandmember-index.js

@@ -0,0 +1,13 @@
+exports.up = function(r, conn) {
+  return r
+    .table('usersCommunities')
+    .indexCreate('userIdAndIsMember', [r.row('userId'), r.row('isMember')])
+    .run(conn);
+};
+
+exports.down = function(r, conn) {
+  return r
+    .table('usersCommunities')
+    .indexDrop('userIdAndIsMember')
+    .run(conn);
+};

api/models/channel.js

@@ -435,6 +435,36 @@ const getMemberCount = (channelId: string): Promise<number> => {
     .run();
 };
 
+const getChannelsOnlineMemberCounts = (channelIds: Array<string>) => {
+  return db
+    .table('usersChannels')
+    .getAll(...channelIds, {
+      index: 'channelId',
+    })
+    .filter({ isBlocked: false, isMember: true })
+    .pluck(['channelId', '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('channelId')
+    .count()
+    .run();
+};
+
 module.exports = {
   getChannelBySlug,
   getChannelById,
@@ -456,6 +486,7 @@ module.exports = {
   decrementMemberCount,
   setMemberCount,
   getMemberCount,
+  getChannelsOnlineMemberCounts,
   __forQueryTests: {
     channelsByCommunitiesQuery,
     channelsByIdsQuery,

api/models/community.js

@@ -61,9 +61,7 @@ export const getCommunitiesByUser = (userId: string): Promise<Array<DBCommunity>
     db
       .table('usersCommunities')
       // get all the user's communities
-      .getAll(userId, { index: 'userId' })
-      // only return communities the user is a member of
-      .filter({ isMember: true })
+      .getAll([userId, true], { index: 'userIdAndIsMember' })
       // get the community objects for each community
       .eqJoin('communityId', db.table('communities'))
       // get rid of unnecessary info from the usersCommunities object on the left
@@ -81,9 +79,7 @@ export const getVisibleCommunitiesByUser = async (evaluatingUserId: string, curr
   const evaluatingUserMemberships = await db
     .table('usersCommunities')
     // get all the user's communities
-    .getAll(evaluatingUserId, { index: 'userId' })
-    // only return communities the user is a member of
-    .filter({ isMember: true })
+    .getAll([evaluatingUserId, true], { index: 'userIdAndIsMember' })
     // get the community objects for each community
     .eqJoin('communityId', db.table('communities'))
     // get rid of unnecessary info from the usersCommunities object on the left
@@ -97,9 +93,7 @@ export const getVisibleCommunitiesByUser = async (evaluatingUserId: string, curr
   const currentUserMemberships = await db
     .table('usersCommunities')
     // get all the user's communities
-    .getAll(currentUserId, { index: 'userId' })
-    // only return communities the user is a member of
-    .filter({ isMember: true })
+    .getAll([currentUserId, true], { index: 'userIdAndIsMember' })
     // get the community objects for each community
     .eqJoin('communityId', db.table('communities'))
     // get rid of unnecessary info from the usersCommunities object on the left
@@ -130,9 +124,7 @@ export const getPublicCommunitiesByUser = async (userId: string) => {
   return await db
     .table('usersCommunities')
     // get all the user's communities
-    .getAll(userId, { index: 'userId' })
-    // only return communities the user is a member of
-    .filter({ isMember: true })
+    .getAll([userId, true], { index: 'userIdAndIsMember' })
     // get the community objects for each community
     .eqJoin('communityId', db.table('communities'))
     // only return public community ids
@@ -159,8 +151,9 @@ export const getCommunitiesChannelCounts = (communityIds: Array<string>) => {
 export const getCommunitiesMemberCounts = (communityIds: Array<string>) => {
   return db
     .table('usersCommunities')
-    .getAll(...communityIds, { index: 'communityId' })
-    .filter({ isBlocked: false, isMember: true })
+    .getAll(...communityIds.map(id => [id, true]), {
+      index: 'communityIdAndIsMember',
+    })
     .group('communityId')
     .count()
     .run();
@@ -171,10 +164,9 @@ export const getCommunitiesOnlineMemberCounts = (
 ) => {
   return db
     .table('usersCommunities')
-    .getAll(...communityIds, {
-      index: 'communityId',
+    .getAll(...communityIds.map(id => [id, true]), {
+      index: 'communityIdAndIsMember',
     })
-    .filter({ isBlocked: false, isMember: true })
     .pluck(['communityId', 'userId'])
     .eqJoin('userId', db.table('users'))
     .pluck('left', { right: ['lastSeen', 'isOnline'] })
@@ -812,8 +804,7 @@ export const setMemberCount = (
 export const getMemberCount = (communityId: string): Promise<number> => {
   return db
     .table('usersCommunities')
-    .getAll(communityId, { index: 'communityId' })
-    .filter({ isMember: true })
+    .getAll([communityId, true], { index: 'communityIdAndIsMember' })
     .count()
     .run();
 };

api/models/meta.js

@@ -19,8 +19,7 @@ const saveUserCommunityPermissions = (
 ): Promise<Object> => {
   return db
     .table('usersCommunities')
-    .getAll(userId, { index: 'userId' })
-    .filter({ communityId })
+    .getAll([userId, communityId], { index: 'userIdAndCommunityId' })
     .update(
       {
         ...permissions,

api/models/search.js

@@ -102,8 +102,7 @@ export const getUsersJoinedChannels = (userId: string): Promise<Array<string>> =
 export const getUsersJoinedCommunities = (userId: string): Promise<Array<string>> => {
   return db
     .table('usersCommunities')
-    .getAll(userId, { index: 'userId' })
-    .filter({ isMember: true })
+    .getAll([userId, true], { index: 'userIdAndIsMember' })
     .eqJoin('communityId', db.table('communities'))
     .filter(row => row('right').hasFields('deletedAt').not())
     .zip()
@@ -129,8 +128,7 @@ export const getUsersJoinedPrivateChannelIds = (userId: string): Promise<Array<s
 export const getUsersJoinedPrivateCommunityIds = (userId: string): Promise<Array<string>> => {
   return db
     .table('usersCommunities')
-    .getAll(userId, { index: 'userId' })
-    .filter({ isMember: true })
+    .getAll([userId, true], { index: 'userIdAndIsMember' })
     .eqJoin('communityId', db.table('communities'))
     .filter(row => row('right')('isPrivate').eq(true).and(row('right').hasFields('deletedAt').not()))
     .without({ left: ['id'] })