ruboty-slack_take_turns 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b98f6ffc5770342532f934cb3db9fcba19f75ab65e37c5a6efbad023273eddb
-  data.tar.gz: 549004740d3c89be077f56c2b0d2da07802d91ef3d9c7cf394ab8cb8baedeea1
+  metadata.gz: 86a3c6b945edd4c52bd10ce98d481691f818a81ed0a2a5c033821ff32b7c18e9
+  data.tar.gz: 14951a5881e82732b2584e284fc3c36ef7d154ec51d9db35218d40034a633cdf
 SHA512:
-  metadata.gz: a9147d3263a5348852f772c602ab3846680edc927b0cf58a97c42bd0aba5ef73797aef432ec484390c37230b22ae3f3c5081ed2e532a1fab5d7a5abd2eb7527a
-  data.tar.gz: d4b101f831991650352231eafdae9e7dc7488b74c7aab3460d3007c8ba4215b920d23b315fb0e83a4e010accd5092f569be941d3f5724927d894c643fdb03e04
+  metadata.gz: 337b5acb5193b672d5bf153138f9cea62a202890ec89b96f4ddd0826c9411b761c0d98c9b6ef304878615cf0ab82532e0f3f59c5a794ab18ef1330027f25b36c
+  data.tar.gz: 4c06ab5b299ac49860d5ffbca201a6dff39e3ae34d64a32ee702da66987ec2d9a8671eb8e27d425fa8c82efab2c620690d6fd099075dcf2c41ab6ca822ced1c0

data/lib/ruboty/slack_take_turns/slack_client.rb

@@ -7,7 +7,7 @@ module Ruboty
       def initialize(channel)
         @client ||= Slack::Client.new(token: ENV['SLACK_TOKEN'])
         @channel = channel
-        @channels_info = {}
+        @conversations_members = {}
       end
 
       def all_users
@@ -25,7 +25,7 @@ module Ruboty
       def channel_user_ids
         unless @channel_user_ids&.dig(channel)
           @channel_user_ids = {} unless @channel_user_ids
-          ids = private_channel?(channel) ? private_channel_user_ids(channel) : public_channel_user_ids(channel)
+          ids = conversations_members(channel)
           # 退職してアカウント停止した人とボットは除く
           ids = ids.select{|id| user = find_user_by_user_id(id); !user['deleted'] && !user['is_bot']}
           @channel_user_ids[channel] = ids.sort
@@ -33,20 +33,10 @@ module Ruboty
         @channel_user_ids[channel]
       end
 
-      def public_channel_user_ids(channel)
-        channel_info = @channels_info[channel]
-        @channels_info[channel] = client.channels_info(channel: channel) unless channel_info
-        @channels_info[channel]['channel']['members']
-      end
-
-      def private_channel_user_ids(channel)
-        channel_info = @channels_info[channel]
-        @channels_info[channel] = client.groups_info(channel: channel) unless channel_info
-        @channels_info[channel]['group']['members']
-      end
-
-      def private_channel?(channel)
-        channel[0] == "G"
+      def conversations_members(channel)
+        members = @conversations_members[channel]
+        @conversations_members[channel] = client.conversations_members(channel: channel)['members'] unless members
+        @conversations_members[channel]
       end
 
       def find_user_by_user_id(user_id)

data/lib/ruboty/slack_take_turns/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackTakeTurns
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_take_turns
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - oharato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler