@hubot-friends/hubot-slack 1.0.4 → 1.0.6

package/.github/workflows/ci-build.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Install hubot
-        run: npm i hubot@5.x
+        run: npm i hubot
       - name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
         run: npm audit signatures
   test:
@@ -50,7 +50,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
       - run: npm ci
-      - run: npm i hubot@5.x
+      - run: npm i hubot
       - run: npm test
   release:
     needs: [build, test]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubot-friends/hubot-slack",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A new Slack adapter for Hubot",
   "homepage": "https://github.com/hubot-friends/hubot-slack#readme",
   "main": "./index.js",
@@ -27,7 +27,7 @@
     "@slack/web-api": "^6.8.1"
   },
   "peerDependencies": {
-    "hubot": "^6.x.x"
+    "hubot": "^7.x.x"
   },
   "engines": {
     "node": ">= 18.16.0",

package/src/bot.js

@@ -60,11 +60,11 @@ class SlackClient {
 
   setTopic(conversationId, topic) {
     this.robot.logger.debug(`SlackClient#setTopic() with topic ${topic}`);
-    return this.web.conversations.info(conversationId)
+    return this.web.conversations.info({channel: conversationId})
       .then(res => {
         const conversation = res.channel;
         if (!conversation.is_im && !conversation.is_mpim) {
-          return this.web.conversations.setTopic(conversationId, topic);
+          return this.web.conversations.setTopic({channel: conversationId, topic});
         } else {
           return this.robot.logger.debug(`Conversation ${conversationId} is a DM or MPDM. ` +
                               "These conversation types do not have topics."
@@ -116,7 +116,7 @@ class SlackClient {
 
   async fetchUser(userId) {
     if (this.robot.brain.data.users[userId] != null) { return Promise.resolve(this.robot.brain.data.users[userId]); }
-    const r = await this.web.users.info(userId);
+    const r = await this.web.users.info({user: userId});
     this.updateUserInBrain(r.user);
     return r.user;
   }
@@ -125,7 +125,7 @@ class SlackClient {
     if (((this.channelData[conversationId] != null ? this.channelData[conversationId].channel : undefined) != null) &&
       (expiration < (this.channelData[conversationId] != null ? this.channelData[conversationId].updated : undefined))) { return Promise.resolve(this.channelData[conversationId].channel); }
     if (this.channelData[conversationId] != null) { delete this.channelData[conversationId]; }
-    return this.web.conversations.info(conversationId).then(r => {
+    return this.web.conversations.info({channel: conversationId}).then(r => {
       if (r.channel != null) {
         this.channelData[conversationId] = {
           channel: r.channel,
@@ -165,8 +165,7 @@ class SlackClient {
     try {
       await this.eventHandler(event);
     } catch (error) {
-      console.trace(error);
-      this.robot.logger.error(`An error occurred while processing an event from SlackBot's SlackClient: ${error.message}.`);
+      this.robot.logger.error(`bot.js: eventWrapper: An error occurred while processing an event from SlackBot's SlackClient: ${error.message}.`);
     }
   }
 }
@@ -408,6 +407,7 @@ class SlackBot extends Adapter {
    * @param {SlackBotInfo} [event.bot] - the description of the bot creating this event as returned by `bots.info`
    */
   async eventHandler(message) {
+    this.robot.logger.debug(`eventHandler ${JSON.stringify(message, null, 2)}`);
     if(!message?.body?.event?.user) {
       if (message?.ack) {
         return await message?.ack();
@@ -431,7 +431,9 @@ class SlackBot extends Adapter {
 
     // Ignore anything we sent
     if (from?.id === this.self.user_id) { 
-      return;
+      if (message?.ack) {
+        return await message?.ack();
+      }
     }
     
     this.robot.logger.debug(`event ${JSON.stringify(message, null, 2)} user = ${user}`);
@@ -453,7 +455,6 @@ class SlackBot extends Adapter {
     from.name = from.profile.display_name;
 
     // add the bot id to the message if it's a direct message
-
     message.body.event.text = this.addBotIdToMessage(message.body.event);
     message.body.event.text = this.replaceBotIdWithName(message.body.event);
     this.robot.logger.debug(`Text = ${message.body.event.text}`);

package/src/client.js

@@ -131,10 +131,10 @@ class SlackClient extends EventEmitter {
     // topic is made regardless of the conversation type. If the conversation type is not compatible, the call would
     // fail, which is exactly the outcome in this implementation.
     try {
-      const res = await this.web.conversations.info(conversationId)
+      const res = await this.web.conversations.info({channel: conversationId})
       const conversation = res.channel;
       if (!conversation.is_im && !conversation.is_mpim) {
-        return await this.web.conversations.setTopic(conversationId, topic);
+        return await this.web.conversations.setTopic({channel: conversationId, topic});
       } else {
         return this.robot.logger.debug(`Conversation ${conversationId} is a DM or MPDM. These conversation types do not have topics.`);
       }
@@ -287,7 +287,7 @@ class SlackClient extends EventEmitter {
     if (this.channelData[conversationId] != null) { delete this.channelData[conversationId]; }
 
     // Return conversations.info promise
-    const r = await this.web.conversations.info(conversationId)
+    const r = await this.web.conversations.info({channel: conversationId})
     if (r.channel != null) {
       this.channelData[conversationId] = {
         channel: r.channel,

package/src/message.js

@@ -135,17 +135,6 @@ class SlackTextMessage extends TextMessage {
         text = text.replace(/&lt;/g, "<");
         text = text.replace(/&gt;/g, ">");
         text = text.replace(/&amp;/g, "&");
-
-        // special handling for message text when inside a DM conversation
-        if (conversationInfo.is_im) {
-          const startOfText = text.indexOf("@") === 0 ? 1 : 0;
-          const robotIsNamed = (text.indexOf(this._robot_name) === startOfText) || (text.indexOf(this._robot_alias) === startOfText);
-          // Assume it was addressed to us even if it wasn't
-          if (!robotIsNamed) {
-            text = `${this._robot_name} ${text}`;     // If this is a DM, pretend it was addressed to us
-          }
-        }
-
         this.text = text;
         return cb();
     }).catch(error => {

package/test/bot.js

@@ -33,7 +33,7 @@ describe('Adapter', function() {
     process.env.HUBOT_SLACK_APP_TOKEN = 'xapp-faketoken';
     process.env.HUBOT_SLACK_BOT_TOKEN = 'xoxb-faketoken';
 
-    const loadedRobot = loadBot('slack', false, 'Hubot');
+    const loadedRobot = loadBot('hubot-slack', false, 'Hubot');
     await loadedRobot.loadAdapter();    
 
     assert.ok(loadedRobot.hearReaction instanceof Function);

package/test/data/topic-message.json

@@ -0,0 +1,49 @@
+{
+    "envelope_id": "asasdfsdfdf-cf4a-4aab-a3d4-80cb02209ff2",
+    "body": {
+      "token": "shgretafdasdfasd",
+      "team_id": "T0asfdasdfasdf",
+      "context_team_id": "T0asfdasdfasdf",
+      "context_enterprise_id": null,
+      "api_app_id": "asdfasdfasd",
+      "event": {
+        "type": "message",
+        "subtype": "channel_topic",
+        "ts": "1690670214.666729",
+        "user": "U3fasdfasdsd",
+        "text": "set the channel topic: indeed! It did  work.",
+        "topic": "indeed! It did  work.",
+        "channel": "CDasdfasdfsd",
+        "event_ts": "1690670214.666729",
+        "channel_type": "channel"
+      },
+      "type": "event_callback",
+      "event_id": "Ev05KDEERU2E",
+      "event_time": 1690670214,
+      "authorizations": [
+        {
+          "enterprise_id": null,
+          "team_id": "T0asfdasdfasdf",
+          "user_id": "U3fasdfasdsd",
+          "is_bot": true,
+          "is_enterprise_install": false
+        }
+      ],
+      "is_ext_shared_channel": false,
+      "event_context": "4-asdfasdfasd"
+    },
+    "event": {
+      "type": "message",
+      "subtype": "channel_topic",
+      "ts": "1690670214.666729",
+      "user": "U3fasdfasdsd",
+      "text": "set the channel topic: indeed! It did  work.",
+      "topic": "indeed! It did  work.",
+      "channel": "CDasdfasdfsd",
+      "event_ts": "1690670214.666729",
+      "channel_type": "channel"
+    },
+    "retry_num": 0,
+    "retry_reason": "",
+    "accepts_response_payload": false
+  }

package/test/stubs.js

@@ -239,7 +239,7 @@ module.exports = function() {
     }
   };
   stubs.conversationsMock = {
-    setTopic: (id, topic) => {
+    setTopic: ({channel, topic}) => {
       stubs._topic = topic;
       if (stubs.receiveMock.onTopic != null) { 
         stubs.receiveMock.onTopic(stubs._topic);
@@ -247,11 +247,11 @@ module.exports = function() {
       return Promise.resolve();
     },
     info: conversationId => {
-      if (conversationId === stubs.channel.id) {
+      if (conversationId.channel === stubs.channel.id) {
         return Promise.resolve({ok: true, channel: stubs.channel});
-      } else if (conversationId === stubs.DM.id) {
+      } else if (conversationId.channel === stubs.DM.id) {
         return Promise.resolve({ok: true, channel: stubs.DM});
-      } else if (conversationId === 'C789') {
+      } else if (conversationId.channel === 'C789') {
         return Promise.resolve();
       } else {
         return Promise.reject(new Error('conversationsMock could not match conversation ID'));