ruboty-haiku_wo_yome 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290cc0098888c2d95b458d1ee86a77183f2fc0df
-  data.tar.gz: 54710400a219d4452706fd32c16e982c4dd6a879
+  metadata.gz: 58c07b5c86a17b3eb436206fccffdb09a34a9af3
+  data.tar.gz: 2fdfa0fe3146efc5afa2df42e5c8e0db14885748
 SHA512:
-  metadata.gz: 04af8e5e625fdd377f1965063af38ed4cebe9ea6a97307e9f03747bfde1d4d763f67a69432a8c0ebacc0e71298c9672be7080df4ceaf609caac2b7f1ec6893d1
-  data.tar.gz: 13a10223a4c7258c8011cc970d95adf5e17d3cdd59c54eda97c3188f532b064493e4359a92c7d28779b934cd422cd193cf359bafbc851880b4135a4fe7a25c49
+  metadata.gz: 1cd86322100b6afd38cab0e3cdd175d3730df897ad35d7fa86afcd8bc56aa3580748b6fb513a1d26d0ee94fa480dcf01441454851c3dae849b8660bd49e72ab5
+  data.tar.gz: bd714462e171cd6ddbed1bf76fee7f09abe16b2e459cd31da98ada1dccc9dc1cd4276c4fd48d94db798b8d6457977aed97b03fd15d0a4c0daa4beda433d4057c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.2
+
+Add =サン handler
+
 # 0.3.1
 
 Cache search result

data/lib/ruboty/haiku_wo_yome/actions/haiku.rb

@@ -56,7 +56,14 @@ module Ruboty
         end
 
         def user_public_messages
-          search_result = client.search_messages(query: user_name, count: 1000)
+          query = nil
+          begin
+            query = "from:#{user_name}"
+          rescue
+            query = search_word
+          end
+          puts query
+          search_result = client.search_messages(query: query, count: 1000)
           return [] if search_result.nil?
           return [] if search_result['messages'].nil? 
           search_result['messages']['matches']
@@ -68,6 +75,10 @@ module Ruboty
           name.start_with?('@') ? name : "@#{name}"
         end
 
+        def search_word
+          message[:search_word]
+        end
+
         def haiku_reviewer(options = {})
           rule = options[:rule] || [5, 7, 5]
           @reviewer ||= Ikku::Reviewer.new(rule: rule)

data/lib/ruboty/haiku_wo_yome/version.rb

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

data/lib/ruboty/handlers/haiku.rb

@@ -5,8 +5,10 @@ module Ruboty
     class Haiku < Ruboty::Handlers::Base
       env 'SLACK_TOKEN_FOR_SEARCH', "Slack token for search api (important: bot user can't call search api! require human api key"
 
-      on('(?<user_name>.+) ハイクを詠め', name: :haiku_wo_yome, description: 'カイシャクしてやる', all: true)
-      on('(?<user_name>.+) タンカを詠め', name: :tanka_wo_yome, description: 'カイシャクしてやる', all: true)
+      on(/ハイクを詠め\s\@?(?<user_name>\w+)[=＝]サン/, name: :haiku_wo_yome, description: 'カイシャクしてやる', all: true)
+      on(/タンカを詠め\s\@?(?<user_name>\w+)[=＝]サン/, name: :tanka_wo_yome, description: 'カイシャクしてやる', all: true)
+      on(/(?<search_word>.+)\s+ハイクを詠め/, name: :haiku_wo_yome, description: 'カイシャクしてやる', all: true)
+      on(/(?<search_word>.+)\s+タンカを詠め/, name: :tanka_wo_yome, description: 'カイシャクしてやる', all: true)
 
       def haiku_wo_yome(message)
         Ruboty::HaikuWoYome::Actions::Haiku.new(message).call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-haiku_wo_yome
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kinoshita.Yasuhiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty