slack-bot-server 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1a580f416814eef8f1582047b3f748022b2f094
-  data.tar.gz: e307931094203fe4590049d3d4eb966ad4a96fed
+  metadata.gz: 905bc700aa34e23d3da3e04a4956248ceb8f6d09
+  data.tar.gz: 8e85e1157e0d351c58b861f30586570786d8e871
 SHA512:
-  metadata.gz: 88d60ed5fc1b11d4df51d4ebfe9f92042e660a61bed513130d22a200fb4bee70001655320f5683b0c0418336ec50ede9facfbc36961105bbfa90199b1962a0d2
-  data.tar.gz: 48eae3c8528df390699a124782b558d64d36685d4f83b014b11dc3b4d89857c654c6c27efdfb02ae47e200b112e8c5773af0ed0b1eaebd9c0c4a992f8b8ac721
+  metadata.gz: a4836b1679ba77a3089bca65188317847a8a3b7c797d87e18a9cad009237fa3e0655e9dcc5a9b6faf7a9e5054b8f23863a44bcf3db4db8a4beed9495b8fcfda1
+  data.tar.gz: b6e71a1aafb3139235875f2d07c82b2d9f780647416ae3bb32ba5af8a63cb31c352c453ee3d3f1b05cff202d706139d4fb17f8592aca2a1d719ca23437f447a9

data/README.md

@@ -35,7 +35,7 @@ require 'slack_bot_server/simple_bot'
 
 # Use a Redis-based queue to add/remove bots and to trigger
 # bot messages to be sent
-queue = SlackBotServer::RedisQueue.new(Redis.new)
+queue = SlackBotServer::RedisQueue.new
 
 # Create a new server using that queue
 server = SlackBotServer::Server.new(queue: queue)

data/lib/slack_bot_server/bot.rb

@@ -10,12 +10,17 @@ class SlackBotServer::Bot
     @key = key || @token
     @api = ::Slack::Client.new(token: @token)
     @im_channel_ids = []
+    @channel_ids = []
+    @connected = false
+    @running = false
 
     raise InvalidToken unless auth_test['ok']
   end
 
   def say(options)
-    @api.chat_postMessage(default_message_options.merge(options))
+    @channel_ids.each do |channel_id|
+      @api.chat_postMessage(default_message_options.merge(options).merge(channel: channel_id))
+    end
   end
 
   def reply(options)
@@ -35,34 +40,49 @@ class SlackBotServer::Bot
   end
 
   def start
+    @running = true
     @ws = Faye::WebSocket::Client.new(websocket_url, nil, ping: 60)
 
     @ws.on :open do |event|
+      @connected = true
       log "connected to '#{team}'"
       load_im_channels
+      load_channels
     end
 
     @ws.on :message do |event|
       begin
-        debug event
+        debug event.data
         handle_message(event)
       rescue => e
         log error: e
+        log backtrace: e.backtrace
       end
     end
 
     @ws.on :close do |event|
       log "disconnected"
+      @connected = false
+      if @running
+        start
+      end
     end
   end
 
   def stop
     log "closing connection"
+    @running = false
     @ws.close
     log "closed"
   end
 
+  def connected?
+    @connected
+  end
+
   class << self
+    attr_reader :mention_keywords
+
     def username(name)
       default_message_options[:username] = name
     end
@@ -71,8 +91,12 @@ class SlackBotServer::Bot
       default_message_options[:icon_url] = url
     end
 
+    def mention_as(*keywords)
+      @mention_keywords = keywords
+    end
+
     def default_message_options
-      @default_message_options ||= {channel: '#general'}
+      @default_message_options ||= {}
     end
 
     def callbacks_for(type)
@@ -92,9 +116,9 @@ class SlackBotServer::Bot
     def on_mention(&block)
       on(:message) do |data|
         if !bot_message?(data) &&
-           (data['text'] =~ /\A#{user}[\s\:](.*)/ ||
-            data['text'] =~ /\A<@#{user_id}>[\s\:](.*)/)
-          message = $1.strip
+           (data['text'] =~ /\A(#{mention_keywords.join('|')})[\s\:](.*)/i ||
+            data['text'] =~ /\A(<@#{user_id}>)[\s\:](.*)/)
+          message = $2.strip
           @last_received_data = data.merge('message' => message)
           instance_exec(@last_received_data, &block)
         end
@@ -117,6 +141,18 @@ class SlackBotServer::Bot
     @im_channel_ids << channel_id
   end
 
+  on :channel_joined do |data|
+    channel_id = data['channel']['id']
+    log "Adding new channel: #{channel_id}"
+    @channel_ids << channel_id
+  end
+
+  on :channel_left do |data|
+    channel_id = data['channel']
+    log "Removing channel: #{channel_id}"
+    @channel_ids.delete(channel_id)
+  end
+
   def to_s
     "<#{self.class.name} key:#{key}>"
   end
@@ -170,12 +206,20 @@ class SlackBotServer::Bot
     log im_channels: @im_channel_ids
   end
 
+  def load_channels
+    log "Loading IM 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
+  end
+
   def is_im_channel?(id)
     @im_channel_ids.include?(id)
   end
 
   def bot_message?(data)
-    data['subtype'] == 'bot_message'
+    data['subtype'] == 'bot_message' ||
+    data['user'] == 'USLACKBOT'
   end
 
   def websocket_url
@@ -185,4 +229,8 @@ class SlackBotServer::Bot
   def default_message_options
     self.class.default_message_options
   end
+
+  def mention_keywords
+    self.class.mention_keywords || [user]
+  end
 end

data/lib/slack_bot_server/redis_queue.rb

@@ -1,9 +1,14 @@
 require 'multi_json'
 
 class SlackBotServer::RedisQueue
-  def initialize(redis)
+  def initialize(redis=nil)
     @key = 'slack_bot_server:queue'
-    @redis = redis
+    @redis = if redis
+      redis
+    else
+      require 'redis'
+      Redis.new
+    end
   end
 
   def push(value)
@@ -13,7 +18,7 @@ class SlackBotServer::RedisQueue
   def pop
     json_value = @redis.lpop @key
     if json_value
-      MultiJson.load(json_value)
+      MultiJson.load(json_value, symbolize_keys: true)
     else
       nil
     end

data/lib/slack_bot_server/version.rb

@@ -1,3 +1,3 @@
 module SlackBotServer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/slack_bot_server.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "redis"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-eventmachine"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Adam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-api
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement