twterm 2.0.1 → 2.1.0

data/lib/twterm/rest_client.rb

@@ -245,17 +245,15 @@ module Twterm
       end
     end
 
-    def post(text, in_reply_to = nil)
+    def post(text, options = {})
       send_request do
-        if in_reply_to.is_a? Status
-          user = user_repository.find(in_reply_to.user_id)
-          text = "@#{user.screen_name} #{text}"
-          rest_client.update(text, in_reply_to_status_id: in_reply_to.id)
-        else
-          rest_client.update(text)
-        end
-        publish(Event::Notification::Success.new('Your tweet has been posted'))
+        rest_client.update(text, options)
       end
+        .then do |status|
+          publish(Event::Notification::Success.new('Your tweet has been posted'))
+
+          status
+        end
     end
 
     def rate_limit_status

data/lib/twterm/scheduler.rb

@@ -25,5 +25,6 @@ class Scheduler
 
   def run
     @block.call unless @paused
+  rescue
   end
 end

data/lib/twterm/status.rb

@@ -1,10 +1,19 @@
 require 'concurrent'
 
+class Twitter::Tweet
+  attr_reader :quoted_status_id
+
+  def initialize(*args)
+    @quoted_status_id = args[0][:quoted_status_id]
+    super
+  end
+end
+
 module Twterm
   class Status
     attr_reader :created_at, :favorite_count, :favorited, :id,
       :in_reply_to_status_id, :media, :retweet_count, :retweeted,
-      :retweeted_status_id, :text, :urls, :user_id
+      :quoted_status_id, :retweeted_status_id, :text, :url, :urls, :user_id
     alias_method :favorited?, :favorited
     alias_method :retweeted?, :retweeted
 
@@ -35,6 +44,8 @@ module Twterm
       @text = CGI.unescapeHTML(tweet.full_text.dup)
       @created_at = tweet.created_at.dup.localtime
       @in_reply_to_status_id = tweet.in_reply_to_status_id
+      @quoted_status_id = tweet.quoted_status_id
+      @url = tweet.url
 
       update!(tweet, is_retweeted_status)
 
@@ -48,6 +59,10 @@ module Twterm
       expand_url!
     end
 
+    def quote?
+      !quoted_status_id.nil?
+    end
+
     def retweet?
       !retweeted_status_id.nil?
     end

data/lib/twterm/tab/new/search.rb

@@ -36,9 +36,9 @@ module Twterm
 
           input_thread = Thread.new do
             close_screen
-            app.completion_manager.set_default_mode!
+            app.completion_manager.set_search_mode!
             puts "\ninput search query"
-            query = (readline('> ') || '').strip
+            query = (readline('> ', true) || '').strip
             resetter.call
 
             tab = query.nil? || query.empty? ? Tab::New::Search.new(app, client) : Tab::Statuses::Search.new(app, client, query)

data/lib/twterm/tab/new/user.rb

@@ -25,7 +25,7 @@ module Twterm
           input_thread = Thread.new do
             close_screen
             puts "\nSearch user"
-            screen_name = (readline('> @') || '').strip
+            screen_name = (readline('> @', true) || '').strip
             resetter.call
 
             if screen_name.nil? || screen_name.empty?

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

@@ -116,10 +116,16 @@ module Twterm
           render
         end
 
+        def quote
+          return if highlighted_status.nil?
+
+          app.tweetbox.quote(highlighted_original_status)
+        end
+
         def reply
           return if highlighted_status.nil?
 
-          app.tweetbox.compose(highlighted_original_status)
+          app.tweetbox.reply(highlighted_original_status)
         end
 
         def respond_to_key(key)
@@ -142,6 +148,8 @@ module Twterm
             retweet
           when k[:tab, :reload]
             reload
+          when k[:status, :quote]
+            quote
           when k[:status, :user]
             show_user
           else

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

@@ -0,0 +1,18 @@
+module Twterm
+  module Tab
+    module Statuses
+      module Cacheable
+        def retrieve_from_cache!
+          statuses = cached_statuses
+          cached_statuses.each { |status| append(status) }
+
+          unless statuses.empty?
+            sort
+            scroller.move_to_top
+            initially_loaded!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,14 @@
 require 'concurrent'
 
+require 'twterm/tab/dumpable'
 require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/cacheable'
 
 module Twterm
   module Tab
     module Statuses
       class Conversation < Base
+        include Cacheable
         include Dumpable
 
         attr_reader :status_id
@@ -18,7 +21,10 @@ module Twterm
           find_or_fetch_status(status_id).then do |status|
             append(status)
             fetch_ancestor(status)
+            fetch_quoted_status(status)
             find_descendants(status)
+            fetch_possible_quotes(status)
+            fetch_possible_replies(status)
           end
         end
 
@@ -40,11 +46,62 @@ module Twterm
             end
         end
 
+        def fetch_possible_quotes(status)
+          client.search(status.url).then do |statuses|
+            statuses
+              .select { |s| !s.retweet? && s.quoted_status_id == status.id }
+              .each { |s| prepend(s) }
+
+            sort
+            render
+          end
+        end
+
+        def fetch_possible_replies(status)
+          user = app.user_repository.find(status.user_id)
+
+          return if user.nil?
+
+          client.search("to:#{user.screen_name}").then do |statuses|
+            statuses
+              .select { |s| !s.retweet? && s.in_reply_to_status_id == status.id }
+              .each { |s| prepend(s) }
+
+            sort
+            render
+          end
+        end
+
+        def fetch_quoted_status(status)
+          quoted_status_id = status.quoted_status_id
+
+          if quoted_status_id.nil?
+            Concurrent::Promise.fulfill(nil)
+          elsif (instance = app.status_repository.find(quoted_status_id))
+            Concurrent::Promise.fulfill(instance)
+          else
+            client.show_status(quoted_status_id)
+          end
+            .then do |quoted_status|
+              next if quoted_status.nil?
+              append(quoted_status)
+              sort
+              fetch_ancestor(quoted_status)
+              fetch_quoted_status(quoted_status)
+            end
+        end
+
         def find_descendants(status)
-          app.status_repository.find_replies_for(status.id).each do |reply|
+          app.status_repository.find_replies_for(status.id).reject { |s| s.retweet? }.each do |reply|
             prepend(reply)
             find_descendants(reply)
           end
+
+          app.status_repository.find_quotes_for(status.id).reject { |s| s.retweet? }.each do |quote|
+            prepend(quote)
+            find_descendants(quote)
+          end
+
           sort
         end
 
@@ -57,6 +114,8 @@ module Twterm
 
           @status_id = status_id
 
+          retrieve_from_cache!
+
           reload.then do
             scroller.move_to_top
             sort
@@ -66,6 +125,12 @@ module Twterm
         def title
           'Conversation'.freeze
         end
+
+        private
+
+        def cached_statuses
+          [app.status_repository.find(status_id)].compact
+        end
       end
     end
   end

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

@@ -15,6 +15,8 @@ module Twterm
 
           self.title = 'Loading...'.freeze
 
+          @auto_reloader = Scheduler.new(300) { reload }
+
           find_or_fetch_list(list_id).then do |list|
             self.title = list.full_name
             app.tab_manager.refresh_window
@@ -23,8 +25,6 @@ module Twterm
               initially_loaded!
               scroller.move_to_top
             end
-
-            @auto_reloader = Scheduler.new(300) { reload }
           end
         end
 

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

@@ -1,9 +1,11 @@
 require 'twterm/tab/statuses/base'
+require 'twterm/tab/statuses/cacheable'
 
 module Twterm
   module Tab
     module Statuses
       class UserTimeline < Base
+        include Cacheable
         include Dumpable
 
         attr_reader :user, :user_id
@@ -29,6 +31,9 @@ module Twterm
           super(app, client)
 
           @user_id = user_id
+          @auto_reloader = Scheduler.new(120) { reload }
+
+          retrieve_from_cache!
 
           find_or_fetch_user(user_id).then do |user|
             @user = user
@@ -38,14 +43,18 @@ module Twterm
               initially_loaded!
               scroller.move_to_top
             end
-
-            @auto_reloader = Scheduler.new(120) { reload }
           end
         end
 
         def title
           @user.nil? ? 'Loading...' : "@#{@user.screen_name} timeline"
         end
+
+        private
+
+        def cached_statuses
+          app.status_repository.all.select { |status| status.user_id == user_id }
+        end
       end
     end
   end

data/lib/twterm/tweetbox.rb

@@ -15,109 +15,98 @@ module Twterm
       @app, @client = app, client
     end
 
-    def compose(in_reply_to = nil)
-      @text = ''
-
-      @in_reply_to, screen_name =
-        if in_reply_to.is_a?(Status)
-          [in_reply_to, app.user_repository.find(in_reply_to.user_id).screen_name]
-      else
-        [nil, nil]
-      end
+    def compose
+      ask_and_post("\e[1mCompose new Tweet\e[0m", '> ', -> body { body })
+    end
 
-      resetter = proc do
-        reset_prog_mode
-        sleep 0.1
-        app.screen.refresh
-      end
+    def quote(status)
+      screen_name = app.user_repository.find(status.user_id).screen_name
+      leading_text = "\e[1mQuoting @#{screen_name}'s Tweet\e[0m\n\n#{status.text}"
+      prompt = '> '
 
-      thread = Thread.new do
-        close_screen
+      ask_and_post(leading_text, prompt, -> body { "#{body} #{status.url}" })
+    end
 
-        if in_reply_to.nil?
-          puts "\nCompose new tweet:"
-        else
-          puts "\nReply to @#{screen_name}'s tweet: \"#{in_reply_to.text}\""
-        end
+    def reply(status)
+      screen_name = app.user_repository.find(status.user_id).screen_name
+      leading_text = "\e[1mReplying to @#{screen_name}\e[0m\n\n#{status.text}"
+      prompt = "> @#{screen_name} "
 
-        app.completion_manager.set_default_mode!
+      ask_and_post(leading_text, prompt, -> body { "@#{screen_name} #{body}" }, { in_reply_to_status_id: status.id })
+    end
+
+    private
+
+    attr_reader :app, :client, :in_reply_to
+
+    def ask(prompt, postprocessor, &cont)
+      app.completion_manager.set_default_mode!
+
+      thread = Thread.new do
+        raw_text = ''
 
         loop do
           loop do
-            msg = in_reply_to.nil? || !text.empty? ? '> ' : "> @#{screen_name} "
-            line = (readline(msg, true) || '').strip
+            line = (readline(prompt, true) || '').strip
             break if line.empty?
 
             if line.end_with?('\\')
-              @text << line.chop.rstrip + "\n"
+              raw_text << line.chop.rstrip + "\n"
             else
-              @text << line
+              raw_text << line
               break
             end
           end
 
           puts "\n"
 
+          text = postprocessor.call(raw_text)
+
           begin
-            validate_text!
+            validate!(text)
             break
           rescue EmptyTextError
             break
           rescue InvalidCharactersError
             puts 'Text contains invalid characters'
           rescue TextTooLongError
-            puts "Text is too long (#{text_length} / 140 characters)"
+            puts "Text is too long (#{text_length(text)} / 140 characters)"
           end
 
           puts "\n"
-          clear
+          raw_text = ''
         end
 
-        resetter.call
-        post
+        reset
+        cont.call(raw_text) unless raw_text.empty?
       end
 
       app.register_interruption_handler do
         thread.kill
-        clear
         puts "\nCanceled"
-        resetter.call
+        reset
       end
 
       thread.join
     end
 
-    private
-
-    attr_reader :app, :client, :in_reply_to
-
-    def clear
-      @text = ''
-      @in_reply_to = nil
-    end
-
-    def post
-      validate_text!
-      client.post(text, in_reply_to)
-    rescue EmptyTextError
-      # do nothing
-    rescue InvalidCharactersError
-      publish(Event::Notification::Error.new('Text contains invalid characters'))
-    rescue TextTooLongError
-      publish(Event::Notification::Error.new("Text is too long (#{text_length} / 140 characters)"))
-    ensure
-      clear
+    def ask_and_post(leading_text, prompt, postprocessor, options = {})
+      close_screen
+      puts "\e[H\e[2J#{leading_text}\n\n"
+      ask(prompt, postprocessor) { |text| client.post(postprocessor.call(text), options) }
     end
 
-    def text
-      @text || ''
+    def reset
+      reset_prog_mode
+      sleep 0.1
+      app.screen.refresh
     end
 
-    def text_length
+    def text_length(text)
       Twitter::Validation.tweet_length(text)
     end
 
-    def validate_text!
+    def validate!(text)
       case Twitter::Validation.tweet_invalid?(text)
       when :empty
         fail EmptyTextError