ruboty-slack_rtm 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f95736f27208e55dcea4fad8b2cd2335ca3bfcd3
-  data.tar.gz: 141a8135f8c1765193d09834f4a452ce034f0124
+  metadata.gz: 45e73d77b1b4391c773714eb6f44b0221ad8dabf
+  data.tar.gz: b97942197c1b6ac18f0b29a7bbf11bcb1fbdb97a
 SHA512:
-  metadata.gz: 8f9413b2f75f3de4854295805c4ef7ecb878b9f2eb5fe55f2595265ef0e54e7ed46c26f8c290d22973b107c9cdc3a9e25e75fb25ad304d7f7a990739fd0ad4c9
-  data.tar.gz: 484e7ce9b6ec14d2222d2278f4599d964a78c3e9adfe4b5db5fd71ec9ea7e65df632b41b0b9926b60cdf3388e6d551495f7f599b0391e5038caaa01d520fa524
+  metadata.gz: 196669e7298354cc24f308c5b95634c169b4cbb655163fd13f99aff566f06e4fe0f8157fe07cb81b72efb8ade73bcf6d5875e5e88c98634c96718fd2823cf3cc
+  data.tar.gz: f30da17bd38608e2d2b0914cc85d1f8519607a046f77d474eceab2cdc6d72211b33fc784464e46deb10db75ee31b360a2281bac74e70438f76e5cc639f88d3c7

data/README.md

@@ -12,13 +12,11 @@ gem 'ruboty-slack_rtm'
 
 ## ENV
 
-```
-SLACK_TOKEN - Account's token. get one on https://api.slack.com/web#basics
-```
-
-Do not requires real user account. using with bot is recommended.
+- `SLACK_TOKEN`: Account's token. get one on https://api.slack.com/web#basics
+- `SLACK_EXPOSE_CHANNEL_NAME_AS_FROM`: if this set to 1, `message.from` will be channel name instead of id (optional)
 
-see: https://api.slack.com/bot-users
+This adapter doesn't require a real user account. Using with bot integration's API token is recommended.
+See: https://api.slack.com/bot-users
 
 ## Contributing
 

data/lib/ruboty/adapters/slack_rtm.rb

@@ -7,6 +7,7 @@ module Ruboty
   module Adapters
     class SlackRTM < Base
       env :SLACK_TOKEN, "Account's token. get one on https://api.slack.com/web#basics"
+      env :SLACK_EXPOSE_CHANNEL_NAME_AS_FROM, "if this set to 1, message.from will be channel name instead of id", optional: true
 
       def run
         init
@@ -35,7 +36,7 @@ module Ruboty
       def init
         response = client.auth_test
         @user_info_caches = {}
-        @channel_info_cahces = {}
+        @channel_info_caches = {}
 
         ENV['RUBOTY_NAME'] ||= response['user']
 
@@ -73,6 +74,14 @@ module Ruboty
         @realtime ||= ::SlackRTM::Client.new(websocket_url: url)
       end
 
+      def expose_channel_name_as_from?
+        if @expose_channel_name_as_from.nil?
+          @expose_channel_name_as_from = ENV['SLACK_EXPOSE_CHANNEL_NAME_AS_FROM'] == '1'
+        else
+          @expose_channel_name_as_from
+        end
+      end
+
       def set_active
         client.users_setActive
       end
@@ -83,12 +92,15 @@ module Ruboty
         data = resolve_mention!(data)
         user = user_info(data['user']) || {}
 
+        channel = channel_info(data['channel'])
+        channel_from = expose_channel_name_as_from? ? "##{channel['name']}" : channel['id']
+
         robot.receive(
           body: data['text'],
-          from: data['channel'],
+          from: channel_from,
           from_name: user['name'],
           to: data['channel'],
-          channel: channel_info(data['channel']),
+          channel: channel,
           user: user,
           mention_to: data['mention_to'],
           time: Time.at(data['ts'].to_f)
@@ -154,13 +166,13 @@ module Ruboty
 
       def resolve_send_mention(text)
         text = text.to_s
-        text.gsub!(/@(?<mention>[0-9a-z_-]+)/) do |_|
+        text.gsub!(/@(?<mention>[0-9a-z._-]+)/) do |_|
           mention = Regexp.last_match[:mention]
           msg = "@#{mention}"
 
           @user_info_caches.each_pair do |id, user|
             if user['name'].downcase == mention.downcase
-              msg = "<@#{id}|#{mention}>"
+              msg = "<@#{id}>"
             end
           end
 
@@ -175,7 +187,7 @@ module Ruboty
           room_id = Regexp.last_match[:room_id]
           msg = "##{room_id}"
 
-          @channel_info_cahces.each_pair do |id, channel|
+          @channel_info_caches.each_pair do |id, channel|
             if channel && channel['name'] == room_id
               msg = "<##{id}|#{room_id}>"
             end
@@ -200,7 +212,7 @@ module Ruboty
         resp = client.channels_list
         if resp['ok']
           resp['channels'].each do |channel|
-            @channel_info_cahces[channel['id']] = channel
+            @channel_info_caches[channel['id']] = channel
           end
         end
       end
@@ -216,7 +228,7 @@ module Ruboty
       end
 
       def channel_info(channel_id)
-        @channel_info_cahces[channel_id] ||= begin
+        @channel_info_caches[channel_id] ||= begin
           resp = case channel_id
             when /^C/
               client.channels_info(channel: channel_id)

data/lib/ruboty/slack_rtm/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackRTM
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_rtm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler