Merge branch 'alpha' of github.com:withspectrum/spectrum into 2.8.2

Author: brianlovin

README.md

@@ -22,7 +22,7 @@ It is difficult to grow, manage and measure the impact of online communities. Co
 
 ### Status
 
-Spectrum has been in full-time development since March 2017 and is [part of GitHub since November 2018](https://spectrum.chat/spectrum/general/spectrum-is-joining-github~1d3eb8ee-4c99-46c0-8daf-ca35a96be6ce).
+Spectrum has been in full-time development since March 2017 and is [part of GitHub since November 2018](https://spectrum.chat/spectrum/general/spectrum-is-joining-github~1d3eb8ee-4c99-46c0-8daf-ca35a96be6ce). See our current priorities and what we are working on in the [main project board](https://github.com/withspectrum/spectrum/projects/23).
 
 <div align="center">
   <img height="50px" src="public/img/cluster-1.svg" />
@@ -51,7 +51,7 @@ Spectrum has been in full-time development since March 2017 and is [part of GitH
 
 ## Contributing
 
-**We heartily welcome any and all contributions that match [our product roadmap](https://github.com/withspectrum/spectrum/projects/19) and engineering standards!**
+**We heartily welcome any and all contributions that match our engineering standards!**
 
 That being said, this codebase isn't your typical open source project because it's not a library or package with a limited scope—it's our entire product.
 
@@ -67,7 +67,9 @@ If you found a technical bug on Spectrum or have ideas for features we should im
 
 #### Fixing a bug or implementing a new feature
 
-If you find a bug on Spectrum and open a PR that fixes it we'll review it as soon as possible to ensure it matches our engineering standards. If you want to implement a new feature, open an issue first to discuss what it'd look like and to ensure it fits in [our roadmap](https://github.com/withspectrum/spectrum/projects/19) and plans for the app.
+If you find a bug on Spectrum and open a PR that fixes it we'll review it as soon as possible to ensure it matches our engineering standards.
+
+If you want to implement a new feature, open an issue first to discuss what it'd look like and to ensure it fits in our roadmap and plans for the app (see [the main project board](https://github.com/withspectrum/spectrum/projects/23) for planned and currently ongoing work).
 
 If you want to contribute but are unsure to start, we have [a "good first issue" label](https://github.com/withspectrum/spectrum/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) which is applied to newcomer-friendly issues. Take a look at [the full list of good first issues](https://github.com/withspectrum/spectrum/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and pick something you like! There is also [an "open" channel in the Spectrum community on Spectrum](https://spectrum.chat/spectrum/open) (how meta), if you run into troubles while trying to contribute that is the best place to talk to us.
 
@@ -162,12 +164,11 @@ Spectrum has four big installation steps:
 1. **Install RethinkDB**: See [the RethinkDB documentation](https://rethinkdb.com/docs/install/) for instructions on installing it with your OS.
 2. **Install Redis**: See [the Redis documentation](https://redis.io/download) for instructions on installing it with your OS.
 3. **Install yarn**: We use [yarn](https://yarnpkg.com) to handle our JavaScript dependencies. (plain `npm` doesn't work due to our monorepo setup) See [the yarn documentation](https://yarnpkg.com/en/docs/install) for instructions on installing it.
+4. **Install the dependencies**: Because it's pretty tedious to install the dependencies for each worker individually we've created a script that goes through and runs `yarn install` for every worker for you: (this takes a couple minutes, so dive into the [technical docs](./docs) in the meantime)
 
-Once you have RethinkDB, Redis and yarn installed locally its time to install the JavaScript dependencies. Because it's pretty tedious to install the dependencies for each worker individually we've created a script that goes through and runs `yarn install` for every worker for you: (this takes a couple minutes, so dive into the [technical docs](./docs) in the meantime)
-
-```sh
-node shared/install-dependencies.js
-```
+  ```sh
+  node shared/install-dependencies.js
+  ```
 
 You've now finished installing everything! Let's migrate the database and you'll be ready to go :100:
 

api/mutations/directMessageThread/createDirectMessageThread.js

@@ -17,12 +17,14 @@ 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';
 
 export type CreateDirectMessageThreadInput = {
   input: {
     participants: Array<string>,
     message: {
-      messageType: 'text' | 'media' | 'draftjs',
+      messageType: MessageType,
       threadType: string,
       content: {
         body: string,
@@ -80,15 +82,18 @@ export default requireAuth(
     }
 
     const handleStoreMessage = async message => {
-      if (message.messageType === 'text' || message.messageType === 'draftjs') {
+      if (
+        message.messageType === messageTypeObj.text ||
+        message.messageType === messageTypeObj.draftjs
+      ) {
         // once we have an id we can generate a proper message object
         const messageWithThread = {
           ...message,
           threadId,
         };
 
         return await storeMessage(messageWithThread, user.id);
-      } else if (message.messageType === 'media' && message.file) {
+      } else if (message.messageType === messageTypeObj.media && message.file) {
         let url;
         try {
           url = await uploadImage(message.file, 'threads', threadId);

api/mutations/message/addMessage.js

@@ -19,12 +19,16 @@ import {
 } from '../../utils/permissions';
 import { trackQueue, calculateThreadScoreQueue } from 'shared/bull/queues';
 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';
 
 type Input = {
   message: {
     threadId: string,
     threadType: 'story' | 'directMessageThread',
-    messageType: 'text' | 'media' | 'draftjs',
+    messageType: MessageType,
     content: {
       body: string,
     },
@@ -42,20 +46,15 @@ export const addMessage = async (
       ? events.MESSAGE_SENT_FAILED
       : events.DIRECT_MESSAGE_SENT_FAILED;
 
-  if (message.messageType === 'text') {
-    message.content.body = JSON.stringify(
-      convertToRaw(
-        stateFromMarkdown(message.content.body, {
-          parserOptions: {
-            breaks: true,
-          },
-        })
-      )
+  if (message.messageType === messageTypeObj.text) {
+    message.content.body = processMessageContent(
+      messageTypeObj.text,
+      message.content.body
     );
-    message.messageType = 'draftjs';
+    message.messageType = messageTypeObj.draftjs;
   }
 
-  if (message.messageType === 'draftjs') {
+  if (message.messageType === messageTypeObj.draftjs) {
     let body;
     try {
       body = JSON.parse(message.content.body);
@@ -107,7 +106,7 @@ export const addMessage = async (
 
   // construct the shape of the object to be stored in the db
   let messageForDb = Object.assign({}, message);
-  if (message.file && message.messageType === 'media') {
+  if (message.file && message.messageType === messageTypeObj.media) {
     const { file } = message;
 
     const fileMetaData = {
@@ -186,7 +185,7 @@ export default requireAuth(async (_: any, args: Input, ctx: GraphQLContext) => {
     }
   }
 
-  if (message.messageType === 'media' && !message.file) {
+  if (message.messageType === messageTypeObj.media && !message.file) {
     trackQueue.add({
       userId: user.id,
       event: eventFailed,

api/mutations/message/editMessage.js

@@ -1,6 +1,5 @@
 // @flow
 import type { GraphQLContext } from '../../';
-import { convertToRaw } from 'draft-js';
 import { stateFromMarkdown } from 'draft-js-import-markdown';
 import UserError from '../../utils/UserError';
 import {
@@ -17,11 +16,15 @@ import { events } from 'shared/analytics';
 import { isAuthedResolver as requireAuth } from '../../utils/permissions';
 import { trackQueue } from 'shared/bull/queues';
 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';
 
 type Args = {
   input: {
     id: string,
-    messageType?: 'draftjs' | 'text' | 'media',
+    messageType?: MessageType,
     content: {
       body: string,
     },
@@ -49,24 +52,16 @@ export default requireAuth(async (_: any, args: Args, ctx: GraphQLContext) => {
   }
 
   let body = content.body;
-  if (messageType === 'text') {
-    body = JSON.stringify(
-      convertToRaw(
-        stateFromMarkdown(body, {
-          parserOptions: {
-            breaks: true,
-          },
-        })
-      )
-    );
-    messageType = 'draftjs';
+  if (messageType === messageTypeObj.text) {
+    body = processMessageContent(messageTypeObj.text, body);
+    messageType = messageTypeObj.draftjs;
   }
   const eventFailed =
     message.threadType === 'story'
       ? events.MESSAGE_EDITED_FAILED
       : events.DIRECT_MESSAGE_EDITED_FAILED;
 
-  if (messageType === 'draftjs') {
+  if (messageType === messageTypeObj.draftjs) {
     let parsed;
     try {
       parsed = JSON.parse(body);

api/mutations/thread/publishThread.js

@@ -350,15 +350,10 @@ export default requireAuth(
     // 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;
-      const sentence =
-        Array.isArray(usersPreviousPublishedThreads) &&
-        usersPreviousPublishedThreads.length === 0
-          ? `their first thread 👋`
-          : 'a new thread 📝';
       await addMessage(
         {
           content: {
-            body: `${identifier} just posted ${sentence} https://spectrum.chat/${
+            body: `${identifier} just posted a new thread 📝 https://spectrum.chat/${
               community.slug
             }/${channel.slug}/${slugg(dbThread.content.title)}~${dbThread.id}`,
           },

api/package.json

@@ -92,7 +92,7 @@
     "pre-commit": "^1.2.2",
     "prismjs": "^1.15.0",
     "query-string": "5.1.1",
-    "ratelimiter": "^3.2.0",
+    "ratelimiter": "^3.3.0",
     "raven": "^2.6.4",
     "react": "^15.4.1",
     "react-app-rewire-styled-components": "^3.0.2",

api/queries/directMessageThread/snippet.js

@@ -3,6 +3,7 @@
 import type { GraphQLContext } from '../../';
 import { canViewDMThread } from '../../utils/permissions';
 import { toPlainText, toState } from 'shared/draft-utils';
+import { messageTypeObj } from 'shared/draft-utils/process-message-content';
 
 export default async (
   { id }: { id: string },
@@ -17,7 +18,7 @@ export default async (
   return loaders.directMessageSnippet.load(id).then(message => {
     if (!message) return 'No messages yet...';
     if (message.messageType === 'media') return '📷 Photo';
-    return message.messageType === 'draftjs'
+    return message.messageType === messageTypeObj.draftjs
       ? toPlainText(toState(JSON.parse(message.content.body)))
       : message.content.body;
   });

api/yarn.lock

@@ -7823,10 +7823,10 @@ range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-ratelimiter@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ratelimiter/-/ratelimiter-3.2.0.tgz#ae74cf9629daae4cc8900ec126ab28d3794070f1"
-  integrity sha512-zMc9X4FNmOk3RBxV95lvp13sZRtf43UJJN1FficbYiusBB09zB6gcJtK2X18dKmH+Gq0C7W6qNCHE+UJx0YwVg==
+ratelimiter@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ratelimiter/-/ratelimiter-3.3.0.tgz#bed9882f552e1aff4d7d3281bd1ab380f94cbf74"
+  integrity sha512-dDax7d0XosqzOrrQyMYEiu87tHDT6Wqm9LtGlxnQVAQJtEG6bmbvgPZ6E2/g1XrIpikJyec9hrOHKZ+DuVWxgQ==
 
 raven@^2.6.4:
   version "2.6.4"

athena/queues/direct-message-notification.js

@@ -20,6 +20,7 @@ import { toPlainText, toState } from 'shared/draft-utils';
 import { sendNewDirectMessageEmailQueue } from 'shared/bull/queues';
 import type { Job, DirectMessageNotificationJobData } from 'shared/bull/types';
 import { signUser, signMessage } from 'shared/imgix';
+import { messageTypeObj } from 'shared/draft-utils/process-message-content';
 
 export default async (job: Job<DirectMessageNotificationJobData>) => {
   const { message: incomingMessage, userId: currentUserId } = job.data;
@@ -115,7 +116,7 @@ export default async (job: Job<DirectMessageNotificationJobData>) => {
         ...signedMessage,
         content: {
           body:
-            signedMessage.messageType === 'draftjs'
+            signedMessage.messageType === messageTypeObj.draftjs
               ? toPlainText(toState(JSON.parse(signedMessage.content.body)))
               : signedMessage.content.body,
         },

athena/queues/moderationEvents/message.js

@@ -8,6 +8,7 @@ import { toState, toPlainText } from 'shared/draft-utils';
 import getPerspectiveScore from './perspective';
 import { _adminSendToxicContentEmailQueue } from 'shared/bull/queues';
 import type { Job, AdminToxicMessageJobData } from 'shared/bull/types';
+import { messageTypeObj } from 'shared/draft-utils/process-message-content';
 
 export default async (job: Job<AdminToxicMessageJobData>) => {
   debug('new job for admin message moderation');
@@ -16,7 +17,7 @@ export default async (job: Job<AdminToxicMessageJobData>) => {
   } = job;
 
   const text =
-    message.messageType === 'draftjs'
+    message.messageType === messageTypeObj.draftjs
       ? toPlainText(toState(JSON.parse(message.content.body)))
       : message.content.body;