termtter 1.6.0 → 1.7.0

data/lib/plugins/defaults/retweet.rb

@@ -1,43 +1,95 @@
 # -*- coding: utf-8 -*-
 
-config.plugins.retweet.set_default(:format, '<%= comment %>RT @<%=s.user.screen_name%>: <%=s.text%>')
-config.plugins.retweet.set_default(:confirm_protected, true)
+config.plugins.retweet.set_default(
+  :format, '<%= comment %><%= rt_or_qt %> @<%=s.user.screen_name%>: <%=s.text%>')
+config.plugins.retweet.set_default(
+  :confirm_protected, true)
+config.plugins.retweet.set_default(
+  :official_retweet, true)
+config.plugins.retweet.set_default(
+  :quotetweet, false)
 
 module Termtter::Client
   def self.post_retweet(s, comment = nil)
-    if s.user.protected && config.plugins.retweet.confirm_protected &&
-        !confirm("#{s.user.screen_name} is protected! Are you sure?", false)
+    s.user.protected and
+      config.plugins.retweet.confirm_protected and
+      !confirm("#{s.user.screen_name} is protected! Are you sure?", false) and
       return
-    end
 
+    # NOTE: If it's possible, this plugin tries to
+    #   use the default RT feature twitter provides.
+    if comment.nil? && config.plugins.retweet.official_retweet
+      begin
+        Termtter::API.twitter.retweet(s.id)
+        # TODO: Vimshell support
+        puts TermColor.parse("<blue>=&gt; RT @#{s.user.screen_name}: #{s.text}</blue>")
+        return
+      rescue Rubytter::APIError  # XXX: just for transition period
+        if $!.to_s == 'Not found'
+          Termtter::Client.logger.warn "Failed official retweet. Set twitter langage to English in https://twitter.com/account/settings or set config.plugins.retweet.official_retweet to false."
+        end
+      end
+    end
     comment += ' ' unless comment.nil?
+    rt_or_qt = (config.plugins.retweet.quotetweet and comment) ? 'QT' : 'RT'
     text = ERB.new(config.plugins.retweet.format).result(binding)
     Termtter::API.twitter.update(text)
     puts "=> #{text}"
