ayadn 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b368e6b16ec1903579576dc5a461f3037e5e7fd
-  data.tar.gz: 485754ebd58ac05955588af81b4fda20bff937b8
+  metadata.gz: 50a5231b4bcda461e9adfb2d2ad0cb7ecddaee40
+  data.tar.gz: c6dda497fe8883e4449ba446c9e9c4800c0b5891
 SHA512:
-  metadata.gz: acfcc32900d14e089df868901d0bd066675849e2708398d93c3cfc5aaa61a6a5d596bbaf11e7c7bd2adca9b536379de5ca6d8afed288960901a79c774f5d133b
-  data.tar.gz: 1390378aaf18adf3f0f2ec1dc70df9ae1d4df927a161fb5793dd3ceeb5875d54c1b91df81c6d49589c5ce34cea82db044db85328dd67982b104decaa04c71767
+  metadata.gz: 65a41024fa6f58361b67e37c74df7ad4d0d69341fe2880f53047544d7ee06b5aaf5d3ba9cd8ab669dd57f7be1f0dfaf6105e4e4705fbff6351c7d8f72c98e952
+  data.tar.gz: 2a95a67105ef3211717874682109d103a60b5dd6fdf464db67f2f15637c78dd3bee22aac17364bfb5063e321075ed08c03297562785cee40a04c5902d120c906

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.2.3 - 'Taylor'
+
+- Text containing '#' but not an hashtag: not colorized
+- Add/remove several elements to/from blacklist at once
+- Cached results for NiceRank (expire = 24h)
+- NiceRank filter works better
+- NiceRank logs missed users ids in a separate file
+- Option for showing debug messages
+- Show spinner = true
+
 # 1.2.2 - 'Chris'
 
 - No more empty lines in the scroll

data/lib/ayadn/action.rb

@@ -48,7 +48,11 @@ module Ayadn
         options[:filter] = true
         doing(options)
         stream = @api.get_global(options)
-        niceranks = @api.get_niceranks stream
+
+        ###DEBUG
+        #niceranks = @api.get_niceranks stream
+        niceranks, _ = @api.get_niceranks stream, 0
+
         (no_new_posts unless Databases.has_new?(stream, 'global')) if options[:new]
         Databases.save_max_id(stream)
         render_view(stream, options, niceranks)

data/lib/ayadn/api.rb

@@ -200,22 +200,97 @@ module Ayadn
       end
     end
 
-    def get_niceranks stream
+    ###DEBUG
+    #def get_niceranks stream
+    def get_niceranks stream, iter
+      ###DEBUG
+      @iter = iter
+
       user_ids, table, niceranks = [], {}, {}
       stream['data'].each do |post|
         user_ids << post['user']['id'].to_i
         table[post['user']['id'].to_i] = post['user']['username']
       end
       user_ids.uniq!
-      resp = JSON.parse(CNX.get "http://api.search-adn.net/user/nicerank?ids=#{user_ids.join(',')}")
-      return {} if resp['meta']['code'] != 200
-      resp['data'].each do |obj|
-        niceranks[obj['user_id']] = {
-          username: table[obj['user_id']],
-          rank: obj['rank']
-        }
+
+      db_ranks = Databases.get_niceranks user_ids
+      get_these = []
+      db_ranks.each do |id,ranks|
+        if ranks.nil?
+          get_these << id
+        elsif (Time.now - ranks[:cached]) > 86400 # 24 hours cache
+          get_these << id
+        else
+          niceranks[id] = {
+          username: ranks[:username],
+          rank: ranks[:rank],
+          is_human: ranks[:is_human],
+          cached: ranks[:cached]
+          }
+        end
+      end
+
+      if Settings.options[:timeline][:show_debug] == true
+        puts "=====\nNiceRanks\n".color(Settings.options[:colors][:debug])
+        puts "From DB:\t#{niceranks}\n".color(Settings.options[:colors][:debug])
+        puts "To get:\t\t#{get_these}\n=====\n".color(Settings.options[:colors][:debug])
+      end
+
+      unless get_these.empty?
+        req = "http://api.search-adn.net/user/nicerank?ids=#{get_these.join(',')}"
+        resp = JSON.parse(CNX.get req)
+
+        #Error handling
+        if resp['meta']['code'] != 200
+          if Settings.options[:timeline][:show_debug] == true
+            puts "=====\nNiceRank:\tError #{resp['meta']['code']} (#{resp['meta']['time']})\n=====\n".color(Settings.options[:colors][:debug])
+          end
+          Errors.nr "REQUESTED: #{get_these.join(' ')}"
+
+          ###DEBUG
+          @iter += 1
+
+          if niceranks
+            if Settings.options[:timeline][:show_debug] == true
+              puts "=====\nNiceRanks:\t#{niceranks}".color(Settings.options[:colors][:debug])
+              puts "=====\n".color(Settings.options[:colors][:debug])
+            end
+
+            #return niceranks
+
+            ###DEBUG
+            return niceranks, @iter
+          else
+
+            # return {}
+
+            ###DEBUG
+            return {}, @iter
+          end
+        end
+
+        ###DEBUG
+        @iter += 1
+
+        resp['data'].each do |obj|
+          niceranks[obj['user_id']] = {
+            username: table[obj['user_id']],
+            rank: obj['rank'],
+            is_human: obj['is_human'],
+            cached: Time.now
+          }
+        end
+        if Settings.options[:timeline][:show_debug] == true
+          puts "=====\nNiceRanks:\t#{niceranks}".color(Settings.options[:colors][:debug])
+          puts "Resp:\t\t#{resp}".color(Settings.options[:colors][:debug])
+          puts "=====\n".color(Settings.options[:colors][:debug])
+        end
       end
