ayadn 1.8.2 → 2.0

data/lib/ayadn/workers.rb

@@ -3,23 +3,44 @@ module Ayadn
   class Workers
 
     def initialize
-      @shell = Thor::Shell::Color.new
+      @thor = Thor::Shell::Color.new
+      @status = Status.new
+    end
+
+    def table_borders
+      if Settings.options[:formats][:table][:borders] == true
+        { :width => Settings.options[:formats][:table][:width], border_x: '—', border_i: '+', border_y: '|' }
+      else
+        { :width => Settings.options[:formats][:table][:width], border_x: ' ', border_i: ' ', border_y: ' ' }
+      end
     end
 
     def build_aliases_list(list)
       table = init_table
       table.title = "List of your channel aliases".color(:cyan) + "".color(:white)
-      table.style = {border_x: '~', border_i: '+', border_y: ':'}
-      list.each {|k,v| table << ["#{k}".color(:green), "#{v}".color(:red)]}
+      table.style = table_borders()
+      table.headings = [ 'Channel', 'Alias' ]
+      list.each_with_index do |obj, index|
+        table << [obj[0].to_s.color(:green), obj[1].color(:red)]
+        if index + 1 != list.length && Settings.options[:timeline][:compact] == false
+          table << :separator
+        end
+      end
       table
     end
 
     def build_blacklist_list(list)
       table = init_table
       table.title = "Your blacklist".color(:cyan) + "".color(:white)
-      table.style = {border_x: '~', border_i: '+', border_y: ':'}
-      list = list.sort_by {|k,v| v} # no sort_by! for Daybreak dbs
-      list.each {|k,v| table << ["#{v.capitalize}".color(:green), "#{k}".color(:red)]}
+      table.style = table_borders()
+      table.headings = [ 'Name', 'Type' ]
+      list.sort!
+      list.each_with_index do |obj, index|
+        table << ["#{obj[1].capitalize}".color(:green), "#{obj[0]}".color(:red)]
+        if index + 1 != list.length && Settings.options[:timeline][:compact] == false
+          table << :separator
+        end
+      end
       table
     end
 
@@ -29,9 +50,9 @@ module Ayadn
       users_list = []
       list.each do |obj|
         obj['name'].nil? ? name = "" : name = obj['name']
-        users_list << {:username => obj['username'], :name => name, :you_follow => obj['you_follow'], :follows_you => obj['follows_you'], :id => obj['id']}
+        users_list << {:username => obj['username'], :name => name, :you_follow => obj['you_follow'], :follows_you => obj['follows_you'], :id => obj['id'], :posts => obj['counts']['posts']}
       end
-      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
+      table.style = table_borders()
       return users_list, table
     end
 
@@ -41,50 +62,50 @@ module Ayadn
       users_list = []
       list.each do |obj|
         obj['name'].nil? ? name = "" : name = obj['name']
-        users_list << {:username => obj['username'], :name => name, :you_follow => obj['you_follow'], :follows_you => obj['follows_you'], :id => obj['id']}
+        users_list << {:username => obj['username'], :name => name, :you_follow => obj['you_follow'], :follows_you => obj['follows_you'], :id => obj['id'], :posts => obj['counts']['posts']}
       end
-      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
+      table.style = table_borders()
       return users_list, table
     end
 
-    def build_followings_list(list, target) #takes a hash of users with ayadn format
+    def build_followings_list(list, target, options = {}) #takes a hash of users with ayadn format
       table = init_table
       table.title = if target == "me"
         "List of users you're following".color(:cyan) + "".color(:white)
       else
         "List of users ".color(:cyan) + "#{target}".color(:red) + " is following ".color(:cyan) + "".color(:white)
       end
-      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
+      table.style = table_borders()
       users_list = build_users_array(list)
-      build_users_list(users_list, table)
+      build_users_list(users_list, table, options)
     end
 
-    def build_followers_list(list, target)
+    def build_followers_list(list, target, options = {})
       table = init_table
       table.title = if target == "me"
         "List of your followers".color(:cyan) + "".color(:white)
       else
         "List of users following ".color(:cyan) + "#{target}".color(:red) + "".color(:white)
       end
-      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
-      build_users_list(build_users_array(list), table)
+      table.style = table_borders()
+      build_users_list(build_users_array(list), table, options)
     end
 
-    def build_muted_list(list)
+    def build_muted_list(list, options = {})
       table = init_table
       table.title = "List of users you muted".color(:cyan) + "".color(:white)
-      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
-      build_users_list(build_users_array(list), table)
+      table.style = table_borders()
+      build_users_list(build_users_array(list), table, options)
     end
 
-    def build_blocked_list(list)
+    def build_blocked_list(list, options = {})
       table = init_table
       table.title = "List of users you blocked".color(:cyan) + "".color(:white)
-      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
-      build_users_list(build_users_array(list), table)
+      table.style = table_borders()
+      build_users_list(build_users_array(list), table, options)
     end
 
-    def build_users_list(list, table)
+    def build_users_list(list, table, options = {})
       users = at(list.map {|obj| obj[:username]})
       ids = list.map {|obj| obj[:id].to_i}
       ranks = NiceRank.new.from_ids(ids)
@@ -97,9 +118,18 @@ module Ayadn
           indexed_ranks[r['user_id']] = r
         end
       end
-      table << ['USERNAME'.color(:red), 'NAME'.color(:red), 'POSTS/DAY'.color(:red)]
+      table << ['USERNAME'.color(:red), 'NAME'.color(:red), 'POSTS'.color(:red), 'POSTS/DAY'.color(:red)]
       table << :separator
-      list.each_with_index do |obj, index|
+      arr = []
+      if options[:username]
+        list.sort_by! { |obj| obj[:username] }
+      elsif options[:name]
+        list.sort_by! { |obj| obj[:name].downcase }
+      elsif options[:posts]
+        list.sort_by! { |obj| [obj[:posts], obj[:username]] }
+      end
+      list.each do |obj|
+        obj[:name] = "" if obj[:name].nil?
         unless indexed_ranks == false
           details = indexed_ranks[obj[:id].to_i]
           if details['user']['posts_day'] == -1
@@ -111,13 +141,21 @@ module Ayadn
           posts_day = 'unknown'
         end
         obj[:username].length > 23 ? username = "#{obj[:username][0..20]}..." : username = obj[:username]
-        unless obj[:name].nil? || obj[:name].empty?
-          obj[:name].length > 23 ? name = "#{obj[:name][0..20]}..." : name = obj[:name]
-          table << [ "@#{username} ".color(Settings.options[:colors][:username]), "#{name}", posts_day ]
-        else
-          table << [ "@#{username} ".color(Settings.options[:colors][:username]), "", posts_day ]
-        end
-        if index + 1 != list.length && Settings.options[:timeline][:compact] == false
+        obj[:name].length > 23 ? name = "#{obj[:name][0..20]}..." : name = obj[:name]
+        arr << [ "@#{username} ".color(Settings.options[:colors][:username]), "#{name}", obj[:posts], posts_day ]
+      end
+      if options[:posts_day]
+        arr.sort_by! { |obj| obj[3].to_f }
+      end
+      if options[:reverse]
+        arr.reverse!
+      end
+      if Settings.options[:formats][:list][:reverse] == true
+        arr.reverse!
+      end
+      arr.each_with_index do |obj, index|
+        table << arr[index]
+        if index + 1 != arr.length && Settings.options[:timeline][:compact] == false
           table << :separator
         end
       end
@@ -129,38 +167,46 @@ module Ayadn
       # skip objects in blacklist unless force
       posts = {}
       data.each.with_index(1) do |post, index|
-        unless Settings.options[:force]
-          if Databases.blacklist[post['source']['name'].downcase]
-            Debug.skipped({source: post['source']['name']})
-            next
+        unless Settings.global[:force] == true
+          if Settings.options[:blacklist][:active] == true
+            if Databases.is_in_blacklist?('client', post['source']['name'].downcase)
+              Debug.skipped({source: post['source']['name']})
+              next
+            end
           end
         end
-        unless Settings.options[:force]
-          if Databases.blacklist["-@#{post['user']['username'].downcase}"]
-            Debug.skipped({user: post['user']['username']})
-            next
+        unless Settings.global[:force] == true
+          if Settings.options[:blacklist][:active] == true
+            if Databases.is_in_blacklist?('user', post['user']['username'].downcase)
+              Debug.skipped({user: post['user']['username']})
+              next
+            end
           end
         end
         hashtags = extract_hashtags(post)
         @skip = false
-        unless Settings.options[:force]
-          hashtags.each do |h|
-            if Databases.blacklist[h.downcase]
-              @skip = true
-              Debug.skipped({hashtag: h})
-              break
+        unless Settings.global[:force] == true
+          if Settings.options[:blacklist][:active] == true
+            hashtags.each do |h|
+              if Databases.is_in_blacklist?('hashtag', h.downcase)
+                @skip = true
+                Debug.skipped({hashtag: h})
+                break
+              end
             end
           end
         end
         next if @skip
         mentions= []
         post['entities']['mentions'].each { |m| mentions << m['name'] }
-        unless Settings.options[:force]
-          mentions.each do |m|
-            if Databases.blacklist["@#{m.downcase}"]
-              @skip = true
-              Debug.skipped({mention: m})
-              break
+        unless Settings.global[:force] == true
+          if Settings.options[:blacklist][:active] == true
+            mentions.each do |m|
+              if Databases.is_in_blacklist?('mention', m.downcase)
+                @skip = true
+                Debug.skipped({mention: m})
+                break
+              end
             end
           end
         end
@@ -174,7 +220,7 @@ module Ayadn
         else
           rank = false
           is_human = 'unknown'
-          real_person = nil
+          real_person = 'unknown'
         end
 
         if post['user'].has_key?('name')
@@ -198,6 +244,7 @@ module Ayadn
           handle: "@#{post['user']['username']}",
           type: post['user']['type'],
           date: parsed_time(post['created_at']),
+          date_short: parsed_time_short(post['created_at']),
           you_starred: post['you_starred'],
           source_name: source,
           source_link: post['source']['link'],
@@ -258,6 +305,7 @@ module Ayadn
         posts[post['id'].to_i] = values
 
       end
+
       posts
     end
 
@@ -268,7 +316,7 @@ module Ayadn
           if ann['type'] == "net.app.core.oembed"
             if ann['value']['embeddable_url']
               links << ann['value']['embeddable_url']
-            elsif ann['value']['url'] && Settings.options[:timeline][:show_channel_oembed] == true
+            elsif ann['value']['url'] && Settings.options[:channels][:links] == true
               links << ann['value']['url']
             end
           end
@@ -291,7 +339,7 @@ module Ayadn
       }
       filename = "#{Settings.config[:identity][:handle]}_#{origin}_links.json"
       FileOps.save_links(obj, filename)
-      puts Status.links_saved(filename)
+      @status.links_saved(filename)
     end
 
     def extract_hashtags(post)
@@ -302,37 +350,41 @@ module Ayadn
       bucket = []
       data = [data] unless data.is_a?(Array)
       if options[:channels]
-        puts "Downloading list of channels and their users credentials.\n\nPlease wait, it could take a while if there are many results and users...".color(:cyan)
+        @thor.say_status :downloading, "list of channels and their users credentials", :yellow
+        @thor.say_status :info, "it could take a while if there are many results and users", :cyan
       else
-        puts "Downloading the channels and recording their users attributes (owners, writers, editors and readers).\n\nThe users are recorded in a database for later filtering and analyzing.\n\nPlease wait, it could take a while the first time if you have many channels.\n\n".color(:cyan)
+        @thor.say_status :downloading, "the channels and their users attributes (owners, writers, editors and readers)", :yellow
+        @thor.say_status :info, "users are recorded in a database for later filtering and analyzing", :cyan
+        @thor.say_status :info, "it could take a while if there are many results", :cyan
       end
       chan = Struct.new(:id, :num_messages, :subscribers, :type, :owner, :annotations, :readers, :editors, :writers, :you_subscribed, :unread, :recent_message_id, :recent_message)
       no_user = {}
+      @api = API.new
       data.each do |ch|
         unless ch['writers']['user_ids'].empty?
-          @shell.say_status :parsing, "channel #{ch['id']}", :cyan
+          @thor.say_status :parsing, "channel #{ch['id']}", :cyan
           usernames = []
           ch['writers']['user_ids'].each do |id|
             next if no_user[id]
-            db = Databases.users[id]
+            db = Databases.find_user_by_id(id)
             if db.nil?
-              @shell.say_status :downloading, "user #{id}"
-              resp = API.new.get_user(id)
+              @thor.say_status :downloading, "user #{id}", :yellow
+              resp = @api.get_user(id)
 
               if resp['meta']['code'] != 200
-                @shell.say_status :error, "can't get user #{id}'s data, skipping", :red
+                @thor.say_status :error, "can't get user #{id}'s data, skipping", :red
                 no_user[id] = true
                 next
               end
 
               the_username = resp['data']['username']
-              @shell.say_status :recording, "@#{the_username}", :green
+              @thor.say_status :recording, "@#{the_username}", :yellow
 
               usernames << "@" + the_username
               Databases.add_to_users_db(id, the_username, resp['data']['name'])
             else
-              the_username = "@" + db.keys.first
-              @shell.say_status :match, "#{the_username} is already in the database", :blue
+              the_username = "@#{db}"
+              @thor.say_status :match, "#{the_username} is already in the database", :blue
 
               usernames << the_username
             end
@@ -347,8 +399,6 @@ module Ayadn
         else
           unread = "No unread messages"
         end
-        @shell.say_status :recording, "channel #{ch['id']}", :green
-        Databases.add_channel_object(ch)
         bucket << chan.new(ch['id'], ch['counts']['messages'], ch['counts']['subscribers'], ch['type'], ch['owner'], ch['annotations'], ch['readers'], ch['editors'], writers, ch['you_subscribed'], unread, ch['recent_message_id'], ch['recent_message'])
       end
       puts "\e[H\e[2J"
@@ -359,21 +409,13 @@ module Ayadn
       "#{string[0...10]} #{string[11...19]}"
     end
 
-    def at usernames #TODO: consolidate
-      usernames.map do |user|
-        if user == 'me'
-          'me'
-        elsif user[0] == '@'
-          user
-        else
-          "@#{user}"
-        end
-      end
+    def parsed_time_short(string)
+      "#{string[11...19]}"
     end
 
     def get_original_id(post_id, resp)
       if resp['data']['repost_of']
-        puts Status.redirecting
+        @status.redirecting
         id = resp['data']['repost_of']['id']
         Errors.repost(post_id, id)
         return id
@@ -388,7 +430,7 @@ module Ayadn
         channel_id = Databases.get_channel_id(orig)
         if channel_id.nil?
           Errors.warn("Alias '#{orig}' doesn't exist.")
-          puts Status.no_alias
+          @status.no_alias
           exit
         end
       end
@@ -405,9 +447,9 @@ module Ayadn
 
     def get_real_post_id post_id
       id = post_id.to_i
-      if id > 0 && id <= length_of_index
+      if id <= 200
         resp = get_post_from_index(id)
-        post_id = resp[:id]
+        post_id = resp['id']
       end
       post_id
     end
@@ -435,7 +477,7 @@ module Ayadn
       args
     end
 
-    def add_arobases_to_usernames args #TODO: replace all these arobase legacy methods by a unique one
+    def add_arobases_to_usernames args
       args.map do |username|
         if username == 'me'
           who_am_i
@@ -447,16 +489,26 @@ module Ayadn
       end
     end
 
+    def at usernames
+      usernames.map do |user|
+        if user == 'me'
+          'me'
+        elsif user[0] == '@'
+          user
+        else
+          "@#{user}"
+        end
+      end
+    end
+
     def who_am_i
-      db = Databases.init(Dir.home + "/ayadn/accounts.db")
-      active = db['ACTIVE']
-      db[active][:handle]
+      Databases.active_account(Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite"))[2]
     end
 
     def extract_users(resp)
       users_hash = {}
       resp['data'].each do |item|
-        users_hash[item['id']] = [item['username'], item['name'], item['you_follow'], item['follows_you']]
+        users_hash[item['id']] = [item['username'], item['name'], item['you_follow'], item['follows_you'], item['counts']['posts']]
       end
       users_hash
     end
@@ -543,6 +595,10 @@ module Ayadn
       at(arr)
     end
 
+    def self.epoch_to_date(epoch)
+      Time.at(epoch).to_time
+    end
+
     private
 
     def def_str(word, reg_split)
@@ -564,13 +620,9 @@ module Ayadn
 
     def build_users_array(list)
       users = list.map do |key, value|
-        {:username => value[0], :name => value[1], :you_follow => value[2], :follows_you => value[3], :id => key}
-      end
-      if Settings.options[:formats][:list][:reverse]
-        return users.reverse
-      else
-        return users
+        {:username => value[0], :name => value[1], :you_follow => value[2], :follows_you => value[3], :id => key, :posts => value[4]}
       end
+      return users
     end
 
     def extract_checkins(post)

data/lib/ayadn.rb

@@ -1,13 +1,12 @@
 # encoding: utf-8
 require_relative 'ayadn/version'
 
-%w{rest_client json thor rainbow/ext/string terminal-table yaml logger daybreak fileutils io/console unicode_utils/char_type readline}.each { |r| require "#{r}" }
-
-# winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
-# case Gem::Platform.local.os
-# when *winPlatforms
-#   require 'win32console'
-#   require 'pstore'
-# end
+begin
+  %w{rest_client json thor rainbow/ext/string terminal-table yaml logger fileutils io/console unicode_utils/char_type readline amalgalite fast_cache}.each { |r| require "#{r}" }
+rescue LoadError => e
+  puts "\nAYADN: Error while loading Gems\n\n"
+  puts "RUBY: #{e}\n\n"
+  exit
+end
 
 require_relative 'ayadn/app'

data/spec/unit/annotations_spec.rb

@@ -9,15 +9,13 @@ describe Ayadn::Annotations do
       {
         timeline: {
           directed: 1,
-          deleted: 0,
           html: 0,
-          annotations: 1,
-          show_source: true,
-          show_symbols: true,
-          show_real_name: true,
-          show_date: true,
-          show_spinner: true,
-          show_debug: false
+          source: true,
+          symbols: true,
+          name: true,
+          date: true,
+          spinner: true,
+          debug: false
         },
         counts: {
           default: 50,
@@ -54,12 +52,13 @@ describe Ayadn::Annotations do
           mentions: :red,
           source: :cyan,
           symbols: :green,
-          debug: :red
+          debug: :red,
+          excerpt: :green
         },
         backup: {
-          auto_save_sent_posts: false,
-          auto_save_sent_messages: false,
-          auto_save_lists: false
+          posts: false,
+          messages: false,
+          lists: false
         },
         scroll: {
           timer: 3
@@ -68,7 +67,7 @@ describe Ayadn::Annotations do
           threshold: 2.1,
           cache: 48,
           filter: true,
-          filter_unranked: false
+          unranked: false
         },
         nowplaying: {},
         movie: {

data/spec/unit/api_spec.rb

@@ -8,7 +8,6 @@ describe Ayadn::API do
         },
         timeline: {
           directed: 1,
-          deleted: 0,
           html: 0,
           annotations: 1
         }
@@ -19,10 +18,10 @@ describe Ayadn::API do
       expect(Ayadn::API.build_query({count: 12})).to match /count=12/
     end
     it 'returns a URL with directed=0' do
-      expect(Ayadn::API.build_query({directed: 0})).to match /directed=0/
+      expect(Ayadn::API.build_query({directed: 0})).to match /directed_posts=0/
     end
-    it 'returns a URL with html=1' do
-      expect(Ayadn::API.build_query({html: 1})).to match /html=1/
+    it 'returns a URL with html=0 anyway' do
+      expect(Ayadn::API.build_query({html: 1})).to match /html=0/
     end
   end
   describe "#check_response_meta_code" do

data/spec/unit/blacklistworkers_spec.rb

@@ -14,13 +14,14 @@ describe Ayadn::BlacklistWorkers do
           symbols: :green,
           index: :blue,
           date: :cyan,
-          link: :magenta
+          link: :magenta,
+          excerpt: :green
         },
         timeline: {
-          show_real_name: true,
-          show_date: true,
-          show_symbols: true,
-          show_source: true
+          name: true,
+          date: true,
+          symbols: true,
+          source: true
         },
         formats: {table: {width: 75}},
         counts: {
@@ -37,7 +38,6 @@ describe Ayadn::BlacklistWorkers do
         version: 'wee',
         paths: {
           db: 'spec/mock/',
-          pagination: 'spec/mock/',
           log: 'spec/mock'
         }
       })
@@ -53,17 +53,17 @@ describe Ayadn::BlacklistWorkers do
     it "adds a client to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['source', 'Zapier'])
-      expect(Ayadn::Databases.blacklist['zapier']).to eq :client
+      expect(Ayadn::Databases.is_in_blacklist?('client', 'zapier')).to eq true
     end
     it "adds a hashtag to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['tag', 'tv'])
-      expect(Ayadn::Databases.blacklist['tv']).to eq :hashtag
+      expect(Ayadn::Databases.is_in_blacklist?('hashtag', 'tv')).to eq true
     end
     it "adds a mention to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['mentions', 'yolo'])
-      expect(Ayadn::Databases.blacklist['@yolo']).to eq :mention
+      expect(Ayadn::Databases.is_in_blacklist?('mention', 'yolo')).to eq true
     end
   end
 
@@ -71,49 +71,44 @@ describe Ayadn::BlacklistWorkers do
     it "removes a client from the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['client', 'IFTTT'])
-      expect(Ayadn::Databases.blacklist['ifttt']).to eq :client
+      expect(Ayadn::Databases.is_in_blacklist?('client', 'ifttt')).to eq true
 
       k = Ayadn::BlacklistWorkers.new
       k.remove(['client', 'IFTTT'])
-      expect(Ayadn::Databases.blacklist['ifttt']).to eq nil
+      expect(Ayadn::Databases.is_in_blacklist?('client', 'ifttt')).to eq false
     end
     it "removes a hashtag from the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['hashtag', 'Sports'])
-      expect(Ayadn::Databases.blacklist['sports']).to eq :hashtag
+      expect(Ayadn::Databases.is_in_blacklist?('hashtag', 'sports')).to eq true
 
       k = Ayadn::BlacklistWorkers.new
       k.remove(['hashtag', 'Sports'])
-      expect(Ayadn::Databases.blacklist['sports']).to eq nil
+      expect(Ayadn::Databases.is_in_blacklist?('hashtag', 'sports')).to eq false
     end
     it "removes a mention from the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['mention', 'mrTest'])
-      expect(Ayadn::Databases.blacklist['@mrtest']).to eq :mention
+      expect(Ayadn::Databases.is_in_blacklist?('mention', 'mrtest')).to eq true
 
       k = Ayadn::BlacklistWorkers.new
       k.remove(['mention', 'mrTest'])
-      expect(Ayadn::Databases.blacklist['@mrtest']).to eq nil
+      expect(Ayadn::Databases.is_in_blacklist?('mention', 'mrtest')).to eq false
     end
     it "removes a user from the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['user', 'mrTest'])
-      expect(Ayadn::Databases.blacklist['-@mrtest']).to eq :user
+      expect(Ayadn::Databases.is_in_blacklist?('user', 'mrtest')).to eq true
 
       k = Ayadn::BlacklistWorkers.new
       k.remove(['account', 'mrTest'])
-      expect(Ayadn::Databases.blacklist['-@mrtest']).to eq nil
+      expect(Ayadn::Databases.is_in_blacklist?('user', 'mrtest')).to eq false
     end
   end
 
   after do
     File.delete('spec/mock/ayadn.log')
     Ayadn::Databases.open_databases
-    Ayadn::Databases.blacklist.clear
-    Ayadn::Databases.users.clear
-    Ayadn::Databases.pagination.clear
-    Ayadn::Databases.index.clear
-    Ayadn::Databases.aliases.clear
-    Ayadn::Databases.close_all
+    Ayadn::Databases.clear_blacklist
   end
 end