ayadn 1.6.0 → 1.7.0

data/lib/ayadn/set.rb

@@ -62,7 +62,7 @@ module Ayadn
         begin
           param = timeline_config.validate(args[1])
           timeline_config.send(args[0], param)
-        rescue NoMethodError
+        rescue NoMethodError, ArgumentError
           puts Status.error_missing_parameters
           exit
         rescue => e
@@ -84,7 +84,7 @@ module Ayadn
         begin
           param = counts_config.validate(args[1])
           counts_config.send(args[0], param)
-        rescue NoMethodError
+        rescue NoMethodError, ArgumentError
           puts Status.error_missing_parameters
           exit
         rescue => e
@@ -108,7 +108,7 @@ module Ayadn
         begin
           color_config.validate(args[1])
           color_config.send(args[0], args[1])
-        rescue NoMethodError
+        rescue NoMethodError, ArgumentError
           puts Status.error_missing_parameters
           exit
         rescue => e
@@ -129,7 +129,7 @@ module Ayadn
         begin
           param = backup_config.validate(args[1])
           backup_config.send(args[0], param)
-        rescue NoMethodError
+        rescue NoMethodError, ArgumentError
           puts Status.error_missing_parameters
           exit
         rescue => e
@@ -148,7 +148,53 @@ module Ayadn
       Settings.restore_defaults
       puts Status.done
     end
+  end
 
+  class Validators
+    def self.boolean(value)
+      case value.downcase
+      when "true", "1", "yes"
+        true
+      when "false", "0", "no"
+        false
+      else
+        abort(Status.error_missing_parameters)
+      end
+    end
+    def self.index_range(min, max, value)
+      x = value.to_i
+      if x >= min && x <= max
+        x
+      else
+        abort(Status.must_be_integer)
+      end
+    end
+    def self.cache_range value
+      if value >= 1 && value <= 168
+        value.round
+      else
+        abort(Status.cache_range)
+      end
+    end
+    def self.threshold value
+      value = value.to_f
+      if value > 0 and value < 5
+        value
+      else
+        abort(Status.threshold)
+      end
+    end
+    def self.timer(t)
+      t = t.to_i
+      t >= 1 ? t : 3
+    end
+    def self.color(color)
+      colors_list = %w{red green magenta cyan yellow blue white black}
+      unless colors_list.include?(color)
+        puts Status.error_missing_parameters
+        abort(Status.valid_colors(colors_list))
+      end
+    end
   end
 
   class SetScroll
@@ -222,7 +268,7 @@ module Ayadn
       Logs.create_logger
     end
     def log(args)
-      x = "New value for '#{args[0]}' in 'NiceRank' => #{"%1.1f" % args[1].to_f}"
+      x = "New value for '#{args[0]}' in 'NiceRank' => #{args[1]}"
       puts "\n#{x}\n".color(:cyan)
       Logs.rec.info x
     end
@@ -261,60 +307,12 @@ module Ayadn
     def validate(value)
       Validators.boolean(value)
     end
-    def auto_save_sent_posts(value)
-      Settings.options[:backup][:auto_save_sent_posts] = value
-    end
-    def auto_save_sent_messages(value)
-      Settings.options[:backup][:auto_save_sent_messages] = value
-    end
-    def auto_save_lists(value)
-      Settings.options[:backup][:auto_save_lists] = value
-    end
-  end
-
-  class Validators
-    def self.boolean(value)
-      case value.downcase
-      when "true", "1", "yes"
-        true
-      when "false", "0", "no"
-        false
-      else
-        abort(Status.error_missing_parameters)
-      end
-    end
-    def self.index_range(min, max, value)
-      x = value.to_i
-      if x >= min && x <= max
-        x
+    def method_missing(meth, options)
+      case meth.to_s
+      when 'auto_save_sent_posts', 'auto_save_sent_messages', 'auto_save_lists'
+        Settings.options[:backup][meth.to_sym] = options
       else
-        abort(Status.must_be_integer)
-      end
-    end
-    def self.cache_range value
-      if value >= 1 && value <= 168
-        value.round
-      else
-        abort(Status.cache_range)
-      end
-    end
-    def self.threshold value
-      value = value.to_f
-      if value > 0 and value < 5
-        value
-      else
-        abort(Status.threshold)
-      end
-    end
-    def self.timer(t)
-      t = t.to_i
-      t >= 1 ? t : 3
-    end
-    def self.color(color)
-      colors_list = %w{red green magenta cyan yellow blue white black}
-      unless colors_list.include?(color)
-        puts Status.error_missing_parameters
-        abort(Status.valid_colors(colors_list))
+        super
       end
     end
   end
@@ -337,53 +335,13 @@ module Ayadn
     def validate(value)
       Validators.index_range(1, 200, value)
     end
-    def default(value)
-      Settings.options[:counts][:default] = value
-    end
-    def unified(value)
-      Settings.options[:counts][:unified] = value
-    end
-    def global(value)
-      Settings.options[:counts][:global] = value
-    end
-    def checkins(value)
-      Settings.options[:counts][:checkins] = value
-    end
-    def conversations(value)
-      Settings.options[:counts][:conversations] = value
-    end
-    def photos(value)
-      Settings.options[:counts][:photos] = value
-    end
-    def trending(value)
-      Settings.options[:counts][:trending] = value
-    end
-    def mentions(value)
-      Settings.options[:counts][:mentions] = value
-    end
-    def convo(value)
-      Settings.options[:counts][:convo] = value
-    end
-    def posts(value)
-      Settings.options[:counts][:posts] = value
-    end
-    def messages(value)
-      Settings.options[:counts][:messages] = value
-    end
-    def search(value)
-      Settings.options[:counts][:search] = value
-    end
-    def whoreposted(value)
-      Settings.options[:counts][:whoreposted] = value
-    end
-    def whostarred(value)
-      Settings.options[:counts][:whostarred] = value
-    end
-    def whatstarred(value)
-      Settings.options[:counts][:whatstarred] = value
-    end
-    def files(value)
-      Settings.options[:counts][:files] = value
+    def method_missing(meth, options)
+      case meth.to_s
+      when 'default', 'unified', 'checkins', 'conversations', 'global', 'photos', 'trending', 'mentions', 'convo', 'posts', 'messages', 'search', 'whoreposted', 'whostarred', 'whatstarred', 'files'
+        Settings.options[:counts][meth.to_sym] = options.to_i
+      else
+        super
+      end
     end
   end
 
@@ -405,37 +363,15 @@ module Ayadn
     def save
       Settings.save_config
     end
-    def directed(value)
-      Settings.options[:timeline][:directed] = value
-    end
-    def deleted(value)
-      #Settings.options[:timeline][:deleted] = value
-      abort(Status.not_mutable)
-    end
-    def html(value)
-      Settings.options[:timeline][:html] = value
-    end
-    def annotations(value)
-      #Settings.options[:timeline][:annotations] = value
-      abort(Status.not_mutable)
-    end
-    def show_source(value)
-      Settings.options[:timeline][:show_source] = value
-    end
-    def show_symbols(value)
-      Settings.options[:timeline][:show_symbols] = value
-    end
-    def show_real_name(value)
-      Settings.options[:timeline][:show_real_name] = value
-    end
-    def show_date(value)
-      Settings.options[:timeline][:show_date] = value
-    end
-    def show_spinner value
-      Settings.options[:timeline][:show_spinner] = value
-    end
-    def show_debug value
-      Settings.options[:timeline][:show_debug] = value
+    def method_missing(meth, options)
+      case meth.to_s
+      when 'directed', 'html', 'show_source', 'show_symbols', 'show_real_name', 'show_date', 'show_spinner', 'show_debug'
+        Settings.options[:timeline][meth.to_sym] = options
+      when 'deleted', 'annotations'
+        abort(Status.not_mutable)
+      else
+        super
+      end
     end
   end
 
@@ -461,68 +397,17 @@ module Ayadn
       Settings.save_config
     end
 
-    def id(color)
-      Settings.options[:colors][:id] = color.to_sym
-    end
-
-    def index(color)
-      Settings.options[:colors][:index] = color.to_sym
-    end
-
-    def username(color)
-      Settings.options[:colors][:username] = color.to_sym
-    end
-
-    def name(color)
-      Settings.options[:colors][:name] = color.to_sym
-    end
-
-    def date(color)
-      Settings.options[:colors][:date] = color.to_sym
-    end
-
-    def link(color)
-      Settings.options[:colors][:link] = color.to_sym
-    end
-
-    def dots(color)
-      Settings.options[:colors][:dots] = color.to_sym
-    end
-
-    def hashtags(color)
-      Settings.options[:colors][:hashtags] = color.to_sym
-    end
-
-    def hashtag color
-      hashtags color
-    end
-
-    def mentions(color)
-      Settings.options[:colors][:mentions] = color.to_sym
-    end
-
-    def mention color
-      mentions color
-    end
-
-    def source(color)
-      Settings.options[:colors][:source] = color.to_sym
-    end
-
-    def client color
-      source color
-    end
-
-    def symbols(color)
-      Settings.options[:colors][:symbols] = color.to_sym
-    end
-
-    def symbol(color)
-      symbols color
-    end
-
-    def debug(color)
-      Settings.options[:colors][:debug] = color.to_sym
+    def method_missing(meth, options)
+      case meth.to_s
+      when 'id', 'index', 'username', 'name', 'date', 'link', 'dots', 'hashtags', 'mentions', 'source', 'symbols', 'debug'
+        Settings.options[:colors][meth.to_sym] = options.to_sym
+      when 'hashtag', 'mention', 'symbol'
+        Settings.options[:colors]["#{meth}s".to_sym] = options.to_sym
+      when 'client'
+        Settings.options[:colors][:source] = options.to_sym
+      else
+        super
+      end
     end
   end
 end

data/lib/ayadn/status.rb

@@ -309,5 +309,8 @@ module Ayadn
     def self.no_show_infos
       "\nSorry, can't find informations about this show.\n".color(:blue)
     end
+    def self.no_force target
+      "\n'#{target}' can't be displayed (could be muted, blocked, in the Blacklist, etc). Use option '--force' ('-f') to try and display this content anyway.\n\n".color(:blue)
+    end
   end
 end

data/lib/ayadn/stream.rb

@@ -9,64 +9,46 @@ module Ayadn
       @workers = workers
     end
 
-    def unified options
-      @view.downloading(options)
-      stream = @api.get_unified(options)
-      Check.no_new_posts(stream, options, 'unified')
-      Databases.save_max_id(stream)
-      @view.render(stream, options)
-      Scroll.new(@api, @view).unified(options) if options[:scroll]
-    end
-
-    def checkins options
-      @view.downloading(options)
-      stream = @api.get_checkins(options)
-      Check.no_new_posts(stream, options, 'explore:checkins')
-      Databases.save_max_id(stream)
-      @view.render(stream, options)
-      Scroll.new(@api, @view).checkins(options) if options[:scroll]
-    end
-
     def global settings
+      Settings.options[:force] = true if settings[:force]
       options = settings.dup
       options[:filter] = nicerank_true()
       @view.downloading(options)
       stream = @api.get_global(options)
-      niceranks = NiceRank.new.get_ranks(stream)
+      Settings.options[:force] == true ? niceranks = {} : niceranks = NiceRank.new.get_ranks(stream)
       Check.no_new_posts(stream, options, 'global')
-      Databases.save_max_id(stream)
+      Databases.save_max_id(stream, 'global') unless stream['meta']['max_id'].nil?
       @view.render(stream, options, niceranks)
       Scroll.new(@api, @view).global(options) if options[:scroll]
     end
 
-    def trending options
-      @view.downloading(options)
-      stream = @api.get_trending(options)
-      Check.no_new_posts(stream, options, 'explore:trending')
-      Databases.save_max_id(stream)
-      @view.render(stream, options)
-      Scroll.new(@api, @view).trending(options) if options[:scroll]
-    end
 
-    def photos options
-      @view.downloading(options)
-      stream = @api.get_photos(options)
-      Check.no_new_posts(stream, options, 'explore:photos')
-      Databases.save_max_id(stream)
-      @view.render(stream, options)
-      Scroll.new(@api, @view).photos(options) if options[:scroll]
+    def method_missing(meth, options)
+      case meth
+      when :checkins, :trending, :photos
+        stream(meth, options, "explore:#{meth}")
+      when :conversations
+        stream(meth, options, "explore:replies")
+      when :unified
+        stream(meth, options, meth.to_s)
+      else
+        super
+      end
     end
 
-    def conversations options
+    def stream meth, options, target
+      Settings.options[:force] = true if options[:force]
       @view.downloading(options)
-      stream = @api.get_conversations(options)
-      Check.no_new_posts(stream, options, 'explore:replies')
+      stream = @api.send("get_#{meth}".to_sym, options)
+      Check.no_new_posts(stream, options, target)
       Databases.save_max_id(stream)
       @view.render(stream, options)
-      Scroll.new(@api, @view).replies(options) if options[:scroll]
+      Scroll.new(@api, @view).send(meth, options) if options[:scroll]
     end
 
+
     def mentions username, options
+      Settings.options[:force] = true if options[:force]
       Check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
@@ -81,13 +63,17 @@ module Ayadn
     end
 
     def posts username, options
+      Settings.options[:force] = true if options[:force]
       Check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
       stream = @api.get_posts(username, options)
       Check.no_user(stream, username)
-      Databases.save_max_id(stream)
+      Databases.save_max_id(stream) unless stream['meta']['marker'].nil?
       Check.no_data(stream, 'mentions')
+      if Databases.blacklist["-#{username.downcase}"] || stream['data'][0]['user']['you_muted'] || stream['data'][0]['user']['you_blocked']
+        abort(Status.no_force("#{username.downcase}")) unless options[:raw] || Settings.options[:force]
+      end
       @view.render(stream, options)
       Scroll.new(@api, @view).posts(username, options) if options[:scroll]
     end
@@ -178,6 +164,7 @@ module Ayadn
     end
 
     def convo(post_id, options)
+      Settings.options[:force] = true if options[:force]
       Check.bad_post_id(post_id)
       @view.downloading(options)
       details = @api.get_details(post_id, options)

data/lib/ayadn/tvshow.rb

@@ -72,6 +72,7 @@ module Ayadn
     end
 
     def post options = {}
+      options = options.dup
       reg = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
       filename = "#{@name.downcase.strip.gsub(reg, '_').split(' ').join('_')}.jpg"
       if options['banner']
@@ -81,14 +82,15 @@ module Ayadn
       end
       @view.clear_screen
       puts "\nPosting and uploading the show poster...\n".color(:green)
-      file = ["#{Settings.config[:paths][:downloads]}/#{filename}"]
+      options[:embed] = ["#{Settings.config[:paths][:downloads]}/#{filename}"]
+      options[:tvshow] = true
       dic = {
-        'text' => @text,
-        'data' => FileOps.upload_files(file),
-        'title' => @name,
-        'source' => 'TVDb'
+        options: options,
+        text: @text,
+        title: @name,
+        source: 'TVDb'
       }
-      resp = Post.new.send_tvshow(dic)
+      resp = Post.new.post(dic)
       FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
       @view.clear_screen
       puts Status.yourpost

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/lib/ayadn/view.rb

@@ -6,6 +6,14 @@ module Ayadn
       @workers = Workers.new
     end
 
+    def show_cursor
+      puts "\e[?25h"
+    end
+
+    def hide_cursor
+      puts "\e[?25l"
+    end
+
     def show_posts_with_index(data, options, niceranks = {})
       posts, view = build_stream_with_index(data, options, niceranks)
       puts view unless view == ""

data/lib/ayadn/workers.rb

@@ -118,39 +118,49 @@ module Ayadn
       table
     end
 
+    # builds a hash of hashes, each hash is a normalized post with post id as a key
     def build_posts(data, niceranks = {})
-      # builds a hash of hashes, each hash is a normalized post with post id as a key
+      # skip objects in blacklist unless force
       posts = {}
       data.each.with_index(1) do |post, index|
-        if Databases.blacklist[post['source']['name'].downcase]
-          Debug.skipped({source: post['source']['name']})
-          next
+        unless Settings.options[:force]
+          if Databases.blacklist[post['source']['name'].downcase]
+            Debug.skipped({source: post['source']['name']})
+            next
+          end
         end
-        if Databases.blacklist["-@#{post['user']['username'].downcase}"]
-          Debug.skipped({user: post['user']['username']})
-          next
+        unless Settings.options[:force]
+          if Databases.blacklist["-@#{post['user']['username'].downcase}"]
+            Debug.skipped({user: post['user']['username']})
+            next
+          end
         end
         hashtags = extract_hashtags(post)
         @skip = false
-        hashtags.each do |h|
-          if Databases.blacklist[h.downcase]
-            @skip = true
-            Debug.skipped({hashtag: h})
-            break
+        unless Settings.options[:force]
+          hashtags.each do |h|
+            if Databases.blacklist[h.downcase]
+              @skip = true
+              Debug.skipped({hashtag: h})
+              break
+            end
           end
         end
         next if @skip
         mentions= []
         post['entities']['mentions'].each { |m| mentions << m['name'] }
-        mentions.each do |m|
-          if Databases.blacklist["@#{m.downcase}"]
-            @skip = true
-            Debug.skipped({mention: m})
-            break
+        unless Settings.options[:force]
+          mentions.each do |m|
+            if Databases.blacklist["@#{m.downcase}"]
+              @skip = true
+              Debug.skipped({mention: m})
+              break
+            end
           end
         end
         next if @skip
 
+        # create custom objects from ADN response
         if niceranks[post['user']['id'].to_i]
           rank = niceranks[post['user']['id'].to_i][:rank]
           is_human = niceranks[post['user']['id'].to_i][:is_human]
@@ -242,8 +252,7 @@ module Ayadn
     end
 
     def extract_links(post)
-      links = []
-      post['entities']['links'].each { |l| links << l['url'] }
+      links = post['entities']['links'].map { |l| l['url'] }
       unless post['annotations'].nil? || post['annotations'].empty?
         post['annotations'].each do |ann|
           if ann['type'] == "net.app.core.oembed"
@@ -251,14 +260,11 @@ module Ayadn
           end
         end
       end
-      links.uniq!
-      links
+      links.uniq
     end
 
     def extract_hashtags(post)
-      tags = []
-      post['entities']['hashtags'].each { |h| tags << h['name'] }
-      tags
+      post['entities']['hashtags'].map { |h| h['name'] }
     end
 
     def build_channels(data, options = {})
@@ -369,7 +375,16 @@ module Ayadn
       username.join
     end
 
-    def add_arobases_to_usernames args #TODO: replace
+    def remove_arobase_if_present args
+      args.map! do |username|
+        temp = username.chars
+        temp.shift if temp.first == "@"
+        temp.join
+      end
+      args
+    end
+
+    def add_arobases_to_usernames args #TODO: replace all these arobase legacy methods by a unique one
       args.map do |username|
         if username == 'me'
           who_am_i
@@ -387,15 +402,6 @@ module Ayadn
       db[active][:handle]
     end
 
-    def remove_arobase_if_present args
-      args.map! do |username|
-        temp = username.chars
-        temp.shift if temp.first == "@"
-        temp.join
-      end
-      args
-    end
-
     def extract_users(resp)
       users_hash = {}
       resp['data'].each do |item|
@@ -473,8 +479,7 @@ module Ayadn
       stream['data'].each do |post|
         extract_links(post).each {|l| links << l}
       end
-      links.uniq!
-      links
+      links.uniq
     end
 
     def all_but_me usernames