ruboty-slack_rtm 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11510a4a0e35da5630eff5dc6e94784225dff973
-  data.tar.gz: c4d99a6dcbae908eb437f09387ddd60a4b9cce5c
+  metadata.gz: 5e4546f427a69aee99fc391dd6681301c7109962
+  data.tar.gz: da84efd1447b98ace8eb8cbe58d433e6d20ce8ce
 SHA512:
-  metadata.gz: b6a2d177a7ee38661ebacd8a5a3ca2c1384dc951c040960242d29b4066c9630dfc36b5281060893e42132079ed0e65f310c78ac6a781558683a903f11858ee70
-  data.tar.gz: 5778e53030dc8526bfcef607c4c55863f6999b395bc582496c2d84127da9ed997779263b27d05db29b9492a0cd799fc58d046e3c7e65cb7f70d204023721f635
+  metadata.gz: 18183e21f0cf9ed4d4b0606555ddd6e50951a8fb732172cd06fb4d1f8d024dd37f537c2c9fbb26bd682b4904f9a6aa6704a55dfd6eb23ea5ff3facad01d45229
+  data.tar.gz: df72d3706b7aec6e2c32c025ffdad945f189a1e6c6595569aa13bb444cd30dd66f4b89ac82412150d18a0122b91067472f81a57666ba44a6fb4c36975fd88b85

data/lib/ruboty/adapters/slack_rtm.rb

@@ -18,7 +18,7 @@ module Ruboty
         realtime.send(
           type: 'message',
           channel: message[:to],
-          text: message[:code] ?  "```\n#{message[:body]}\n```" : message[:body],
+          text: message[:code] ?  "```\n#{message[:body]}\n```" : resolve_send_mention(message[:body]),
           mrkdwn: true
         )
       end
@@ -31,6 +31,9 @@ module Ruboty
         @channel_info_cahces = {}
 
         ENV['RUBOTY_NAME'] ||= response['user']
+
+        make_users_cache
+        make_channels_cache
       end
 
       def bind
@@ -86,9 +89,7 @@ module Ruboty
       end
 
       def on_channel_change(data)
-        channel_id = data['channel']
-        channel_id = channel_id['id'] if channel_id.is_a?(Hash)
-        @channel_info_cahces[channel_id] = nil
+        make_channels_cache
       end
       alias_method :on_channel_deleted, :on_channel_change
       alias_method :on_channel_renamed, :on_channel_change
@@ -107,17 +108,96 @@ module Ruboty
 
         data['mention_to'] = []
 
-        (data['text'] || '').gsub!(/\<\@(?<uid>[0-9A-Z]+)\>/) do |_|
-          user = user_info(Regexp.last_match[:uid])
+        data['text'] = (data['text'] || '').gsub(/\<\@(?<uid>[0-9A-Z]+)(?:\|(?<name>[^>]+))?\>/) do |_|
+          name = Regexp.last_match[:name]
+
+          unless name
+            user = user_info(Regexp.last_match[:uid])
+
+            data['mention_to'] << user
+
+            name = user['name']
+          end
+
+          "@#{name}"
+        end
 
-          data['mention_to'] << user
+        data['text'].gsub!(/\<!(?<special>[^>]+)\>/) do |_|
+          "@#{Regexp.last_match[:special]}"
+        end
 
-          "@#{user['name']}"
+        data['text'].gsub!(/\<((?<link>[^>|]+)(?:\|(?<ref>[^>]*))?)\>/) do |_|
+          Regexp.last_match[:ref] || Regexp.last_match[:link]
+        end
+
+
+        data['text'].gsub!(/\#(?<room_id>[A-Z0-9]+)/) do |_|
+          room_id = Regexp.last_match[:room_id]
+          msg = "##{room_id}"
+
+          if channel = channel_info(room_id)
+            msg = "##{channel['name']}"
+          end
+
+          msg
         end
 
         data
       end
 
+      def resolve_send_mention(text)
+        text = text.to_s
+        text.gsub!(/@(?<mention>[0-9a-z_-]+)/) do |_|
+          mention = Regexp.last_match[:mention]
+          msg = "@#{mention}"
+
+          @user_info_caches.each_pair do |id, user|
+            if user['name'].downcase == mention.downcase
+              msg = "<@#{id}|#{mention}>"
+            end
+          end
+
+          msg
+        end
+
+        text.gsub!(/@(?<special>(?:everyone|group|channel))/) do |_|
+          "<!#{Regexp.last_match[:special]}>"
+        end
+
+        text.gsub!(/\#(?<room_id>[a-z0-9_-]+)/) do |_|
+          room_id = Regexp.last_match[:room_id]
+          msg = "##{room_id}"
+
+          @channel_info_cahces.each_pair do |id, channel|
+            if channel && channel['name'] == room_id
+              msg = "<##{id}|#{room_id}>"
+            end
+          end
+
+          msg
+        end
+
+        text
+      end
+
+      def make_users_cache
+        resp = client.users_list
+        if resp['ok']
+          resp['members'].each do |user|
+            @user_info_caches[user['id']] = user
+          end
+        end
+      end
+
+      def make_channels_cache
+        resp = client.channels_list
+        if resp['ok']
+          resp['channels'].each do |channel|
+            @channel_info_cahces[channel['id']] = channel
+          end
+        end
+      end
+
       def user_info(user_id)
         @user_info_caches[user_id] ||= begin
           resp = client.users_info(user: user_id)

data/lib/ruboty/slack_rtm/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackRTM
-    VERSION = '0.0.2'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_rtm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Slack real time messaging adapter for Ruboty