ayadn 1.4.6 → 1.5.0

data/lib/ayadn/api.rb

@@ -125,6 +125,10 @@ module Ayadn
       get_parsed_response(Endpoints.new.user(username))
     end
 
+    def get_users(usernames)
+      get_parsed_response(Endpoints.new.users(usernames))
+    end
+
     def get_details(post_id, options = {})
       get_parsed_response(Endpoints.new.single_post(post_id, options))
     end
@@ -154,12 +158,12 @@ module Ayadn
       JSON.parse(CNX.post(Endpoints.new.star(post_id)))
     end
 
-    def follow(post_id)
-      JSON.parse(CNX.post(Endpoints.new.follow(post_id)))
+    def follow(username)
+      JSON.parse(CNX.post(Endpoints.new.follow(username)))
     end
 
-    def mute(post_id)
-      JSON.parse(CNX.post(Endpoints.new.mute(post_id)))
+    def mute(username)
+      JSON.parse(CNX.post(Endpoints.new.mute(username)))
     end
 
     def block(username)
@@ -235,42 +239,19 @@ module Ayadn
     end
 
     def self.build_query(arg)
-      count = Settings.options[:counts][:default]
-      if arg[:count]
-        if arg[:count].to_s.is_integer?
-          count = arg[:count]
-        end
-      end
-      directed = Settings.options[:timeline][:directed]
-      if arg[:directed]
-        if arg[:directed] == 0 || arg[:directed] == 1
-          directed = arg[:directed]
-        end
-      end
-      deleted = Settings.options[:timeline][:deleted]
-      if arg[:deleted]
-        if arg[:deleted] == 0 || arg[:deleted] == 1
-          deleted = arg[:deleted]
-        end
-      end
-      html = Settings.options[:timeline][:html]
-      if arg[:html]
-        if arg[:html] == 0 || arg[:html] == 1
-          html = arg[:html]
-        end
-      end
-      annotations = Settings.options[:timeline][:annotations]
-      if arg[:annotations]
-        if arg[:annotations] == 0 || arg[:annotations] == 1
-          annotations = arg[:annotations]
-        end
+      if arg[:count].to_s.is_integer?
+        count = arg[:count]
+      else
+        count = Settings.options[:counts][:default]
       end
+      directed = arg[:directed] || Settings.options[:timeline][:directed]
+      html = arg[:html] || Settings.options[:timeline][:html]
       if arg[:since_id]
-        "&count=#{count}&include_html=#{html}&include_directed=#{directed}&include_deleted=#{deleted}&include_annotations=#{annotations}&since_id=#{arg[:since_id]}"
+        "&count=#{count}&include_html=#{html}&include_directed=#{directed}&include_deleted=0&include_annotations=1&since_id=#{arg[:since_id]}"
       elsif arg[:recent_message]
-        "&count=#{count}&include_html=#{html}&include_directed=#{directed}&include_deleted=#{deleted}&include_annotations=#{annotations}&include_recent_message=#{arg[:recent_message]}"
+        "&count=#{count}&include_html=#{html}&include_directed=#{directed}&include_deleted=0&include_annotations=1&include_recent_message=#{arg[:recent_message]}"
       else
-        "&count=#{count}&include_html=#{html}&include_directed=#{directed}&include_deleted=#{deleted}&include_annotations=#{annotations}"
+        "&count=#{count}&include_html=#{html}&include_directed=#{directed}&include_deleted=0&include_annotations=1"
       end
     end
 
@@ -301,7 +282,8 @@ module Ayadn
       loop do
         resp = get_parsed_response(get_list_url(username, target, options))
         abort(Status.user_404(username)) if resp['meta']['code'] == 404
-        big_hash.merge!(Workers.extract_users(resp))
+        users = Workers.extract_users(resp)
+        big_hash.merge!(users)
         break if resp['meta']['min_id'] == nil
         options = {:count => 200, :before_id => resp['meta']['min_id']}
       end

data/lib/ayadn/app.rb

@@ -5,6 +5,9 @@ module Ayadn
 
     %w{action api descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug}.each { |r| require_relative "#{r}" }
 
+    ##
+    # These methods are intended to be called from the CLI.
+
     desc "timeline", "Show your App.net timeline, aka the Unified Stream (-tl)"
     map "unified" => :timeline
     map "-tl" => :timeline
@@ -455,11 +458,7 @@ module Ayadn
     desc "version", "Show the current Ayadn version (-v)"
     map "-v" => :version
     def version
-      puts "\nAYADN\n".color(:red)
-      puts "Version:\t".color(:cyan) + "#{VERSION}\n".color(:green)
-      puts "Changelog:\t".color(:cyan) + "https://github.com/ericdke/na/blob/master/CHANGELOG.md\n".color(:yellow)
-      puts "Docs:\t\t".color(:cyan) + "http://ayadn-app.net/doc/".color(:yellow)
-      puts "\n"
+      Action.new.version
     end
 
   end

data/lib/ayadn/databases.rb

@@ -38,13 +38,7 @@ module Ayadn
     end
 
     def self.init(path)
-      # winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
-      # case RbConfig::CONFIG['host_os']
-      # when *winPlatforms
-      #   abort("\nSorry, Ayadn doesn't work on Windows.\n\n".color(:red))
-      # else
         Daybreak::DB.new "#{path}"
-      # end
     end
 
     def self.add_niceranks niceranks

data/lib/ayadn/debug.rb

@@ -2,6 +2,12 @@
 module Ayadn
   class Debug
 
+    def self.skipped dic
+      if Settings.options[:timeline][:show_debug] == true
+        Logs.rec.debug "SKIPPED: #{dic.keys.first.to_s.capitalize} => #{dic.values.first}"
+      end
+    end
+
     def self.http response, url
       if Settings.options[:timeline][:show_debug] == true
         # deb = ":::::\n"

data/lib/ayadn/endpoints.rb

@@ -195,10 +195,14 @@ module Ayadn
       "#{@channels_url}search?q=#{words}&order=popularity&access_token=#{Settings.user_token}#{@options_list}"
     end
 
-    def user(username)
+    def user(username) # accepts a string
       "#{@users_url}#{username}?access_token=#{Settings.user_token}&include_user_annotations=1"
     end
 
+    def users(usernames) # accepts an array
+      "#{@users_url}?ids=#{usernames.join(',')}?access_token=#{Settings.user_token}&include_user_annotations=1"
+    end
+
     def single_post(post_id, options)
       "#{@posts_url}#{post_id}?access_token=#{Settings.user_token}#{API.build_query(options)}"
     end

data/lib/ayadn/mark.rb

@@ -4,6 +4,7 @@ module Ayadn
 
     desc "add POST_ID (TITLE)", "Create a bookmark for this conversation"
     long_desc Descriptions.mark_add
+    map "create" => :add
     def add(*args)
       begin
         unless args.empty?
@@ -50,8 +51,6 @@ module Ayadn
         puts Status.done
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
-      ensure
-        Databases.close_all
       end
     end
 
@@ -97,6 +96,7 @@ module Ayadn
     end
 
     desc "delete POST_ID", "Delete entry POST_ID from your bookmarked conversations"
+    map "remove" => :delete
     long_desc Descriptions.mark_delete
     def delete *args
       begin

data/lib/ayadn/nicerank.rb

@@ -6,6 +6,39 @@ module Ayadn
       @url = 'http://api.nice.social/user/nicerank?ids='
     end
 
+    def get_posts_day ids
+      resp = JSON.parse(CNX.get("#{@url}#{ids.join(',')}&show_details=Y"))
+      if resp.nil? || resp['meta']['code'] != 200
+        []
+      else
+        resp['data'].map do |obj|
+          pday = obj['user']['posts_day'] == -1 ? 0 : obj['user']['posts_day']
+          {
+            id: obj['user_id'],
+            posts_day:pday.round(2)
+          }
+        end
+      end
+    end
+
+    def from_ids ids
+      blocs, ranks = [], []
+      blank = JSON.parse({'meta' => {'code' => 404}, 'data' => []}.to_json)
+      until ids.empty?
+        blocs << ids.shift(200)
+      end
+      blocs.each do |bloc|
+        got = CNX.get("#{@url}#{bloc.join(',')}&show_details=Y")
+        if got.nil? || got.empty?
+          ranks << [{}]
+        else
+          resps = JSON.parse(got)
+          ranks << resps['data']
+        end
+      end
+      return ranks.flatten!
+    end
+
     def get_ranks stream
       user_ids, get_these, table, niceranks = [], [], {}, {}
 
@@ -16,16 +49,7 @@ module Ayadn
       user_ids.uniq!
 
       db_ranks = Databases.get_niceranks user_ids
-      if Settings.options[:nicerank].nil?
-        expire = 172800 # 48h
-      else
-        if Settings.options[:nicerank][:cache].nil?
-          Settings.options[:nicerank][:cache] = 48
-          expire = 172800
-        else
-          expire = Settings.options[:nicerank][:cache] * 3600
-        end
-      end
+      expire = Settings.options[:nicerank][:cache] * 3600 # Time.now needs seconds
 
       db_ranks.each do |id, ranks|
         if ranks.nil? || (Time.now - ranks[:cached]) > expire

data/lib/ayadn/post.rb

@@ -44,6 +44,26 @@ module Ayadn
 
     def payload_nowplaying dic
       ann = annotations()
+      if dic['visible'] == true
+        ann << {
+          "type" => "com.ayadn.nowplaying",
+            "value" => {
+              "title" => dic['title'],
+              "artist" => dic['artist'],
+              "artwork" => dic['artwork'],
+              "link" => dic['link'],
+              "source" => dic['source']
+            }
+        }
+      else
+        ann << {
+          "type" => "com.ayadn.nowplaying",
+            "value" => {
+              "status" => "no-url",
+              "source" => dic['source']
+            }
+        }
+      end
       if dic['visible'] == true
         ann << {
           "type" => "net.app.core.oembed",

data/lib/ayadn/set.rb

@@ -71,12 +71,6 @@ module Ayadn
       counts_config.save
     end
 
-    # desc "format ITEM NUMBER", "Set ITEM parameter to NUMBER by default"
-    # map "formats" => :format
-    # def format(*args)
-    #   puts args
-    # end
-
     desc "color ITEM COLOR", "Set ITEM to COLOR"
     long_desc Descriptions.set_color
     map "colors" => :color
@@ -160,17 +154,6 @@ module Ayadn
       Settings.get_token
       Settings.init_config
       Logs.create_logger
-      unless Settings.options[:nicerank]
-        Settings.options[:nicerank] = {
-          threshold: 2.1,
-          cache: 48,
-          filter: true,
-          filter_unranked: false
-        }
-      end
-      unless Settings.options[:colors][:nicerank]
-        Settings.options[:colors][:nicerank] = :cyan
-      end
     end
     def log(args)
       x = "New value for '#{args[0]}' in 'NiceRank' => #{"%1.1f" % args[1].to_f}"
@@ -382,26 +365,10 @@ module Ayadn
     def show_date(value)
       Settings.options[:timeline][:show_date] = value
     end
-    def show_nicerank value
-      unless Settings.options[:nicerank]
-        Settings.options[:nicerank] = {
-          threshold: 2.1,
-          filter: true,
-          filter_unranked: false
-        }
-      end
-      unless Settings.options[:colors][:nicerank]
-        Settings.options[:colors][:nicerank] = :cyan
-      end
-      Settings.options[:timeline][:show_nicerank] = value
-    end
     def show_spinner value
       Settings.options[:timeline][:show_spinner] = value
     end
     def show_debug value
-      unless Settings.options[:colors][:debug]
-        Settings.options[:colors][:debug] = :cyan
-      end
       Settings.options[:timeline][:show_debug] = value
     end
   end
@@ -491,9 +458,5 @@ module Ayadn
     def debug(color)
       Settings.options[:colors][:debug] = color.to_sym
     end
-
-    def nicerank(color)
-      Settings.options[:colors][:nicerank] = color.to_sym
-    end
   end
 end

data/lib/ayadn/settings.rb

@@ -6,7 +6,7 @@ module Ayadn
 
     class << self
       attr_accessor :options, :config
-      attr_reader :user_token
+      attr_reader :user_token, :default_nr
     end
 
     def self.load_config
@@ -35,6 +35,12 @@ module Ayadn
           handle: db[active][:handle]
         }
       }
+      @default_nr = {
+        threshold: 2.1,
+        cache: 48,
+        filter: true,
+        filter_unranked: false
+      }
       db.close
       @options = self.defaults
     end
@@ -78,9 +84,21 @@ module Ayadn
     def self.config_file
       config_file = @config[:paths][:config] + "/config.yml"
       if File.exist?(config_file)
-        # TODO: system to merge existing config file when future category are added
         begin
-          @options = YAML.load(File.read(config_file))
+          conf = YAML.load(File.read(config_file))
+
+          # force delete obsolete keys (because legacy versions of the config file)
+          conf[:timeline].delete_if {|k,_| k == :show_nicerank}
+          conf[:colors].delete_if {|k,_| k == :nicerank}
+          # force create mandatory keys (idem)
+          conf[:nicerank] = @default_nr if conf[:nicerank].nil? || conf[:nicerank].size != 4
+          conf[:timeline][:show_debug] = false if conf[:timeline][:show_debug].nil?
+          conf[:timeline][:show_spinner] = true if conf[:timeline][:show_spinner].nil?
+          conf[:colors][:debug] = :red if conf[:colors][:debug].nil?
+          conf[:nowplaying] = {} if conf[:nowplaying].nil?
+
+          @options = conf
+          self.write_config_file(config_file, @options)
         rescue => e
           Errors.global_error({error: e, caller: caller, data: []})
         end
@@ -152,27 +170,26 @@ module Ayadn
           show_symbols: true,
           show_real_name: true,
           show_date: true,
-          show_nicerank: false,
           show_spinner: true,
           show_debug: false
         },
         counts: {
           default: 50,
-          unified: 50,
-          global: 50,
-          checkins: 50,
+          unified: 100,
+          global: 100,
+          checkins: 100,
           conversations: 50,
           photos: 50,
-          trending: 50,
-          mentions: 50,
-          convo: 50,
-          posts: 50,
+          trending: 100,
+          mentions: 100,
+          convo: 100,
+          posts: 100,
           messages: 50,
-          search: 100,
+          search: 200,
           whoreposted: 50,
           whostarred: 50,
           whatstarred: 100,
-          files: 66
+          files: 100
         },
         formats: {
           table: {
@@ -191,7 +208,6 @@ module Ayadn
           mentions: :red,
           source: :cyan,
           symbols: :green,
-          nicerank: :cyan,
           debug: :red
         },
         backup: {
@@ -202,12 +218,8 @@ module Ayadn
         scroll: {
           timer: 3
         },
-        nicerank: {
-          threshold: 2.1,
-          cache: 48,
-          filter: true,
-          filter_unranked: false
-        }
+        nicerank: @default_nr,
+        nowplaying: {}
       }
     end
 

data/lib/ayadn/version.rb

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