ayadn 3.0 → 4.0

data/lib/ayadn/blacklist.rb

@@ -1,6 +1,7 @@
 # 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
@@ -33,12 +34,6 @@ module Ayadn
       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
@@ -56,18 +51,7 @@ module Ayadn
       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
@@ -81,6 +65,7 @@ module Ayadn
         end
       end
     end
+
     def add(args)
       begin
         type = args.shift
@@ -110,6 +95,7 @@ module Ayadn
         end
       end
     end
+
     def remove(args)
       begin
         type = args.shift
@@ -137,9 +123,10 @@ module Ayadn
         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

data/lib/ayadn/channel_object.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+module Ayadn
+
+  class ChannelReadersObject
+
+    attr_reader :input, :you, :any_user, :public, :immutable
+
+    def initialize hash
+      @input = hash
+      @you = @input["you"]
+      @any_user = @input["any_user"]
+      @public = @input["public"]
+      @immutable = @input["immutable"]
+    end
+  end
+
+  class ChannelEditorsObject
+
+    attr_reader :input, :you, :any_user, :public, :immutable, :user_ids
+
+    def initialize hash
+      @input = hash
+      @you = @input["you"]
+      @any_user = @input["any_user"]
+      @public = @input["public"]
+      @immutable = @input["immutable"]
+      @user_ids = @input["user_ids"]
+    end
+  end
+
+  class ChannelCountsObject
+
+    attr_reader :input, :messages, :subscribers
+
+    def initialize hash
+      @input = hash
+      @messages = @input["messages"]
+      @subscribers = @input["subscribers"]
+    end
+
+  end
+
+  class ChannelObject
+
+  	attr_reader :input, :pagination_id, :is_inactive, :readers, :you_muted, :you_can_edit, :has_unread, :editors, :annotations, :recent_message_id, :writers, :you_subscribed, :owner, :type, :id, :counts, :recent_message
+
+    def initialize hash
+      @input = hash
+      @pagination_id = @input["pagination_id"]
+      @is_inactive = @input["is_inactive"]
+      @readers = ChannelReadersObject.new(@input["readers"])
+      @you_muted = @input["you_muted"]
+      @you_can_edit = @input["you_can_edit"]
+      @has_unread = @input["has_unread"]
+      @editors = ChannelEditorsObject.new(@input["editors"])
+      @annotations = @input["annotations"].map { |ann| PostAnnotationObject.new(ann) }
+      @recent_message_id = @input["recent_message_id"]
+      @writers = ChannelEditorsObject.new(@input["writers"])
+      @you_subscribed = @input["you_subscribed"]
+      @owner = @input["owner"].nil? ? nil : UserObject.new(@input["owner"])
+      @type = @input["type"]
+      @id = @input["id"]
+      @counts = ChannelCountsObject.new(@input["counts"])
+      @recent_message = @input["recent_message"].nil? ? nil : PostObject.new(@input["recent_message"])
+    end
+
+  end
+end
+
+
+
+
+
+
+

data/lib/ayadn/check.rb

@@ -3,24 +3,24 @@ module Ayadn
 
   class Check
 
-    def initialize
-      @status = Status.new
+    def initialize status = Status.new
+      @status = status
     end
 
-    def same_username(stream)
-      stream['data']['username'] == Settings.config[:identity][:username]
+    def same_username(user_object)
+      user_object.username == Settings.config.identity.username
     end
 
     def auto_save_muted(list)
-      FileOps.save_muted_list(list) if Settings.options[:backup][:lists]
+      FileOps.save_muted_list(list) if Settings.options.backup.lists
     end
 
     def auto_save_followers(list)
-      FileOps.save_followers_list(list) if Settings.options[:backup][:lists]
+      FileOps.save_followers_list(list) if Settings.options.backup.lists
     end
 
     def auto_save_followings(list)
-      FileOps.save_followings_list(list) if Settings.options[:backup][:lists]
+      FileOps.save_followings_list(list) if Settings.options.backup.lists
     end
 
     def no_username username
@@ -31,7 +31,7 @@ module Ayadn
     end
 
     def no_data stream, target
-      if stream['data'].empty?
+      if stream.posts.empty?
         Errors.warn "In action/#{target}: no data"
         @status.empty_list
         exit
@@ -39,7 +39,7 @@ module Ayadn
     end
 
     def no_new_posts stream, options, title
-      if options[:new] == true
+      if options[:new]
         unless Databases.has_new?(stream, title)
           @status.no_new_posts
           exit
@@ -48,7 +48,15 @@ module Ayadn
     end
 
     def no_post stream, post_id
-      if stream['meta']['code'] == 404
+      if stream.meta.code == 404
+        @status.post_404(post_id)
+        Errors.info("Impossible to find #{post_id}")
+        exit
+      end
+    end
+
+    def no_details stream, post_id
+      if stream["meta"]["code"] == 404
         @status.post_404(post_id)
         Errors.info("Impossible to find #{post_id}")
         exit
@@ -72,7 +80,7 @@ module Ayadn
     end
 
     def no_user stream, username
-      if stream['meta']['code'] == 404
+      if stream.meta.code == 404
         @status.user_404(username)
         Errors.info("User #{username} doesn't exist")
         exit

data/lib/ayadn/cnx.rb

@@ -9,7 +9,7 @@ module Ayadn
       rescue RestClient::RequestTimeout => e
         thor = Thor::Shell::Color.new
         thor.say_status :error, "connection timeout", :red
-        if working == true
+        if working
           working = false
           thor.say_status :info, "trying again", :yellow
           retry
@@ -17,7 +17,7 @@ module Ayadn
         Errors.global_error({error: e, caller: caller, data: [url]})
       rescue SocketError, SystemCallError, OpenSSL::SSL::SSLError => e
         thor = Thor::Shell::Color.new
-        if working == true
+        if working
           working = false
           thor.say_status :error, "'#{url}' didn't respond", :red
           thor.say_status :info, "trying again in 5 secs", :yellow
@@ -45,7 +45,7 @@ module Ayadn
           check_nr response, url
         end
       rescue SocketError, SystemCallError, OpenSSL::SSL::SSLError, RestClient::RequestTimeout => e
-        if working == true
+        if working
           working = false
           sleep 0.5
           retry
@@ -84,8 +84,7 @@ module Ayadn
           check response
         end
       rescue RestClient::RequestTimeout => e
-        thor = Thor::Shell::Color.new
-        thor.say_status :error, "connection timeout", :red
+        Thor::Shell::Color.new.say_status :error, "connection timeout", :red
         if try_cnx < 4
           try_cnx = retry_adn 5, try_cnx
           retry
@@ -102,9 +101,8 @@ module Ayadn
         Thor::Shell::Color.new.say_status :error, "connection or authorization problem", :red
         Errors.global_error({error: e, caller: caller, data: [url]})
       rescue Interrupt
-        thor = Thor::Shell::Color.new
         puts "\n"
-        thor.say_status :canceled, "connection canceled", :red
+        Thor::Shell::Color.new.say_status :canceled, "connection canceled", :red
         puts "\n"
         exit
       rescue => e
@@ -155,9 +153,8 @@ module Ayadn
         Thor::Shell::Color.new.say_status :error, "connection problem", :red
         Errors.global_error({error: e, caller: caller, data: [url]})
       rescue Interrupt
-        thor = Thor::Shell::Color.new
         puts "\n"
-        thor.say_status :canceled, "connection canceled", :red
+        Thor::Shell::Color.new.say_status :canceled, "connection canceled", :red
         puts "\n"
         exit
       rescue => e
@@ -175,9 +172,8 @@ module Ayadn
         Thor::Shell::Color.new.say_status :error, "connection problem", :red
         Errors.global_error({error: e, caller: caller, data: [url, payload]})
       rescue Interrupt
-        thor = Thor::Shell::Color.new
         puts "\n"
-        thor.say_status :canceled, "connection canceled", :red
+        Thor::Shell::Color.new.say_status :canceled, "connection canceled", :red
         puts "\n"
         exit
       rescue => e
@@ -195,9 +191,8 @@ module Ayadn
         Thor::Shell::Color.new.say_status :error, "connection problem", :red
         Errors.global_error({error: e, caller: caller, data: [url, payload]})
       rescue Interrupt
-        thor = Thor::Shell::Color.new
         puts "\n"
-        thor.say_status :canceled, "connection canceled", :red
+        Thor::Shell::Color.new.say_status :canceled, "connection canceled", :red
         puts "\n"
         exit
       rescue => e
@@ -215,9 +210,8 @@ module Ayadn
         Thor::Shell::Color.new.say_status :error, "connection problem", :red
         Errors.global_error({error: e, caller: caller, data: [url, payload]})
       rescue Interrupt
-        thor = Thor::Shell::Color.new
         puts "\n"
-        thor.say_status :canceled, "connection canceled", :red
+        Thor::Shell::Color.new.say_status :canceled, "connection canceled", :red
         puts "\n"
         exit
       rescue => e

data/lib/ayadn/databases.rb

@@ -4,7 +4,7 @@ module Ayadn
   class Databases
 
     def self.open_databases
-      @sqlfile = "#{Settings.config[:paths][:db]}/ayadn.sqlite"
+      @sqlfile = "#{Settings.config.paths.db}/ayadn.sqlite"
       @sql = Amalgalite::Database.new(@sqlfile)
       @accounts = Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite")
     end
@@ -178,20 +178,6 @@ module Ayadn
       end
     end
 
-    # def self.import_blacklist(blacklist)
-    #   new_list = self.init blacklist
-    #   new_list.each {|name,type| @blacklist[name] = type}
-    #   new_list.close
-    # end
-    # def self.convert_blacklist
-    #   dummy = {}
-    #   @blacklist.each {|v,k| dummy[v.downcase] = k}
-    #   @blacklist.clear
-    #   dummy.each {|v,k| @blacklist[v] = k}
-    # end
-
-
-
     def self.active_account(acc)
       crashes = 0
       begin
@@ -628,12 +614,14 @@ module Ayadn
         @sql.execute("DELETE FROM TLIndex")
         @sql.transaction do |db_in_transaction|
           posts.each do |k, v|
-            insert_data = {}
-            insert_data[":post_id"] = v[:id]
-            insert_data[":count"] = v[:count]
-            insert_data[":content"] = v.to_json.to_s
-            db_in_transaction.prepare("INSERT INTO TLIndex(count, post_id, content) VALUES(:count, :post_id, :content);") do |insert|
-              insert.execute(insert_data)
+            if !v.blank?
+              insert_data = {}
+              insert_data[":post_id"] = v[:id]
+              insert_data[":count"] = v[:count]
+              insert_data[":content"] = v.to_json.to_s
+              db_in_transaction.prepare("INSERT INTO TLIndex(count, post_id, content) VALUES(:count, :post_id, :content);") do |insert|
+                insert.execute(insert_data)
+              end
             end
           end
         end
@@ -871,7 +859,7 @@ module Ayadn
       crashes = 0
       begin
         res = @sql.execute("SELECT post_id FROM Pagination WHERE name=(?)", [title]).flatten[0]
-        stream['meta']['max_id'].to_i > res.to_i
+        stream.meta.max_id.to_i > res.to_i
       rescue Amalgalite::SQLite3::Error => e
         if crashes < 2
           crashes += 1
@@ -881,7 +869,7 @@ module Ayadn
           puts "ERROR in Databases"
           puts caller
           puts e
-          puts ['has_new?', stream, title].inspect
+          puts ['has_new?', stream.inspect, title].inspect
           exit
         end
       end
@@ -890,13 +878,13 @@ module Ayadn
     def self.save_max_id(stream, name = 'unknown')
       crashes = 0
       begin
-        if stream['meta']['marker'].nil?
+        if stream.meta.marker.nil?
           key = name
         else
-          key = stream['meta']['marker']['name']
+          key = stream.meta.marker.name
         end
         @sql.execute("DELETE FROM Pagination WHERE name=(?)", [key])
-        @sql.execute("INSERT INTO Pagination(name, post_id) VALUES(?, ?);", [key, stream['meta']['max_id'].to_i])
+        @sql.execute("INSERT INTO Pagination(name, post_id) VALUES(?, ?);", [key, stream.meta.max_id.to_i])
       rescue Amalgalite::SQLite3::Error => e
         if crashes < 2
           crashes += 1
@@ -906,7 +894,7 @@ module Ayadn
           puts "ERROR in Databases"
           puts caller
           puts e
-          puts ['save_max_id', stream, name].inspect
+          puts ['save_max_id', stream.inspect, name].inspect
           exit
         end
       end

data/lib/ayadn/debug.rb

@@ -3,13 +3,13 @@ module Ayadn
   class Debug
 
     def self.skipped dic
-      if Settings.options[:timeline][:debug] == true
+      if Settings.options.timeline.debug
         Logs.rec.debug "SKIPPED: #{dic.keys.first.to_s.capitalize} => #{dic.values.first}"
       end
     end
 
     def self.http response, url
-      if Settings.options[:timeline][:debug] == true
+      if Settings.options.timeline.debug
         deb = "\n"
         deb << "+ HTTP\n"
         deb << "* t#{Time.now.to_i}\n"
@@ -24,7 +24,7 @@ module Ayadn
 
     def self.err error, stack
       # Logs.rec.debug "+DEBUG STACK: #{stack}"
-      if Settings.options[:timeline][:debug] == true
+      if Settings.options.timeline.debug
         puts "\nDEBUG:\n"
         puts error.inspect
         raise error
@@ -35,20 +35,20 @@ module Ayadn
     end
 
     def self.stream(stream, options, target)
-      if Settings.options[:timeline][:debug] == true
+      if Settings.options.timeline.debug
         deb = "\n"
         deb << "+ STREAM\n"
         deb << "* t#{Time.now.to_i}\n"
         deb << "Options:\t#{options.inspect}\n"
         deb << "Target:\t\t#{target.inspect}\n"
-        deb << "Posts:\t\t#{stream['data'].length}\n"
-        deb << "Meta:\t\t#{stream['meta']}\n"
+        deb << "Posts:\t\t#{stream.posts.length}\n"
+        deb << "Meta:\t\t#{stream.meta.input.inspect}\n"
         deb << "\n"
-        puts deb.color(Settings.options[:colors][:debug])
-        Logs.rec.debug "STREAM/META: #{stream['meta']}"
+        puts deb.color(Settings.options.colors.debug)
+        Logs.rec.debug "STREAM/META: #{stream.meta.input.inspect}"
         Logs.rec.debug "STREAM/OPTIONS: #{options.inspect}"
         Logs.rec.debug "STREAM/TARGET: #{target.inspect}"
-        Logs.rec.debug "STREAM/POSTS: #{stream['data'].length}"
+        Logs.rec.debug "STREAM/POSTS: #{stream.posts.length}"
       end
     end