slack_twitter_egosa 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53436719b93625ed57416f119407b05589b336b6
-  data.tar.gz: b74944ebfc0f12593c21b746d67a8367ea53030e
+SHA256:
+  metadata.gz: 163a699d485f9c986265105fceb48ca8af2fa95746e5bf09a01d1877b319d004
+  data.tar.gz: 967c8cedd7af22e47b02c8b743a130decf08e8c4cab0fe6f954e9f6fa216e240
 SHA512:
-  metadata.gz: 14d5b439c7b8478a3bfea963d9b7d27935d043ff17322e48d0eb72d5a73d2ce639ac30e8b9635981ba98da542a6e719592dc39bc2ad4404586673cee98ae81f7
-  data.tar.gz: e8a9fae9abe23cb1d2558b972c119796f8806a4dc48df3c136d05bd8452216f50d1eaa9a169ec17c06ad2ec7e605845e7ac2b33cf2c87d3e9ec7fdcc665d1ded
+  metadata.gz: aa2c25f3ff9c777a5952b681066039891082972fda176450e662c65e5267bc91ca670db8a04cd87b6a35f130f4b9ebb6d51ea0af6e8f650bd735f8d4a7614110
+  data.tar.gz: f04bd596287ecb0a5ed5690c6bc004b8cfec27fca76e27ac651a1a9fb3221764c69149aa0d6eae70fb01e3604b53775864f6400f84958e11632eae942cab284b

data/Dockerfile

@@ -1,10 +1,10 @@
-FROM ruby:latest
+FROM ruby:alpine
 
-MAINTAINER ABCanG <abcang1015@gmail.com>
+MAINTAINER abcang <abcang1015@gmail.com>
 
-# timezone
-RUN cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
+RUN apk add --update make g++ && \
+    gem install slack_twitter_egosa && \
+    apk del make && \
+    rm -rf /var/cache/apk/*
 
-RUN gem install slack_twitter_egosa
-
-CMD slack_twitter_egosa
+CMD ["slack_twitter_egosa"]

data/README.md

@@ -20,8 +20,8 @@ TwitterでエゴサしてSlackに投稿します。
 * `CONSUMER_SECRET`: TwitterのConsumer Secret
 * `OAUTH_TOKEN`: TwitterのAccess Token
 * `OAUTH_TOKEN_SECRET`: TwitterのAccess Token Secret
-* `USER_STREAM_WORDS`: 自分のタイムラインから検索するワード。スペース区切りで複数指定可能。
-* `FILTER_STREAM_WORDS`: Twitter全体から検索するワード。スペース区切りで複数指定可能。
+* `HOME_TIMELINE_WORDS`: 自分のタイムラインから検索するワード。スペース区切りで複数指定可能。
+* `SEARCH_WORDS`: Twitter全体から検索するワード。スペース区切りで複数指定可能。
 * `MUTE_USERS`: エゴサ対象外にするユーザ。スペース区切りで複数指定可能。
 
 ## 普通に起動
@@ -34,9 +34,9 @@ CONSUMER_KEY=XXXXXXXX
 CONSUMER_SECRET=XXXXXXXX
 OAUTH_TOKEN=XXXXXXXX
 OAUTH_TOKEN_SECRET=XXXXXXXX
-USER_STREAM_WORDS=阿部 あべ
-FILTER_STREAM_WORDS=abcang ABCanG1015 -@ABCanG1015
-MUTE_USERS=ABCanG1015
+HOME_TIMELINE_WORDS=阿部 あべ
+SEARCH_WORDS=abcang abcang1015 -@abcang1015
+MUTE_USERS=abcang1015
 ^D
 $ slack_twitter_egosa .env
 ```
@@ -50,9 +50,9 @@ docker run \
     -e "CONSUMER_SECRET=XXXXXXXX" \
     -e "OAUTH_TOKEN=XXXXXXXX" \
     -e "OAUTH_TOKEN_SECRET=XXXXXXXX" \
-    -e "USER_STREAM_WORDS=阿部 あべ" \
-    -e "FILTER_STREAM_WORDS=abcang ABCanG1015 -@ABCanG1015" \
-    -e "MUTE_USERS=ABCanG1015" \
+    -e "HOME_TIMELINE_WORDS=阿部 あべ" \
+    -e "SEARCH_WORDS=abcang abcang1015 -@abcang1015" \
+    -e "MUTE_USERS=abcang1015" \
     abcang/slack-twitter-egosa
 ```
 
@@ -60,6 +60,7 @@ docker run \
 * 2016/08/23: 公開
 * 2016/09/20: ミュートユーザ、除外キーワード機能を追加
 * 2016/09/22: 除外キーワードバグの修正、gemで公開、大文字小文字を区別しないようにした
+* 2018/05/21: ストリーミングAPIを使わないように変更(90秒に1回REST APIを叩く)
 
 ## ライセンス
 MIT

data/lib/slack_twitter_egosa/version.rb

@@ -1,3 +1,3 @@
 module SlackTwitterEgosa
-  VERSION = '0.1.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/slack_twitter_egosa.rb

@@ -4,7 +4,7 @@ require 'slack_twitter_egosa/word_manager'
 require 'slack_twitter_egosa/user_filter'
 
 require 'dotenv'
-require 'tweetstream'
+require 'twitter'
 
 module SlackTwitterEgosa
   class << self
@@ -20,11 +20,9 @@ module SlackTwitterEgosa
         exit 1
       end
 
-      init_twitter
-
       threads = [
-        user_stream_thread,
-        filter_stream_thread
+        home_timeline_thread,
+        search_thread
       ]
       threads.each(&:join)
     end
@@ -42,13 +40,12 @@ module SlackTwitterEgosa
       target_env - env_list
     end
 
-    def init_twitter
-      TweetStream.configure do |config|
-        config.consumer_key       = ENV['CONSUMER_KEY']
-        config.consumer_secret    = ENV['CONSUMER_SECRET']
-        config.oauth_token        = ENV['OAUTH_TOKEN']
-        config.oauth_token_secret = ENV['OAUTH_TOKEN_SECRET']
-        config.auth_method        = :oauth
+    def client
+      @client ||= Twitter::REST::Client.new do |config|
+        config.consumer_key        = ENV['CONSUMER_KEY']
+        config.consumer_secret     = ENV['CONSUMER_SECRET']
+        config.access_token        = ENV['OAUTH_TOKEN']
+        config.access_token_secret = ENV['OAUTH_TOKEN_SECRET']
       end
     end
 
@@ -56,40 +53,70 @@ module SlackTwitterEgosa
       @poster ||= SlackPoster.new(ENV['WEBHOOK_URL'])
     end
 
-    def user_stream
-      @user_stream ||= WordManager.new(ENV['USER_STREAM_WORDS'])
+    def home_timeline_words
+      @home_timeline_words ||= WordManager.new(ENV['HOME_TIMELINE_WORDS'])
     end
 
-    def filter_stream
-      @filter_stream ||= WordManager.new(ENV['FILTER_STREAM_WORDS'])
+    def search_words
+      @search_words ||= WordManager.new(ENV['SEARCH_WORDS'])
     end
 
     def mute_users
       @mute_users ||= UserFilter.new(ENV['MUTE_USERS'])
     end
 
-    def user_stream_thread
+    def match_on_home_timeline?(status)
+      if status.retweet?
+        status = status.retweeted_status
+        return false if status.user.following?
+      end
+
+      mute_users.unmatch?(status.user.screen_name) && home_timeline_words.match?(CGI.unescapeHTML(status.full_text))
+    end
+
+    def match_on_search?(status)
+      !status.retweet? && mute_users.unmatch?(status.user.screen_name) &&
+        search_words.unmatch_exclude?(CGI.unescapeHTML(status.full_text))
+    end
+
+    def home_timeline_thread
       Thread.new do
-        TweetStream::Client.new.userstream do |status|
-          if status.retweet?
-            status = status.retweeted_status
-            next if status.user.following?
-          end
+        loop do
+          sleep 90 if @home_timeline_since_id
+
+          params = { count: 200 }
+          params[:since_id] = @home_timeline_since_id if @home_timeline_since_id
+          statuses = client.home_timeline(params)
+          next if statuses.empty?
+
+          before_home_timeline_since_id = @home_timeline_since_id
+          @home_timeline_since_id = statuses.first.id
+          next unless before_home_timeline_since_id
 
-          if mute_users.unmatch?(status.user.screen_name) &&
-              user_stream.match?(CGI.unescapeHTML(status.full_text))
-            poster.post_status(status)
+          statuses.each do |status|
+            poster.post_status(status) if match_on_home_timeline?(status)
           end
         end
       end
     end
 
-    def filter_stream_thread
+    def search_thread
       Thread.new do
-        TweetStream::Client.new.track(*filter_stream.target) do |status|
-          if !status.retweet? && mute_users.unmatch?(status.user.screen_name) &&
-              filter_stream.unmatch_exclude?(CGI.unescapeHTML(status.full_text))
-            poster.post_status(status)
+        loop do
+          sleep 90 if @search_since_id
+
+          params = { result_type: 'recent', count: 100 }
+          params[:since_id] = @search_since_id if @search_since_id
+          q = search_words.target.join(' OR ') + ' ' + search_words.exclude.map { |word| "-#{word}" }.join(' ')
+          statuses = client.search(q, params).to_a
+          next if statuses.empty?
+
+          before_search_since_id = @search_since_id
+          @search_since_id = statuses.first.id
+          next unless before_search_since_id
+
+          statuses.each do |status|
+            poster.post_status(status) if match_on_search?(status)
           end
         end
       end

data/slack_twitter_egosa.gemspec

@@ -6,7 +6,7 @@ require 'slack_twitter_egosa/version'
 Gem::Specification.new do |spec|
   spec.name          = 'slack_twitter_egosa'
   spec.version       = SlackTwitterEgosa::VERSION
-  spec.authors       = ['ABCanG']
+  spec.authors       = ['abcang']
   spec.email         = ['abcang1015@gmail.com']
 
   spec.summary       = 'Eegosearching twitter and post to slack.'
@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dotenv', '~> 2.1.1'
+  spec.add_dependency 'dotenv', '~> 2.4.0'
   spec.add_dependency 'slack-poster', '~> 2.2.0'
-  spec.add_dependency 'tweetstream', '~> 2.6.1'
+  spec.add_dependency 'twitter', '~> 6.2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack_twitter_egosa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
-- ABCanG
+- abcang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: slack-poster
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: tweetstream
+  name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Eegosearching twitter and post to slack.