senrigan 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d02137fd9bdfa9c8672bd248ed7b94e0d189ebe97b1d6e83c7f550f82fce91
-  data.tar.gz: a62f0e2614eb78d065b80cf40a1a26053d043b4c86c7528a4ce40ece1215842f
+  metadata.gz: 31e1010fe33a276e722f409afa222d52fd9f0640cfb3718da9182d3e6307ec88
+  data.tar.gz: 932916ac50b24d6e80a38cbbd64384f30cc12e48cad3c09a6eb41cf52b9a01ea
 SHA512:
-  metadata.gz: 5e740a6f81d821e17edace236d4681975ef6ce1e5e47b4d9170381719ed251d2e0874ada5c539d440aa5f3052baffc0f2fad4ca92a2822b1a0f828a686ca2041
-  data.tar.gz: 11a2cc641a20b1addb6ccf7110232188036a90d266c08d789c3588c84b99903e2e57cb108786a94d1215fc6a86dd85a879ccfdb3054daeb2208caf3ee638f31b
+  metadata.gz: 5b3fc066d08f12627258daedc9f4e4b7d378c996454d78ebd28b1c4a2c38395120d190c5124088f4ed6006ec09c38cf9e46d15b2a6c2081bdd2b1f6b7e14a5d6
+  data.tar.gz: 56c06758235706b3a7be1ad3c73a985a590bb9f991cd1552af142f17d8436fc4154c2339c432d1fc4654ce97bbf45ba340a06fc702e0da40510d8edb3077e8a5

data/lib/senrigan/adapter.rb

@@ -29,6 +29,8 @@ module Senrigan
           @rtm.start!
         rescue StandardError => e
           STDOUT.puts e.inspect if ENV['DEBUG'].to_i != 0
+        ensure
+          @rtm.stop! rescue nil
         end
         sleep 5
       end
@@ -49,10 +51,7 @@ module Senrigan
     end
 
     def regenerate_cache
-      @channel_caches = (
-          @client.channels_list['channels'] +
-          @client.groups_list['groups']
-        ).map { |c| [c['id'], c] }.to_h
+      @channel_caches = {}
       @user_caches = @client.users_list['members'].map { |u| [u['id'], u] }.to_h
     end
 
@@ -61,37 +60,23 @@ module Senrigan
         resp = @client.users_info(
           user: user_id
         )
-        resp['channel'] || OpenStruct.new
+        resp['user'] || OpenStruct.new
       end
     end
 
     def fetch_channel(channel_id)
       @channel_caches[channel_id] ||= begin
-        data =
-          case channel_id.first
-          when 'C'
-            resp = @client.conversations_info(
-              channel: channel_id
-            )
-            resp['channel']
-          when 'G'
-            resp = @client.groups_info(
-              channel: channel_id
-            )
-            resp['group']
-          else
-            OpenStruct.new(name: channel_id, is_private: true)
-          end
+        data = @client.conversations_info(channel: channel_id)['channel']
         data || OpenStruct.new(name: channel_id, is_private: false)
       end
     end
 
     def on_message(msg)
       entity =
-        case
-        when msg.subtype == 'message_changed'
+        case msg.subtype
+        when 'message_changed'
           create_message_change_event_entity(msg)
-        when msg.subtype.nil?, msg.subtype == 'bot_message'
+        when nil, 'bot_message', 'me_message'
           create_message_entity(msg)
         end
       return unless entity
@@ -171,7 +156,7 @@ module Senrigan
         )
       when msg.user, msg.message&.user
         user = fetch_user(msg.user || msg.message.user)
-        name = [user&.profile&.display_name, user&.name, msg.user].find { |n| !n.nil? && !n.empty? }
+        name = user ? pick_name_from_user(user) : msg.user
         Entities::User.new(
           name: name.to_s,
           is_bot: user&.is_bot
@@ -181,14 +166,20 @@ module Senrigan
       end
     end
 
+    def pick_name_from_user(user)
+      return '' unless user
+      return user.profile.display_name if user.profile&.display_name
+      user.name.to_s
+    end
+
     def format_text(src_text)
       text = src_text.to_s.dup
       text.gsub!(/\\b/, '')
       text.gsub!(/\<\@(U[^>\|]+)\>/) do
-        "@#{fetch_user(Regexp.last_match(1)).name}"
+        "@#{pick_name_from_user(fetch_user(Regexp.last_match(1)))}"
       end
       text.gsub!(/\<\@(U[^\|]+)\|([^>]+)\>/) do
-        "@#{fetch_user(Regexp.last_match(1)).name}"
+        "@#{pick_name_from_user(fetch_user(Regexp.last_match(1)))}"
       end
       text.gsub!(/\<\#(C[^>\|]+)\>/) do
         "##{fetch_channel(Regexp.last_match(1)).name}"

data/lib/senrigan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Senrigan
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/senrigan.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faye-websocket'
   spec.add_dependency 'gemoji'
   spec.add_dependency 'slack-ruby-client'
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_dependency 'async-websocket', '~> 0.8.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: senrigan
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - ru_shalm
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -67,33 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: 0.8.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - ru_shalm@hazimu.com
 executables:
@@ -139,7 +153,7 @@ files:
 homepage: https://github.com/rutan/senrigan
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Slack timeline viewer
 test_files: []