Merge pull request #1147 from blackflux/dev

[Gally]: master <- dev
blackflux · Aug 1, 2021 · 1da1350 · 1da1350
2 parents 55d7479 + b6d80a1
commit 1da1350
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 4 deletions.
diff --git a/src/index/channel.js b/src/index/channel.js
@@ -11,13 +11,19 @@ module.exports = (call) => ({
   },
   setTopic: async (name, topic) => {
     const channel = await getChannelMeta(call, name);
+    if (channel.topic?.value === topic) {
+      return null;
+    }
     return call('conversations.setTopic', {
       topic,
       channel: channel.id
     });
   },
   setPurpose: async (name, purpose) => {
     const channel = await getChannelMeta(call, name);
+    if (channel.purpose?.value === purpose) {
+      return null;
+    }
     return call('conversations.setPurpose', {
       purpose,
       channel: channel.id

diff --git a/test/index/channel.spec.js b/test/index/channel.spec.js
@@ -35,11 +35,21 @@ describe('Testing Slack SDK', {
     expect(r).to.deep.contain({ ok: true });
   });
 
+  it('Testing channel.setTopic (unchanged)', async () => {
+    const r = await slack.channel.setTopic('channel', 'topic');
+    expect(r).to.equal(null);
+  });
+
   it('Testing channel.setPurpose', async () => {
     const r = await slack.channel.setPurpose('channel', 'purpose');
     expect(r).to.deep.contain({ ok: true });
   });
 
+  it('Testing channel.setPurpose (unchanged)', async () => {
+    const r = await slack.channel.setPurpose('channel', 'purpose');
+    expect(r).to.equal(null);
+  });
+
   it('Testing channel.shareFiles', async () => {
     const r = await slack.channel.shareFiles('channel', ['F029QHN0AAZ', 'F02AH8J752L']);
     expect(r).to.deep.equal({ ok: true });

diff --git a/...annel.spec.js__cassettes/testingSlackSDK_testingChannelSetPurposeUnchanged_recording.json b/...annel.spec.js__cassettes/testingSlackSDK_testingChannelSetPurposeUnchanged_recording.json
@@ -0,0 +1,24 @@
+[
+  {
+    "scope": "https://workspace.slack.com:443",
+    "method": "POST",
+    "path": "/api/rtm.start",
+    "body": "----------------------------898525272439246643720391\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------898525272439246643720391--\r\n",
+    "status": 200,
+    "response": {
+      "ok": true,
+      "channels": [
+        {
+          "id": "C3Y9NQTQG",
+          "name": "channel",
+          "topic": {
+            "value": "topic"
+          },
+          "purpose": {
+            "value": "purpose"
+          }
+        }
+      ]
+    }
+  }
+]
diff --git a/.../index/channel.spec.js__cassettes/testingSlackSDK_testingChannelSetPurpose_recording.json b/.../index/channel.spec.js__cassettes/testingSlackSDK_testingChannelSetPurpose_recording.json
@@ -3,7 +3,7 @@
     "scope": "https://workspace.slack.com:443",
     "method": "POST",
     "path": "/api/rtm.start",
-    "body": "----------------------------128508069392224419437859\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------128508069392224419437859--\r\n",
+    "body": "----------------------------198402330513246502238920\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------198402330513246502238920--\r\n",
     "status": 200,
     "response": {
       "ok": true,
@@ -19,7 +19,7 @@
     "scope": "https://workspace.slack.com:443",
     "method": "POST",
     "path": "/api/conversations.setPurpose",
-    "body": "----------------------------198402330513246502238920\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------198402330513246502238920\r\nContent-Disposition: form-data; name=\"purpose\"\r\n\r\npurpose\r\n----------------------------198402330513246502238920\r\nContent-Disposition: form-data; name=\"channel\"\r\n\r\nC3Y9NQTQG\r\n----------------------------198402330513246502238920--\r\n",
+    "body": "----------------------------240931670220439824763760\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------240931670220439824763760\r\nContent-Disposition: form-data; name=\"purpose\"\r\n\r\npurpose\r\n----------------------------240931670220439824763760\r\nContent-Disposition: form-data; name=\"channel\"\r\n\r\nC3Y9NQTQG\r\n----------------------------240931670220439824763760--\r\n",
     "status": 200,
     "response": {
       "ok": true

diff --git a/...channel.spec.js__cassettes/testingSlackSDK_testingChannelSetTopicUnchanged_recording.json b/...channel.spec.js__cassettes/testingSlackSDK_testingChannelSetTopicUnchanged_recording.json
@@ -0,0 +1,24 @@
+[
+  {
+    "scope": "https://workspace.slack.com:443",
+    "method": "POST",
+    "path": "/api/rtm.start",
+    "body": "----------------------------128508069392224419437859\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------128508069392224419437859--\r\n",
+    "status": 200,
+    "response": {
+      "ok": true,
+      "channels": [
+        {
+          "id": "C3Y9NQTQG",
+          "name": "channel",
+          "topic": {
+            "value": "topic"
+          },
+          "purpose": {
+            "value": "purpose"
+          }
+        }
+      ]
+    }
+  }
+]
diff --git a/.../index/channel.spec.js__cassettes/testingSlackSDK_testingChannelShareFiles_recording.json b/.../index/channel.spec.js__cassettes/testingSlackSDK_testingChannelShareFiles_recording.json
@@ -3,7 +3,7 @@
     "scope": "https://workspace.slack.com:443",
     "method": "POST",
     "path": "/api/rtm.start",
-    "body": "----------------------------240931670220439824763760\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------240931670220439824763760--\r\n",
+    "body": "----------------------------437991048648655338960848\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------437991048648655338960848--\r\n",
     "status": 200,
     "response": {
       "ok": true,
@@ -19,7 +19,7 @@
     "scope": "https://workspace.slack.com:443",
     "method": "POST",
     "path": "/api/files.share",
-    "body": "----------------------------898525272439246643720391\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------898525272439246643720391\r\nContent-Disposition: form-data; name=\"files\"\r\n\r\nF029QHN0AAZ,F02AH8J752L\r\n----------------------------898525272439246643720391\r\nContent-Disposition: form-data; name=\"channel\"\r\n\r\nC3Y9NQTQG\r\n----------------------------898525272439246643720391--\r\n",
+    "body": "----------------------------199934421484272806572989\r\nContent-Disposition: form-data; name=\"token\"\r\n\r\nSLACK-SESSION-TOKEN\r\n----------------------------199934421484272806572989\r\nContent-Disposition: form-data; name=\"files\"\r\n\r\nF029QHN0AAZ,F02AH8J752L\r\n----------------------------199934421484272806572989\r\nContent-Disposition: form-data; name=\"channel\"\r\n\r\nC3Y9NQTQG\r\n----------------------------199934421484272806572989--\r\n",
     "status": 200,
     "response": {
       "ok": true