slack-bot-server 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51fdaf71346b7717b1f2c2334300d5759492da93
-  data.tar.gz: fa36c3d1286153e4528e66faa59c6731ed78e8a8
+  metadata.gz: 08f9edd260732b19478908af280a1d3acf318190
+  data.tar.gz: 1a82cf329ca85099d093e6fb78090adebc44393f
 SHA512:
-  metadata.gz: 1e37531bc9a0ce2296ba1efceb0f5ceb348e34b4a6b6083d07923f5dc37d6aeed2a0f41741073dc4691e630ed52b660e7c1ba3e7a8a3397825790740d2bcdb7f
-  data.tar.gz: 045cb48c928ad23eb314df4c9c257ffd80ab72f8a472d2a23b76d45bae5ebf3c4b265438e14d878b9e938ad09ddab716f33a02077faacca6a08daa1a85f0958e
+  metadata.gz: a4da0c83a05616f950969841c32b029ca7d60ffc79056fee1178011c31b5e748adf0f7e470772628524aa7e92db62a1521fe17bf30337d136f332558f833ec65
+  data.tar.gz: 951b05156d6d4365c4d0ef64b6ea8f460efc4b612dab3e9f39c58bfcd5479a49126aa08d41cd400845b174748d53583efe95ca88a4f2688a43367bf0b771b6f4

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 2.1.3
-before_install: gem install bundler -v 1.10.3
+  - 2.1
+  - 2.2
+before_install: gem install bundler

data/lib/slack_bot_server/bot.rb

@@ -2,6 +2,8 @@ require 'slack'
 require 'slack/client'
 
 class SlackBotServer::Bot
+  SLACKBOT_USER_ID = 'USLACKBOT'
+
   attr_reader :key
 
   class InvalidToken < RuntimeError; end
@@ -15,24 +17,28 @@ class SlackBotServer::Bot
     @connected = false
     @running = false
 
-    raise InvalidToken unless auth_test['ok']
+    raise InvalidToken unless rtm_start_data['ok']
   end
 
   def say(options)
-    @channel_ids.each do |channel_id|
-      @api.chat_postMessage(default_message_options.merge(options).merge(channel: channel_id))
+    @api.chat_postMessage(default_message_options.merge(options))
+  end
+
+  def broadcast(options)
+    @channel_ids.each do |channel|
+      say(options.merge(channel: channel))
     end
   end
 
   def reply(options)
     channel = @last_received_data['channel']
-    @api.chat_postMessage(default_message_options.merge(options.merge(channel: channel)))
+    say(options.merge(channel: channel))
   end
 
   def say_to(user_id, options)
     result = @api.im_open(user: user_id)
-    channel_id = result['channel']['id']
-    say(options.merge(channel: channel_id))
+    channel = result['channel']['id']
+    say(options.merge(channel: channel))
   end
 
   def call(method, args)
@@ -46,9 +52,8 @@ class SlackBotServer::Bot
 
     @ws.on :open do |event|
       @connected = true
-      log "connected to '#{team}'"
-      load_im_channels
-      load_channels
+      log "connected to '#{team_name}'"
+      run_callbacks(:start)
     end
 
     @ws.on :message do |event|
@@ -100,18 +105,21 @@ class SlackBotServer::Bot
       @default_message_options ||= {}
     end
 
+    def callbacks
+      @callbacks ||= {}
+    end
+
     def callbacks_for(type)
-      callbacks = @callbacks[type.to_sym] || []
+      matching_callbacks = callbacks[type.to_sym] || []
       if superclass.respond_to?(:callbacks_for)
-        callbacks += superclass.callbacks_for(type)
+        matching_callbacks += superclass.callbacks_for(type)
       end
-      callbacks
+      matching_callbacks.reverse
     end
 
     def on(type, &block)
-      @callbacks ||= {}
-      @callbacks[type.to_sym] ||= []
-      @callbacks[type.to_sym] << block
+      callbacks[type.to_sym] ||= []
+      callbacks[type.to_sym] << block
     end
 
     def on_mention(&block)
@@ -136,6 +144,10 @@ class SlackBotServer::Bot
     end
   end
 
+  on :start do
+    load_channels
+  end
+
   on :im_created do |data|
     channel_id = data['channel']['id']
     log "Adding new IM channel: #{channel_id}"
