twterm 1.0.12 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d68a787d82a916e9db6edf8801d3b774d70b62
-  data.tar.gz: 769b6645edd66d51ff21ae54d58a66ae8412e1dd
+  metadata.gz: 21bc4a036d064d1a1a4755eb3655f187ebca6514
+  data.tar.gz: 03be117b59f4775d71aaad2fef2384f916eb4c92
 SHA512:
-  metadata.gz: 668fd496ea6667035ba1a839ac308a6d92d3e76daf05b67ad5b3f685e25d7fcc52642a8a66588bc2ca8c310e9e597e82f37e81784bf492005019ebaed2435c49
-  data.tar.gz: e17fbe8226c4aa0c351d6d5d11a5d4619d54a024383f217f7e46fac255b1aebc0f90a5f5854a06690e4ec1887f3cbd63c650533bdad28714ebca583781f07aaf
+  metadata.gz: 096afbe0caffeaa8d861e8119b8f35144c93e5ff116e996c4f93c67e8e06eff3a3b9bddf46575441c3f777b222760a4867f78d48f1832773886d4a48c94a429e
+  data.tar.gz: 29a3516e9f86141dea2b74c4b76ebafcd8f3b68cef94284809d3d17507462a6f60f4c7ba832f3df8bfc6b4129081ecd0eafcde46d26750eae493fda29613a45d

data/lib/twterm.rb

@@ -8,6 +8,7 @@ require 'launchy'
 require 'oauth'
 require 'readline'
 require 'singleton'
+require 'set'
 require 'tweetstream'
 require 'twitter'
 require 'twitter-text'
@@ -25,6 +26,7 @@ require 'twterm/extensions/integer'
 require 'twterm/extensions/string'
 require 'twterm/filter_query_window'
 require 'twterm/filterable_list'
+require 'twterm/friendship'
 require 'twterm/history/base'
 require 'twterm/history/hashtag'
 require 'twterm/history/screen_name'
@@ -33,6 +35,7 @@ require 'twterm/notification/base'
 require 'twterm/notification/message'
 require 'twterm/notification/error'
 require 'twterm/notifier'
+require 'twterm/promise'
 require 'twterm/screen'
 require 'twterm/scheduler'
 require 'twterm/status'
@@ -41,25 +44,29 @@ require 'twterm/tab/base'
 require 'twterm/tab/dumpable'
 require 'twterm/tab/exceptions'
 require 'twterm/tab/scrollable'
-require 'twterm/tab/statuses_tab'
-require 'twterm/tab/conversation_tab'
 require 'twterm/tab/key_assignments_cheatsheet'
-require 'twterm/tab/list_tab'
-require 'twterm/tab/mentions_tab'
 require 'twterm/tab/new/start'
 require 'twterm/tab/new/list'
 require 'twterm/tab/new/search'
 require 'twterm/tab/new/user'
-require 'twterm/tab/search_tab'
-require 'twterm/tab/timeline_tab'
+require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/conversation'
+require 'twterm/tab/statuses/favorites'
+require 'twterm/tab/statuses/home'
+require 'twterm/tab/statuses/list_timeline'
+require 'twterm/tab/statuses/mentions'
+require 'twterm/tab/statuses/search'
+require 'twterm/tab/statuses/user_timeline'
 require 'twterm/tab/user_tab'
+require 'twterm/tab/users/base'
+require 'twterm/tab/users/followers'
+require 'twterm/tab/users/friends'
 require 'twterm/tweetbox'
 require 'twterm/user'
-require 'twterm/user_window'
 require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.12'
+    REQUIRE_VERSION = '1.1.0.beta1'
   end
 end

data/lib/twterm/app.rb

@@ -12,17 +12,16 @@ module Twterm
       Screen.instance
       FilterQueryWindow.instance
 
-      timeline = Tab::TimelineTab.new(client)
+      timeline = Tab::Statuses::Home.new(client)
       TabManager.instance.add_and_show(timeline)
 
-      mentions_tab = Tab::MentionsTab.new(client)
+      mentions_tab = Tab::Statuses::Mentions.new(client)
       TabManager.instance.add(mentions_tab)
       TabManager.instance.recover_tabs
 
       Screen.instance.refresh
 
       client.stream
-      UserWindow.instance
 
       reset_interruption_handler
     end

data/lib/twterm/client.rb

@@ -8,6 +8,16 @@ module Twterm
 
     @@instances = []
 
+    def block(*user_ids)
+      send_request do
+        rest_client.block(*user_ids)
+      end.then do |users|
+        users.each do |user|
+          Friendship.block(self.user_id, user.id)
+        end
+      end
+    end
+
     def connect_stream
       stream_client.stop_stream
 
@@ -24,14 +34,16 @@ module Twterm
     end
 
     def destroy_status(status)
-      send_request do
-        begin
-          rest_client.destroy_status(status.id)
-          yield if block_given?
-        rescue Twitter::Error::NotFound, Twitter::Error::Forbidden
+      send_request_without_catch do
+        rest_client.destroy_status(status.id)
+      end.catch do |reason|
+        case reason
+        when Twitter::Error::NotFound, Twitter::Error::Forbidden
           Notifier.instance.show_error 'You cannot destroy that status'
