ruboty-slack_rtm 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77e6ea5e7b18b37c9552ff4a2bdd4f49e543ef7
-  data.tar.gz: ad5c8c7c9f66110e4b67cffa8fa851d5fada7886
+  metadata.gz: 359ba35900b7f5a50ae244f89d0ef51b7d83ab44
+  data.tar.gz: 292b9ec04aad2813568975987433471fd48288ed
 SHA512:
-  metadata.gz: f3e6d5f9ca604bacb69ff8bcf0f6b91c95a00c7470d0e5666b5584382c789b9ebf785b2a8202a76f719b594bd0e78495217097876be2e0ac08391f4bf771024a
-  data.tar.gz: 2559a3b14c72ff93ca8a0e859a64071cc43e34366da65a78a350a02eed262d6be8051dbbed864f369d67a22e46cf0412ec3894c0cb8ced46f555f48e34516fa8
+  metadata.gz: f2b275014e2d920b612ec864a1250056a2bef3ff5d741160ceef715fcce3ed90a5f6d755cdd641cd0d4f46ceeae71535e01815884cd147dfe6a0214bb0cfe17e
+  data.tar.gz: 0db4ff4ef1b3a90f28ccaf8a0c8284fc0646229156b35c12ceac48ab8e16b4a998a23d4eae93f2c78e6f57ca0f463061737eb4e539790dc9b291bdb14b78bcb6

data/lib/ruboty/adapters/slack_rtm.rb

@@ -99,7 +99,6 @@ module Ruboty
       # event handlers
 
       def on_message(data)
-        data = resolve_mention!(data)
         user = user_info(data['user']) || {}
 
         channel = channel_info(data['channel'])
@@ -122,16 +121,18 @@ module Ruboty
           to: channel_to,
           channel: channel,
           user: user,
-          mention_to: data['mention_to'],
           time: Time.at(data['ts'].to_f)
         }
 
-        robot.receive(message_info.merge(body: CGI.unescapeHTML(data['text'])))
+        text, mention_to = extract_mention(data['text'])
+        robot.receive(message_info.merge(body: text, mention_to: mention_to))
 
         (data['attachments'] || []).each do |attachment|
-          body = attachment['fallback'] || "#{attachment['text']} #{attachment['pretext']}"
+          body, body_mention_to = extract_mention(attachment['fallback'] || "#{attachment['text']} #{attachment['pretext']}".strip)
 
-          robot.receive(message_info.merge(body: CGI.unescapeHTML(body))) unless body.empty?
+          unless body.empty?
+            robot.receive(message_info.merge(body: body, mention_to: body_mention_to))
+          end
         end
       end
 
@@ -150,18 +151,16 @@ module Ruboty
       alias_method :on_bot_added, :on_user_change
       alias_method :on_bot_changed, :on_user_change
 
-      def resolve_mention!(data)
-        data = data.dup
-
-        data['mention_to'] = []
+      def extract_mention(text)
+        mention_to = []
 
-        data['text'] = (data['text'] || '').gsub(/\<\@(?<uid>[0-9A-Z]+)(?:\|(?<name>[^>]+))?\>/) do |_|
+        text = (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
+            mention_to << user
 
             name = user['name']
           end
@@ -169,7 +168,7 @@ module Ruboty
           "@#{name}"
         end
 
-        data['text'].gsub!(/\<!subteam\^(?<usergroup_id>[0-9A-Z]+)(?:\|(?<handle>[^>]+))?\>/) do |_|
+        text.gsub!(/\<!subteam\^(?<usergroup_id>[0-9A-Z]+)(?:\|(?<handle>[^>]+))?\>/) do |_|
           handle = Regexp.last_match[:handle]
 
           unless handle
@@ -179,16 +178,16 @@ module Ruboty
           "#{handle}"
         end
 
-        data['text'].gsub!(/\<!(?<special>[^>|@]+)(\|\@[^>]+)?\>/) do |_|
+        text.gsub!(/\<!(?<special>[^>|@]+)(\|\@[^>]+)?\>/) do |_|
           "@#{Regexp.last_match[:special]}"
         end
 
-        data['text'].gsub!(/\<((?<link>[^>|]+)(?:\|(?<ref>[^>]*))?)\>/) do |_|
+        text.gsub!(/\<((?<link>[^>|]+)(?:\|(?<ref>[^>]*))?)\>/) do |_|
           Regexp.last_match[:ref] || Regexp.last_match[:link]
         end
 
 
-        data['text'].gsub!(/\#(?<room_id>[A-Z0-9]+)/) do |_|
+        text.gsub!(/\#(?<room_id>[A-Z0-9]+)/) do |_|
           room_id = Regexp.last_match[:room_id]
           msg = "##{room_id}"
 
@@ -199,7 +198,7 @@ module Ruboty
           msg
         end
 
-        data
+        [CGI.unescapeHTML(text), mention_to]
       end
 
       def resolve_send_mention(text)

data/lib/ruboty/slack_rtm/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackRTM
-    VERSION = '2.4.2'
+    VERSION = '2.4.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_rtm
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Sho Kusano