Merge pull request #2618 from withspectrum/2.1.11

2.1.11

Author: brianlovin

Diff for: iris/mutations/channel/joinChannelWithToken.js

@@ -35,22 +35,24 @@ export default async (
 
   const { communitySlug, channelSlug, token } = input;
 
-  const [communityPermissions, channelPermissions, channel] = await Promise.all(
-    [
-      getUserPermissionsInCommunity(communitySlug, currentUser.id),
-      getUserPermissionsInChannel(channelSlug, currentUser.id),
-      getChannelBySlug(channelSlug, communitySlug),
-    ]
-  );
+  const channel = await getChannelBySlug(channelSlug, communitySlug);
 
   if (!channel) return new UserError('No channel found in this community');
 
-  const settings = await getChannelSettings(channel.id);
-
   if (!channel.isPrivate) {
     return channel;
   }
 
+  const [
+    communityPermissions,
+    channelPermissions,
+    settings,
+  ] = await Promise.all([
+    getUserPermissionsInCommunity(channel.communityId, currentUser.id),
+    getUserPermissionsInChannel(channel.id, currentUser.id),
+    getChannelSettings(channel.id),
+  ]);
+
   if (
     channelPermissions.isOwner ||
     channelPermissions.isModerator ||

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "private": true,
   "devDependencies": {
     "babel-cli": "^6.24.1",

Diff for: src/views/notifications/components/actorsRow.js

@@ -1,18 +1,20 @@
+// @flow
 import React from 'react';
-// $FlowFixMe
 import { ActorPhotosContainer, ActorPhotoItem } from '../style';
 import Avatar from '../../../components/avatar';
 
-export const ActorsRow = ({ actors }) => {
+export const ActorsRow = ({ actors }: { actors: Array<Object> }) => {
+  if (!actors || actors.length === 0) return null;
+
   return (
     <ActorPhotosContainer>
       {actors.map(actor => {
         return (
           <ActorPhotoItem key={actor.id}>
             <Avatar
               user={actor}
-              size={32}
-              radius={32}
+              size={'32'}
+              radius={'32'}
               isOnline={actor.isOnline}
               src={actor.profilePhoto}
               link={actor.username ? `/users/${actor.username}` : null}

Diff for: src/views/notifications/components/newUserInCommunityNotification.js

@@ -21,6 +21,7 @@ import {
 } from '../../../components/threadFeedCard/style';
 import compose from 'recompose/compose';
 import markSingleNotificationSeenMutation from 'shared/graphql/mutations/notification/markSingleNotificationSeen';
+import { DEFAULT_DEPRECATION_REASON } from 'graphql';
 
 type Props = {
   notification: Object,
@@ -37,6 +38,9 @@ export class NewUserInCommunityNotification extends React.Component<Props> {
     const date = parseNotificationDate(notification.modifiedAt);
     const context = parseContext(notification.context);
 
+    if (!actors.asString || !actors.asObjects || actors.asObjects.length === 0)
+      return null;
+
     return (
       <NotificationCard>
         <CardLink to={`/${notification.context.payload.slug}`} />
@@ -80,6 +84,9 @@ class MiniNewUserInCommunityNotificationWithMutation extends React.Component<
     const date = parseNotificationDate(notification.modifiedAt);
     const context = parseContext(notification.context);
 
+    if (!actors.asString || !actors.asObjects || actors.asObjects.length === 0)
+      return null;
+
     return (
       <NotificationListRow
         isSeen={notification.isSeen}

Diff for: src/views/notifications/utils.js

@@ -1,5 +1,4 @@
 import React from 'react';
-// $FlowFixMe
 import Link from 'src/components/link';
 import { timeDifferenceShort } from '../../helpers/utils';
 import { Timestamp } from './style';