+        else
+          raise reason
         end
-      end
+      end.catch(&show_error)
     end
 
     def favorite(status)
@@ -39,27 +51,80 @@ module Twterm
 
       send_request do
         rest_client.favorite(status.id)
+      end.then do
         status.favorite!
-        yield status if block_given?
       end
+    end
 
-      self
+    def favorites(user_id = nil)
+      user_id ||= self.user_id
+
+      send_request do
+        rest_client.favorites(user_id, count: 200)
+      end.then do |tweets|
+        tweets.map(&CREATE_STATUS_PROC)
+      end
     end
 
     def fetch_muted_users
       send_request do
         @muted_user_ids = rest_client.muted_ids.to_a
-        yield @muted_user_ids if block_given?
+      end
+    end
+
+    def follow(*user_ids)
+      send_request do
+        rest_client.follow(*user_ids)
+      end.then do |users|
+        users.each do |user|
+          if user.protected?
+            Friendship.following_requested(self.user_id, user.id)
+          else
+            Friendship.follow(self.user_id, user.id)
+          end
+        end
+      end
+    end
+
+    def followers(user_id = nil)
+      user_id ||= self.user_id
+
+      m = Mutex.new
+
+      send_request do
+        rest_client.follower_ids(user_id).each_slice(100) do |user_ids|
+          m.synchronize do
+            users = rest_client.users(*user_ids).map(& -> u { User.new(u) })
+            users.each do |user|
+              Friendship.follow(user.id, self.user_id)
+            end if user_id == self.user_id
+            yield users
+          end
+        end
+      end
+    end
+
+    def friends(user_id = nil)
+      user_id ||= self.user_id
+
+      m = Mutex.new
+
+      send_request do
+        rest_client.friend_ids(user_id).each_slice(100) do |user_ids|
+          m.synchronize do
+            yield rest_client.users(*user_ids).map(& -> u { User.new(u) })
+          end
+        end
       end
     end
 
     def home_timeline
       send_request do
-        statuses = rest_client
-          .home_timeline(count: 100)
+        rest_client.home_timeline(count: 200)
+      end.then do |statuses|
+        statuses
           .select(&@mute_filter)
           .map(&CREATE_STATUS_PROC)
-        yield statuses
       end
     end
 
@@ -83,7 +148,9 @@ module Twterm
 
     def list(list_id)
       send_request do
-        yield List.new(rest_client.list(list_id))
+        rest_client.list(list_id)
+      end.then do |list|
+        List.new(list)
       end
     end
 
@@ -91,27 +158,66 @@ module Twterm
       fail ArgumentError,
         'argument must be an instance of List class' unless list.is_a? List
       send_request do
-        statuses = rest_client
-          .list_timeline(list.id, count: 100)
+        rest_client.list_timeline(list.id, count: 200)
+      end.then do |statuses|
+        statuses
           .select(&@mute_filter)
           .map(&CREATE_STATUS_PROC)
-        yield statuses
       end
     end
 
     def lists
       send_request do
-        yield rest_client.lists.map { |list| List.new(list) }
+        rest_client.lists
+      end.then do |lists|
+        lists.map { |list| List.new(list) }
       end
     end
 
+    def lookup_friendships
+      user_ids = User.ids.reject { |id| Friendship.already_looked_up?(id) }
+      send_request_without_catch do
+        user_ids.each_slice(100) do |chunked_user_ids|
+          friendships = rest_client.friendships(*chunked_user_ids)
+          friendships.each do |friendship|
+            id = friendship.id
+            client_id = user_id
+
+            conn = friendship.connections
+            conn.include?('blocking') ? Friendship.block(client_id, id) : Friendship.unblock(client_id, id)
+            conn.include?('following') ? Friendship.follow(client_id, id) : Friendship.unfollow(client_id, id)
+            conn.include?('following_requested') ? Friendship.following_requested(client_id, id) : Friendship.following_not_requested(client_id, id)
+            conn.include?('followed_by') ? Friendship.follow(id, client_id) : Friendship.unfollow(id, client_id)
+            conn.include?('muting') ? Friendship.mute(client_id, id) : Friendship.unmute(client_id, id)
+          end
+        end
+      end.catch do |e|
+        case e
+        when Twitter::Error::TooManyRequests
+          # do nothing
+        else
+          raise e
+        end
+      end.catch(&show_error)
+    end
+
     def mentions
       send_request do
-        statuses = rest_client
-          .mentions(count: 100)
+        rest_client.mentions(count: 200)
+      end.then do |statuses|
+        statuses
           .select(&@mute_filter)
           .map(&CREATE_STATUS_PROC)
-        yield statuses
+      end
+    end
+
+    def mute(user_ids)
+      send_request do
+        rest_client.mute(*user_ids)
+      end.then do |users|
+        users.each do |user|
+          Friendship.mute(self.user_id, user.id)
+        end
       end
     end
 