-
-    return text
   end
 
   register_command(
-    :name      => :retweet,
-    :aliases   => [:rt],
-    :help      => ['retweet,rt (ID|@USER)', 'Post a retweet message'],
-    :exec_proc => lambda {|arg|
+    :name  => :retweet,
+    :alias => :rt,
+    :help  => ['retweet,rt (ID|@USER)', 'Post a retweet message'],
+    :exec  => lambda {|arg|
       arg, comment = arg.split(/\s/, 2)
 
-      if public_storage[:typable_id] && s = typable_id_status(arg)
-        post_retweet(s, comment)
-      else
-        case arg
-        when /(\d+)/
-          post_retweet(Termtter::API.twitter.show(arg), comment)
-        when /@([A-Za-z0-9_]+)/
-          user = $1
-          statuses = Termtter::API.twitter.user_timeline(user)
-          return if statuses.empty?
-          post_retweet(statuses[0], comment)
-        end
+      case arg
+      when /(\d+)/
+        post_retweet(Termtter::API.twitter.show(arg), comment)
+      when /@([A-Za-z0-9_]+)/
+        user = $1
+        statuses = Termtter::API.twitter.user_timeline(user)
+        return if statuses.empty?
+        post_retweet(statuses[0], comment)
       end
     }
   )
+
+  register_command(
+    :name => :retweets,
+    :help => ['retweets ID', 'Show retweets of a tweet'],
+    :exec => lambda {|arg|
+      statuses = Termtter::API.twitter.retweets(arg)
+      output(statuses, :retweets)
+    }
+  )
+
+  register_command(
+    :name => :retweeted_by_me,
+    :help => ['retweeted_by_me', 'Show retweets posted by you.'],
+    :exec => lambda {|arg|
+      statuses = Termtter::API.twitter.retweeted_by_me
+      output(statuses, :retweeted_by_me)
+    }
+  )
+
+  register_command(
+    :name => :retweeted_to_me,
+    :help => ['retweeted_to_me', 'Show retweets posted by friends.'],
+    :exec => lambda {|arg|
+      statuses = Termtter::API.twitter.retweeted_to_me
+      output(statuses, :retweeted_to_me)
+    }
+  )
+
+  register_command(
+    :name => :retweets_of_me,
+    :help => ['retweets_of_me',
+      'Show tweets of you that have been retweeted by others.'],
+    :exec => lambda {|arg|
+      statuses = Termtter::API.twitter.retweets_of_me
+      output(statuses, :retweets_of_me)
+    }
+  )
 end

data/lib/plugins/defaults/standard_commands.rb

@@ -7,7 +7,7 @@ config.plugins.standard.set_default(
  :limit_format,
  '<<%=remaining_color%>><%=limit.remaining_hits%></<%=remaining_color%>>/<%=limit.hourly_limit%> until <%=Time.parse(limit.reset_time).getlocal%> (<%=remaining_time%> remaining)')
 
-config.set_default(:easy_reply, true)
+config.set_default(:easy_reply, false)
 
 module Termtter::Client
 
@@ -15,20 +15,21 @@ module Termtter::Client
     :name => :reload,
     :exec => lambda {|arg|
       args = @since_id ? [{:since_id => @since_id}] : []
-      statuses = Termtter::API.twitter.friends_timeline(*args)
+      statuses = Termtter::API.twitter.home_timeline(*args)
       unless statuses.empty?
         print "\e[0G" + "\e[K" unless win?
         @since_id = statuses[0].id
         output(statuses, :update_friends_timeline)
         Readline.refresh_line if arg =~ /\-r/
       end
-    }
+    },
+    :help => ['reload', 'Reload time line']
   )
 
   register_command(
     :name => :update, :alias => :u,
     :exec => lambda {|arg|
-      unless arg.rstrip.empty?
+      unless arg.empty?
         params =
           if config.easy_reply && /^\s*(@\w+)/ =~ arg
             user_name = normalize_as_user_name($1)
@@ -39,7 +40,12 @@ module Termtter::Client
           end
 
         result = Termtter::API.twitter.update(arg, params)
-        puts "updated => #{result.text}"
+
+        if result.text == arg
+          puts "updated => #{result.text}"
+        else
+          puts TermColor.parse("<red>Failed to update :(</red>")
+        end
       end
     },
     :help => ["update,u TEXT", "Post a new message"]
@@ -63,60 +69,39 @@ module Termtter::Client
     :help => ['delete,del [STATUS ID]', 'Delete a status']
   )
 
-  direct_message_struct = Struct.new(:id, :text, :user, :created_at)
-  direct_message_struct.class_eval do
-    def method_missing(*args, &block)
-      nil
+  unless defined? DirectMessage
+    class DirectMessage < Struct.new(:id, :text, :user, :created_at)
+      def method_missing(*args, &block)
+        nil
+      end
     end
   end
-  register_command(
-    :name => :direct, :aliases => [:d],
-    :exec_proc => lambda {|arg|
-      case arg
-      when /^([^\s]+)\s+?(.*)\s*$/
-        user, text = normalize_as_user_name($1), $2
-        Termtter::API.twitter.direct_message(user, text)
-        puts "=> to:#{user} message:#{text}"
-      when 'list'
-        output(
-          Termtter::API.twitter.direct_messages.map { |d|
-            direct_message_struct.new(d.id, "#{d.text} => #{d.recipient_screen_name}", d.sender, d.created_at)
-          },
-          :direct_messages
-        )
-      when 'sent_list'
-        output(
-          Termtter::API.twitter.sent_direct_messages.map { |d|
-            direct_message_struct.new(d.id, "#{d.text} => #{d.recipient_screen_name}", d.sender, d.created_at)
-          },
-          :direct_messages
-        )
-      end
-    },
-    :help => [
-      ["direct,d USERNAME TEXT", "Send direct message"],
-      ["direct,d list", 'List direct messages'],
-      ["direct,d sent_list", 'List sent direct messages']
-    ]
-  )
 
