ayadn 1.8.2 → 2.0

data/lib/ayadn/alias.rb

@@ -8,22 +8,22 @@ module Ayadn
     def create(*args)
       begin
         init
+        status = Status.new
         unless args.empty?
           channel, channel_alias = args[0], args[1]
         else
-          abort(Status.wrong_arguments)
+          status.wrong_arguments
+          exit
         end
         if channel.is_integer?
           Databases.create_alias(channel, channel_alias)
           Logs.rec.info "Added alias '#{channel_alias}' for channel #{channel}."
-          puts Status.done
+          status.done
         else
-          puts Status.error_missing_channel_id
+          status.error_missing_channel_id
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
-      ensure
-        Databases.close_all
       end
     end
 
@@ -36,63 +36,36 @@ module Ayadn
         unless args.empty?
           Databases.delete_alias(args[0])
           Logs.rec.info "Deleted alias '#{args[0]}'."
-          puts Status.done
+          Status.new.done
         else
-          abort(Status.wrong_arguments)
+          Status.new.wrong_arguments
+          exit
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
-      ensure
-        Databases.close_all
-      end
-    end
-
-    desc "import DATABASE", "Imports an aliases database from a backed up Ayadn account"
-    long_desc Descriptions.alias_import
-    def import(database)
-      begin
-        init
-        unless database.nil?
-          new_db = File.realpath(database)
-        else
-          abort(Status.wrong_arguments)
-        end
-        if File.exist?(new_db)
-          Databases.import_aliases(new_db)
-          Logs.rec.info "Imported '#{new_db}' values in aliases database."
-          puts Status.done
-        else
-          puts "\nFile '#{new_db}' doesn't exist.".color(:red)
-        end
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [database]})
-      ensure
-        Databases.close_all
       end
     end
 
     desc "list", "List previously created aliases"
     long_desc Descriptions.alias_list
     option :raw, aliases: "-x", type: :boolean, desc: "Outputs the raw list in JSON"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def list
       begin
         init
-        list = Databases.aliases
+        Settings.options[:timeline][:compact] = true if options[:compact] == true
+        list = Databases.all_aliases
         unless list.empty? || list.nil?
           if options[:raw]
-            h = {}
-            list.each {|k,v| h[k] = v}
-            puts h.to_json
+            puts list.to_json
           else
             View.new.page Workers.new.build_aliases_list(list)
           end
         else
-          puts Status.empty_list
+          Status.new.empty_list
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [options]})
-      ensure
-        Databases.close_all
       end
     end
 
@@ -100,19 +73,18 @@ module Ayadn
     def clear
       begin
         init
-        puts "\n\nAre you sure you want to erase all the content of your aliases database?\n\n[y/N]\n".color(:red)
+        status = Status.new
+        status.ask_clear_databases
         input = STDIN.getch
         if input == 'y' || input == 'Y'
           Databases.clear_aliases
           Logs.rec.info "Cleared the aliases database."
-          puts Status.done
+          status.done
         else
-          abort Status.canceled
+          status.canceled
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: []})
-      ensure
-        Databases.close_all
       end
     end
 

data/lib/ayadn/annotations.rb

@@ -161,7 +161,7 @@ module Ayadn
     end
 
     def nowplaying(dic)
