Merge pull request #4847 from withspectrum/2.8.4

2.8.4

Author: brianlovin

.circleci/config.yml

@@ -1,4 +1,5 @@
-# CircleCI configuration for Spectrum
+# CircleCI configuration for Spectrum 
+version: 2.1
 
 # Aliases
 aliases:
@@ -63,7 +64,6 @@ js_defaults: &js_defaults
   docker:
     - image: circleci/node:8
 
-version: 2
 jobs:
 
   # Set up environment and install required dependencies
@@ -72,9 +72,9 @@ jobs:
     steps:
       - checkout
 
-      - restore-cache: *restore-yarn-cache
+      - restore_cache: *restore-yarn-cache
       - run: *yarn
-      - save-cache: *save-yarn-cache
+      - save_cache: *save-yarn-cache
 
       - persist_to_workspace:
           root: .
@@ -112,15 +112,19 @@ jobs:
 
 
   # Start db and servers, then run e2e and unit tests
-  test_e2e:
+  test_integration:
     <<: *defaults
     docker:
       - image: circleci/node:8-browsers
       - image: redis:3.2.7
       - image: cypress/base:6
       - image: rethinkdb:2.3.5
-    parallel: true
-    parallelism: 9
+    parameters:
+      parallelism:
+        type: integer
+        default: 1
+        description: Number of boxes to use to run this job
+    parallelism: <<parameters.parallelism>>
     environment:
       TERM: xterm
     steps:
@@ -144,6 +148,14 @@ jobs:
               yarn run test:e2e
             fi
 
+  # This runs after the above and is only here to hack around missing support for varying jobs based on external vs internal PRs
+  # See https://github.com/withspectrum/spectrum/pull/4820
+  test_e2e:
+    docker:
+      - image: cypress/base:10
+    steps:
+      - run: echo "pass"
+
   # Run eslint, flow etc.
   test_static_js:
     <<: *js_defaults
@@ -158,8 +170,6 @@ jobs:
           command: yarn run lint
 
 workflows:
-  version: 2
-
   test:
     jobs:
       - checkout_environment
@@ -172,6 +182,26 @@ workflows:
       - build_web:
           requires:
             - checkout_environment
-      - test_e2e:
+      # Run pull requests from internal contributors in parallel
+      - test_integration:
+          name: test_e2e_internal
+          requires:
+            - build_web
+          parallelism: 4
+          filters:
+            branches:
+              ignore: /pull.*/
+      # Run pull requests from external contributors on one machine
+      - test_integration:
+          name: test_e2e_external
           requires:
             - build_web
+          parallelism: 1
+          filters:
+            branches:
+              only: /pull.*/
+      # If either of the test_e2e_* jobs pass, this one passes so we can mark it as required on GitHub
+      - test_e2e:
+          requires:
+            - test_e2e_internal
+            - test_e2e_external

api/mutations/directMessageThread/createDirectMessageThread.js

@@ -17,8 +17,8 @@ import type { FileUpload } from 'shared/types';
 import { events } from 'shared/analytics';
 import { trackQueue } from 'shared/bull/queues';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
