t 2.2.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a30a59d381d4a4e6815086c4e45d1541fb372855
+  data.tar.gz: 300d0fedac30548d0fea628774e4b9a632716017
+SHA512:
+  metadata.gz: 09c862bc9a765df7f652ea0820631c8d284266df0a87af3a9840694c9a1ce75cdae8e143c8312eba5cae686194185602ffe2b90e9f7d0633c80c3c43b0c8bab7
+  data.tar.gz: 15970f41bc2c623d6040eeb3fb7cc721ac67742b4697ec4826e6d1d8123525b4e9e039a6485299b545c625482cd77c1cde917146a6540a1217d2205def19aa71

data/README.md

@@ -280,6 +280,7 @@ implementations:
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
+* Ruby 2.1.0
 
 If something doesn't work on one of these Ruby versions, it's a bug.
 

data/bin/t

@@ -2,7 +2,7 @@
 
 # Trap interrupts to quit cleanly. See
 # https://twitter.com/mitchellh/status/283014103189053442
-Signal.trap('INT') { exit 1 }
+Signal.trap('INT') { abort }
 
 require 'oauth'
 require 't'
@@ -13,28 +13,23 @@ def pute(*args)
   first = args.shift.dup
   first.insert(0, "#{$PROGRAM_NAME}: ")
   args.unshift(first)
-  $stderr.puts(*args)
+  abort(*args)
 end
 
 begin
   T::CLI.start(ARGV)
 rescue Interrupt
   pute 'Quitting...'
-  exit 1
 rescue OAuth::Unauthorized
   pute 'Authorization failed'
-  exit 1
 rescue Twitter::Error::TooManyRequests => error
   pute error.message,
        "The rate limit for this request will reset in #{error.rate_limit.reset_in} seconds.",
        'While you wait, consider making a polite request for Twitter to increase the API rate limit at https://dev.twitter.com/discussions/10644'
-  exit 1
 rescue Twitter::Error::BadRequest => error
   pute error.message,
        'Run `t authorize` to authorize.'
-  exit 1
 rescue Twitter::Error::Forbidden, Twitter::Error::Unauthorized => error
-  pute error.message
   if error.message == 'Error processing your OAuth request: Read-only application cannot POST' ||
     error.message == 'This application is not allowed to access or delete your direct messages'
     $stderr.puts(%q(Make sure to set your Twitter application's Access Level to "Read, Write and Access direct messages".))
@@ -42,9 +37,9 @@ rescue Twitter::Error::Forbidden, Twitter::Error::Unauthorized => error
     Thor::Shell::Basic.new.ask 'Press [Enter] to open the Twitter Developer site.'
     require 'launchy'
     Launchy.open('https://dev.twitter.com/apps') { |u, o, e| $stderr.puts "Manually open #{u}" }
+  else
+    pute error.message
   end
-  exit 1
 rescue Twitter::Error => error
   pute error.message
-  exit 1
 end

data/lib/t.rb

@@ -14,13 +14,13 @@ module T
 
     def utc_offset=(offset)
       @utc_offset = case offset
-                    when String
-                      Time.zone_offset(offset)
-                    when NilClass
-                      nil
-                    else
-                      offset.to_i
-                    end
+      when String
+        Time.zone_offset(offset)
+      when NilClass
+        nil
+      else
+        offset.to_i
+      end
     end
   end
 end

data/lib/t/cli.rb

@@ -29,7 +29,7 @@ module T
 
     check_unknown_options!
 
-    class_option 'color', :aliases => '-C', :type => :string, :enum => %w(auto never), :default => 'auto', :desc => 'Control how color is used in output'
+    class_option 'color', :aliases => '-C', :type => :string, :enum => %w[auto never], :default => 'auto', :desc => 'Control how color is used in output'
     class_option 'profile', :aliases => '-P', :type => :string, :default => File.join(File.expand_path('~'), T::RCFile::FILE_NAME), :desc => 'Path to RC file', :banner => 'FILE'
 
     def initialize(*)
@@ -124,26 +124,28 @@ module T
 
     desc 'direct_messages', "Returns the #{DEFAULT_NUM_RESULTS} most recent Direct Messages sent to you."
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
     def direct_messages
       count = options['number'] || DEFAULT_NUM_RESULTS
+      opts = {}
+      opts[:include_entities] = !!options['decode_uris']
       direct_messages = collect_with_count(count) do |count_opts|
-        client.direct_messages(count_opts)
+        client.direct_messages(count_opts.merge(opts))
       end
       direct_messages.reverse! if options['reverse']
-      require 'htmlentities'
       if options['csv']
         require 'csv'
         say DIRECT_MESSAGE_HEADINGS.to_csv unless direct_messages.empty?
         direct_messages.each do |direct_message|
-          say [direct_message.id, csv_formatted_time(direct_message), direct_message.sender.screen_name, HTMLEntities.new.decode(direct_message.text)].to_csv
+          say [direct_message.id, csv_formatted_time(direct_message), direct_message.sender.screen_name, decode_full_text(direct_message, options['decode_uris'])].to_csv
         end
       elsif options['long']
         array = direct_messages.map do |direct_message|
-          [direct_message.id, ls_formatted_time(direct_message), "@#{direct_message.sender.screen_name}", HTMLEntities.new.decode(direct_message.text).gsub(/\n+/, ' ')]
+          [direct_message.id, ls_formatted_time(direct_message), "@#{direct_message.sender.screen_name}", decode_full_text(direct_message, options['decode_uris']).gsub(/\n+/, ' ')]
         end
         format = options['format'] || DIRECT_MESSAGE_HEADINGS.size.times.map { '%s' }
         print_table_with_headings(array, DIRECT_MESSAGE_HEADINGS, format)
@@ -153,30 +155,32 @@ module T
         end
       end
     end
-    map %w(directmessages dms) => :direct_messages
+    map %w[directmessages dms] => :direct_messages
 
     desc 'direct_messages_sent', "Returns the #{DEFAULT_NUM_RESULTS} most recent Direct Messages you've sent."
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
-    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
     def direct_messages_sent
       count = options['number'] || DEFAULT_NUM_RESULTS
+      opts = {}
+      opts[:include_entities] = !!options['decode_uris']
       direct_messages = collect_with_count(count) do |count_opts|
-        client.direct_messages_sent(count_opts)
+        client.direct_messages_sent(count_opts.merge(opts))
       end
       direct_messages.reverse! if options['reverse']
-      require 'htmlentities'
       if options['csv']
         require 'csv'
         say DIRECT_MESSAGE_HEADINGS.to_csv unless direct_messages.empty?
         direct_messages.each do |direct_message|
-          say [direct_message.id, csv_formatted_time(direct_message), direct_message.recipient.screen_name, HTMLEntities.new.decode(direct_message.text)].to_csv
+          say [direct_message.id, csv_formatted_time(direct_message), direct_message.recipient.screen_name, decode_full_text(direct_message, options['decode_uris'])].to_csv
         end
       elsif options['long']
         array = direct_messages.map do |direct_message|
-          [direct_message.id, ls_formatted_time(direct_message), "@#{direct_message.recipient.screen_name}", HTMLEntities.new.decode(direct_message.text).gsub(/\n+/, ' ')]
+          [direct_message.id, ls_formatted_time(direct_message), "@#{direct_message.recipient.screen_name}", decode_full_text(direct_message, options['decode_uris']).gsub(/\n+/, ' ')]
         end
         format = options['format'] || DIRECT_MESSAGE_HEADINGS.size.times.map { '%s' }
         print_table_with_headings(array, DIRECT_MESSAGE_HEADINGS, format)
@@ -186,7 +190,7 @@ module T
         end
       end
     end
-    map %w(directmessagessent sent_messages sentmessages sms) => :direct_messages_sent
+    map %w[directmessagessent sent_messages sentmessages sms] => :direct_messages_sent
 
     desc 'groupies [USER]', "Returns the list of people who follow you but you don't follow back."
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
@@ -194,21 +198,17 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[favorites followers friends listed screen_name since tweets tweeted], :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def groupies(user = nil)
       user = if user
-               require 't/core_ext/string'
-               options['id'] ? user.to_i : user.strip_ats
-             else
-               client.verify_credentials.screen_name
-             end
-      follower_ids = Thread.new do
-        client.follower_ids(user).to_a
-      end
-      following_ids = Thread.new do
-        client.friend_ids(user).to_a
+        require 't/core_ext/string'
+        options['id'] ? user.to_i : user.strip_ats
+      else
+        client.verify_credentials.screen_name
       end
+      follower_ids = Thread.new { client.follower_ids(user).to_a }
+      following_ids = Thread.new { client.friend_ids(user).to_a }
       disciple_ids = (follower_ids.value - following_ids.value)
       require 'retryable'
       users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
@@ -216,7 +216,7 @@ module T
       end
       print_users(users)
     end
-    map %w(disciples) => :groupies
+    map %w[disciples] => :groupies
 
     desc 'dm USER MESSAGE', 'Sends that person a Direct Message.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
@@ -226,7 +226,7 @@ module T
       direct_message = client.create_direct_message(user, message)
       say "Direct Message sent from @#{@rcfile.active_profile[0]} to @#{direct_message.recipient.screen_name}."
     end
-    map %w(d m) => :dm
+    map %w[d m] => :dm
 
     desc 'does_contain [USER/]LIST USER', 'Find out whether a list contains a user.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
@@ -241,30 +241,37 @@ module T
       if client.list_member?(owner, list, user)
         say "Yes, #{list} contains @#{user}."
       else
-        say "No, #{list} does not contain @#{user}."
-        exit 1
+        abort "No, #{list} does not contain @#{user}."
       end
     end
-    map %w(dc doescontain) => :does_contain
+    map %w[dc doescontain] => :does_contain
 
     desc 'does_follow USER [USER]', 'Find out whether one user follows another.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
     def does_follow(user1, user2 = nil)
       require 't/core_ext/string'
-      user1 = options['id'] ? client.user(user1.to_i).screen_name : user1.strip_ats
-      if user2.nil?
-        user2 = @rcfile.active_profile[0]
+      thread1 = if options['id']
+        Thread.new { client.user(user1.to_i).screen_name }
       else
-        user2 = options['id'] ? client.user(user2.to_i).screen_name : user2.strip_ats
+        Thread.new { user1.strip_ats }
       end
+      thread2 = if user2.nil?
+        Thread.new { @rcfile.active_profile[0] }
+      else
+        if options['id']
+          Thread.new { client.user(user2.to_i).screen_name }
+        else
+          Thread.new { user2.strip_ats }
+        end
+      end
+      user1, user2 = thread1.value, thread2.value
       if client.friendship?(user1, user2)
         say "Yes, @#{user1} follows @#{user2}."
       else
-        say "No, @#{user1} does not follow @#{user2}."
-        exit 1
+        abort "No, @#{user1} does not follow @#{user2}."
       end
     end
-    map %w(df doesfollow) => :does_follow
+    map %w[df doesfollow] => :does_follow
 
     desc 'favorite TWEET_ID [TWEET_ID...]', 'Marks Tweets as favorites.'
     def favorite(status_id, *status_ids)
@@ -279,21 +286,23 @@ module T
       say
       say "Run `#{File.basename($PROGRAM_NAME)} delete favorite #{status_ids.join(' ')}` to unfavorite."
     end
-    map %w(fave favourite) => :favorite
+    map %w[fave favourite] => :favorite
 
     desc 'favorites [USER]', "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets you favorited."
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
-    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'max_id', :aliases => '-m', :type => :numeric, :desc => 'Returns only the results with an ID less than the specified ID.'
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
     method_option 'since_id', :aliases => '-s', :type => :numeric, :desc => 'Returns only the results with an ID greater than the specified ID.'
     def favorites(user = nil)
       count = options['number'] || DEFAULT_NUM_RESULTS
       opts = {}
       opts[:exclude_replies] = true if options['exclude'] == 'replies'
+      opts[:include_entities] = !!options['decode_uris']
       opts[:include_rts] = false if options['exclude'] == 'retweets'
       opts[:max_id] = options['max_id'] if options['max_id']
       opts[:since_id] = options['since_id'] if options['since_id']
@@ -306,7 +315,7 @@ module T
       end
       print_tweets(tweets)
     end
-    map %w(faves favourites) => :favorites
+    map %w[faves favourites] => :favorites
 
     desc 'follow USER [USER...]', 'Allows you to start following users.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify input as Twitter user IDs instead of screen names.'
@@ -325,7 +334,7 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[favorites followers friends listed screen_name since tweets tweeted], :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def followings(user = nil)
       if user
@@ -346,7 +355,7 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[favorites followers friends listed screen_name since tweets tweeted], :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def followers(user = nil)
       if user
@@ -367,21 +376,17 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[favorites followers friends listed screen_name since tweets tweeted], :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def friends(user = nil)
       user = if user
-               require 't/core_ext/string'
-               options['id'] ? user.to_i : user.strip_ats
-             else
-               client.verify_credentials.screen_name
-             end
-      following_ids = Thread.new do
-        client.friend_ids(user).to_a
-      end
-      follower_ids = Thread.new do
-        client.follower_ids(user).to_a
+        require 't/core_ext/string'
+        options['id'] ? user.to_i : user.strip_ats
+      else
+        client.verify_credentials.screen_name
       end
+      following_ids = Thread.new { client.friend_ids(user).to_a }
+      follower_ids = Thread.new { client.follower_ids(user).to_a }
       friend_ids = (following_ids.value & follower_ids.value)
       require 'retryable'
       users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
@@ -396,21 +401,17 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[favorites followers friends listed screen_name since tweets tweeted], :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def leaders(user = nil)
       user = if user
-               require 't/core_ext/string'
-               options['id'] ? user.to_i : user.strip_ats
-             else
-               client.verify_credentials.screen_name
-             end
-      following_ids = Thread.new do
-        client.friend_ids(user).to_a
-      end
-      follower_ids = Thread.new do
-        client.follower_ids(user).to_a
+        require 't/core_ext/string'
+        options['id'] ? user.to_i : user.strip_ats
+      else
+        client.verify_credentials.screen_name
       end
+      following_ids = Thread.new { client.friend_ids(user).to_a }
+      follower_ids = Thread.new { client.follower_ids(user).to_a }
       leader_ids = (following_ids.value - follower_ids.value)
       require 'retryable'
       users = retryable(:tries => 3, :on => Twitter::Error, :sleep => 0) do
@@ -425,16 +426,16 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(members mode since slug subscribers), :default => 'slug', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[members mode since slug subscribers], :default => 'slug', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def lists(user = nil)
       lists = if user
-                require 't/core_ext/string'
-                user = options['id'] ? user.to_i : user.strip_ats
-                client.lists(user)
-              else
-                client.lists
-              end
+        require 't/core_ext/string'
+        user = options['id'] ? user.to_i : user.strip_ats
+        client.lists(user)
+      else
+        client.lists
+      end
       print_lists(lists)
     end
 
@@ -443,18 +444,21 @@ module T
 
     desc 'mentions', "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets mentioning you."
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
-    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
     def mentions
       count = options['number'] || DEFAULT_NUM_RESULTS
+      opts = {}
+      opts[:include_entities] = !!options['decode_uris']
       tweets = collect_with_count(count) do |count_opts|
-        client.mentions(count_opts)
+        client.mentions(count_opts.merge(opts))
       end
       print_tweets(tweets)
     end
-    map %w(replies) => :mentions
+    map %w[replies] => :mentions
 
     desc 'open USER', "Opens that user's profile in a web browser."
     method_option 'display-uri', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Display the requested URL instead of attempting to open it.'
@@ -502,7 +506,7 @@ module T
       end
       say "@#{@rcfile.active_profile[0]} reported #{pluralize(number, 'user')}."
     end
-    map %w(report reportspam spam) => :report_spam
+    map %w[report reportspam spam] => :report_spam
 
     desc 'retweet TWEET_ID [TWEET_ID...]', 'Sends Tweets to your followers.'
     def retweet(status_id, *status_ids)
@@ -517,31 +521,34 @@ module T
       say
       say "Run `#{File.basename($PROGRAM_NAME)} delete status #{retweets.map { |tweet| tweet.retweeted_status.id }.join(' ')}` to undo."
     end
-    map %w(rt) => :retweet
+    map %w[rt] => :retweet
 
     desc 'retweets [USER]', "Returns the #{DEFAULT_NUM_RESULTS} most recent Retweets by a user."
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
-    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
     def retweets(user = nil)
       count = options['number'] || DEFAULT_NUM_RESULTS
+      opts = {}
+      opts[:include_entities] = !!options['decode_uris']
       tweets = if user
-                 require 't/core_ext/string'
-                 user = options['id'] ? user.to_i : user.strip_ats
-                 collect_with_count(count) do |count_opts|
-                   client.retweeted_by_user(user, count_opts)
-                 end
-               else
-                 collect_with_count(count) do |count_opts|
-                   client.retweeted_by_me(count_opts)
-                 end
-               end
+        require 't/core_ext/string'
+        user = options['id'] ? user.to_i : user.strip_ats
+        collect_with_count(count) do |count_opts|
+          client.retweeted_by_user(user, count_opts.merge(opts))
+        end
+      else
+        collect_with_count(count) do |count_opts|
+          client.retweeted_by_me(count_opts.merge(opts))
+        end
+      end
       print_tweets(tweets)
     end
-    map %w(rts) => :retweets
+    map %w[rts] => :retweets
 
     desc 'ruler', 'Prints a 140-character ruler'
     method_option 'indent', :aliases => '-i', :type => :numeric, :default => 0, :desc => 'The number of space to print before the ruler.'
@@ -552,40 +559,43 @@ module T
 
     desc 'status TWEET_ID', 'Retrieves detailed information about a Tweet.'
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     def status(status_id) # rubocop:disable CyclomaticComplexity
-      status = client.status(status_id.to_i, :include_my_retweet => false)
+      opts = {:include_my_retweet => false}
+      opts[:include_entities] = !!options['decode_uris']
+      status = client.status(status_id.to_i, opts)
       location = if status.place?
-                   if status.place.name && status.place.attributes && status.place.attributes[:street_address] && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
-                     [status.place.name, status.place.attributes[:street_address], status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(', ')
-                   elsif status.place.name && status.place.attributes && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
-                     [status.place.name, status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(', ')
-                   elsif status.place.full_name && status.place.attributes && status.place.attributes[:region] && status.place.country
-                     [status.place.full_name, status.place.attributes[:region], status.place.country].join(', ')
-                   elsif status.place.full_name && status.place.country
-                     [status.place.full_name, status.place.country].join(', ')
-                   elsif status.place.full_name
-                     status.place.full_name
-                   else
-                     status.place.name
-                   end
-                 elsif status.geo?
-                   reverse_geocode(status.geo)
-                 end
+        if status.place.name && status.place.attributes && status.place.attributes[:street_address] && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
+          [status.place.name, status.place.attributes[:street_address], status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(', ')
+        elsif status.place.name && status.place.attributes && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
+          [status.place.name, status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(', ')
+        elsif status.place.full_name && status.place.attributes && status.place.attributes[:region] && status.place.country
+          [status.place.full_name, status.place.attributes[:region], status.place.country].join(', ')
+        elsif status.place.full_name && status.place.country
+          [status.place.full_name, status.place.country].join(', ')
+        elsif status.place.full_name
+          status.place.full_name
+        else
+          status.place.name
+        end
+      elsif status.geo?
+        reverse_geocode(status.geo)
+      end
       status_headings = ['ID', 'Posted at', 'Screen name', 'Text', 'Retweets', 'Favorites', 'Source', 'Location']
       if options['csv']
         require 'csv'
         say status_headings.to_csv
-        say [status.id, csv_formatted_time(status), status.user.screen_name, decode_full_text(status), status.retweet_count, status.favorite_count, strip_tags(status.source), location].to_csv
+        say [status.id, csv_formatted_time(status), status.user.screen_name, decode_full_text(status, options['decode_uris']), status.retweet_count, status.favorite_count, strip_tags(status.source), location].to_csv
       elsif options['long']
-        array = [status.id, ls_formatted_time(status), "@#{status.user.screen_name}", decode_full_text(status).gsub(/\n+/, ' '), status.retweet_count, status.favorite_count, strip_tags(status.source), location]
+        array = [status.id, ls_formatted_time(status), "@#{status.user.screen_name}", decode_full_text(status, options['decode_uris']).gsub(/\n+/, ' '), status.retweet_count, status.favorite_count, strip_tags(status.source), location]
         format = options['format'] || status_headings.size.times.map { '%s' }
         print_table_with_headings([array], status_headings, format)
       else
         array = []
         array << ['ID', status.id.to_s]
-        array << ['Text', decode_full_text(status).gsub(/\n+/, ' ')]
+        array << ['Text', decode_full_text(status, options['decode_uris']).gsub(/\n+/, ' ')]
         array << ['Screen name', "@#{status.user.screen_name}"]
         array << ['Posted at', "#{ls_formatted_time(status, :created_at, false)} (#{time_ago_in_words(status.created_at)} ago)"]
         array << ['Retweets', number_with_delimiter(status.retweet_count)]
@@ -598,18 +608,20 @@ module T
 
     desc 'timeline [USER]', "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets posted by a user."
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
-    method_option 'exclude', :aliases => '-e', :type => :string, :enum => %w(replies retweets), :desc => 'Exclude certain types of Tweets from the results.', :banner => 'TYPE'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'exclude', :aliases => '-e', :type => :string, :enum => %w[replies retweets], :desc => 'Exclude certain types of Tweets from the results.', :banner => 'TYPE'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
-    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'max_id', :aliases => '-m', :type => :numeric, :desc => 'Returns only the results with an ID less than the specified ID.'
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
     method_option 'since_id', :aliases => '-s', :type => :numeric, :desc => 'Returns only the results with an ID greater than the specified ID.'
     def timeline(user = nil)
       count = options['number'] || DEFAULT_NUM_RESULTS
       opts = {}
       opts[:exclude_replies] = true if options['exclude'] == 'replies'
+      opts[:include_entities] = !!options['decode_uris']
       opts[:include_rts] = false if options['exclude'] == 'retweets'
       opts[:max_id] = options['max_id'] if options['max_id']
       opts[:since_id] = options['since_id'] if options['since_id']
@@ -626,7 +638,7 @@ module T
       end
       print_tweets(tweets)
     end
-    map %w(tl) => :timeline
+    map %w[tl] => :timeline
 
     desc 'trends [WOEID]', 'Returns the top 10 trending topics.'
     method_option 'exclude-hashtags', :aliases => '-x', :type => :boolean, :default => false, :desc => 'Remove all hashtags from the trends list.'
@@ -642,22 +654,22 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(country name parent type woeid), :default => 'name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[country name parent type woeid], :default => 'name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def trend_locations
       places = client.trend_locations
       places = case options['sort']
-               when 'country'
-                 places.sort_by { |place| place.country.downcase }
-               when 'parent'
-                 places.sort_by { |place| place.parent_id.to_i }
-               when 'type'
-                 places.sort_by { |place| place.place_type.downcase }
-               when 'woeid'
-                 places.sort_by { |place| place.woeid.to_i }
-               else
-                 places.sort_by { |place| place.name.downcase }
-               end unless options['unsorted']
+      when 'country'
+        places.sort_by { |place| place.country.downcase }
+      when 'parent'
+        places.sort_by { |place| place.parent_id.to_i }
+      when 'type'
+        places.sort_by { |place| place.place_type.downcase }
+      when 'woeid'
+        places.sort_by { |place| place.woeid.to_i }
+      else
+        places.sort_by { |place| place.name.downcase }
+      end unless options['unsorted']
       places.reverse! if options['reverse']
       if options['csv']
         require 'csv'
@@ -675,7 +687,7 @@ module T
         print_attribute(places, :name)
       end
     end
-    map %w(locations trendlocations) => :trend_locations
+    map %w[locations trendlocations] => :trend_locations
 
     desc 'unfollow USER [USER...]', 'Allows you to stop following users.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify input as Twitter user IDs instead of screen names.'
@@ -695,17 +707,16 @@ module T
       message = T::Editor.gets if message.nil? || message.empty?
       opts = {:trim_user => true}
       add_location!(options, opts)
-
       status = if options['file']
-                 client.update_with_media(message, File.new(File.expand_path(options['file'])), opts)
-               else
-                 client.update(message, opts)
-               end
+        client.update_with_media(message, File.new(File.expand_path(options['file'])), opts)
+      else
+        client.update(message, opts)
+      end
       say "Tweet posted by @#{@rcfile.active_profile[0]}."
       say
       say "Run `#{File.basename($PROGRAM_NAME)} delete status #{status.id}` to delete."
     end
-    map %w(post tweet) => :update
+    map %w[post tweet] => :update
 
     desc 'users USER [USER...]', 'Returns a list of users you specify.'
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
@@ -713,7 +724,7 @@ module T
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :default => false, :desc => 'Reverse the order of the sort.'
-    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
+    method_option 'sort', :aliases => '-s', :type => :string, :enum => %w[favorites followers friends listed screen_name since tweets tweeted], :default => 'screen_name', :desc => 'Specify the order of the results.', :banner => 'ORDER'
     method_option 'unsorted', :aliases => '-u', :type => :boolean, :default => false, :desc => 'Output is not sorted.'
     def users(user, *users)
       users.unshift(user)
@@ -722,32 +733,34 @@ module T
       users = client.users(users)
       print_users(users)
     end
-    map %w(stats) => :users
+    map %w[stats] => :users
 
     desc 'version', 'Show version.'
     def version
       require 't/version'
       say T::Version
     end
-    map %w(-v --version) => :version
+    map %w[-v --version] => :version
 
     desc 'whois USER', 'Retrieves profile information for the user.'
     method_option 'csv', :aliases => '-c', :type => :boolean, :default => false, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :default => false, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'id', :aliases => '-i', :type => :boolean, :default => false, :desc => 'Specify user via ID instead of screen name.'
     method_option 'long', :aliases => '-l', :type => :boolean, :default => false, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     def whois(user) # rubocop:disable CyclomaticComplexity
       require 't/core_ext/string'
+      opts = {}
+      opts[:include_entities] = !!options['decode_uris']
       user = options['id'] ? user.to_i : user.strip_ats
-      user = client.user(user)
-      require 'htmlentities'
+      user = client.user(user, opts)
       if options['csv'] || options['long']
         print_users([user])
       else
         array = []
         array << ['ID', user.id.to_s]
         array << ['Since', "#{ls_formatted_time(user, :created_at, false)} (#{time_ago_in_words(user.created_at)} ago)"]
-        array << ['Last update', "#{decode_full_text(user.status).gsub(/\n+/, ' ')} (#{time_ago_in_words(user.status.created_at)} ago)"] unless user.status.nil?
+        array << ['Last update', "#{decode_full_text(user.status, options['decode_uris']).gsub(/\n+/, ' ')} (#{time_ago_in_words(user.status.created_at)} ago)"] unless user.status.nil?
         array << ['Screen name', "@#{user.screen_name}"]
         array << [user.verified ? 'Name (Verified)' : 'Name', user.name] unless user.name.nil?
         array << ['Tweets', number_with_delimiter(user.statuses_count)]
@@ -761,7 +774,7 @@ module T
         print_table(array)
       end
     end
-    map %w(user) => :whois
+    map %w[user] => :whois
 
     desc 'delete SUBCOMMAND ...ARGS', 'Delete Tweets, Direct Messages, etc.'
     subcommand 'delete', T::Delete