-      return nowplaying_silent(dic) if dic[:options][:no_url]
+      return nowplaying_silent(dic) if dic[:options][:no_url] == true || dic[:visible] == false
       [{
         "type" => "com.ayadn.nowplaying",
           "value" => {

data/lib/ayadn/api.rb

@@ -4,6 +4,7 @@ module Ayadn
 
     def initialize
       @workers = Workers.new
+      @status = Status.new
     end
 
     def get_unified(options)
@@ -268,12 +269,7 @@ module Ayadn
       else
         directed = 0
       end
-      html = arg[:html] || Settings.options[:timeline][:html]
-      if html == true || html == 1
-        html = 1
-      else
-        html = 0
-      end
+      html = 0
       if arg[:since_id]
         "&count=#{count}&include_html=#{html}&include_directed_posts=#{directed}&include_deleted=0&include_annotations=1&since_id=#{arg[:since_id]}"
       elsif arg[:recent_message]
@@ -287,7 +283,7 @@ module Ayadn
 
     def paginate options, target
       if options[:new] || options[:scroll]
-        return {since_id: Databases.pagination[target]}
+        return {since_id: Databases.find_last_id_from(target)}
       end
       return options
     end
@@ -309,7 +305,10 @@ module Ayadn
       big_hash = {}
       loop do
         resp = get_parsed_response(get_list_url(username, target, options))
-        abort(Status.user_404(username)) if resp['meta']['code'] == 404
+        if resp['meta']['code'] == 404
+          @status.user_404(username)
+          exit
+        end
         users = @workers.extract_users(resp)
         big_hash.merge!(users)
         break if resp['meta']['min_id'] == nil

data/lib/ayadn/app.rb

@@ -3,7 +3,7 @@ module Ayadn
   class App < Thor
     package_name "Ayadn"
 
-    %w{action stream api search descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug check nowplaying nowwatching tvshow annotations profile}.each { |r| require_relative "#{r}" }
+    %w{action stream api search descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug check nowplaying nowwatching tvshow annotations profile migration}.each { |r| require_relative "#{r}" }
 
     ##
     # These methods are intended to be called from the CLI.
@@ -18,6 +18,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def timeline
       Action.new.unified(options)
     end
@@ -31,6 +32,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def checkins
       Action.new.checkins(options)
     end
@@ -44,6 +46,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def global
       Action.new.global(options)
     end
@@ -57,6 +60,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def trending
       Action.new.trending(options)
     end
@@ -70,6 +74,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def photos
       Action.new.photos(options)
     end
@@ -83,6 +88,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def conversations
       Action.new.conversations(options)
     end
@@ -95,6 +101,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def mentions(*username)
       Action.new.mentions(username, options)
     end
@@ -107,6 +114,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def userposts(*username)
       Action.new.posts(username, options)
     end
@@ -115,6 +123,7 @@ module Ayadn
     map "-int" => :interactions
     long_desc Descriptions.interactions
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def interactions
       Action.new.interactions(options)
     end
@@ -126,6 +135,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def whatstarred(*username)
       Action.new.whatstarred(username, options)
     end
@@ -134,6 +144,8 @@ module Ayadn
     map "-wor" => :whoreposted
     long_desc Descriptions.whoreposted
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: "Force retrieve the actual post id (ignores index)"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def whoreposted(post_id)
       Action.new.whoreposted(post_id, options)
     end
@@ -142,6 +154,8 @@ module Ayadn
     map "-wos" => :whostarred
     long_desc Descriptions.whostarred
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: "Force retrieve the actual post id (ignores index)"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def whostarred(post_id)
       Action.new.whostarred(post_id, options)
     end
@@ -153,6 +167,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     long_desc Descriptions.convo
     def convo(post_id)
       Action.new.convo(post_id, options)
@@ -162,6 +177,12 @@ module Ayadn
     map "-fwg" => :followings
     long_desc Descriptions.followings
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
+    option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
+    option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
+    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
+    option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def followings(*username)
       Action.new.followings(username, options)
     end
@@ -170,6 +191,12 @@ module Ayadn
     map "-fwr" => :followers
     long_desc Descriptions.followers
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
+    option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
+    option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
+    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
+    option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def followers(*username)
       Action.new.followers(username, options)
     end
@@ -178,6 +205,12 @@ module Ayadn
     map "-mtd" => :muted
     long_desc Descriptions.muted
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
+    option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
+    option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
+    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
+    option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def muted
       Action.new.muted(options)
     end
@@ -186,6 +219,12 @@ module Ayadn
     map "-bkd" => :blocked
     long_desc Descriptions.blocked
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
+    option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
+    option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
+    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
+    option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def blocked
       Action.new.blocked(options)
     end
@@ -196,6 +235,7 @@ module Ayadn
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def hashtag(hashtag)
       Action.new.hashtag(hashtag, options)
     end
@@ -206,6 +246,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     option :messages, type: :boolean, desc: 'Search for WORD(S) in messages, including PMs.'
@@ -220,6 +261,7 @@ module Ayadn
     map "-sg" => :settings
     long_desc Descriptions.settings
     option :raw, aliases: "-x", type: :boolean, desc: "Outputs the raw list in JSON"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def settings
       Action.new.view_settings(options)
     end
@@ -228,6 +270,7 @@ module Ayadn
     map "-ui" => :userinfo
     long_desc Descriptions.userinfo
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def userinfo(*username)
       Action.new.userinfo(username, options)
     end
@@ -252,6 +295,7 @@ module Ayadn
     long_desc Descriptions.postinfo
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def postinfo(post_id)
       Action.new.postinfo(post_id, options)
     end
@@ -269,8 +313,9 @@ module Ayadn
     desc "delete POST", "Delete a post (-D)"
     map "-D" => :delete
     long_desc Descriptions.delete
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def delete(*post_id)
-      Action.new.delete(post_id)
+      Action.new.delete(post_id, options)
     end
 
     desc "delete_m CHANNEL MESSAGE", "Delete a message (-DM)"
@@ -304,29 +349,33 @@ module Ayadn
     desc "unrepost POST", "Unrepost a post (-UR)"
     map "-UR" => :unrepost
     long_desc Descriptions.unrepost
-    def unrepost(post_id)
-      Action.new.unrepost(post_id)
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    def unrepost(*post_id)
+      Action.new.unrepost(post_id, options)
     end
 
     desc "unstar POST", "Unstar a post (-US)"
     map "-US" => :unstar
     long_desc Descriptions.unstar
-    def unstar(post_id)
-      Action.new.unstar(post_id)
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    def unstar(*post_id)
+      Action.new.unstar(post_id, options)
     end
 
     desc "star POST", "Star a post (-ST)"
     map "-ST" => :star
     long_desc Descriptions.star
-    def star(post_id)
-      Action.new.star(post_id)
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    def star(*post_id)
+      Action.new.star(post_id, options)
     end
 
     desc "repost POST", "Repost a post (-O)"
     map "-O" => :repost
     long_desc Descriptions.repost
-    def repost(post_id)
-      Action.new.repost(post_id)
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    def repost(*post_id)
+      Action.new.repost(post_id, options)
     end
 
     desc "follow @USERNAME", "Follow @username (-FO)"
@@ -354,6 +403,10 @@ module Ayadn
     map "-ch" => :channels
     long_desc Descriptions.channels
     option :id, aliases: "-i", type: :array, desc: "Retrieve only the specified channel(s)"
+    option :broadcasts, aliases: "-b", type: :boolean, desc: "Only your broadcast channel(s)"
+    option :messages, aliases: "-m", type: :boolean, desc: "Only your private messaging channel(s)"
+    option :patter, aliases: "-p", type: :boolean, desc: "Only your patter room channel(s)"
+    option :other, aliases: "-o", type: :boolean, desc: "Only other than private messaging and broadcasts channel(s)"
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     def channels
       Action.new.channels(options)
@@ -367,6 +420,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: "Specify the number of messages to retrieve"
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channel as read"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def messages(channel_id)
       Action.new.messages(channel_id, options)
     end
@@ -374,6 +428,7 @@ module Ayadn
     desc "messages_unread", "Show your unread private messages (-pmu)"
     map "-pmu" => :messages_unread
     option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channels as read"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     long_desc Descriptions.messages_unread
     def messages_unread
         Action.new.messages_unread(options)
@@ -381,8 +436,9 @@ module Ayadn
 
     desc "pin POST TAG(S)", "Export a post's link and text with tags to Pinboard"
     long_desc Descriptions.pin
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def pin(post_id, *tags)
-      Action.new.pin(post_id, tags)
+      Action.new.pin(post_id, tags, options)
     end
 
     desc "post Your text", "Simple post to App.net (-P)"
@@ -392,6 +448,7 @@ module Ayadn
     option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new post"
     option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
     option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def post(*args)
       Action.new.post(args, options)
     end
@@ -404,6 +461,7 @@ module Ayadn
     option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new post"
     option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
     option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def write
       Action.new.write(options)
     end
@@ -415,6 +473,7 @@ module Ayadn
     option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new message"
     option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new message"
     option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channel as read"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def pm(*username)
       Action.new.pmess(username, options)
     end
@@ -427,6 +486,7 @@ module Ayadn
     option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new message"
     option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new message"
     option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channel as read"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def send_to_channel(channel_id)
       Action.new.send_to_channel(channel_id, options)
     end
@@ -439,6 +499,8 @@ module Ayadn
     option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
     option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
     option :noredirect, aliases: "-n", type: :boolean, desc: "Do not respond to the original post but to the reposted one if possible"
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def reply(id)
       ayadn = Action.new
       ayadn.reply(id, options)
@@ -482,6 +544,9 @@ module Ayadn
     long_desc Descriptions.nowplaying
     option :no_url, aliases: "-n", type: :boolean, desc: "Don't append preview or album art at the end of the post"
     option :lastfm, aliases: "-l", type: :boolean, desc: "Get current track from Last.fm instead of iTunes"
+    option :hashtag, aliases: "-h", type: :array, desc: "Specify a custom hashtag"
+    option :text, aliases: "-t", type: :array, desc: "Add custom text"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def nowplaying
       Action.new.nowplaying(options)
     end
@@ -492,6 +557,7 @@ module Ayadn
     map "-NW" => :movie
     long_desc Descriptions.nowwatching
     option :alt, aliases: "-a", type: :boolean, desc: "Select an alternative response if the first didn't match"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def movie(*title)
       Action.new.nowwatching(title, options)
     end
@@ -501,6 +567,7 @@ module Ayadn
     long_desc Descriptions.tvshow
     option :alt, aliases: "-a", type: :boolean, desc: "Select an alternative response if the first didn't match"
     option :banner, aliases: "-b", type: :boolean, desc: "Inserts the show banner instead of the show poster"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already (after posting)"
     def tvshow(*title)
       Action.new.tvshow(title, options)
     end
@@ -508,20 +575,32 @@ module Ayadn
     desc "random", "Show random posts from App.net (-rnd)"
     map "-rnd" => :random
     option :wait, aliases: "-w", type: :numeric, desc: "In seconds, time to wait before next page"
+    option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     long_desc Descriptions.random_posts
     def random
       Action.new.random_posts(options)
     end
 
-    desc "authorize", "Authorize Ayadn (-auth)"
+    desc "authorize", "Authorize Ayadn (-AU)"
     map "-auth" => :authorize
+    map "-AU" => :authorize
     long_desc Descriptions.authorize
     def authorize
       Authorize.new.authorize
     end
 
+    desc "unauthorize @USERNAME", "Unauthorize an Ayadn user account (-UA)"
+    map "-unauth" => :unauthorize
+    map "-UA" => :unauthorize
+    option :delete, aliases: "-D", type: :boolean, desc: "Deletes user folders (default: false)"
+    long_desc Descriptions.unauthorize
+    def unauthorize(*user)
+      Authorize.new.unauthorize(user, options)
+    end
+
     desc "switch @USERNAME", "Switch between authorized App.net accounts (-@)"
     map "-@" => :switch
+    map "login" => :switch
     option :list, aliases: "-l", type: :boolean, desc: "List authorized accounts"
     long_desc Descriptions.switch
     def switch(*username)
@@ -538,5 +617,13 @@ module Ayadn
       Action.new.version
     end
 
+    desc "migrate", "Migrate databases (upgrade accounts)", :hide => true
+    map "upgrade" => :migrate
+    long_desc Descriptions.migrate
+    def migrate
+      mig = Migration.new
+      mig.all
+    end
+
   end
 end