-import { messageTypeObj } from 'shared/draft-utils/process-message-content';
-import type { MessageType } from 'shared/draft-utils/process-message-content';
+import { messageTypeObj } from 'shared/draft-utils/message-types';
+import type { MessageType } from 'shared/draft-utils/message-types';
 
 export type CreateDirectMessageThreadInput = {
   input: {

api/mutations/message/addMessage.js

@@ -22,7 +22,7 @@ import { validateRawContentState } from '../../utils/validate-draft-js-input';
 import processMessageContent, {
   messageTypeObj,
 } from 'shared/draft-utils/process-message-content';
-import type { MessageType } from 'shared/draft-utils/process-message-content';
+import type { MessageType } from 'shared/draft-utils/message-types';
 
 type Input = {
   message: {
@@ -34,6 +34,7 @@ type Input = {
     },
     parentId?: string,
     file?: FileUpload,
+    bot?: boolean,
   },
 };
 

api/mutations/message/editMessage.js

@@ -19,7 +19,7 @@ import { validateRawContentState } from '../../utils/validate-draft-js-input';
 import processMessageContent, {
   messageTypeObj,
 } from 'shared/draft-utils/process-message-content';
-import type { MessageType } from 'shared/draft-utils/process-message-content';
+import type { MessageType } from 'shared/draft-utils/message-types';
 
 type Args = {
   input: {

api/mutations/thread/publishThread.js

@@ -348,22 +348,24 @@ export default requireAuth(
     await createParticipantInThread(dbThread.id, user.id);
 
     // Post a new message with a link to the new thread to the watercooler thread if one exists
-    // if (community.watercoolerId && !channel.isPrivate) {
-    //   const identifier = user.username ? `@${user.username}` : user.name;
-    //   await addMessage(
-    //     {
-    //       content: {
-    //         body: `${identifier} just posted a new thread 📝 https://spectrum.chat/${
-    //           community.slug
-    //         }/${channel.slug}/${slugg(dbThread.content.title)}~${dbThread.id}`,
-    //       },
-    //       messageType: 'text',
-    //       threadId: community.watercoolerId,
-    //       threadType: 'story',
-    //     },
-    //     'sam'
-    //   );
-    // }
+    if (community.watercoolerId && !channel.isPrivate) {
+      await addMessage(
+        {
+          content: {
+            body: `${
+              user.name
+            } just posted a new thread 📝 https://spectrum.chat/${
+              community.slug
+            }/${channel.slug}/${slugg(dbThread.content.title)}~${dbThread.id}`,
+          },
+          messageType: 'text',
+          threadId: community.watercoolerId,
+          threadType: 'story',
+          bot: true,
+        },
+        user.id
+      );
+    }
 
     if (!thread.filesToUpload || thread.filesToUpload.length === 0) {
       return dbThread;

api/package.json

@@ -122,7 +122,7 @@
     "sanitize-filename": "^1.6.1",
     "serialize-javascript": "^1.6.1",
     "session-rethinkdb": "^2.0.0",
-    "slate": "^0.44.10",
+    "slate": "^0.44.11",
     "slate-markdown": "0.1.0",
     "slugg": "^1.1.0",
     "string-replace-to-array": "^1.0.3",

api/queries/thread/channel.js

@@ -2,5 +2,16 @@
 import type { GraphQLContext } from '../../';
 import type { DBThread } from 'shared/types';
 
-export default ({ channelId }: DBThread, _: any, { loaders }: GraphQLContext) =>
-  loaders.channel.load(channelId);
+export default async (root: DBThread, _: any, ctx: GraphQLContext) => {
+  const { channelId, id } = root;
+  const { loaders } = ctx;
+  const channel = await loaders.channel.load(channelId);
+  if (!channel) {
+    console.error(
+      'User queried thread of non-existent/deleted channel: ',
+      channelId
+    );
+    console.error('Thread queried: ', id);
+  }
+  return channel;
+};

api/queries/thread/community.js

@@ -2,8 +2,16 @@
 import type { GraphQLContext } from '../../';
 import type { DBThread } from 'shared/types';
 
-export default (
-  { communityId }: DBThread,
-  _: any,
-  { loaders }: GraphQLContext
-) => loaders.community.load(communityId);
+export default async (root: DBThread, _: any, ctx: GraphQLContext) => {
+  const { communityId, id } = root;
+  const { loaders } = ctx;
+  const community = await loaders.community.load(communityId);
+  if (!community) {
+    console.error(
+      'User queried thread of non-existent/deleted community: ',
+      communityId
+    );
+    console.error('Thread queried: ', id);
+  }
+  return community;
+};

api/types/Message.js

@@ -30,6 +30,7 @@ const Message = /* GraphQL */ `
     messageType: MessageTypes!
     parent: Message
     modifiedAt: Date
+    bot: Boolean
     sender: User! @deprecated(reason: "Use Message.author field instead")
   }
 

api/yarn.lock

@@ -8726,10 +8726,10 @@ [email protected]:
     react "^0.14.0 || ^15.0.0"
     styled-components "^2.0.0"
 
-slate@^0.44.10:
-  version "0.44.10"
-  resolved "https://registry.yarnpkg.com/slate/-/slate-0.44.10.tgz#ac7c3e3cf85570a8723a64a8a7807c881ddbfa8a"
-  integrity sha512-2jMPgOjExjeWfHrYUsYTMLo/ykbXjCwLUFwG3G34Q0vwRsmf4yOf3b0Zx5LoUaNlyvQDdBsOGsF1qi6yTx53DA==
+slate@^0.44.11:
+  version "0.44.11"
+  resolved "https://registry.yarnpkg.com/slate/-/slate-0.44.11.tgz#0cdf454726a6d45a6dbf3174ea3f6261ad1a0428"
+  integrity sha512-ZtNCxHtGMuWXwUb6vmbrLR73MbHeEQ1LRJNIIyEpj1Kixk0Sd0T+zSKI+cBWCXlOOITqFEfBcJOWaSppiID+1A==
   dependencies:
     debug "^3.1.0"
     direction "^0.1.5"