socrates 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f813438b75945834217c30d8bc6a5ef40ee9c1e4
-  data.tar.gz: e7b0f2f3cb3aee495da7587452ec16f644e49921
+  metadata.gz: c9bb99fd80afa2c0115599cf6deb59a48689aa48
+  data.tar.gz: 7af67f0f859c82ff79fc2e59208b768dc41a9d16
 SHA512:
-  metadata.gz: e83c6751e94f0f4019edbcffdc61669acd41c474e9502db5e2c0b501175e5aa64a2eb9c9bc0273c30b1d60a6f1a255d752a6a0ce977e3ebf786cbed4810a1531
-  data.tar.gz: a0394070b283a41a9c265690a67a4edc001ff0b3f95f3793b3f2836824d83181a655c70186867ba71ca2bf5ba1071ee6cc1878319bf9de0100147d0e0c653f9f
+  metadata.gz: 1da101c9c7d1bb8ab6d77320a96038e7b83f0cc3d491bada410e11e315b7346aa1699abc2063cf52b300c4fff4d31da29d6172b4110dd25663e36dc872984186
+  data.tar.gz: dcbcafde4c22bc45e2e1a0d0b08228e3c5dcf64c1d83150e78b8803720b2a3beb30ae73089cfac72e460d926037459b8e4862fd1eb5677e4b768b6c3c4da6890

data/lib/socrates/adapters/console_adapter.rb

@@ -35,7 +35,7 @@ module Socrates
         users << User.new(id, name, Profile.new(first, last, email))
       end
 
-      def users_list
+      def users_list(*)
         Response.new(users)
       end
 

data/lib/socrates/adapters/memory_adapter.rb

@@ -34,7 +34,7 @@ module Socrates
         users << User.new(id, name, Profile.new(first, last, email))
       end
 
-      def users_list
+      def users_list(*)
         Response.new(users)
       end
 

data/lib/socrates/adapters/slack_adapter.rb

@@ -6,30 +6,41 @@ module Socrates
       end
 
       def client_id_from_context(context)
-        context&.user
+        raise ArgumentError, "Context cannot be nil" if context.nil?
+        raise ArgumentError, "Expected context to respond to :user" unless context.respond_to?(:user)
+
+        context.user
       end
 
       def send_message(message, context:)
+        raise ArgumentError, "Expected context to respond to :channel" unless context.respond_to?(:channel)
+
         @real_time_client.message(text: message, channel: context.channel)
       end
 
       def send_direct_message(message, user, *)
-        user = user.id if user.respond_to?(:id)
+        raise ArgumentError, "Expected user to respond to :id" unless user.respond_to?(:id)
 
         im_channel = lookup_im_channel(user)
 
         @real_time_client.message(text: message, channel: im_channel)
       end
 
-      def users_list
+      def users_list(include_deleted: false, include_bots: false)
         client = @real_time_client.web_client
-        client.users_list
+
+        client.users_list.tap do |response|
+          response.members.reject!(&:deleted?) unless include_deleted
+          response.members.reject!(&:is_bot?) unless include_bots
+        end
       end
 
       def lookup_email(context:)
+        raise ArgumentError, "Expected context to respond to :user" unless context.respond_to?(:user)
+
         client = @real_time_client.web_client
-        info = client.users_info(user: context.user)
-        info.present? ? info.user.profile.email : nil
+        info   = client.users_info(user: context.user)
+        info.present? ? info.user.profile.email.presence : nil
       end
 
       private

data/lib/socrates/bots/slack_bot.rb

@@ -18,13 +18,20 @@ module Socrates
       end
 
       def start
+        reply_to_messages = {}
+
         @slack_client.on :message do |data|
           # puts "> #{data}"
 
-          # When first connecting, Slack may resend the last message. Ignore it...
-          next if data.reply_to.present?
+          if data.reply_to.present?
+            # Stash this message away because we may need it later.
+            reply_to_messages[data.channel] = data.text
+          end
 
-          @dispatcher.dispatch(data.text, context: data)
+          # Only dispatch the message if it does not match a previous reply_to message for the channel.
+          if reply_to_messages[data.channel] != data.text
+            @dispatcher.dispatch(data.text, context: data)
+          end
         end
 
         @slack_client.start!

data/lib/socrates/core/state.rb

@@ -46,7 +46,9 @@ module Socrates
       end
 
       def send_message(to:, message:)
-        @logger.info %(#{client_id} send direct to #{to}: "#{format_for_logging(message)}")
+        displayable_to = to.respond_to?(:id) ? to.id : to
+
+        @logger.info %(#{client_id} send direct to #{displayable_to}: "#{format_for_logging(message)}")
         @adapter.send_direct_message(message, to, context: @context)
       end
 

data/lib/socrates/version.rb

@@ -1,3 +1,3 @@
 module Socrates
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socrates
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Christian Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler