Merge branch 'alpha' of github.com:withspectrum/spectrum into message-syntax-highlighting

Author: brianlovin

api/migrations/seed/default/channels.js

@@ -6,15 +6,18 @@ const {
   PAYMENTS_COMMUNITY_ID,
   DELETED_COMMUNITY_ID,
   PRIVATE_COMMUNITY_ID,
+  SINGLE_CHANNEL_COMMUNITY_ID,
   SPECTRUM_GENERAL_CHANNEL_ID,
   SPECTRUM_PRIVATE_CHANNEL_ID,
   PAYMENTS_GENERAL_CHANNEL_ID,
   PAYMENTS_PRIVATE_CHANNEL_ID,
+  PAYMENTS_FEATURES_CHANNEL_ID,
   SPECTRUM_ARCHIVED_CHANNEL_ID,
   SPECTRUM_DELETED_CHANNEL_ID,
   DELETED_COMMUNITY_DELETED_CHANNEL_ID,
   MODERATOR_CREATED_CHANNEL_ID,
   PRIVATE_GENERAL_CHANNEL_ID,
+  SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
 } = constants;
 
 module.exports = [
@@ -66,6 +69,18 @@ module.exports = [
     memberCount: 5,
   },
 
+  {
+    id: PAYMENTS_FEATURES_CHANNEL_ID,
+    communityId: PAYMENTS_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'Payments Features',
+    description: 'Payments Features',
+    slug: 'features',
+    isPrivate: false,
+    isDefault: false,
+    memberCount: 5,
+  },
+
   {
     id: SPECTRUM_ARCHIVED_CHANNEL_ID,
     communityId: SPECTRUM_COMMUNITY_ID,
@@ -128,4 +143,16 @@ module.exports = [
     isDefault: false,
     memberCount: 1,
   },
+
+  {
+    id: SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
+    communityId: SINGLE_CHANNEL_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'General',
+    description: 'General',
+    slug: 'general',
+    isPrivate: false,
+    isDefault: false,
+    memberCount: 1,
+  },
 ];

api/migrations/seed/default/communities.js

@@ -6,6 +6,7 @@ const {
   PAYMENTS_COMMUNITY_ID,
   DELETED_COMMUNITY_ID,
   PRIVATE_COMMUNITY_ID,
+  SINGLE_CHANNEL_COMMUNITY_ID,
 } = constants;
 
 module.exports = [
@@ -66,4 +67,18 @@ module.exports = [
     slug: 'private',
     memberCount: 1,
   },
+  {
+    id: SINGLE_CHANNEL_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    isPrivate: false,
+    name: 'Single channel community',
+    description: 'Single channel community',
+    website: 'https://spectrum.chat',
+    profilePhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Profile.png.0.6225566835336693',
+    coverPhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Header.png.0.3303118636071434',
+    slug: 'single',
+    memberCount: 1,
+  },
 ];

api/migrations/seed/default/constants.js

@@ -17,23 +17,29 @@ const PENDING_USER_ID = '7';
 const CHANNEL_MODERATOR_USER_ID = '8';
 // this user is moderator in all communities
 const COMMUNITY_MODERATOR_USER_ID = '9';
+// this user is only a member of one community, and that community only has
+// one channel - use for testing the composer community+channel selection
+const SINGLE_CHANNEL_COMMUNITY_USER_ID = '10';
 
 // communities
 const SPECTRUM_COMMUNITY_ID = '1';
 const PAYMENTS_COMMUNITY_ID = '2';
 const DELETED_COMMUNITY_ID = '3';
 const PRIVATE_COMMUNITY_ID = '4';
+const SINGLE_CHANNEL_COMMUNITY_ID = '5';
 
 // channels
 const SPECTRUM_GENERAL_CHANNEL_ID = '1';
 const SPECTRUM_PRIVATE_CHANNEL_ID = '2';
 const PAYMENTS_GENERAL_CHANNEL_ID = '3';
 const PAYMENTS_PRIVATE_CHANNEL_ID = '4';
+const PAYMENTS_FEATURES_CHANNEL_ID = '10';
 const SPECTRUM_ARCHIVED_CHANNEL_ID = '5';
 const SPECTRUM_DELETED_CHANNEL_ID = '6';
 const DELETED_COMMUNITY_DELETED_CHANNEL_ID = '7';
 const MODERATOR_CREATED_CHANNEL_ID = '8';
 const PRIVATE_GENERAL_CHANNEL_ID = '9';
+const SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID = '11';
 
 module.exports = {
   DATE,
@@ -46,17 +52,21 @@ module.exports = {
   PENDING_USER_ID,
   CHANNEL_MODERATOR_USER_ID,
   COMMUNITY_MODERATOR_USER_ID,
+  SINGLE_CHANNEL_COMMUNITY_USER_ID,
   SPECTRUM_COMMUNITY_ID,
   PAYMENTS_COMMUNITY_ID,
   DELETED_COMMUNITY_ID,
   PRIVATE_COMMUNITY_ID,
+  SINGLE_CHANNEL_COMMUNITY_ID,
   SPECTRUM_GENERAL_CHANNEL_ID,
   SPECTRUM_PRIVATE_CHANNEL_ID,
   PAYMENTS_GENERAL_CHANNEL_ID,
   PAYMENTS_PRIVATE_CHANNEL_ID,
+  PAYMENTS_FEATURES_CHANNEL_ID,
   SPECTRUM_ARCHIVED_CHANNEL_ID,
   SPECTRUM_DELETED_CHANNEL_ID,
   DELETED_COMMUNITY_DELETED_CHANNEL_ID,
   MODERATOR_CREATED_CHANNEL_ID,
   PRIVATE_GENERAL_CHANNEL_ID,
+  SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
 };

api/migrations/seed/default/messages.js

@@ -186,4 +186,21 @@ module.exports = [
     senderId: BRYN_ID,
     timestamp: new Date(DATE + 300000),
   },
+  {
+    id: '14',
+    threadId: 'thread-6',
+    threadType: 'story',
+    content: {
+      body: JSON.stringify(
+        toJSON(
+          fromPlainText(
+            'http://localhost:3000/spectrum/general/yet-another-thread~thread-9'
+          )
+        )
+      ),
+    },
+    messageType: 'draftjs',
+    senderId: BRIAN_ID,
+    timestamp: new Date(DATE + 300000),
+  },
 ];

api/migrations/seed/default/users.js

@@ -9,6 +9,7 @@ const {
   PREVIOUS_MEMBER_USER_ID,
   CHANNEL_MODERATOR_USER_ID,
   COMMUNITY_MODERATOR_USER_ID,
+  SINGLE_CHANNEL_COMMUNITY_USER_ID,
   DATE,
 } = constants;
 
@@ -128,4 +129,18 @@ module.exports = [
     createdAt: new Date(DATE),
     lastSeen: new Date(DATE),
   },
+  {
+    id: SINGLE_CHANNEL_COMMUNITY_USER_ID,
+    name: 'Single community person',
+    description: 'Im a member of one community',
+    website: '',
+    username: 'single-community-user',
+    profilePhoto:
+      'https://pbs.twimg.com/profile_images/848823167699230721/-9CbPtto_bigger.jpg',
+    coverPhoto:
+      'https://pbs.twimg.com/profile_banners/17106008/1491444958/1500x500',
+    email: '[email protected]',
+    createdAt: new Date(DATE),
+    lastSeen: new Date(DATE),
+  },
 ];

api/migrations/seed/default/usersChannels.js

@@ -9,14 +9,17 @@ const {
   PREVIOUS_MEMBER_USER_ID,
   CHANNEL_MODERATOR_USER_ID,
   COMMUNITY_MODERATOR_USER_ID,
+  SINGLE_CHANNEL_COMMUNITY_USER_ID,
   SPECTRUM_GENERAL_CHANNEL_ID,
   PRIVATE_GENERAL_CHANNEL_ID,
   SPECTRUM_ARCHIVED_CHANNEL_ID,
   SPECTRUM_PRIVATE_CHANNEL_ID,
   DELETED_COMMUNITY_DELETED_CHANNEL_ID,
   PAYMENTS_GENERAL_CHANNEL_ID,
   PAYMENTS_PRIVATE_CHANNEL_ID,
+  PAYMENTS_FEATURES_CHANNEL_ID,
   MODERATOR_CREATED_CHANNEL_ID,
+  SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
 } = constants;
 
 module.exports = [
@@ -142,6 +145,18 @@ module.exports = [
     isPending: false,
     receiveNotifications: true,
   },
+  {
+    id: '32',
+    createdAt: new Date(DATE),
+    userId: BRIAN_ID,
+    channelId: PAYMENTS_FEATURES_CHANNEL_ID,
+    isOwner: true,
+    isModerator: false,
+    isMember: true,
+    isBlocked: false,
+    isPending: false,
+    receiveNotifications: true,
+  },
   {
     id: '11',
     createdAt: new Date(DATE),
@@ -396,4 +411,28 @@ module.exports = [
     isPending: false,
     receiveNotifications: false,
   },
+  {
+    id: '33',
+    createdAt: new Date(DATE),
+    userId: BRIAN_ID,
+    channelId: SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
+    isOwner: false,
+    isModerator: false,
+    isMember: true,
+    isBlocked: false,
+    isPending: false,
+    receiveNotifications: false,
+  },
+  {
+    id: '34',
+    createdAt: new Date(DATE),
+    userId: SINGLE_CHANNEL_COMMUNITY_USER_ID,
+    channelId: SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
+    isOwner: false,
+    isModerator: false,
+    isMember: true,
+    isBlocked: false,
+    isPending: false,
+    receiveNotifications: false,
+  },
 ];

api/migrations/seed/default/usersCommunities.js

@@ -9,9 +9,11 @@ const {
   BLOCKED_USER_ID,
   CHANNEL_MODERATOR_USER_ID,
   COMMUNITY_MODERATOR_USER_ID,
+  SINGLE_CHANNEL_COMMUNITY_USER_ID,
   SPECTRUM_COMMUNITY_ID,
   PAYMENTS_COMMUNITY_ID,
   PRIVATE_COMMUNITY_ID,
+  SINGLE_CHANNEL_COMMUNITY_ID,
 } = constants;
 
 module.exports = [
@@ -39,7 +41,7 @@ module.exports = [
     isBlocked: false,
     isPending: false,
     receiveNotifications: true,
-    reputation: 100,
+    reputation: 101,
   },
   {
     id: '3',
@@ -199,4 +201,32 @@ module.exports = [
     receiveNotifications: true,
     reputation: 100,
   },
+
+  {
+    id: '16',
+    createdAt: new Date(DATE),
+    userId: BRIAN_ID,
+    communityId: SINGLE_CHANNEL_COMMUNITY_ID,
+    isOwner: false,
+    isModerator: false,
+    isMember: true,
+    isBlocked: false,
+    isPending: false,
+    receiveNotifications: true,
+    reputation: 0,
+  },
+
+  {
+    id: '17',
+    createdAt: new Date(DATE),
+    userId: SINGLE_CHANNEL_COMMUNITY_USER_ID,
+    communityId: SINGLE_CHANNEL_COMMUNITY_ID,
+    isOwner: false,
+    isModerator: false,
+    isMember: true,
+    isBlocked: false,
+    isPending: false,
+    receiveNotifications: true,
+    reputation: 0,
+  },
 ];

api/migrations/seed/default/usersSettings.js

@@ -2,7 +2,7 @@
 
 module.exports = () => {
   let settings = [];
-  for (let step = 0; step < 10; step++) {
+  for (let step = 0; step < 11; step++) {
     settings.push({
       userId: step.toString(),
       notifications: {

api/models/test/__snapshots__/channel.test.js.snap

@@ -85,6 +85,23 @@ Array [
     "receiveNotifications": true,
     "slug": "private",
   },
+  Object {
+    "communityId": "5",
+    "createdAt": 2016-12-31T23:00:00.000Z,
+    "description": "General",
+    "id": "11",
+    "isBlocked": false,
+    "isDefault": false,
+    "isMember": true,
+    "isModerator": false,
+    "isOwner": false,
+    "isPending": false,
+    "isPrivate": false,
+    "memberCount": 1,
+    "name": "General",
+    "receiveNotifications": false,
+    "slug": "general",
+  },
   Object {
     "communityId": "1",
     "createdAt": 2016-12-31T23:00:00.000Z,
@@ -119,6 +136,23 @@ Array [
     "receiveNotifications": true,
     "slug": "general",
   },
+  Object {
+    "communityId": "2",
+    "createdAt": 2016-12-31T23:00:00.000Z,
+    "description": "Payments Features",
+    "id": "10",
+    "isBlocked": false,
+    "isDefault": false,
+    "isMember": true,
+    "isModerator": false,
+    "isOwner": true,
+    "isPending": false,
+    "isPrivate": false,
+    "memberCount": 5,
+    "name": "Payments Features",
+    "receiveNotifications": true,
+    "slug": "features",
+  },
   Object {
     "communityId": "2",
     "createdAt": 2016-12-31T23:00:00.000Z,

api/queries/community/channelConnection.js

@@ -7,7 +7,7 @@ import { canViewCommunity } from '../../utils/permissions';
 export default async ({ id }: DBCommunity, _: any, ctx: GraphQLContext) => {
   const { user, loaders } = ctx;
 
-  if (!await canViewCommunity(user, id, loaders)) {
+  if (!(await canViewCommunity(user, id, loaders))) {
     return {
       pageInfo: {
         hasNextPage: false,