-      niceranks
+      Databases.add_niceranks niceranks
+
+      ###DEBUG
+      #niceranks
+      return niceranks, @iter
     end
 
     def get_channels

data/lib/ayadn/blacklist.rb

@@ -4,7 +4,7 @@ module Ayadn
     desc "add TYPE TARGET", "Adds a mention, hashtag or client to your blacklist"
     long_desc Descriptions.blacklist_add
     def add(*args)
-      if args.length != 2
+      if args.length < 2
         puts Status.type_and_target_missing
       end
       blacklist = BlacklistWorkers.new
@@ -15,7 +15,7 @@ module Ayadn
     desc "remove TYPE TARGET", "Removes a mention, hashtag or client from your blacklist"
     long_desc Descriptions.blacklist_remove
     def remove(*args)
-      if args.length != 2
+      if args.length < 2
         puts Status.type_and_target_missing
       end
       blacklist = BlacklistWorkers.new
@@ -80,18 +80,18 @@ module Ayadn
     end
     def add(args)
       begin
-        type, target = args[0], args[1]
+        type = args.shift
         case type
         when 'mention', 'mentions'
-          target = Workers.add_arobase_if_missing([target])
+          target = Workers.add_arobases_to_usernames args
           Databases.add_mention_to_blacklist(target)
           Logs.rec.info "Added '#{target}' to blacklist of mentions."
         when 'client', 'source'
-          Databases.add_client_to_blacklist(target)
-          Logs.rec.info "Added '#{target}' to blacklist of clients."
+          Databases.add_client_to_blacklist(args)
+          Logs.rec.info "Added '#{args}' to blacklist of clients."
         when 'hashtag', 'tag'
-          Databases.add_hashtag_to_blacklist(target)
-          Logs.rec.info "Added '#{target}' to blacklist of hashtags."
+          Databases.add_hashtag_to_blacklist(args)
+          Logs.rec.info "Added '#{args}' to blacklist of hashtags."
         else
           puts Status.wrong_arguments
         end
@@ -101,15 +101,15 @@ module Ayadn
     end
     def remove(args)
       begin
-        type, target = args[0], args[1]
+        type = args.shift
         case type
         when 'mention', 'mentions'
-          target = Workers.add_arobase_if_missing([target])
+          target = Workers.add_arobases_to_usernames args
           Databases.remove_from_blacklist(target)
           Logs.rec.info "Removed '#{target}' from blacklist of mentions."
         when 'client', 'source', 'hashtag', 'tag'
-          Databases.remove_from_blacklist(target)
-          Logs.rec.info "Removed '#{type}:#{target}' from blacklist."
+          Databases.remove_from_blacklist(args)
+          Logs.rec.info "Removed '#{type}:#{args}' from blacklist."
         else
           puts Status.wrong_arguments
         end

data/lib/ayadn/cnx.rb

@@ -5,7 +5,9 @@ module Ayadn
     def self.get url
       begin
         RestClient.get(url) do |response, request, result|
-          response
+          debug(response, url) if Settings.options[:timeline][:show_debug] == true
+          #response
+          check_nr response, url
         end
       rescue SocketError => e
         puts "\nConnection error.".color(:red)
@@ -18,9 +20,31 @@ module Ayadn
       end
     end
 
+    def self.check_nr response, url
+      case response.code
+      when 200
+        response
+      when 204
+        puts "\nError: the NiceRank filter made too many requests to the server. You may either wait for a little while before scrolling the filtered Global again, or set the scroll timer to a greater value (example: `ayadn set scroll timer 5`). You can also let the unranked posts appear in the stream if you prefer (see http://ayadn-app.net/doc).\n".color(:red)
+        Errors.global_error("cnx.rb/get", [url, response.inspect, response.headers], "NiceRank: TOO MANY REQUESTS")
+      else
+        response
+      end
+    end
+
+    def self.debug response, url
+      puts ":::::".color(Settings.options[:colors][:debug])
+      puts "Url:\t\t#{url}\n".color(Settings.options[:colors][:debug])
+      #puts "Resp:\t\t#{response.code}\n".color(Settings.options[:colors][:debug])
+      puts "Headers:\t#{response.headers}\n".color(Settings.options[:colors][:debug])
+      puts "Remaining:\t#{response.headers[:x_ratelimit_remaining]}".color(Settings.options[:colors][:debug])
+      puts ":::::\n".color(Settings.options[:colors][:debug])
+    end
+
     def self.get_response_from(url)
       begin
         RestClient.get(url) do |response, request, result| #, :verify_ssl => OpenSSL::SSL::VERIFY_NONE
+          debug(response, url) if Settings.options[:timeline][:show_debug] == true
           check(response)
         end
       rescue SocketError => e
@@ -73,6 +97,7 @@ module Ayadn
       begin
         #RestClient::Resource.new(url).delete
         RestClient.delete(url) do |response, request, result|
+          debug(response, url) if Settings.options[:timeline][:show_debug] == true
           check(response)
         end
       rescue SocketError => e
@@ -89,6 +114,7 @@ module Ayadn
     def self.post(url, payload = nil)
       begin
         RestClient.post(url, payload.to_json, :content_type => :json, :accept => :json) do |response, request, result|
+          debug(response, url) if Settings.options[:timeline][:show_debug] == true
           check(response)
         end
       rescue SocketError => e
@@ -105,6 +131,7 @@ module Ayadn
     def self.put(url, payload)
       begin
         RestClient.put(url, payload.to_json, :content_type => :json, :accept => :json) do |response, request, result|
+          debug(response, url) if Settings.options[:timeline][:show_debug] == true
           check(response)
         end
       rescue SocketError => e

data/lib/ayadn/databases.rb

@@ -4,7 +4,7 @@ module Ayadn
   class Databases
 
     class << self
-      attr_accessor :users, :index, :pagination, :aliases, :blacklist, :bookmarks
+      attr_accessor :users, :index, :pagination, :aliases, :blacklist, :bookmarks, :nicerank
     end
 
     def self.open_databases
@@ -14,37 +14,60 @@ module Ayadn
       @aliases = self.init "#{Settings.config[:paths][:db]}/aliases.db"
       @blacklist = self.init "#{Settings.config[:paths][:db]}/blacklist.db"
       @bookmarks = self.init "#{Settings.config[:paths][:db]}/bookmarks.db"
+      @nicerank = self.init "#{Settings.config[:paths][:db]}/nicerank.db"
     end
 
     def self.close_all
-      [@users, @index, @pagination, @aliases, @blacklist, @bookmarks].each do |db|
-          db.compact
+      [@users, @index, @pagination, @aliases, @blacklist, @bookmarks, @nicerank].each do |db|
           db.flush
+          db.compact
           db.close
       end
     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
+      # 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
+      niceranks.each do |id,infos|
+        @nicerank[id] = infos
+      end
+    end
+
+    def self.get_niceranks user_ids
+      ids = {}
+      user_ids.each do |id|
+        ids[id] = @nicerank[id]
       end
+      ids
     end
 
     def self.add_mention_to_blacklist(target)
-      @blacklist[target.downcase] = :mention
+      target.each do |username|
+        @blacklist[username.downcase] = :mention
+      end
     end
     def self.add_client_to_blacklist(target)
-      @blacklist[target.downcase] = :client
+      target.each do |source|
+        @blacklist[source.downcase] = :client
+      end
     end
     def self.add_hashtag_to_blacklist(target)
-      @blacklist[target.downcase] = :hashtag
+      target.each do |tag|
+        @blacklist[tag.downcase] = :hashtag
+      end
     end
     def self.remove_from_blacklist(target)
-      @blacklist.delete(target.downcase)
+      target.each do |el|
+        @blacklist.delete(el.downcase)
+      end
     end
     def self.import_blacklist(blacklist)
       new_list = self.init blacklist

data/lib/ayadn/errors.rb

@@ -11,7 +11,9 @@ module Ayadn
       Logs.rec.debug "STACK: #{caller}"
       Logs.rec.error "--END--"
       puts "\n(error logged in #{Settings.config[:paths][:log]}/ayadn.log)\n".color(:blue)
-      #raise error
+      if Settings.options[:timeline][:show_debug] == true
+        raise error
+      end
       exit
     end
     def self.error(status)
@@ -26,6 +28,9 @@ module Ayadn
     def self.repost(repost, original)
       Logs.rec.info "Post #{repost} is a repost. Using original: #{original}."
     end
+    def self.nr msg
+      Logs.nr.warn msg
+    end
 
     private
 

data/lib/ayadn/logs.rb

@@ -1,32 +1,38 @@
 # encoding: utf-8
 module Ayadn
   class Logs
+
     class << self
-      attr_accessor :rec
+      attr_accessor :rec, :nr
     end
+
     def self.create_logger
       @rec = Logger.new(Settings.config[:paths][:log] + "/ayadn.log", 'monthly')
       @rec.formatter = proc do |severity, datetime, progname, msg|
         "#{datetime} (#{Settings.config[:version]}) #{severity} -- #{msg}\n"
       end
+      @nr = Logger.new(Settings.config[:paths][:log] + "/nicerank.log", 'monthly')
+      @nr.formatter = proc do |severity, datetime, progname, msg|
+        "#{datetime} (#{Settings.config[:version]}) #{severity} -- #{msg}\n"
+      end
     end
 
     # unused (experiment)
-    def self.send_log(from, args, content)
-      begin
-        log = {
-          "platform" => "#{Settings.config[:platform]}",
-          "date" => Time.now,
-          "version" => "#{Settings.config[:version]}",
-          "source" => from,
-          "args" => args,
-          "content" => content
-        }
-        Post.new.send_log(log)
-      rescue
-        @rec.warn("Unable to send log.")
-      end
-    end
+    # def self.send_log(from, args, content)
+    #   begin
+    #     log = {
+    #       "platform" => "#{Settings.config[:platform]}",
+    #       "date" => Time.now,
+    #       "version" => "#{Settings.config[:version]}",
+    #       "source" => from,
+    #       "args" => args,
+    #       "content" => content
+    #     }
+    #     Post.new.send_log(log)
+    #   rescue
+    #     @rec.warn("Unable to send log.")
+    #   end
+    # end
 
   end
 end

data/lib/ayadn/scroll.rb

@@ -20,18 +20,43 @@ module Ayadn
     def scroll_it(target, options, niceranks)
       options = check_raw(options)
       orig_target = target
+
+      ###DEBUG
+      @iter = 0
+      @adn = 1
+
       loop do
         begin
           stream = get(target, options)
+
+          ###DEBUG
+          @adn += 1
+
           if options[:filter] == true
             unless stream['data'].empty?
-              niceranks = @api.get_niceranks stream
+              ###DEBUG
+              #niceranks = @api.get_niceranks stream
+              niceranks, @iter = @api.get_niceranks stream, @iter
+              ###DEBUG
+              if Settings.options[:timeline][:show_debug] == true
+                puts "@@@@@\nADN calls:\t#{@adn}\n".color(Settings.options[:colors][:debug])
+                puts "NiceRank calls:\t#{@iter}".color(Settings.options[:colors][:debug])
+                puts "@@@@@\n".color(Settings.options[:colors][:debug])
+              end
             else
-             niceranks = {}
+              niceranks = {}
             end
           else
             niceranks = {}
           end
+
+          if Settings.options[:timeline][:show_debug] == true
+            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
+            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
+            puts "Target:\t\t#{target.inspect}\n".color(Settings.options[:colors][:debug])
+            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
+          end
+
           target = "explore:#{target}" if explore?(target)
           show_if_new(stream, options, target, niceranks)
           target = orig_target if target =~ /explore/
@@ -50,6 +75,14 @@ module Ayadn
       loop do
         begin
           stream = @api.get_mentions(username, options)
+
+          if Settings.options[:timeline][:show_debug] == true
+            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
+            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
+            puts "Target:\t\t#{username}\n".color(Settings.options[:colors][:debug])
+            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
+          end
+
           show_if_new(stream, options, "mentions:#{id}")
           options = save_then_return(stream, options)
           countdown
@@ -66,6 +99,14 @@ module Ayadn
       loop do
         begin
           stream = @api.get_posts(username, options)
+
+          if Settings.options[:timeline][:show_debug] == true
+            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
+            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
+            puts "Target:\t\t#{username}\n".color(Settings.options[:colors][:debug])
+            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
+          end
+
           show_if_new(stream, options, "posts:#{id}")
           options = save_then_return(stream, options)
           countdown
@@ -80,6 +121,14 @@ module Ayadn
       loop do
         begin
           stream = @api.get_convo(post_id, options)
+
+          if Settings.options[:timeline][:show_debug] == true
+            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
+            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
+            puts "Target:\t\t#{post_id}\n".color(Settings.options[:colors][:debug])
+            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
+          end
+
           show_if_new(stream, options, "replies:#{post_id}")
           options = save_then_return(stream, options)
           countdown
@@ -94,6 +143,14 @@ module Ayadn
       loop do
         begin
           stream = @api.get_messages(channel_id, options)
+
+          if Settings.options[:timeline][:show_debug] == true
+            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
+            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
+            puts "Target:\t\t#{channel_id}\n".color(Settings.options[:colors][:debug])
+            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
+          end
+
           show_if_new(stream, options, "channel:#{channel_id}")
           options = save_then_return(stream, options)
           countdown

data/lib/ayadn/set.rb

@@ -379,6 +379,12 @@ module Ayadn
     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
 
   class SetColor
@@ -446,5 +452,9 @@ module Ayadn
     def symbols(color)
       Settings.options[:colors][:symbols] = color.to_sym
     end
+
+    def debug(color)
+      Settings.options[:colors][:debug] = color.to_sym
+    end
   end
 end

data/lib/ayadn/settings.rb

@@ -81,6 +81,12 @@ module Ayadn
         # TODO: system to merge existing config file when future category are added
         begin
           @options = YAML.load(File.read(config_file))
+          if @options[:timeline][:show_debug].nil?
+            @options[:timeline][:show_debug] = false
+          end
+          if @options[:nicerank][:threshold]
+            @options[:nicerank][:threshold] = @options[:nicerank][:threshold].round
+          end
         rescue => e
           Errors.global_error("myconfig/load config.yml", nil, e)
         end
@@ -153,7 +159,8 @@ module Ayadn
           show_real_name: true,
           show_date: true,
           show_nicerank: false,
-          show_spinner: false
+          show_spinner: true,
+          show_debug: false
         },
         counts: {
           default: 50,
@@ -190,7 +197,8 @@ module Ayadn
           mentions: :red,
           source: :cyan,
           symbols: :green,
-          nicerank: :cyan
+          nicerank: :cyan,
+          debug: :red
         },
         backup: {
           auto_save_sent_posts: false,

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -288,6 +288,7 @@ module Ayadn
               end
               unless content[:nicerank] == false
                 next if content[:nicerank] < Settings.options[:nicerank][:threshold]
+                next if content[:is_human] == false
               end
               filtered[id] = content
             end

data/lib/ayadn/workers.rb

@@ -117,8 +117,10 @@ module Ayadn
 
         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]
         else
           rank = false
+          is_human = 'unknown'
         end
 
         if post['user'].has_key?('name')
@@ -137,6 +139,7 @@ module Ayadn
           username: post['user']['username'],
           user_id: post['user']['id'].to_i,
           nicerank: rank,
+          is_human: is_human,
           handle: "@#{post['user']['username']}",
           type: post['user']['type'],
           date: parsed_time(post['created_at']),
@@ -162,7 +165,7 @@ module Ayadn
 
         unless post['text'].nil?
           values[:raw_text] = post['text']
-          values[:text] = colorize_text(post['text'], mentions)
+          values[:text] = colorize_text(post['text'], mentions, hashtags)
         else
           values[:raw_text] = ""
           values[:text] = "(no text)"
@@ -262,16 +265,35 @@ module Ayadn
 
     def self.add_arobase_if_missing(username) # expects an array of username(s), works on the first one and outputs a string
       unless username.first == "me"
-        username = username.first.chars.to_a
+        username = username.first.chars
         username.unshift("@") unless username.first == "@"
       else
-        username = "me".chars.to_a
+        username = "me".chars
       end
       username.join
     end
 
+    def self.add_arobases_to_usernames args
+      args.map! do |username|
+        if username == 'me'
+          self.who_am_i
+        else
+          temp = username.chars
+          temp.unshift("@") unless temp.first == "@"
+          temp.join
+        end
+      end
+      args
+    end
+
+    def self.who_am_i
+      db = Databases.init(Dir.home + "/ayadn/accounts.db")
+      active = db['ACTIVE']
+      db[active][:handle]
+    end
+
     def self.remove_arobase_if_present(username)
-      username = username.chars.to_a
+      username = username.chars
       username.shift if username.first == "@"
       username.join
     end
@@ -284,7 +306,7 @@ module Ayadn
       users_hash
     end
 
-    def colorize_text(text, mentions)
+    def colorize_text(text, mentions, hashtags)
       reg_split = '[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]'
       #reg_tag = '#([A-Za-z0-9_]{1,255})(?![\w+])'
       reg_tag = '#([[:alpha:]0-9_]{1,255})(?![\w+])'
@@ -299,7 +321,24 @@ module Ayadn
       text.scan(/#{reg_sentence}/) do |sentence|
         sentence.split(' ').each do |word|
           if word =~ /#\w+/
-            words << word.gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
+            slices = word.split('#')
+            has_h = false
+            slices.each do |tag|
+              bit = tag.downcase.scan(/[[:alpha:]0-9_]/).join('')
+              if hashtags.include? bit
+                has_h = true
+              end
+            end
+            if has_h == true
+              if slices.length > 1
+                word = slices.join('#')
+                words << word.gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
+              else
+                words << word.gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
+              end
+            else
+              words << word
+            end
           elsif word =~ /@\w+/
             @str = def_str(word, reg_split)
             if handles.include?(@str.downcase)

data/lib/ayadn.rb

@@ -3,11 +3,11 @@ require_relative 'ayadn/version'
 
 %w{rest_client json thor rainbow/ext/string terminal-table yaml logger daybreak fileutils io/console}.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
+# winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
+# case Gem::Platform.local.os
+# when *winPlatforms
+#   require 'win32console'
+#   require 'pstore'
+# end
 
 require_relative 'ayadn/app'

data/spec/unit/workers_spec.rb

@@ -149,7 +149,7 @@ describe Ayadn::Workers do
     it "colorizes mentions and hashtags" do
       text = regex_post['data']['text']
       mentions = regex_post['data']['entities']['mentions']
-      expect(Ayadn::Workers.new.colorize_text(text, mentions)).to eq "\e[36m#test\e[0m \e[36m#regex\e[0m\n@aya_tests's \e[36m#true\e[0m\n(@aya_tests) \e[36m#true\e[0m\n@AyA_TeSts \e[36m#true\e[0m\n@aya_test \e[36m#false\e[0m\naya@aya_tests.yolo \e[36m#false\e[0m\n-@aya_tests:ohai! \e[36m#true\e[0m\ntext,@aya_tests,txt \e[36m#true\e[0m"
+      expect(Ayadn::Workers.new.colorize_text(text, mentions, ['false', 'true', 'test', 'regex'])).to eq "\e[36m#test\e[0m \e[36m#regex\e[0m\n@aya_tests's \e[36m#true\e[0m\n(@aya_tests) \e[36m#true\e[0m\n@AyA_TeSts \e[36m#true\e[0m\n@aya_test \e[36m#false\e[0m\naya@aya_tests.yolo \e[36m#false\e[0m\n-@aya_tests:ohai! \e[36m#true\e[0m\ntext,@aya_tests,txt \e[36m#true\e[0m"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor