repp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d7c022e0eece174a0e7cd1e0e0d569307353982586fca0a71001d27425cad48
-  data.tar.gz: 7e8aaeea3a3b61bfa29846c4ba248ef3c7e4f2f15a9de728d72e80bf84657f90
+  metadata.gz: 95bb3f7cd6e674913e4c9c9862570ad84360922e70e6b0c610292c3fa63346f4
+  data.tar.gz: 64aaf03c29c5a7d561aa0bfd4f49575ee32dd03a78e433651bb306d46a921ff7
 SHA512:
-  metadata.gz: 3aee6a054338de1436ba5297f85a3c9f60770de504e64f38eb3f376bd898a244911479b5e6393c39dac4a820dc5650fd0ba55b496cba2ec816fbeaa3a71e15d5
-  data.tar.gz: 39f65759bbdcc3d61c8cb70a427bdde0e1920d09e944505d952670dc936f1a1e7e836accd041a948f1051b0d0ff0758c5558960426eeae46759b0333111322a3
+  metadata.gz: 5ae22b70a81277b959555c5851ac0623a5e6f68a3ea3cc25d4ad9d1fa4f35357981fbb945e382968e7620e483fe50795857e4549b33dc6baa5cd6ee813ed3312
+  data.tar.gz: 712527ac39e00ff3dbcbdfa8ac66e557e8a768a86cdea43a41fa3b45394cd39acc68d61f3ffd6d2e732d5d08761d87936ae798521d8a714b4c85881a9199d3ad

data/lib/repp/handler/slack.rb

@@ -3,26 +3,55 @@ module Repp
     class Slack
       require 'slack-ruby-client'
 
+      REPLY_REGEXP = /<@(\w+?)>/
+
       class SlackReceive < Event::Receive
-        interface :channel, :user, :type, :ts
+        interface :channel, :user, :type, :ts, :reply_to
+
+        def bot?; !!@is_bot;  end
+        def bot=(switch); @is_bot = switch; end
       end
 
-      module SlackMessageHandler
-        def self.handle(client, web_client, app)
+      class SlackMessageHandler
+        attr_reader :client, :web_client, :app
+        def initialize(client, web_client, app)
+          @client = client
+          @web_client = web_client
+          @app = app
+        end
+
+        def users(refresh = false)
+          @users = @web_client.list_users.members if refresh
+          @users ||= @web_client.users_list.members
+        end
+
+        def handle
           client.on :message do |data|
+            reply_to = data.text.scan(REPLY_REGEXP).map do |node|
+              user = users.find { |u| u.id == node.first }
+              user ? user.name : nil
+            end
+
             receive = SlackReceive.new(
               body: data.text,
               channel: data.channel,
               user: data.user,
               type: data.type,
-              ts: data.ts
+              ts: data.ts,
+              reply_to: reply_to.compact
             )
+
+            user = users.find { |u| u.id == data.user } || users(true).find { |u| u.id == data.user }
+            receive.bot = (data['subtype'] == 'bot_message' || user.nil? || user['is_bot'])
+
             res = app.call(receive)
             if res.first
-              channel_to_post = res.last&.[](:channel) || receive.channel
+              channel_to_post = res.last.nil? ? receive.channel : res.last[:channel]
               web_client.chat_postMessage(text: res.first, channel: channel_to_post, as_user: true)
             end
           end
+
+          client.start!
         end
       end
 
@@ -35,8 +64,8 @@ module Repp
           end
           @client = ::Slack::RealTime::Client.new
           @web_client = ::Slack::Web::Client.new
-          SlackMessageHandler.handle(@client, @web_client, app.new)
-          @client.start!
+          handler = SlackMessageHandler.new(@client, @web_client, app.new)
+          handler.handle
         end
 
         def stop!

data/lib/repp/version.rb

@@ -1,3 +1,3 @@
 module Repp
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kinoppyd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine