blacklist.rb in ayadn-4.0

- old
+ new

@@ -1,8 +1,9 @@
 # encoding: utf-8
 module Ayadn
   class Blacklist < Thor
+
     desc "add TYPE TARGET", "Adds a mention, hashtag, client, username or keyword to your blacklist"
     map "create" => :add
     long_desc Descriptions.blacklist_add
     def add(*args)
       if args.length < 2
@@ -31,16 +32,10 @@
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     def list
       BlacklistWorkers.new.list(options)
     end
 
-    # desc "import DATABASE", "Imports a blacklist database from another Ayadn account"
-    # long_desc Descriptions.blacklist_import
-    # def import(database)
-    #   BlacklistWorkers.new.import(database)
-    # end
-
     desc "clear", "Clear your blacklist database"
     def clear
       BlacklistWorkers.new.clear
       Status.new.done
     end
@@ -54,22 +49,11 @@
       Settings.init_config
       Logs.create_logger
       Databases.open_databases
       @workers = Workers.new
     end
-    # def import(database)
-    #   begin
-    #     new_db = File.realpath(database)
-    #     if File.exist?(new_db)
-    #       Databases.import_blacklist(new_db)
-    #       Logs.rec.info "Imported '#{new_db}' values in blacklist database."
-    #     else
-    #       puts "\nFile '#{new_db}' doesn't exist.\n\n".color(:red)
-    #       Logs.rec.warn "File '#{new_db}' doesn't exist."
-    #     end
-    #   end
-    # end
+
     def clear
       begin
         Status.new.ask_clear_blacklist
         input = STDIN.getch
         if input == 'y' || input == 'Y'
@@ -79,10 +63,11 @@
           Status.new.canceled
           exit
         end
       end
     end
+
     def add(args)
       begin
         type = args.shift
         case type
         when 'user', 'username', 'account'
@@ -108,10 +93,11 @@
         else
           Status.new.wrong_arguments
         end
       end
     end
+
     def remove(args)
       begin
         type = args.shift
         case type
         when 'user', 'username', 'account'
@@ -135,12 +121,13 @@
         else
           Status.new.wrong_arguments
         end
       end
     end
+    
     def list(options)
       begin
-        Settings.options[:timeline][:compact] = true if options[:compact] == true
+        Settings.options.timeline.compact = true if options[:compact]
         show_list(options)
       end
     end
 
     private