ruboty-slack_rtm 3.0.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e8844797bbc88f71e3e67b3e7c428da8f6435de38447284ef8fbf96c53d7d0e
-  data.tar.gz: 0a77ab41f21d5ed9fbc057a006d88b056a10f4726fe175cd3f263ad4d39f4db1
+  metadata.gz: 429f0cee022b0da4ec4647dbae78fc5f095db755a7a25ed59f291742d20c5ead
+  data.tar.gz: 5570cb0fe2e14591d36aea251aa7b5b7af29fbd010e95650500506fe7601b360
 SHA512:
-  metadata.gz: 54067fd413c3e1b5f7c808697938f0624499841e6451344e1e92af1668d45626e367bf1daaac2a529a76ce0c4477234b63fc0b09e0adf41201e601f3dcdd4821
-  data.tar.gz: 00b247b0f7e7259618030e364e3159f58132e342eb5b488115d996788dd6541e1aed3c6660f0991fd8405c8292a44d4cfe2445e2c6caa0cb00b4ad9d583ff1b3
+  metadata.gz: 7298e60f71abc1c364f3f427e91a4a700865ecb9c63a3d7e44a5e75adb4a24ebbe42fdf2aa929783ec7be00615913452ebbffb957ea3e7b48e86de0d1eeca618
+  data.tar.gz: 0f4c0f9adafc109eb0f57551c4bf06ad067d9b057857f93221df44721e002034f8d5b4987009887e0b36f7e6c235e47bb3ff58592fe0633edc1d71273ba092ee

data/lib/ruboty/adapters/slack_rtm.rb

@@ -36,7 +36,8 @@ module Ruboty
             parse: message[:parse] || 'full',
             unfurl_links: true,
             as_user: true,
-            attachments: message[:attachments].to_json
+            attachments: message[:attachments].to_json,
+            thread_ts: message[:thread_ts] || message[:original][:thread_ts]
           )
         elsif message[:file]
           path = message[:file][:path]
@@ -46,14 +47,16 @@ module Ruboty
             file: Faraday::UploadIO.new(path, message[:file][:content_type]),
             title: message[:file][:title] || path,
             filename: File.basename(path),
-            initial_comment: message[:body] || ''
+            initial_comment: message[:body] || '',
+            thread_ts: message[:thread_ts] || message[:original][:thread_ts]
           )
         else
-          realtime.send_message(
-            type: 'message',
+          client.chat_postMessage(
             channel: channel,
             text: message[:code] ?  "```\n#{message[:body]}\n```" : resolve_send_mention(message[:body]),
-            mrkdwn: true
+            as_user: true,
+            mrkdwn: true,
+            thread_ts: message[:thread_ts] || message[:original][:thread_ts]
           )
         end
       end
@@ -97,6 +100,8 @@ module Ruboty
           break unless ENV['SLACK_AUTO_RECONNECT']
           @url = nil
           @realtime = nil
+          sleep 3
+          bind
         end
       end
 
@@ -154,6 +159,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 +242,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 +329,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.0.0'
+    VERSION = '3.2.2'
   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.0.0
+  version: 3.2.2
 platform: ruby
 authors:
 - Sho Kusano
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2021-02-25 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.1.4
+signing_key:
 specification_version: 4
 summary: Slack real time messaging adapter for Ruboty
 test_files: []