slack-bot-server 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504c4decb4b2eacb0315295a18eced229b625964
-  data.tar.gz: 212c468b3d11018a48c966a1db9b4152f61b4f49
+  metadata.gz: 58eb298f86ae1232eae9487d0fc28c27eb15a9b4
+  data.tar.gz: 7cfe32f6ff625b0e6cee19872378d50021502396
 SHA512:
-  metadata.gz: f93f32bd83af717a663f5e995eea4678f24c5b2db744dbec043e40e5b7a79e52823130cbd22bad4821e87c89c429cd5322d06bccd12d04087ed9f410a6d313a2
-  data.tar.gz: a277171fd3fa7b384118992cf1b2d80777ab3ea05bbcbd2156f241c64d1063321190364b263d9e7497944aa991f88420cbfb01a5c6b6cc1328fbe8fae49b58c0
+  metadata.gz: 906ea70d84f329a2b4ef0e3968c33dd32892d55a7c3d6db18f6a9d9ba1cfbf3177587f9bf0ae6399e371ffdcbe0312231c18e44f132088140cb9942fcb4219a7
+  data.tar.gz: 963d701368d4038051b42d63b1869831fb3c03163b9bce3737822e2a8df5fbe4c44407851e8c4ebeb4cb0cc21703b2ea67c84d81ee317463403d1005b68605a6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 0.4.4
+
+### Changes
+- Add new bot-private API method `user_message?(data)`, which returns true if the message is some utterance from a user
+- Allow replying from the low-level `on(:message)` callback, although caution should be exercised when doing this (i.e. make sure you aren't replying to bot or other low-level API messages!)
+
 ## 0.4.3
 
 ### Changes

data/lib/slack_bot_server/bot.rb

@@ -111,7 +111,7 @@ class SlackBotServer::Bot
   # @param options [Hash] As {#say}, although the +:channel+ option is
   #    redundant
   def reply(options)
-    channel = @last_received_data.channel
+    channel = @last_received_user_message.channel
     say(options.merge(channel: channel))
   end
 
@@ -129,7 +129,7 @@ class SlackBotServer::Bot
   # @param options [Hash] can contain +:channel+, which should be an ID; if no options
   #    are provided, the channel from the most recently recieved message is used
   def typing(options={})
-    last_received_channel = @last_received_data ? @last_received_data.channel : nil
+    last_received_channel = @last_received_user_message ? @last_received_user_message.channel : nil
     default_options = {channel: last_received_channel}
     @client.typing(default_options.merge(options))
   end
@@ -158,6 +158,7 @@ class SlackBotServer::Bot
     @client.on :message do |data|
       begin
         debug message: data
+        @last_received_user_message = data if user_message?(data)
         handle_message(data)
       rescue => e
         log error: e
@@ -311,8 +312,8 @@ class SlackBotServer::Bot
            (data.text =~ /\A(#{mention_keywords.join('|')})[\s\:](.*)/i ||
             data.text =~ /\A(<@#{bot_user_id}>)[\s\:](.*)/)
           message = $2.strip
-          @last_received_data = data.merge(message: message)
-          instance_exec(@last_received_data, &block)
+          @last_received_user_message.merge!(message: message)
+          instance_exec(@last_received_user_message, &block)
         end
       end
     end
@@ -322,9 +323,9 @@ class SlackBotServer::Bot
     def on_im(&block)
       on(:message) do |data|
         debug on_im: data, bot_message: bot_message?(data), is_im_channel: is_im_channel?(data.channel)
-        if is_im_channel?(data.channel) && !bot_message?(data)
-          @last_received_data = data.merge(message: data.text)
-          instance_exec(@last_received_data, &block)
+        if !bot_message?(data) && is_im_channel?(data.channel)
+          @last_received_user_message.merge!(message: data.text)
+          instance_exec(@last_received_user_message, &block)
         end
       end
     end
@@ -391,6 +392,10 @@ class SlackBotServer::Bot
     data.previous_message.user == bot_user_id
   end
 
+  def user_message?(data)
+    !bot_message?(data) && data.subtype.nil?
+  end
+
   def rtm_incompatible_message?(data)
     !(data[:attachments].nil? &&
       data[:username].nil? &&

data/lib/slack_bot_server/version.rb

@@ -1,4 +1,4 @@
 module SlackBotServer
   # The current version of the +SlackBotServer+ framework
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slack-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - James Adam