@@ -162,13 +174,13 @@ class SlackBotServer::Bot
 
   def handle_message(event)
     data = MultiJson.load(event.data)
-    if data["type"]
-      relevant_callbacks = self.class.callbacks_for(data["type"])
-      if relevant_callbacks && relevant_callbacks.any?
-        relevant_callbacks.each do |c|
-          instance_exec(data, &c)
-        end
-      end
+    run_callbacks(data["type"], data) if data["type"]
+  end
+
+  def run_callbacks(type, data=nil)
+    relevant_callbacks = self.class.callbacks_for(type)
+    relevant_callbacks.each do |c|
+      instance_exec(data, &c)
     end
   end
 
@@ -185,33 +197,31 @@ class SlackBotServer::Bot
   end
 
   def user
-    auth_test['user']
+    rtm_start_data['self']['name']
   end
 
   def user_id
-    auth_test['user_id']
+    rtm_start_data['self']['id']
   end
 
-  def team
-    auth_test['team']
+  def team_name
+    rtm_start_data['team']['name']
   end
 
-  def auth_test
-    @auth_test ||= @api.auth_test
+  def load_channels
+    log "Loading channels"
+    @im_channel_ids = rtm_start_data['ims'].map { |d| d['id'] }
+    log im_channels: @im_channel_ids
+    @channel_ids = rtm_start_data['channels'].select { |d| d['is_member'] == true }.map { |d| d['id'] }
+    log channels: @channel_ids
   end
 
-  def load_im_channels
-    log "Loading IM channels"
-    result = @api.im_list
-    @im_channel_ids = result['ims'].map { |d| d['id'] }
-    log im_channels: @im_channel_ids
+  def websocket_url
+    rtm_start_data['url']
   end
 
-  def load_channels
-    log "Loading channels"
-    result = @api.channels_list(exclude_archived: 1)
-    @channel_ids = result['channels'].select { |d| d['is_member'] == true }.map { |d| d['id'] }
-    log channels: @channel_ids
+  def rtm_start_data
+    @rtm_start_data ||= @api.post('rtm.start')
   end
 
   def is_im_channel?(id)
@@ -220,7 +230,14 @@ class SlackBotServer::Bot
 
   def bot_message?(data)
     data['subtype'] == 'bot_message' ||
-    data['user'] == 'USLACKBOT'
+    data['user'] == SLACKBOT_USER_ID ||
+    data['user'] == user_id ||
+    change_to_previous_bot_message?(data)
+  end
+
+  def change_to_previous_bot_message?(data)
+    data['subtype'] == 'message_changed' &&
+    data['previous_message']['user'] == user_id
   end
 
   def websocket_url

data/lib/slack_bot_server/redis_queue.rb

@@ -24,4 +24,3 @@ class SlackBotServer::RedisQueue
     end
   end
 end
-

data/lib/slack_bot_server/remote_control.rb

@@ -17,10 +17,18 @@ class SlackBotServer::RemoteControl
     @queue.push([:remove_bot, key])
   end
 
+  def broadcast(key, message_data)
+    @queue.push([:broadcast, key, message_data])
+  end
+
   def say(key, message_data)
     @queue.push([:say, key, message_data])
   end
 
+  def say_to(key, user_id, message_data)
+    @queue.push([:say_to, key, user_id, message_data])
+  end
+
   def call(key, method, args)
     @queue.push([:call, [key, method, args]])
   end

data/lib/slack_bot_server/server.rb

@@ -77,10 +77,21 @@ class SlackBotServer::Server
     when :remove_bot
       key = args.first
       remove_bot(key)
+    when :broadcast
+      key, message_data = args
+      log "[#{key}] #{message_data}"
+      bot = bot(key)
+      bot.broadcast(message_data)
     when :say
       key, message_data = args
+      log "[#{key}] #{message_data}"
       bot = bot(key)
       bot.say(message_data)
+    when :say_to
+      key, user_id, message_data = args
+      log "[#{key}] (#{user_id}) #{message_data}"
+      bot = bot(key)
+      bot.say_to(user_id, message_data)
     when :call
       key, method, method_args = args
       bot = bot(key)

data/lib/slack_bot_server/version.rb

@@ -1,3 +1,3 @@
 module SlackBotServer
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - James Adam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-api