slackbot_frd 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f18d78abc8751ff7cf6ccab669a856f3e5896eb
-  data.tar.gz: 7ccd3d4e72331455e3ae954225dea63421cbc696
+  metadata.gz: 9f7493d31b22bcf1ce011a8966d80c54bc11e6e2
+  data.tar.gz: e201692f2be3a8b5fdadd40cce393ceecc4f2937
 SHA512:
-  metadata.gz: cd865011f64fd16a8d53f39ce099f0ca62308b0228117b598471817cf06be91eab66d4e8ee84e3b388c1a345a7bd94e4dbe1c56b45bd46cd46d7894f4a98e529
-  data.tar.gz: 088ccc188cc9f8f4b1bad887ce5beb91107e8053393a927aa6bf36ef29f265036c51c7cfd46ca25994533119ab8101688a6fab6c5c2fe75d78e3e34368bc9740
+  metadata.gz: 7585d262c05115e8878ca21dedf8f53903354a35c7a59449f970ddea9d62e875a8c761c495ffcd6efbbb21d2b7869ed260f476f20040dce33eeec60f2813d3c9
+  data.tar.gz: f7ed2227c9ee666af0535e6f8d5602f2cef915d67ab9f330809aad1c9a52343e600478ef1cc6b5ebf71a963d0595e6ff49a63c60f2c10496668db34f485b60a7

data/lib/slackbot_frd/lib/slack_connection.rb

@@ -128,17 +128,29 @@ module SlackbotFrd
       end
     end
 
-    def send_message(channel:, message:, username: nil, avatar_emoji: nil, avatar_url: nil)
+    def send_im(user:, message:, username: nil, avatar_emoji: nil, avatar_url: nil)
+      send_message(
+        channel: im_channel_for_user(user),
+        message: message,
+        username: username,
+        avatar_emoji: avatar_emoji,
+        avatar_url: avatar_url,
+        channel_is_id: true
+      )
+    end
+
+    def send_message(channel:, message:, username: nil, avatar_emoji: nil, avatar_url: nil, channel_is_id: false)
       if username && (avatar_emoji || avatar_url)
         send_message_as_bot(
           channel: channel,
           message: message,
           username: username,
           avatar_emoji: avatar_emoji,
-          avatar_url: avatar_url
+          avatar_url: avatar_url,
+          channel_id_id: channel_is_id
         )
       else
-        send_message_as_user(channel: channel, message: message)
+        send_message_as_user(channel: channel, message: message, channel_is_id: channel_is_id)
       end
     end
 
@@ -183,6 +195,21 @@ module SlackbotFrd
       SlackbotFrd::Log.debug("#{self.class}: Received response:  #{resp}")
     end
 
+    def im_channel_for_user(user:)
+      SlackbotFrd::Log.debug(
+        "#{self.class}: Opening or retrieving IM channel for user '#{user}'"
+      )
+
+      resp = JSON.parse(SlackbotFrd::SlackMethods::ImOpen.openChannel(
+        token: @token,
+        user: user_name_to_id(user)
+      ))
+
+      SlackbotFrd::Log.debug("#{self.class}: Received response:  #{resp}")
+      return resp["channel"]["id"] if resp["channel"]
+      resp
+    end
+
     def users_in_channel(channel)
       a = SlackMethods::ChannelsInfo.members(
         token: @token,
@@ -258,13 +285,15 @@ module SlackbotFrd
     end
 
     private
-    def send_message_as_user(channel:, message:)
+    def send_message_as_user(channel:, message:, channel_is_id: false)
       unless @ws
         log_and_add_to_error_file(
           "Cannot send message '#{message}' as user to channel '#{channel}' because not connected to wss stream"
         )
       end
 
+      channel_id = channel_is_id ? channel : channel_name_to_id(channel)
+
       SlackbotFrd::Log.debug(
         "#{self.class}: Sending message '#{message}' as user to channel '#{channel}'"
       )
@@ -273,7 +302,7 @@ module SlackbotFrd
         resp = @ws.send({
           id: event_id,
           type: 'message',
-          channel: channel_name_to_id(channel),
+          channel: channel_id,
           text: message
         }.to_json)
 
@@ -284,14 +313,16 @@ module SlackbotFrd
     end
 
     private
-    def send_message_as_bot(channel:, message:, username:, avatar_emoji: nil, avatar_url: nil)
+    def send_message_as_bot(channel:, message:, username:, avatar_emoji: nil, avatar_url: nil, channel_is_id: false)
       SlackbotFrd::Log.debug(
         "#{self.class}: Sending message '#{message}' as bot user '#{username}' to channel '#{channel}'"
       )
 
+      channel_id = channel_is_id ? channel : channel_name_to_id(channel)
+
       resp = SlackbotFrd::SlackMethods::ChatPostMessage.postMessage(
         token: @token,
-        channel: channel_name_to_id(channel),
+        channel: channel_id,
         message: message,
         username: username,
         avatar_emoji: avatar_emoji,

data/lib/slackbot_frd/slack_methods/im_open.rb

@@ -0,0 +1,34 @@
+require 'httparty'
+require 'json'
+
+module SlackbotFrd
+  module SlackMethods
+    class ImOpen
+      include HTTParty
+      base_uri 'https://slack.com/api/im.open'
+
+      def self.openChannel(token:, user:)
+        r = ImOpen.new(
+          token: token,
+          user: user
+        )
+        r.openChannel
+      end
+
+      def initialize(token:, user:)
+        @token = token
+        @user = user
+      end
+
+      def openChannel
+        body = {
+          token: @token,
+          user: @user
+        }
+
+        @response = self.class.post('', :body => body)
+        @response.body
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,6 +179,7 @@ files:
 - lib/slackbot_frd/slack_methods/chat_post_message.rb
 - lib/slackbot_frd/slack_methods/groups_list.rb
 - lib/slackbot_frd/slack_methods/im_channels_list.rb
+- lib/slackbot_frd/slack_methods/im_open.rb
 - lib/slackbot_frd/slack_methods/reactions_add.rb
 - lib/slackbot_frd/slack_methods/rtm_start.rb
 - lib/slackbot_frd/slack_methods/users_list.rb