ruboty-slack_take_turns 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 402c008854811042a1355dc92faf6c2fbe00466e
-  data.tar.gz: 8dd4131bb8cc684439491d2efbe87b4e6f42d14f
+SHA256:
+  metadata.gz: 28faeedaaa8d7e387c3640429ea093de59165aeb2661205d4aa0fbd98a663d72
+  data.tar.gz: f0ad79e131d11bf74ffab2fa4c4496e1e9193e11180f6e9ac75d02c263485555
 SHA512:
-  metadata.gz: 9464ac1d146ceeb79eeec322700d0cfa27a14557ab62a12104422d19e571d8d88ada5997661378199ef66f2d2c5eb542f3c24027cd87048007898b496cbaa186
-  data.tar.gz: 19e9a2f285d9c6a73e77cff83807de8f0a36fb965f452b32727a249cfdc4473f5510f40059b9fbf9b3ea482e06a6a24e44c3d4774f66bf8a26ea09cce47e155c
+  metadata.gz: 1f5c290764fdcffc94a00a52000280a25ce1446212d950ca3df0eb9df2c32442e1faa931fefbe56c80f63f12ce35d2449b72656fa815df8c70938563d1cdac7b
+  data.tar.gz: 291f67b30121a52378df4f1b190e1e173dfd8565ab991d7c17f01fa3ec39f41291a8c8b8f237d4098ec7b5d18365b3eeb9e3d2c62457c96bfc975befec763b09

data/lib/ruboty/handlers/slack_take_turns.rb

@@ -25,12 +25,12 @@ module Ruboty
         description: "#{I18n.t 'messages.handlers.next'}",
       )
       on(
-        /exclude (?<user_name>.+?)\z/,
+        /exclude (?<space_separated_user_names>.+?)\z/,
         name: "exclude",
         description: "#{I18n.t 'messages.handlers.exclude'}",
       )
       on(
-        /include (?<user_name>.+?)\z/,
+        /include (?<space_separated_user_names>.+?)\z/,
         name: "include",
         description: "#{I18n.t 'messages.handlers.include'}",
       )

data/lib/ruboty/slack_take_turns/actions/exclude.rb

@@ -15,12 +15,17 @@ module Ruboty
         private
 
         def exclude
-          user_name = message[:user_name]
-          user_id = find_user_id_by_user_name(user_name)
-          unless excluded_user_ids.include? user_id
-            excluded_user_ids << user_id
+          user_names = message[:space_separated_user_names].strip.delete('@').split(/\s*,\s*/)
+          excluded_user_names = []
+          user_names.each do |user_name|
+            user_id = find_user_id_by_user_name(user_name)
+            unless excluded_user_ids.include? user_id
+              excluded_user_ids << user_id
+              excluded_user_names << user_name
+            end
           end
-          "#{I18n.t 'messages.actions.exclude', user_name: user_name}"
+          return I18n.t 'messages.actions.exclude_failure' if excluded_user_names.empty?
+          "#{I18n.t 'messages.actions.exclude', user_name: excluded_user_names.map{|name| "@#{name}"}.join(', ')}"
         end
 
       end

data/lib/ruboty/slack_take_turns/actions/include.rb

@@ -15,12 +15,17 @@ module Ruboty
         private
 
         def include
-          user_name = message[:user_name]
-          user_id = find_user_id_by_user_name(user_name)
-          if excluded_user_ids.include? user_id
-            excluded_user_ids.delete user_id
+          user_names = message[:space_separated_user_names].strip.delete('@').split(/\s*,\s*/)
+          included_user_names = []
+          user_names.each do |user_name|
+            user_id = find_user_id_by_user_name(user_name)
+            if excluded_user_ids.include? user_id
+              excluded_user_ids.delete user_id
+              included_user_names << user_name
+            end
           end
-          "#{I18n.t 'messages.actions.include', user_name: user_name}"
+          return I18n.t 'messages.actions.include_failure' if included_user_names.empty?
+          "#{I18n.t 'messages.actions.include', user_name: included_user_names.map{|name| "@#{name}"}.join(', ')}"
         end
 
       end

data/lib/ruboty/slack_take_turns/locale/en.yml

@@ -13,8 +13,10 @@ en:
         @%{current_user_name}, please deal with the task below.
         %{keyword}
       current: "@%{current_user_name} is on duty now."
-      exclude: made @%{user_name} to not be on duty after this
-      include: made @%{user_name} to be on duty after this
+      exclude: made %{user_name} to not be on duty after this.
+      exclude_failure: Exclude failure. spelling mistake?.
+      include: made %{user_name} to be on duty after this.
+      include_failure: Include failure. spelling mistake?.
       force:
         ok: made @%{user_name} to take over a duty
         ng: "%{user_name} is free from a duty"

data/lib/ruboty/slack_take_turns/locale/ja.yml

@@ -13,8 +13,10 @@ ja:
         @%{current_user_name}さん、下記の対応をお願いします。
         %{keyword}
       current: "現在の当番は@%{current_user_name}さんです"
-      exclude: "@%{user_name}さんを当番から除外しました"
-      include: "@%{user_name}さんを当番に加えました"
+      exclude: "%{user_name}さんを当番から除外しました"
+      exclude_failure: "当番から除外するのに失敗しました。スペルミス？"
+      include: "%{user_name}さんを当番に加えました"
+      include_failure: "当番に追加するのに失敗しました。スペルミス？"
       force:
         ok: "@%{user_name}さんを当番にしました"
         ng: "%{user_name}さんは当番から除外されています"

data/lib/ruboty/slack_take_turns/slack_client.rb

@@ -7,6 +7,7 @@ module Ruboty
       def initialize(channel)
         @client ||= Slack::Client.new(token: ENV['SLACK_TOKEN'])
         @channel = channel
+        @channels_info = {}
       end
 
       def all_users
@@ -24,32 +25,32 @@ module Ruboty
       def channel_user_ids
         unless @channel_user_ids&.dig(channel)
           @channel_user_ids = {} unless @channel_user_ids
-          ids = private_channel? ? private_channel_user_ids : public_channel_user_ids
+          ids = private_channel?(channel) ? private_channel_user_ids(channel) : public_channel_user_ids(channel)
+          # 退職してアカウント停止した人とボットは除く
+          ids = ids.select{|id| user = find_user_by_user_id(id); !user['deleted'] && !user['is_bot']}
           @channel_user_ids[channel] = ids.sort
         end
         @channel_user_ids[channel]
       end
 
-      def channels_info
-        @channels_info ||= client.channels_info(channel: channel)
+      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 public_channel_user_ids
-        channels_info['channel']['members']
+      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_user_ids
-        private_channels = groups_list
-        current_channel = private_channels.find{|c| c['id'] == channel}
-        current_channel['members']
+      def private_channel?(channel)
+        channel[0] == "G"
       end
 
-      def groups_list
-        @groups_list ||= client.groups_list['groups']
-      end
-
-      def private_channel?
-        channels_info['error'] == "channel_not_found"
+      def find_user_by_user_id(user_id)
+        all_users_hash[user_id] || raise("user not found user_id: #{user_id}#")
       end
 
     end

data/lib/ruboty/slack_take_turns/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackTakeTurns
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_take_turns
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - oharato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruboty plugin to manage a duty that members in a slack channel take turns