@@ -149,63 +255,66 @@ module Twterm
       fail ArgumentError,
         'argument must be an instance of Status class' unless status.is_a? Status
 
-      send_request do
-        begin
-          rest_client.retweet!(status.id)
-          status.retweet!
-          yield status if block_given?
-        rescue => e
-          message =
-            case e
-            when Twitter::Error::AlreadyRetweeted
-              'The status is already retweeted'
-            when Twitter::Error::NotFound
-              'The status is not found'
-            when Twitter::Error::Forbidden
-              if status.user.id == user_id  # when the status is mine
-                'You cannot retweet your own status'
-              else  # when the status is not mine
-                'The status is protected'
-              end
-            else
-              raise e
+      send_request_without_catch do
+        rest_client.retweet!(status.id)
+      end.then do
+        status.retweet!
+      end.catch do |reason|
+        message =
+          case reason
+          when Twitter::Error::AlreadyRetweeted
+            'The status is already retweeted'
+          when Twitter::Error::NotFound
+            'The status is not found'
+          when Twitter::Error::Forbidden
+            if status.user.id == user_id  # when the status is mine
+              'You cannot retweet your own status'
+            else  # when the status is not mine
+              'The status is protected'
             end
-          Notifier.instance.show_error "Retweet attempt failed: #{message}"
-        end
-      end
+          else
+            raise e
+          end
+        Notifier.instance.show_error "Retweet attempt failed: #{message}"
+      end.catch(&show_error)
     end
 
     def saved_search
       send_request do
-        yield rest_client.saved_searches
+        rest_client.saved_searches
       end
     end
 
     def search(query)
       send_request do
-        statuses = rest_client
-          .search(query, count: 100)
+        rest_client.search(query, count: 200)
+      end.then do |statuses|
+        statuses
           .select(&@mute_filter)
           .map(&CREATE_STATUS_PROC)
-        yield statuses
       end
     end
 
     def show_status(status_id)
       send_request do
-        yield Status.new(rest_client.status(status_id))
+        rest_client.status(status_id)
+      end.then do |status|
+        Status.new(status)
       end
     end
 
     def show_user(query)
-      send_request do
-        user =
-          begin
-            User.new(rest_client.user(query))
-          rescue Twitter::Error::NotFound
-            nil
-          end
-        yield user
+      send_request_without_catch do
+        rest_client.user(query)
+      end.catch do |reason|
+        case reason
+        when Twitter::Error::NotFound
+          nil
+        else
+          raise reason
+        end
+      end.catch(&show_error).then do |user|
+        user.nil? ? nil : User.new(user)
       end
     end
 
@@ -252,24 +361,54 @@ module Twterm
       )
     end
 
+    def unblock(*user_ids)
+      send_request do
+        rest_client.unblock(*user_ids)
+      end.then do |users|
+        users.each do |user|
+          Friendship.unblock(self.user_id, user.id)
+        end
+      end
+    end
+
     def unfavorite(status)
       fail ArgumentError,
         'argument must be an instance of Status class' unless status.is_a? Status
 
       send_request do
         rest_client.unfavorite(status.id)
+      end.then do
         status.unfavorite!
-        yield status if block_given?
+      end
+    end
+
+    def unfollow(*user_ids)
+      send_request do
+        rest_client.unfollow(*user_ids)
+      end.then do |users|
+        users.each do |user|
+          Friendship.unfollow(self.user_id, user.id)
+        end
+      end
+    end
+
+    def unmute(user_ids)
+      send_request do
+        rest_client.unmute(*user_ids)
+      end.then do |users|
+        users.each do |user|
+          Friendship.unmute(self.user_id, user.id)
+        end
       end
     end
 
     def user_timeline(user_id)
       send_request do
-        statuses = rest_client
-          .user_timeline(user_id, count: 100)
+        rest_client.user_timeline(user_id, count: 200)
+      end.then do |statuses|
+        statuses
           .select(&@mute_filter)
           .map(&CREATE_STATUS_PROC)
-        yield statuses
       end
     end
 
@@ -285,6 +424,17 @@ module Twterm
 
     private
 
+    def show_error
+      proc do |e|
+        case e
+        when Twitter::Error
+          Notifier.instance.show_error "Failed to send request: #{e.message}"
+        else
+          raise e
+        end
+      end.freeze
+    end
+
     def invoke_callbacks(event, data = nil)
       return if @callbacks[event].nil?
 
@@ -299,15 +449,15 @@ module Twterm
     end
 
     def send_request(&block)
-      Thread.new do
+      send_request_without_catch(&block).catch(&show_error)
+    end
+
+    def send_request_without_catch(&block)
+      Promise.new do |resolve, reject|
         begin
-          block.call
-        rescue Twitter::Error => e
-          Notifier.instance.show_error "Failed to send request: #{e.message}"
-          if e.message == 'getaddrinfo: nodename nor servname provided, or not known'
-            sleep 10
-            retry
-          end
+          resolve.(block.call)
+        rescue Twitter::Error => reason
+          reject.(reason)
         end
       end
     end