Merge pull request #6 from atlassian/send-messages-as-markdown

Send messages as markdown
atlassian · Apr 13, 2018 · 83fdd0d · 83fdd0d
2 parents 1c49b63 + 5513668
commit 83fdd0d
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 267 deletions.
diff --git a/__tests__/adapter/reply.js b/__tests__/adapter/reply.js
@@ -4,9 +4,9 @@ const context = new Context()
 beforeAll(() => context.begin())
 afterAll(() => context.end())
 
-test('Adapter.reply sends message to Stride with user mention prepended', async () => {
+test('Adapter.reply sends message to Stride', async () => {
   const getTokenRequest = utils.waitForRequest(mocks.stride.listeners.getToken)
-  const sendMessageRequest = utils.waitForRequest(mocks.stride.listeners.sendMessage)
+  const sendMessageMarkdownRequest = utils.waitForRequest(mocks.stride.listeners.sendMessageMarkdown)
 
   context.app.adapter.reply({
     room: {
@@ -19,26 +19,6 @@ test('Adapter.reply sends message to Stride with user mention prepended', async
   }, 'test message')
 
   await getTokenRequest
-  const res = await sendMessageRequest
-  expect(res.body).toEqual({
-    'body': {
-      'content': [{
-        'content': [{
-          'attrs': {
-            'id': 'dummy-user-id'
-          },
-          'type': 'mention'
-        }, {
-          'text': ': ',
-          'type': 'text'
-        }, {
-          'text': 'test message',
-          'type': 'text'
-        }],
-        'type': 'paragraph'
-      }],
-      'type': 'doc',
-      'version': 1
-    }
-  })
+  const res = await sendMessageMarkdownRequest
+  expect(res.body).toBe('test message')
 })
diff --git a/__tests__/adapter/replyLink.js b/__tests__/adapter/replyLink.js
diff --git a/__tests__/adapter/send.js b/__tests__/adapter/send.js
@@ -6,7 +6,7 @@ afterAll(() => context.end())
 
 test('Adapter.send sends message to Stride', async () => {
   const getTokenRequest = utils.waitForRequest(mocks.stride.listeners.getToken)
-  const sendMessageRequest = utils.waitForRequest(mocks.stride.listeners.sendMessage)
+  const sendMessageMarkdownRequest = utils.waitForRequest(mocks.stride.listeners.sendMessageMarkdown)
 
   context.app.adapter.send({
     room: {
@@ -16,18 +16,6 @@ test('Adapter.send sends message to Stride', async () => {
   }, 'test message')
 
   await getTokenRequest
-  const res = await sendMessageRequest
-  expect(res.body).toEqual({
-    'body': {
-      'content': [{
-        'content': [{
-          'text': 'test message',
-          'type': 'text'
-        }],
-        'type': 'paragraph'
-      }],
-      'type': 'doc',
-      'version': 1
-    }
-  })
+  const res = await sendMessageMarkdownRequest
+  expect(res.body).toEqual('test message')
 })
diff --git a/__tests__/adapter/sendFailed.js b/__tests__/adapter/sendFailed.js
@@ -6,7 +6,8 @@ afterAll(() => context.end())
 
 test('Adapter.send emits error on failed Stride API calls', async (done) => {
   const getTokenRequest = utils.waitForRequest(mocks.stride.listeners.getToken)
-  const sendMessage400Request = utils.waitForRequest(mocks.stride.listeners.sendMessage400)
+  const sendMessageMarkdown400Request =
+    utils.waitForRequest(mocks.stride.listeners.sendMessageMarkdown400)
 
   context.app.adapter.send({
     room: {
@@ -17,29 +18,29 @@ test('Adapter.send emits error on failed Stride API calls', async (done) => {
 
   context.app.robot.once('error', res => {
     expect(res).toMatchObject({
-      'code': 400,
-      'source': 'stride',
-      'state': {
-        'req': {
-          'method': 'POST',
-          'headers': {
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer kinda jwt'
+      code: 400,
+      source: 'stride',
+      state: {
+        req: {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'text/markdown',
+            Authorization: 'Bearer kinda jwt'
           },
-          'body': '{"body":{"type":"doc","content":[{"type":"paragraph","content":[{"type":"text","text":"test message"}]}],"version":1}}',
-          'url': 'https://api.atlassian.com/site/a436116f-02ce-4520-8fbb-7301462a1674/conversation/b1d1f2c9-d9c7-4de6-8cfd-e31029fb4ad0/message'
+          body: 'test message',
+          url: 'https://api.atlassian.com/site/a436116f-02ce-4520-8fbb-7301462a1674/conversation/b1d1f2c9-d9c7-4de6-8cfd-e31029fb4ad0/message'
         },
-        'methodName': 'sendMessage',
-        'res': {
-          'headers': {},
-          'status': 400,
-          'body': ''
+        methodName: 'sendMessageMarkdown',
+        res: {
+          headers: {},
+          status: 400,
+          body: ''
         }
       }
     })
     done()
   })
 
   await getTokenRequest
-  await sendMessage400Request
+  await sendMessageMarkdown400Request
 })
diff --git a/__tests__/adapter/sendLink.js b/__tests__/adapter/sendLink.js
diff --git a/__tests__/helpers/mocks/stride/listeners.js b/__tests__/helpers/mocks/stride/listeners.js
@@ -14,6 +14,24 @@ function sendMessage (onReply, {
     .reply(201, onReply())
 }
 
+function sendMessageMarkdown (onReply, {
+  cloudId = defaultCloudId,
+  conversationId = defaultConversationId
+} = {}) {
+  return nock(apiUrl)
+    .post(`/site/${cloudId}/conversation/${conversationId}/message`)
+    .reply(201, onReply())
+}
+
+function sendMessageMarkdown400 (onReply, {
+  cloudId = defaultCloudId,
+  conversationId = defaultConversationId
+} = {}) {
+  return nock(apiUrl)
+    .post(`/site/${cloudId}/conversation/${conversationId}/message`)
+    .reply(400, onReply())
+}
+
 function sendMessage400 (onReply, {
   cloudId = defaultCloudId,
   conversationId = defaultConversationId
@@ -52,6 +70,8 @@ module.exports = {
   getToken,
   sendMessage,
   sendMessage400,
+  sendMessageMarkdown,
+  sendMessageMarkdown400,
   uploadFile,
   defaultCloudId,
   defaultConversationId

diff --git a/lib/StrideAdapter.js b/lib/StrideAdapter.js
@@ -61,66 +61,22 @@ class StrideAdapter extends Adapter {
     await invokeReduce(stopOrder, 'stop', this.components)
   }
 
-  send (envelope, ...messages) {
-    const doc = new Document()
-
-    messages.forEach(msg => {
-      const paragraph = doc.paragraph()
-      this._textToParsedParagraph(msg, paragraph)
+  async send (envelope, ...messages) {
+    await Promise.each(messages, msg => {
+      return sc.sendMessageMarkdown(envelope.room.cloudId, envelope.room.conversationId, msg)
+        .catch(error => {
+          this.robot.emit('error', error)
+        })
     })
-
-    sc.sendMessage(envelope.room.cloudId, envelope.room.conversationId, doc)
-      .catch(error => {
-        this.robot.emit('error', error)
-      })
   }
 
-  reply (envelope, ...messages) {
-    const userId = envelope.user.id
-    const doc = new Document()
-
-    messages.forEach(msg => {
-      const paragraph = doc.paragraph()
-      paragraph
-        .mention(userId)
-        .text(': ')
-      this._textToParsedParagraph(msg, paragraph)
+  async reply (envelope, ...messages) {
+    await Promise.each(messages, msg => {
+      return sc.sendMessageMarkdown(envelope.room.cloudId, envelope.room.conversationId, msg)
+        .catch(error => {
+          this.robot.emit('error', error)
+        })
     })
-
-    sc.sendMessage(envelope.room.cloudId, envelope.room.conversationId, doc)
-      .catch(error => {
-        this.robot.emit('error', error)
-      })
-  }
-
-  _textToParsedParagraph (text, paragraph) {
-    const urlsWithIndices = extractUrlsWithIndices(text)
-
-    const plainIndices = urlsWithIndices.reduce((acc, urlIndex) => {
-      acc.push(urlIndex.indices[0])
-      acc.push(urlIndex.indices[1])
-      return acc
-    }, [0])
-    plainIndices.push(text.length)
-
-    plainIndices.forEach((item, currIndex) => {
-      const nextItem = plainIndices[currIndex + 1]
-      if (nextItem) {
-        if (currIndex % 2) {
-          const nodeText = text.slice(item, nextItem)
-          if (nodeText) {
-            paragraph.link(nodeText, nodeText)
-          }
-        } else {
-          const nodeText = text.slice(item, nextItem)
-          if (nodeText) {
-            paragraph.text(nodeText)
-          }
-        }
-      }
-    })
-
-    return paragraph
   }
 }