-  register_command(
-    :name => :profile, :aliases => [:p],
-    :exec_proc => lambda {|arg|
-      user_name = arg.empty? ? config.user_name : arg
-      user = Termtter::API.twitter.user(user_name)
-      attrs = %w[ name screen_name url description profile_image_url location protected following
-        friends_count followers_count statuses_count favourites_count
-        id time_zone created_at utc_offset notifications
-      ]
-      label_width = attrs.map(&:size).max
-      attrs.each do |attr|
-        value = user.__send__(attr.to_sym)
-        puts "#{attr.gsub('_', ' ').rjust(label_width)}: #{value}"
-      end
-    },
-    :help => ["profile,p [USERNAME]", "Show user's profile."]
-  )
+  register_command(:direct, :alias => :d, :help => ["direct,d USERNAME TEXT", "Send direct message"]) do |arg|
+    if /^([^\s]+)\s+?(.*)\s*$/ =~ arg
+      user, text = normalize_as_user_name($1), $2
+      Termtter::API.twitter.direct_message(user, text)
+      puts "=> to:#{user} message:#{text}"
+    end
+  end
+
+  register_command('direct list', :help => ["direct,d list", 'List direct messages']) do |arg|
+    output(
+      Termtter::API.twitter.direct_messages.map { |d|
+        DirectMessage.new(d.id, "#{d.text} => #{d.recipient_screen_name}", d.sender, d.created_at)
+      },
+      :direct_messages
+    )
+  end
+
+  register_command('direct sent_list', :help => ["direct,d sent_list", 'List sent direct messages']) do |arg|
+    output(
+      Termtter::API.twitter.sent_direct_messages.map { |d|
+        DirectMessage.new(d.id, "#{d.text} => #{d.recipient_screen_name}", d.sender, d.created_at)
+      },
+      :direct_messages
+    )
+  end
 
   register_command(
     :name => :followers,
@@ -125,10 +110,12 @@ module Termtter::Client
       user_name = config.user_name if user_name.empty?
 
       followers = []
-      page = 0
+      cursor = -1
       begin
-        followers += tmp = Termtter::API.twitter.followers(user_name, :page => page+=1)
-      end until tmp.empty?
+        tmp = Termtter::API.twitter.followers(user_name, :cursor => cursor)
+        cursor = tmp[:next_cursor]
+        followers += tmp[:users]
+      end until cursor.zero?
       Termtter::Client.public_storage[:followers] = followers
       public_storage[:users] += followers.map(&:screen_name)
       puts followers.map(&:screen_name).join(' ')
@@ -136,32 +123,6 @@ module Termtter::Client
     :help => ["followers", "Show followers"]
   )
 
