2.4.78

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,6 +14,7 @@
 - hermes
 - chronos
 - mobile
+- analytics
 
 **Run database migrations (delete if no migration was added)**
 YES

analytics/models/channel.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBChannel } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 export const getChannelById = (channelId: string): Promise<DBChannel> => {
   return db

analytics/models/community.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBCommunity } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 export const getCommunityById = (communityId: string): Promise<DBCommunity> => {
   return db

analytics/models/message.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBMessage } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 export const getMessageById = (messageId: string): Promise<DBMessage> => {
   return db

analytics/models/notification.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBNotification } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 export const getNotificationById = (
   notificationId: string

analytics/models/reaction.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBReaction, DBThreadReaction } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 export const getReactionById = (reactionId: string): Promise<DBReaction> => {
   return db

analytics/models/thread.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBThread } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 export const getThreadById = (threadId: string): Promise<DBThread> => {
   return db

analytics/models/usersChannels.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBUsersChannels } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 const defaultResult = {
   isMember: false,

analytics/models/usersCommunities.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBUsersCommunities } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 const defaultResult = {
   isMember: false,

analytics/models/usersThreads.js

@@ -1,6 +1,6 @@
 // @flow
 import type { DBUsersThreads } from 'shared/types';
-import { db } from './db';
+import { db } from 'shared/db';
 
 export const getThreadNotificationStatusForUser = (
   threadId: string,

api/apollo-server.js

@@ -61,20 +61,6 @@ const server = new ProtectedApolloServer({
           req.login(data, err => (err ? rej(err) : res()))
         ),
       user: currentUser,
-      getImageSignatureExpiration: () => {
-        /*
-          Expire images sent to the client at midnight each day (UTC).
-          Expiration needs to be consistent across all images in order
-          to preserve client-side caching abilities and to prevent checksum
-          mismatches during SSR
-        */
-        const date = new Date();
-        date.setHours(24);
-        date.setMinutes(0);
-        date.setSeconds(0);
-        date.setMilliseconds(0);
-        return date.getTime();
-      },
     };
   },
   subscriptions: {
@@ -98,28 +84,12 @@ const server = new ProtectedApolloServer({
           return {
             user: user || null,
             loaders: createLoaders({ cache: false }),
-            getImageSignatureExpiration: () => {
-              const date = new Date();
-              date.setHours(24);
-              date.setMinutes(0);
-              date.setSeconds(0);
-              date.setMilliseconds(0);
-              return date.getTime();
-            },
           };
         })
         .catch(err => {
           console.error(err);
           return {
             loaders: createLoaders({ cache: false }),
-            getImageSignatureExpiration: () => {
-              const date = new Date();
-              date.setHours(24);
-              date.setMinutes(0);
-              date.setSeconds(0);
-              date.setMilliseconds(0);
-              return date.getTime();
-            },
           };
         }),
   },

api/index.js

@@ -26,7 +26,6 @@ import type { Loader } from './loaders/types';
 export type GraphQLContext = {
   user: DBUser,
   updateCookieUserData: (data: DBUser) => Promise<void>,
-  getImageSignatureExpiration: () => number,
   loaders: {
     [key: string]: Loader,
   },

api/loaders/directMessageThread.js

@@ -1,7 +1,7 @@
 // @flow
 import { getDirectMessageThreads } from '../models/directMessageThread';
 import { getMembersInDirectMessageThreads } from '../models/usersDirectMessageThreads';
-import { getLastMessages } from '../models/message';
+import { getLastMessageOfThreads } from '../models/message';
 import createLoader from './create-loader';
 import type { Loader } from './types';
 
@@ -15,8 +15,8 @@ export const __createDirectMessageParticipantsLoader = createLoader(
 );
 
 export const __createDirectMessageSnippetLoader = createLoader(
-  threads => getLastMessages(threads),
-  'group'
+  threads => getLastMessageOfThreads(threads),
+  'threadId'
 );
 
 export default () => {

api/migrations/20181126094455-users-channels-roles.js

@@ -0,0 +1,59 @@
+const branch = (r, field, fallback) => {
+  return r.branch(r.row(`is${field}`).eq(true), field.toLowerCase(), fallback);
+};
+
+exports.up = function(r, conn) {
+  return Promise.all([
+    r
+      .table('usersChannels')
+      .indexCreate('channelIdAndRole', [
+        r.row('channelId'),
+        branch(
+          r,
+          'Pending',
+          branch(
+            r,
+            'Blocked',
+            branch(
+              r,
+              'Owner',
+              branch(r, 'Moderator', branch(r, 'Member', r.literal()))
+            )
+          )
+        ),
+      ])
+      .run(conn),
+    r
+      .table('usersChannels')
+      .indexCreate('userIdAndRole', [
+        r.row('userId'),
+        branch(
+          r,
+          'Pending',
+          branch(
+            r,
+            'Blocked',
+            branch(
+              r,
+              'Owner',
+              branch(r, 'Moderator', branch(r, 'Member', r.literal()))
+            )
+          )
+        ),
+      ])
+      .run(conn),
+  ]);
+};
+
+exports.down = function(r, conn) {
+  return Promise.all([
+    r
+      .table('usersChannels')
+      .indexDrop('channelIdAndRole')
+      .run(conn),
+    r
+      .table('usersChannels')
+      .indexDrop('userIdAndRole')
+      .run(conn),
+  ]);
+};

api/migrations/20181127090014-communities-member-count-index.js

@@ -0,0 +1,13 @@
+exports.up = function(r, conn) {
+  return r
+    .table('communities')
+    .indexCreate('memberCount')
+    .run(conn);
+};
+
+exports.down = function(r, conn) {
+  return r
+    .table('communities')
+    .indexDrop('memberCount')
+    .run(conn);
+};

api/models/channel.js

@@ -99,22 +99,28 @@ const getChannelsByUser = (userId: string): Promise<Array<DBChannel>> => {
   );
 };
 
-// prettier-ignore
-const getChannelBySlug = (channelSlug: string, communitySlug: string): Promise<DBChannel> => {
+const getChannelBySlug = async (
+  channelSlug: string,
+  communitySlug: string
+): Promise<?DBChannel> => {
+  const [communityId] = await db
+    .table('communities')
+    .getAll(communitySlug, { index: 'slug' })('id')
+    .run();
+
+  if (!communityId) return null;
+
   return db
     .table('channels')
+    .getAll(communityId, { index: 'communityId' })
     .filter(channel =>
       channel('slug')
         .eq(channelSlug)
         .and(db.not(channel.hasFields('deletedAt')))
     )
-    .eqJoin('communityId', db.table('communities'))
-    .filter({ right: { slug: communitySlug } })
     .run()
-    .then(result => {
-      if (result && result[0]) {
-        return result[0].left;
-      }
+    .then(res => {
+      if (Array.isArray(res) && res.length > 0) return res[0];
       return null;
     });
 };

api/models/message.js

@@ -90,23 +90,25 @@ export const getMessages = (
   return getForwardMessages(threadId, { first, after });
 };
 
-export const getLastMessage = (threadId: string): Promise<DBMessage> => {
+export const getLastMessage = (threadId: string): Promise<?DBMessage> => {
   return db
     .table('messages')
-    .getAll(threadId, { index: 'threadId' })
+    .between([threadId, db.minval], [threadId, db.maxval], {
+      index: 'threadIdAndTimestamp',
+      leftBound: 'open',
+      rightBound: 'closed',
+    })
+    .orderBy({ index: db.desc('threadIdAndTimestamp') })
     .filter(db.row.hasFields('deletedAt').not())
-    .max('timestamp')
-    .run();
+    .limit(1)
+    .run()
+    .then(res => (Array.isArray(res) && res.length > 0 ? res[0] : null));
 };
 
-export const getLastMessages = (threadIds: Array<string>): Promise<Object> => {
-  return db
-    .table('messages')
-    .getAll(...threadIds, { index: 'threadId' })
-    .filter(db.row.hasFields('deletedAt').not())
-    .group('threadId')
-    .max(row => row('timestamp'))
-    .run();
+export const getLastMessageOfThreads = (
+  threadIds: Array<string>
+): Promise<Array<?DBMessage>> => {
+  return Promise.all(threadIds.map(id => getLastMessage(id)));
 };
 
 // prettier-ignore

api/models/search.js

@@ -89,8 +89,7 @@ export const getPrivateCommunityIdsForUsersThreads = (
 export const getUsersJoinedChannels = (userId: string): Promise<Array<string>> => {
   return db
     .table('usersChannels')
-    .getAll(userId, { index: 'userId' })
-    .filter({ isMember: true })
+    .getAll([userId, "member"], [userId, "moderator"], [userId, "owner"], { index: 'userIdAndRole' })
     .eqJoin('channelId', db.table('channels'))
     .filter(row => row('right').hasFields('deletedAt').not())
     .zip()
@@ -114,8 +113,7 @@ export const getUsersJoinedCommunities = (userId: string): Promise<Array<string>
 export const getUsersJoinedPrivateChannelIds = (userId: string): Promise<Array<string>> => {
   return db
     .table('usersChannels')
-    .getAll(userId, { index: 'userId' })
-    .filter({ isMember: true })
+    .getAll([userId, "member"], [userId, "moderator"], [userId, "owner"], { index: 'userIdAndRole' })
     .eqJoin('channelId', db.table('channels'))
     .filter(row => row('right')('isPrivate').eq(true).and(row('right').hasFields('deletedAt').not()))
     .without({ left: ['id'] })

api/models/thread.js

@@ -164,8 +164,14 @@ export const getViewableThreadsByUser = async (
   // get a list of the channelIds the current user is allowed to see threads
   const getCurrentUsersChannelIds = db
     .table('usersChannels')
-    .getAll(currentUser, { index: 'userId' })
-    .filter({ isBlocked: false, isMember: true })
+    .getAll(
+      [currentUser, 'member'],
+      [currentUser, 'moderator'],
+      [currentUser, 'owner'],
+      {
+        index: 'userIdAndRole',
+      }
+    )
     .map(userChannel => userChannel('channelId'))
     .run();
 
@@ -273,8 +279,14 @@ export const getViewableParticipantThreadsByUser = async (
   // get a list of the channelIds the current user is allowed to see threads for
   const getCurrentUsersChannelIds = db
     .table('usersChannels')
-    .getAll(currentUser, { index: 'userId' })
-    .filter({ isBlocked: false, isMember: true })
+    .getAll(
+      [currentUser, 'member'],
+      [currentUser, 'moderator'],
+      [currentUser, 'owner'],
+      {
+        index: 'userIdAndRole',
+      }
+    )
     .map(userChannel => userChannel('channelId'))
     .run();