New roll parser and view

package.json

@@ -26,6 +26,7 @@
     "graphql-type-json": "^0.2.1",
     "immer": "^1.2.1",
     "lodash": "^4.17.5",
+    "lodash.flatten": "^4.4.0",
     "normalize.css": "^8.0.0",
     "prop-types": "^15.5.9",
     "random-js": "^1.0.8",

src/api/models/message.js

@@ -1,9 +1,8 @@
 // @flow
 import firebase from '@firebase/app'
 import '@firebase/firestore'
-import CommandParser from '../utils/commandParser'
-
-const commandParser = new CommandParser()
+import performRolls from '../utils/performRolls'
+import { getMessageResult } from 'common/commandParser'
 
 export const getMessagesByGameId = async (id: string, _first: number) => {
   const collection = firebase
@@ -62,7 +61,13 @@ export const listenToNewMessages = (id: string) => (callback: Function) => {
 export const sendMessage = (id: string, text: string) => {
   const messagesCollection = firebase.firestore().collection(`messages`)
 
-  const result = commandParser.getMessageResult(text)
+  let result = getMessageResult(text)
+  if (result) {
+    result = performRolls(result)
+  }
+  if (result) {
+    result = JSON.stringify(result)
+  }
 
   const message = {
     from: firebase.auth().currentUser.uid,

src/api/types/Message.js

@@ -4,7 +4,7 @@ const Message = `
   type Message {
     id: ID!
     from: String!
-    result: [JSON!]
+    result: String
     text: String!
     timestamp: Date!
   }

src/api/utils/performRolls.js

@@ -0,0 +1,30 @@
+// @flow
+import Random from 'random-js'
+import type { MessageResult } from 'common/types'
+
+const random = new Random(Random.engines.mt19937().autoSeed())
+
+const performRolls = (result: MessageResult): MessageResult => {
+  if (result.type !== 'rolls') {
+    return result
+  }
+
+  result.rolls = result.rolls.map(actions => {
+    const newActions = actions.map(action => {
+      if (action.type !== 'roll') {
+        return action
+      }
+
+      return {
+        ...action,
+        result: random.integer(1, action.die)
+      }
+    })
+
+    return newActions
+  })
+
+  return result
+}
+
+export default performRolls

src/common/__tests__/commandParser.tests.js

@@ -0,0 +1,14 @@
+// @flow
+import { getCommandName } from '../commandParser'
+
+describe('Command parser', () => {
+  it('should correctly identify command names', () => {
+    const result = getCommandName('/roll something')
+    expect(result).toEqual('/roll')
+  })
+
+  it('should return null when no command exists', () => {
+    const result = getCommandName('something')
+    expect(result).toBeNull()
+  })
+})

src/common/commandParser.js

@@ -0,0 +1,25 @@
+// @flow
+import { getRollResult } from './rollCommand'
+import type { MessageResult } from 'common/types'
+
+export function getMessageResult(text: string): ?MessageResult {
+  const command = getCommandName(text)
+
+  if (command == '/r' || command == '/roll' || command === null) {
+    const result = getRollResult(text)
+    return result
+  }
+
+  return null
+}
+
+export function getCommandName(text: string): ?string {
+  if (text[0] == '/') {
+    const firstSpace = text.indexOf(' ')
+    const command = text.slice(0, firstSpace)
+
+    return command
+  }
+
+  return null
+}