ruboty-slack_rtm 3.1.0 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13d45c2a2ce3ddfc579235303cb7dab9af5f4c23c130a13f7e6debd1dcbd613a
-  data.tar.gz: db430b0e9597d5e172e7acc244464b9211985112eb353db25ff0bfd512e87b90
+  metadata.gz: a735292c902d7fc4aff589e5729f9b467a948b77bcc09f47e7348c8d60768cc5
+  data.tar.gz: d318bdcae1a2c3fa09842dc606b8368ac16d2de46225eab88a1ff89b68d89bdf
 SHA512:
-  metadata.gz: a4824a614804add3b808f1004dfe5f16896fcc29e9dea64fab8dc3a07e2b7fa84b652268fa9b6597aeb9dc77ed4a5edc98eb0f17da75c2629ec80f3130801a26
-  data.tar.gz: ad117ad3a96dc38ed9ed5b9242f7bf20b8cb7e16942817c42b7648ca113c4e2ed45a1a4e29866f3ab61d20c4058774bf0c2437cca7b0038d164bcd9bdeef18d9
+  metadata.gz: 53109fa2c2fec6438f59f21f3a4a8af93e715cd0ba6bf665c0e46187adc31fd9e2c13cb080262fe6553d570b7fc8a7df2b8990f3da7c17e08f956950f0da0c5b
+  data.tar.gz: 7bd7dc7ed0a4fb744a571e8179b1c541d9451b587aa293a26ca8be3a2fcf8c23cfbb964cd29e973bcadacc16563dc82afa41e996a339710eac963a5c47a77488

data/lib/ruboty/adapters/slack_rtm.rb

@@ -29,32 +29,39 @@ module Ruboty
 
         return unless channel
 
+        args = {
+          as_user: true
+        }
+        if message[:thread_ts] || (message[:original] && message[:original][:thread_ts])
+          args.merge!(thread_ts: message[:thread_ts] || message[:original][:thread_ts])
+        end
+
         if message[:attachments] && !message[:attachments].empty?
-          client.chat_postMessage(
+          args.merge!(
             channel: channel,
-            text: message[:code] ?  "```\n#{message[:body]}\n```" : message[:body],
+            text: message[:code] ? "```\n#{message[:body]}\n```" : message[:body],
             parse: message[:parse] || 'full',
             unfurl_links: true,
-            as_user: true,
             attachments: message[:attachments].to_json
           )
+          client.chat_postMessage(args)
         elsif message[:file]
           path = message[:file][:path]
-          client.files_upload(
+          args.merge!(
             channels: channel,
-            as_user: true,
             file: Faraday::UploadIO.new(path, message[:file][:content_type]),
             title: message[:file][:title] || path,
             filename: File.basename(path),
             initial_comment: message[:body] || ''
           )
+          client.files_upload(args)
         else
-          client.chat_postMessage(
+          args.merge!(
             channel: channel,
-            text: message[:code] ?  "```\n#{message[:body]}\n```" : resolve_send_mention(message[:body]),
-            as_user: true,
+            text: message[:code] ? "```\n#{message[:body]}\n```" : resolve_send_mention(message[:body]),
             mrkdwn: true
           )
+          client.chat_postMessage(args)
         end
       end
 
@@ -97,6 +104,8 @@ module Ruboty
           break unless ENV['SLACK_AUTO_RECONNECT']
           @url = nil
           @realtime = nil
+          sleep 3
+          bind
         end
       end
 
@@ -154,6 +163,8 @@ module Ruboty
           to: channel_to,
           channel: channel,
           user: user,
+          ts: data['ts'],
+          thread_ts: data['thread_ts'],
           time: Time.at(data['ts'].to_f)
         }
 
@@ -235,7 +246,7 @@ module Ruboty
       end
 
       def resolve_send_mention(text)
-        text = text.to_s
+        text = text.dup.to_s
         text.gsub!(/@(?<mention>[0-9a-z._-]+)/) do |_|
           mention = Regexp.last_match[:mention]
           msg = "@#{mention}"
@@ -322,7 +333,7 @@ module Ruboty
         @channel_info_caches[channel_id] ||= begin
           resp = case channel_id
             when /^C/
-              client.channels_info(channel: channel_id)
+              client.conversations_info(channel: channel_id)
             else
               {}
             end

data/lib/ruboty/slack_rtm/client.rb

@@ -65,7 +65,13 @@ module Ruboty
         Thread.start do
           loop do
             sleep(30)
-            @client.send('', type: 'ping')
+            begin
+              @client.send('', type: 'ping')
+            rescue => e
+              Ruboty.logger.error("#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}")
+              @queue.enq(CONNECTION_CLOSED)
+              break
+            end
           end
         end
       end

data/lib/ruboty/slack_rtm/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackRTM
-    VERSION = '3.1.0'
+    VERSION = '3.2.3'
   end
 end

data/ruboty-slack_rtm.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop', '>= 0.28.0'
 
   spec.add_dependency 'ruboty', '>= 1.1.4'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_rtm
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.3
 platform: ruby
 authors:
 - Sho Kusano
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ homepage: https://github.com/rosylilly/ruboty-slack_rtm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,9 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Slack real time messaging adapter for Ruboty
 test_files: []