twterm 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9d82295e341b326b39878474c7610dc3091d35f8f58a12c40882562c693240
-  data.tar.gz: d305b9a55f9aba8c83ac21999483ccd0450fc0e40e302a2a6f8b074a984a8b21
+  metadata.gz: 5edeb8383924ffcd0cd837dad84d60637bfdae3de7a4edf00a0a9bb9aeaf6a7e
+  data.tar.gz: f707dc76ada2cdf2082e6d7aeec9d8a890056fdde114fa90b3b69aaa28ea257f
 SHA512:
-  metadata.gz: c66d15babe4005dec88320e1221dde230a7bfaa7eaa2d662a0449157647faf183cf5a4077a7f1cc208fd45e44e9fc44a80e38ee8488438aa77595a3bfff416f7
-  data.tar.gz: 9b04ae6462a7a084bedf6e67111ba5495eddf752bef818c4e61767e4843e7aacec4de88733a9a23d7d8b0b23030f869905f35c97dc4f2422680d556a6b8b0071
+  metadata.gz: d92d30135cd6793a117ecb2b1f4a8648ade22e5759c2dadf7c7b39afea0ac72e3622da83d0577a3acb2f96b63d1976928a228e756544a9c694e7eddfd2eb79a2
+  data.tar.gz: f488de8b0fed4655ed95ff767910b136bcd7deeded6258fbffa561f9699b55a3404315ecaf19144a1eed096348559753f1ef78d176976a77109cf946c2590527

data/lib/twterm/app.rb

@@ -89,8 +89,6 @@ module Twterm
 
       publish(Event::Screen::Refresh.new)
 
-      client.connect_user_stream
-
       reset_interruption_handler
 
       Signal.trap(:WINCH) { on_resize }

data/lib/twterm/client.rb

@@ -1,10 +1,8 @@
 require 'twterm/rest_client'
-require 'twterm/streaming_client'
 
 module Twterm
   class Client
     include RESTClient
-    include StreamingClient
 
     attr_reader :user_id, :screen_name
 

data/lib/twterm/tab/statuses/home.rb

@@ -1,5 +1,4 @@
 require 'twterm/subscriber'
-require 'twterm/event/status/timeline'
 require 'twterm/tab/statuses/abstract_statuses_tab'
 require 'twterm/utils'
 
@@ -21,8 +20,6 @@ module Twterm
         def initialize(app, client)
           super(app, client)
 
-          subscribe(Event::Status::Timeline) { |e| prepend(e.status) }
-
           reload.then do
             initially_loaded!
             scroller.move_to_top

data/lib/twterm/tab/statuses/mentions.rb

@@ -1,4 +1,5 @@
 require 'twterm/tab/statuses/abstract_statuses_tab'
+require 'twterm/event/status/mention'
 
 module Twterm
   module Tab

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -259,7 +259,6 @@ files:
 - lib/twterm/event/screen/resize.rb
 - lib/twterm/event/status/abstract_status_event.rb
 - lib/twterm/event/status/mention.rb
-- lib/twterm/event/status/timeline.rb
 - lib/twterm/event/status_deleted.rb
 - lib/twterm/event/status_garbage_collected.rb
 - lib/twterm/event/user_garbage_collected.rb
@@ -320,7 +319,6 @@ files:
 - lib/twterm/screen.rb
 - lib/twterm/search_query_window.rb
 - lib/twterm/status.rb
-- lib/twterm/streaming_client.rb
 - lib/twterm/subscriber.rb
 - lib/twterm/tab/abstract_tab.rb
 - lib/twterm/tab/direct_message/conversation.rb

data/lib/twterm/event/status/timeline.rb

@@ -1,10 +0,0 @@
-require 'twterm/event/status/abstract_status_event'
-
-module Twterm
-  module Event
-    module Status
-      class Timeline < AbstractStatusEvent
-      end
-    end
-  end
-end

data/lib/twterm/streaming_client.rb

@@ -1,146 +0,0 @@
-require 'twterm/event/message/error'
-require 'twterm/event/message/info'
-require 'twterm/event/notification/direct_message'
-require 'twterm/event/notification/favorite'
-require 'twterm/event/notification/follow'
-require 'twterm/event/notification/list_member_added'
-require 'twterm/event/notification/mention'
-require 'twterm/event/notification/quote'
-require 'twterm/event/notification/retweet'
-require 'twterm/event/status/mention'
-require 'twterm/event/status/timeline'
-require 'twterm/publisher'
-
-module Twterm
-  module StreamingClient
-    include Publisher
-
-    CONSUMER_KEY = 'vLNSVFgXclBJQJRZ7VLMxL9lA'.freeze
-    CONSUMER_SECRET = 'OFLKzrepRG2p1hq0nUB9j2S9ndFQoNTPheTpmOY0GYw55jGgS5'.freeze
-
-    def connect_user_stream
-      return if user_stream_connected?
-
-      @streaming_thread = Thread.new do
-        begin
-          publish(Event::Message::Info.new('Trying to connect to Twitter...'))
-          streaming_client.user do |event|
-            keep_alive!
-
-            case event
-            when Twitter::Tweet
-              status = status_repository.create(event)
-              user = user_repository.create(event.user)
-
-              publish(Event::Status::Timeline.new(status))
-
-              if !status.retweet? && status.text.include?('@%s' % screen_name)
-                publish(Event::Status::Mention.new(status))
-
-                notification = Event::Notification::Mention.new(status, user)
-                publish(notification)
-              end
-
-              if status.retweet? && event.retweeted_status.user.id == user_id
-                retweeted_status = status_repository.create(event.retweeted_status)
-                notification = Event::Notification::Retweet.new(retweeted_status, user)
-                publish(notification)
-              end
-            when Twitter::Streaming::Event
-              case event.name
-              when :favorite
-                next if event.source.id == user_id
-                user = user_repository.create(event.source)
-                status = status_repository.create(event.target_object)
-                notification = Event::Notification::Like.new(status, user)
-                publish(notification)
-              when :follow
-                next if event.source.id == user_id
-
-                user = user_repository.create(event.source)
-                notification = Event::Notification::Follow.new(user)
-                publish(notification)
-              when :list_member_added
-                next if event.source.id == user_id
-
-                list = list_repository.create(event.target_object)
-                notification = Event::Notification::ListMemberAdded.new(list)
-                publish(notification)
-              when :quoted_tweet
-                next if event.source.id == user_id
-
-                status = status_repository.create(event.target_object)
-                user = user_repository.create(event.source)
-                notification = Event::Notification::Quote.new(status, user)
-                publish(notification)
-              end
-            when Twitter::DirectMessage
-              next if event.sender.id == user_id
-
-              user = user_repository.create(event.sender)
-              message = DirectMessage.new(event)
-              notification = Event::Notification::DirectMessage.new(message, user)
-              publish(notification)
-            when Twitter::Streaming::FriendList
-              user_stream_connected!
-            when Twitter::Streaming::DeletedTweet
-              publish(Event::StatusDeleted.new(event.id))
-            end
-          end
-        rescue Twitter::Error::TooManyRequests
-          publish(Event::Message::Error.new('Rate limit exceeded'))
-          sleep 120
-          retry
-        rescue Errno::ENETUNREACH, Errno::ETIMEDOUT, Resolv::ResolvError
-          publish(Event::Message::Error.new('Network is unavailable'))
-          sleep 30
-          retry
-        rescue Twitter::Error => e
-          publish(Event::Message::Error.new(e.message))
-        end
-      end
-    end
-
-    private
-
-    def keep_alive!
-      @keep_alive_timer.kill if @keep_alive_timer.is_a?(Thread)
-      @keep_alive_timer = Thread.new do
-        sleep(120)
-        @user_stream_connected = false
-        @streaming_thread.kill
-        connect_user_stream
-      end
-    end
-
-    def streaming_client
-      @streaming_client ||= Twitter::Streaming::Client.new do |config|
-        config.consumer_key       = CONSUMER_KEY
-        config.consumer_secret    = CONSUMER_SECRET
-        config.access_token        = @access_token
-        config.access_token_secret = @access_token_secret
-      end
-    end
-
-    def user_stream_connected?
-      @user_stream_connected || false
-    end
-
-    def user_stream_connected!
-      publish(Event::Message::Info.new('Connection established')) unless user_stream_connected?
-      @user_stream_connected = true
-    end
-
-    def user_stream_disconnected!
-      @user_stream_connected = false
-    end
-
-    def user_stream_initialized?
-      @user_stream_initialized || false
-    end
-
-    def user_stream_initialized!
-      @user_stream_initialized = true
-    end
-  end
-end