-  register_command(
-    :name => :list, :aliases => [:l],
-    :exec_proc => lambda {|arg|
-      if arg =~ /\-([\d]+)/
-        options = {:count => $1}
-        arg = arg.gsub(/\-([\d]+)/, '')
-      else
-        options = {}
-      end
-
-      if arg.empty?
-        event = :list_friends_timeline
-        statuses = Termtter::API.twitter.friends_timeline(options)
-      else
-        event = :list_user_timeline
-        statuses = []
-        Array(arg.split).each do |user|
-          user_name = normalize_as_user_name(user)
-          statuses += Termtter::API.twitter.user_timeline(user_name, options)
-        end
-      end
-      output(statuses, event)
-    },
-    :help => ["list,l [USERNAME] [-COUNT]", "List the posts"]
-  )
-
   class SearchEvent; attr_reader :query; def initialize(query); @query = query end; end
   public_storage[:search_keywords] = Set.new
   register_command(
@@ -190,7 +151,14 @@ module Termtter::Client
   register_command(
     :name => :replies, :aliases => [:r],
     :exec_proc => lambda {|arg|
-      res = Termtter::API.twitter.replies
+      if arg =~ /\-([\d]+)/
+        options = {:count => $1}
+        arg = arg.gsub(/\-([\d]+)/, '')
+      else
+        options = {}
+      end
+
+      res = Termtter::API.twitter.replies(options)
       unless arg.empty?
         res = res.map {|e| e.user.screen_name == arg ? e : nil }.compact
       end
@@ -254,6 +222,11 @@ module Termtter::Client
     :help => ['leave USER', 'Leave user']
   )
 
+  help = ['favorite_list USERNAME', 'show user favorites']
+  register_command(:favorites, :alias => :favlist, :help => help) do |arg|
+    output Termtter::API.twitter.favorites(arg), :user_timeline
+  end
+
   register_command(
     :name => :favorite, :aliases => [:fav],
     :exec_proc => lambda {|arg|
@@ -471,7 +444,7 @@ module Termtter::Client
         return if i <= 0
       end while input == "redo" or input == "."
       begin
-        Termtter::Client.call_commands(input)
+        Termtter::Client.execute(input)
       rescue CommandNotFound => e
         warn "Unknown command \"#{e}\""
         warn 'Enter "help" for instructions'

data/lib/plugins/defaults/standard_completion.rb

@@ -4,20 +4,6 @@ require 'set'
 
 module Termtter::Client
 
-  #
-  # completion for status ids
-  # (I want to delete)
-  #
-
-  public_storage[:status_ids] ||= Set.new
-
-  register_hook(:collect_status_ids, :point => :pre_filter) do |statuses, event|
-    statuses.each do |s|
-      public_storage[:status_ids].add(s.id)
-      public_storage[:status_ids].add(s.in_reply_to_status_id) if s.in_reply_to_status_id
-    end
-  end
-
   #
   # completion for user names
   #
@@ -53,9 +39,19 @@ module Termtter::Client
 
   public_storage[:hashtags_for_completion] ||= Set.new
 
+  def self.collect_hashtags(text)
+    text.force_encoding("UTF-8") if text.respond_to?(:force_encoding)
+    public_storage[:hashtags_for_completion] += text.scan(/#([0-9A-Za-z_]+)/u).flatten
+  end
+
+  Termtter::RubytterProxy.register_hook(:collect_hashtags, :point => :post_update) do |*args|
+    collect_hashtags(args.first)
+    args
+  end
+
   register_hook(:collect_hashtags, :point => :pre_filter) do |statuses, event|
     statuses.each do |s|
-      public_storage[:hashtags_for_completion] += s.text.scan(/#([^\s]+)/).flatten
+      collect_hashtags(s.text)
     end
   end
 
@@ -69,4 +65,18 @@ module Termtter::Client
         map { |i| "#{command_str} ##{i}" }
     end
   end
+
+  #
+  # completion for lists
+  #
+
+  register_hook(:lists_completion, :point => :completion) do |input|
+    if /(.*)\s([^\s]*)$/ =~ input
+      command = $1
+      part_of_list_name = $2
+      public_storage[:lists].
+        grep(/#{Regexp.quote(part_of_list_name)}/i).
+        map {|u| "#{command} %s" % u }
+    end
+  end
 end

data/lib/plugins/defaults/stdout.rb

@@ -7,8 +7,16 @@ require 'tempfile'
 config.plugins.stdout.set_default(:colors, (31..36).to_a + (91..96).to_a)
 config.plugins.stdout.set_default(
   :timeline_format,
-  '<90><%=time%> [<%=status_id%>]</90> <<%=color%>><%=s.user.screen_name%>: <%=text%></<%=color%>> ' +
-  '<90><%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%><%=source%><%=s.user.protected ? "[P]" : ""%></90>'
+  [
+    '<90><%=time%> [<%=status_id%>]</90> ',
+    '<%= indent_text %>',
+    '<<%=color%>><%=s.user.screen_name%>: <%=colorize_users(text)%></<%=color%>> ',
+    '<90>',
+    '<%=reply_to_status_id ? " (reply_to [#{reply_to_status_id}]) " : ""%>',
+    '<%=retweeted_status_id ? " (retweet_to [#{retweeted_status_id}]) " : ""%>',
+    '<%=source%><%=s.user.protected ? "[P]" : ""%>',
+    '</90>'
+  ].join('')
 )
 config.plugins.stdout.set_default(:time_format_today, '%H:%M:%S')
 config.plugins.stdout.set_default(:time_format_not_today, '%y/%m/%d %H:%M')
@@ -17,7 +25,9 @@ config.plugins.stdout.set_default(:pager, 'less -R -f +G')
 config.plugins.stdout.set_default(:window_height, 50)
 config.plugins.stdout.set_default(:typable_ids, ('aa'..'zz').to_a)
 config.plugins.stdout.set_default(:typable_id_prefix, '$')
-config.plugins.stdout.set_default(:show_as_thread, false) # db plugin is required
+config.plugins.stdout.set_default(:show_reply_chain, true)
+config.plugins.stdout.set_default(:indent_format, %q("#{'    ' * (indent - 1)}  → "))
+config.plugins.stdout.set_default(:max_indent_level, 1)
 
 module Termtter
   class TypableIdGenerator
@@ -109,10 +119,17 @@ module Termtter
       color = config.plugins.stdout.colors[s.user.id.to_i % config.plugins.stdout.colors.size]
       status_id = Termtter::Client.data_to_typable_id(s.id)
       reply_to_status_id =
-        if s.in_reply_to_status_id.nil?
+        if s.in_reply_to_status_id
+          Termtter::Client.data_to_typable_id(s.in_reply_to_status_id)
+        else
           nil
+        end
+
+      retweeted_status_id =
+        if s.retweeted_status
+          Termtter::Client.data_to_typable_id(s.retweeted_status.id)
         else
-          Termtter::Client.data_to_typable_id(s.in_reply_to_status_id)
+          nil
         end
 
       time = "(#{Time.parse(s.created_at).strftime(time_format)})"
@@ -122,18 +139,40 @@ module Termtter
         when 'web' then 'web'
         end
 
+      indent_text = indent > 0 ? eval(config.plugins.stdout.indent_format) : ''
       erbed_text = ERB.new(config.plugins.stdout.timeline_format).result(binding)
-      indent_text = indent > 0 ? "#{'    ' * (indent - 1)} ┗ " : ''
 
       erbed_text = Client.get_hooks(:pre_coloring).inject(erbed_text){|result, hook| hook.call(result, event)}
 
-      text = TermColor.parse(indent_text + erbed_text) + "\n"
-      text = TermColor.unescape(text)
-      if config.plugins.stdout.show_as_thread && s.in_reply_to_status_id
-        text << status_line(Status[s.in_reply_to_status_id], time_format, event, indent + 1)
+      text = TermColor.unescape(TermColor.parse(erbed_text) + "\n")
+      if config.plugins.stdout.show_reply_chain && s.in_reply_to_status_id
+        indent += 1
+        unless indent > config.plugins.stdout.max_indent_level
+          begin
+            status = Termtter::API.twitter.show(s.in_reply_to_status_id)
+            text << status_line(status, time_format, event, indent)
+          rescue Rubytter::APIError
+          end
+        end
       end
       text
     end
+
+    def colorize_users(text)
+      text.gsub(/@(\w+)/) do |i|
+        user = Termtter::API.twitter.cached_user($1)
+        if user
+          color = user_color(user)
+          "<#{color}>#{i}</#{color}>"
+        else
+          i
+        end
+      end
+    end
+
+    def user_color(user)
+      config.plugins.stdout.colors[user.id.to_i % config.plugins.stdout.colors.size]
+    end
   end
 
   Client.register_hook(StdOut.new)