ruboty-slack_rtm 3.2.0 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bd44ee1547d957dde6233b843c3782ec588d176d82905663b17fec77a414a8d
-  data.tar.gz: 3e35b643ad57dadbdcf903528b19093d1b34199295022296143f2820bf6f33f5
+  metadata.gz: bcd8fe1175e9a47b5cb4428fd8ab3562d09c60ebc3e3974f104894759bef259b
+  data.tar.gz: a686e3ec96b2659a6ed08308ca24ef2774083562b1515f3fc3d28d9d330fe0a1
 SHA512:
-  metadata.gz: ea4276ca5f71db7d59fe5d17c8d45f7f69946a41329fc687e7c608c67eec60c5f3f5f58c4f3038d2c4fa8bf3810e21844c3b2dc29b3b92d20e465d539cfa8463
-  data.tar.gz: 88d98fc0232e198c3f0af2ef1ed2915a3ac75d6704f25bedde44631da75cbc36341d8e2cb1efeffce2b81f5e2bd2211429e0eb735cfda921493d1dc7d95ce977
+  metadata.gz: c6d8dad32d31f3bf3552c3217636670b2ae9b7c5a425994748076db394f55e97dbc0abfe80bdc8f955e1b500dd5d9ba277f1d0dba10c7ab61fcbc6159270214d
+  data.tar.gz: fb8b7eaa22b275c7601fc5c1a12b56a95549bdfe669a1d2075d335ce566f764425c17b95e77ba4bc6082508385a0a213dd8c003cf263cc87ab65beddefc0a1a5

data/lib/ruboty/adapters/slack_rtm.rb

@@ -29,35 +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,
-            thread_ts: message[:thread_ts] || message[:original][:thread_ts]
+            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] || '',
-            thread_ts: message[:thread_ts] || message[:original][:thread_ts]
+            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,
-            mrkdwn: true,
-            thread_ts: message[:thread_ts] || message[:original][:thread_ts]
+            text: message[:code] ? "```\n#{message[:body]}\n```" : resolve_send_mention(message[:body]),
+            mrkdwn: true
           )
+          client.chat_postMessage(args)
         end
       end
 
@@ -329,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.2.0'
+    VERSION = '3.2.4'
   end
 end

data/ruboty-slack_rtm.gemspec

@@ -18,12 +18,12 @@ 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'
   spec.add_dependency 'slack-api', '~> 1.6'
-  spec.add_dependency 'websocket-client-simple', '~> 0.3.0'
+  spec.add_dependency 'websocket-client-simple', '>= 0.5.0'
   spec.add_dependency 'faraday', '~> 0.11'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_rtm
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.4
 platform: ruby
 authors:
 - Sho Kusano
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2022-01-04 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
@@ -84,16 +84,16 @@ dependencies:
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: faraday
   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,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.2
+signing_key:
 specification_version: 4
 summary: Slack real time messaging adapter for Ruboty
 test_files: []