Assorted fixes when trying a real deploy on AWS

Author: zozs

__mocks__/@slack/web-api.js

@@ -1,9 +1,13 @@
 /* global jest */
 
 const mockAccess = jest.fn()
+const mockJoin = jest.fn()
 const mockOpen = jest.fn()
 const mockPostMessage = jest.fn()
-const mockScheduleMessage = jest.fn()
+const mockScheduleMessage = jest.fn(async () => ({
+  ok: true,
+  scheduled_message_id: 'Q1298393284'
+}))
 
 const mock = jest.fn().mockImplementation(() => {
   return {
@@ -12,6 +16,7 @@ const mock = jest.fn().mockImplementation(() => {
       scheduleMessage: mockScheduleMessage
     },
     conversations: {
+      join: mockJoin,
       open: mockOpen
     },
     oauth: {
@@ -25,6 +30,7 @@ const mock = jest.fn().mockImplementation(() => {
 module.exports = {
   WebClient: mock,
   mockAccess,
+  mockJoin,
   mockOpen,
   mockPostMessage,
   mockScheduleMessage

announces.js

@@ -17,7 +17,7 @@ async function hourlyCheck () {
     const now = DateTime.local()
     const timestamp = await nextAnnounce(instance, now)
 
-    const { scheduled_message_id: messageId } = await slack.scheduleMessage(instance, button(timestamp))
+    const { scheduled_message_id: messageId } = await slack.scheduleMessage(instance, timestamp, button(timestamp))
     await db.storeScheduled(instanceRef, timestamp, messageId)
   }
 }

announces.test.js

@@ -3,11 +3,13 @@
 const { hourlyCheck, nextAnnounce } = require('./announces')
 const { DateTime } = require('luxon')
 
+const button = require('./button')
 const db = require('./db')
 const slack = require('./slack')
 
 const { Instance } = require('./instance')
 
+jest.mock('./button')
 jest.mock('./db')
 jest.mock('./instance')
 jest.mock('./slack')
@@ -67,9 +69,17 @@ describe('hourly check', () => {
       post_at: '1562180400'
     }))
 
+    button.mockImplementation(() => ({
+      text: 'test'
+    }))
+
     await hourlyCheck()
     expect(slack.scheduleMessage.mock.calls.length).toBe(1)
     expect(slack.scheduleMessage.mock.calls[0][0]).toHaveProperty('channel', testInstance.channel)
+    expect(slack.scheduleMessage.mock.calls[0][1]).toHaveProperty('isLuxonDateTime', true)
+    expect(slack.scheduleMessage.mock.calls[0][2]).toHaveProperty('text', 'test')
+
+    expect(button).toHaveBeenCalledTimes(1)
 
     expect(db.storeScheduled.mock.calls.length).toBe(1)
     expect(db.storeScheduled.mock.calls[0][0]).toBe('T00000000')

button.js

@@ -18,7 +18,7 @@ module.exports = (timestamp) => {
             emoji: true
           },
           action_id: 'wild_button',
-          value: timestamp.toISO(),
+          value: timestamp.toUTC().toISO(),
           style: 'primary'
         }
       ]

db.js

@@ -297,6 +297,8 @@ module.exports = {
     const timestamp = dateTime.toUTC().toBSON()
     const collection = await instanceCollection()
 
+    console.debug(`Storing scheduled time ${dateTime} for instance ${instanceRef}`)
+
     const result = await collection.updateOne({ 'team.id': instanceRef }, {
       $set: {
         scheduled: {

routes.js

@@ -63,7 +63,7 @@ module.exports = (app) => {
   // Will handle direct installation of app to workspace
   app.get('/install', async (req, res) => {
     const clientId = process.env.SLACK_CLIENT_ID
-    const scopes = 'channels:read,groups:read,im:read,chat:write,im:write,commands'
+    const scopes = 'channels:read,channels:join,groups:read,im:read,chat:write,chat:write.public,im:write,commands'
     const redirectUri = process.env.SLACK_REDIRECT_URI
     res.redirect(`https://slack.com/oauth/v2/authorize?client_id=${clientId}&scope=${scopes}&redirect_uri=${redirectUri}`)
   })

serverless.yml

@@ -43,7 +43,7 @@ functions:
     handler: handler-serverless.hourly
     events:
     - schedule:
-        rate: rate(1 minute)
+        rate: rate(1 hour)
         enabled: true
 
 plugins:

slack.js

@@ -16,7 +16,22 @@ module.exports = {
       channel: instance.channel,
       post_at: Math.floor(timestamp.toSeconds())
     }
-    await web.chat.scheduleMessage(object)
+
+    try {
+      return await web.chat.scheduleMessage(object)
+    } catch (e) {
+      // If we fail because we're not in the channel we're trying to post to, join it
+      // first, then try again.
+      if (e.data.error === 'not_in_channel') {
+        await web.conversations.join({
+          channel: instance.channel
+        })
+
+        return web.chat.scheduleMessage(object)
+      } else {
+        throw e
+      }
+    }
   },
 
   async sendImToUser (instance, user, data) {

slack.test.js

@@ -5,7 +5,7 @@ const slack = require('./slack')
 const { Instance } = require('./instance')
 
 const { DateTime } = require('luxon')
-const { WebClient, mockOpen, mockPostMessage, mockScheduleMessage } = require('@slack/web-api')
+const { WebClient, mockJoin, mockOpen, mockPostMessage, mockScheduleMessage } = require('@slack/web-api')
 const { IncomingWebhook, mockSend } = require('@slack/webhook')
 
 jest.mock('./instance')
@@ -17,18 +17,20 @@ beforeEach(() => {
   // Clear all instances and calls to constructor and all methods
   IncomingWebhook.mockClear()
   WebClient.mockClear()
+  mockJoin.mockClear()
   mockOpen.mockClear()
   mockPostMessage.mockClear()
   mockScheduleMessage.mockClear()
 })
 
 describe('slack api', () => {
-  test('schedules a message', async () => {
+  test('schedules a message and returns scheduled message id', async () => {
     const t = DateTime.local()
     const data = {}
-    await slack.scheduleMessage(testInstance, t, data)
+    const result = await slack.scheduleMessage(testInstance, t, data)
     expect(WebClient).toHaveBeenCalledTimes(1)
     expect(mockScheduleMessage.mock.calls.length).toBe(1)
+    expect(result).toHaveProperty('scheduled_message_id')
   })
 
   test('schedules a message with a channel parameter', async () => {
@@ -49,6 +51,25 @@ describe('slack api', () => {
     expect(mockScheduleMessage.mock.calls[0][0]).toHaveProperty('post_at', Math.floor(t.toSeconds()))
   })
 
+  test('schedules a message to a channel bot is not in', async () => {
+    mockScheduleMessage.mockRejectedValueOnce({ data: { ok: false, error: 'not_in_channel' } })
+
+    const t = DateTime.local()
+    const data = {}
+    try {
+      await slack.scheduleMessage(testInstance, t, data)
+    } catch (err) {
+      console.log(`should not throw ${err} JSON: ${JSON.stringify(err)}`)
+      expect(err).toBe(undefined)
+    }
+    expect(WebClient).toHaveBeenCalledTimes(1)
+    expect(mockJoin).toHaveBeenCalledTimes(1)
+    expect(mockJoin.mock.calls[0][0]).toHaveProperty('channel', testInstance.channel)
+    expect(mockScheduleMessage).toHaveBeenCalledTimes(2)
+    expect(mockScheduleMessage.mock.calls[0][0]).toHaveProperty('post_at', Math.floor(t.toSeconds()))
+    expect(mockScheduleMessage.mock.calls[1][0]).toHaveProperty('post_at', Math.floor(t.toSeconds()))
+  })
+
   test('replacing response has replace_original set', async () => {
     const url = 'https://test.example.com/hook'
     const data = {}