Merge pull request #7 from Jrc356/jrc356/fix-reactions

only give out avocados on avocado reactions
Jrc356 · Dec 16, 2022 · c604adc · c604adc
2 parents 42aea44 + 1128e9d
commit c604adc
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 1 deletion.
diff --git a/lib/avokudos.js b/lib/avokudos.js
@@ -62,6 +62,9 @@ class Avokudos {
 
   hearReactionAdded = async (res) => {
     const { client, event } = res
+    if (event.reaction !== 'avocado') {
+      return
+    }
     const message = await this.getMessage(
       client,
       event.item.channel,
@@ -91,6 +94,9 @@ class Avokudos {
 
   hearReactionRemoved = async (res) => {
     const { client, event } = res
+    if (event.reaction !== 'avocado') {
+      return
+    }
     const message = await this.getMessage(
       client,
       event.item.channel,

diff --git a/test/avokudos.test.js b/test/avokudos.test.js
@@ -90,7 +90,7 @@ describe('avokudos', () => {
     expect(mockSlackClient.chat.postMessage.mock.calls.length).toBe(0)
   })
 
-  it('gives users mentioned in a message an avocado if someone reacts to a message that mentions users', async () => {
+  it('gives users mentioned in a message an avocado if someone reacts to a message that mentions users with an avocado', async () => {
     const text =
       'hey <@test> <@test2> <@test3> :avocado: for helping with that issue!'
 
@@ -105,6 +105,7 @@ describe('avokudos', () => {
     await avokudos.hearReactionAdded({
       event: {
         user: 'test4',
+        reaction: 'avocado',
         item_user: 'test2',
         item: {
           channel: 'test_channel',
@@ -119,6 +120,36 @@ describe('avokudos', () => {
     expect(mockSlackClient.chat.postMessage.mock.calls.length).toBe(3)
   })
 
+  it('does not give users an avocado if the reaction used is not an avocado', async () => {
+    const text =
+      'hey <@test> <@test2> <@test3> :avocado: for helping with that issue!'
+
+    mockSlackClient.conversations.history.mockReturnValueOnce({
+      messages: [
+        {
+          text
+        }
+      ]
+    })
+
+    await avokudos.hearReactionAdded({
+      event: {
+        user: 'test4',
+        reaction: 'raised_hands',
+        item_user: 'test2',
+        item: {
+          channel: 'test_channel',
+          ts: 'test_ts'
+        }
+      },
+      client: mockSlackClient
+    })
+    expect(keeper.keeper.test).toBe(undefined)
+    expect(keeper.keeper.test2).toBe(undefined)
+    expect(keeper.keeper.test3).toBe(undefined)
+    expect(mockSlackClient.chat.postMessage.mock.calls.length).toBe(0)
+  })
+
   it('gives a user mentioned in a message a single avocado if someone reacts to a message that mentions the same user multiple times', async () => {
     const text =
       'hey <@test> <@test> :avocado: for helping with that issue!'
@@ -135,6 +166,7 @@ describe('avokudos', () => {
       event: {
         user: 'test4',
         item_user: 'test2',
+        reaction: 'avocado',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'
@@ -162,6 +194,7 @@ describe('avokudos', () => {
       event: {
         user: 'test',
         item_user: 'test2',
+        reaction: 'avocado',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'
@@ -187,6 +220,7 @@ describe('avokudos', () => {
       event: {
         user: 'test4',
         item_user: 'test2',
+        reaction: 'avocado',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'
@@ -214,6 +248,7 @@ describe('avokudos', () => {
       event: {
         user: 'test2',
         item_user: 'test2',
+        reaction: 'avocado',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'
@@ -246,6 +281,7 @@ describe('avokudos', () => {
       event: {
         user: 'test4',
         item_user: 'test',
+        reaction: 'avocado',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'
@@ -277,6 +313,7 @@ describe('avokudos', () => {
       event: {
         user: 'test4',
         item_user: 'test',
+        reaction: 'avocado',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'
@@ -305,6 +342,7 @@ describe('avokudos', () => {
       event: {
         user: 'test4',
         item_user: 'test',
+        reaction: 'avocado',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'
@@ -332,6 +370,7 @@ describe('avokudos', () => {
       client: mockSlackClient,
       event: {
         user: 'test',
+        reaction: 'avocado',
         item_user: 'test',
         item: {
           channel: 'test_channel',
@@ -361,6 +400,36 @@ describe('avokudos', () => {
       event: {
         user: 'test',
         item_user: 'test',
+        reaction: 'avocado',
+        item: {
+          channel: 'test_channel',
+          ts: 'test_ts'
+        }
+      }
+    })
+
+    expect(keeper.keeper.test).toBe(1)
+    expect(mockSlackClient.chat.postMessage.mock.calls.length).toBe(0)
+  })
+
+  it('does not remove an avocado from someone if the reaction removed is not an avocado', async () => {
+    keeper.keeper.test = 1
+
+    const text = "I'm weird and want to remove an avocado from myself!"
+    mockSlackClient.conversations.history.mockReturnValueOnce({
+      messages: [
+        {
+          text
+        }
+      ]
+    })
+
+    await avokudos.hearReactionRemoved({
+      client: mockSlackClient,
+      event: {
+        user: 'test',
+        item_user: 'test2',
+        reaction: 'raised_hands',
         item: {
           channel: 'test_channel',
           ts: 'test_ts'