Add *AndRole indexes to usersChannels

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/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/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/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();