ayadn 1.8.2 → 2.0

data/lib/ayadn/view.rb

@@ -4,6 +4,8 @@ module Ayadn
 
     def initialize
       @workers = Workers.new
+      @thor = Thor::Shell::Basic.new
+      @status = Status.new
     end
 
     def show_cursor
@@ -58,23 +60,23 @@ module Ayadn
       puts "\n"
     end
 
-    def show_list_followings(list, target)
-      puts @workers.build_followings_list(list, target)
+    def show_list_followings(list, target, options = {})
+      puts @workers.build_followings_list(list, target, options)
       puts "\n"
     end
 
-    def show_list_followers(list, target)
-      puts @workers.build_followers_list(list, target)
+    def show_list_followers(list, target, options = {})
+      puts @workers.build_followers_list(list, target, options)
       puts "\n"
     end
 
-    def show_list_muted(list)
-      puts @workers.build_muted_list(list)
+    def show_list_muted(list, options = {})
+      puts @workers.build_muted_list(list, options)
       puts "\n"
     end
 
-    def show_list_blocked(list)
-      puts @workers.build_blocked_list(list)
+    def show_list_blocked(list, options = {})
+      puts @workers.build_blocked_list(list, options)
       puts "\n"
     end
 
@@ -89,13 +91,16 @@ module Ayadn
 
     def show_settings
       table = Terminal::Table.new do |t|
-        t.style = { :width => Settings.options[:formats][:table][:width], border_x: ' ', border_i: ' ', border_y: ' ' }
+        if Settings.options[:formats][:table][:borders] == true
+          t.style = { :width => Settings.options[:formats][:table][:width], border_x: '—', border_i: '+', border_y: '|' }
+        else
+          t.style = { :width => Settings.options[:formats][:table][:width], border_x: ' ', border_i: ' ', border_y: ' ' }
+        end
         t.title = "Current Ayadn settings".color(:cyan)
         t.headings = [ "Category".color(:red), "Parameter".color(:red), "Value(s)".color(:red) ]
         @iter = 0
         opts = Settings.options.dup
         opts.each do |k,v|
-          v.delete_if {|ke,_| ke == :deleted || ke == :annotations} # don't show immutable values
           v.each do |x,y|
             t << :separator if @iter >= 1 && Settings.options[:timeline][:compact] == false
             unless y.is_a?(Hash)
@@ -111,20 +116,29 @@ module Ayadn
       end
       clear_screen()
       puts table
+      puts "\n"
     end
 
     def show_userinfos(content, token, show_ranks = false)
+      if Settings.options[:timeline][:compact] == true
+        padding = "\n"
+        view = "\n"
+      else
+        padding = "\n\n"
+        view = ""
+      end
+
       if content['name']
-        view = "Name\t\t\t".color(:cyan) + content['name'].color(Settings.options[:colors][:name])
+        view << "Name\t\t\t".color(:cyan) + content['name'].color(Settings.options[:colors][:name])
       else
-        view = "Name\t\t\t".color(:cyan) + "(no name)".color(:red)
+        view << "Name\t\t\t".color(:cyan) + "(no name)".color(:red)
       end
 
-      view << "\n\nUsername\t\t".color(:cyan) + "@#{content['username']}".color(Settings.options[:colors][:id])
+      view << "#{padding}Username\t\t".color(:cyan) + "@#{content['username']}".color(Settings.options[:colors][:username])
 
-      view << "\n\nID\t\t\t".color(:cyan) + content['id'].color(Settings.options[:colors][:username])
+      view << "#{padding}ID\t\t\t".color(:cyan) + content['id'].color(Settings.options[:colors][:id])
 
-      view << "\n\nURL\t\t\t".color(:cyan) + content['canonical_url'].color(Settings.options[:colors][:link])
+      view << "#{padding}URL\t\t\t".color(:cyan) + content['canonical_url'].color(Settings.options[:colors][:link])
 
       unless content['verified_domain'].nil?
         if content['verified_domain'] =~ (/http/ || /https/)
@@ -136,11 +150,11 @@ module Ayadn
       end
 
 
-      view << "\n\nAccount creation\t".color(:cyan) + @workers.parsed_time(content['created_at']).color(:green)
-      view << "\n\nTimeZone\t\t".color(:cyan) + content['timezone'].color(:green)
-      view << "\nLocale\t\t\t".color(:cyan) + content['locale'].color(:green)
+      view << "#{padding}Account creation\t".color(:cyan) + @workers.parsed_time(content['created_at']).color(Settings.options[:colors][:excerpt])
+      view << "#{padding}TimeZone\t\t".color(:cyan) + content['timezone'].color(Settings.options[:colors][:excerpt])
+      view << "\nLocale\t\t\t".color(:cyan) + content['locale'].color(Settings.options[:colors][:excerpt])
 
-      view << "\n\nPosts\t\t\t".color(:cyan) + content['counts']['posts'].to_s.color(:green)
+      view << "#{padding}Posts\t\t\t".color(:cyan) + content['counts']['posts'].to_s.color(Settings.options[:colors][:excerpt])
 
 
       unless show_ranks == false
@@ -148,25 +162,25 @@ module Ayadn
         # do call them all at once instead if many
         ranks = NiceRank.new.get_posts_day([content['id'].to_i])
         unless ranks.empty?
-          view << "\n\nPosts/day\t\t".color(:cyan) + ranks[0][:posts_day].to_s.color(:green)
+          view << "#{padding}Posts/day\t\t".color(:cyan) + ranks[0][:posts_day].to_s.color(Settings.options[:colors][:excerpt])
         end
       end
 
-      view << "\n\nFollowing\t\t".color(:cyan) + content['counts']['following'].to_s.color(:green)
-      view << "\nFollowers\t\t".color(:cyan) + content['counts']['followers'].to_s.color(:green)
+      view << "#{padding}Following\t\t".color(:cyan) + content['counts']['following'].to_s.color(Settings.options[:colors][:excerpt])
+      view << "\nFollowers\t\t".color(:cyan) + content['counts']['followers'].to_s.color(Settings.options[:colors][:excerpt])
 
       if content['username'] == Settings.config[:identity][:username] && !token.nil?
-        view << "\n\nStorage used\t\t".color(:cyan) + "#{token['storage']['used'].to_filesize}".color(:red)
-        view << "\nStorage available\t".color(:cyan) + "#{token['storage']['available'].to_filesize}".color(:green)
+        view << "#{padding}Storage used\t\t".color(:cyan) + "#{token['storage']['used'].to_filesize}".color(Settings.options[:colors][:excerpt])
+        view << "\nStorage available\t".color(:cyan) + "#{token['storage']['available'].to_filesize}".color(Settings.options[:colors][:excerpt])
       end
 
       #view << "\nStars\t\t\t".color(:cyan) + content['counts']['stars'].to_s.color(:yellow)
 
       unless content['username'] == Settings.config[:identity][:username]
         if content['you_follow']
-          view << "\n\nYou follow ".color(:cyan) + "@#{content['username']}".color(Settings.options[:colors][:username])
+          view << "#{padding}You follow ".color(:cyan) + "@#{content['username']}".color(Settings.options[:colors][:username])
         else
-          view << "\n\nYou don't follow ".color(:cyan) + "@#{content['username']}".color(Settings.options[:colors][:username])
+          view << "#{padding}You don't follow ".color(:cyan) + "@#{content['username']}".color(Settings.options[:colors][:username])
         end
         if content['follows_you']
           view << "\n" + "@#{content['username']}".color(Settings.options[:colors][:username]) + " follows you".color(:cyan)
@@ -182,7 +196,7 @@ module Ayadn
       end
 
       unless content['annotations'].empty?
-        view << "\n"
+        view << "\n" unless Settings.options[:timeline][:compact] == true
       end
       content['annotations'].each do |anno|
         case anno['type']
@@ -196,12 +210,17 @@ module Ayadn
       end
 
 
-      #view << "\n\nAvatar URL\t\t".color(:cyan) + content['avatar_image']['url']
+      #view << "#{padding}Avatar URL\t\t".color(:cyan) + content['avatar_image']['url']
 
       if content['description']
-        view << "\n\n#{content['description']['text']}\n".color(:magenta) + "\n\n"
+        mentions = content['description']['entities']['mentions'].map {|m| "@#{m['name']}"}
+        hashtags = content['description']['entities']['hashtags'].map {|m| m['name']}
+        view << "#{padding}#{@workers.colorize_text(content['description']['text'], mentions, hashtags)}\n"
+        view << "\n" unless Settings.options[:timeline][:compact] == true
       end
 
+      view << "\n" if Settings.options[:timeline][:compact] == true
+
       puts view
 
     end
@@ -210,18 +229,39 @@ module Ayadn
       view = ""
       bucket = @workers.build_channels(resp['data'], options)
       bucket.reverse.each do |ch|
-        view << "\n"
-        ch_alias = false
-        Databases.aliases.each do |k,v|
-          if v == "#{ch.id}"
-            ch_alias = k
-            break
+        if options[:broadcasts]
+          next if ch.type != "net.app.core.broadcast"
+        end
+        if options[:"no-broadcasts"]
+          next if ch.type == "net.app.core.broadcast"
+        end
+        if options[:messages]
+          next if ch.type != "net.app.core.pm"
+        end
+        if options[:"no-messages"]
+          next if ch.type == "net.app.core.pm"
+        end
+        if options[:patter]
+          next if ch.type != "net.patter-app.room"
+        end
+        if options[:"no-patter"]
+          next if ch.type == "net.patter-app.room"
+        end
+        if options[:other]
+          case ch.type
+          when "net.app.core.pm", "net.app.core.broadcast", "net.patter-app.room"
+            next
           end
         end
+        if options[:"no-other"]
+          next if ch.type != "net.app.core.pm" || ch.type != "net.app.core.broadcast" || ch.type != "net.patter-app.room"
+        end
+        view << "\n"
         view << "ID: ".color(:cyan)
         view << "#{ch.id}".color(Settings.options[:colors][:id])
         view << "\n"
-        if ch_alias
+        ch_alias = Databases.get_alias_from_id(ch.id)
+        unless ch_alias.nil?
           view << "Alias: ".color(:cyan)
           view << "#{ch_alias}".color(Settings.options[:colors][:username])
           view << "\n"
@@ -241,7 +281,7 @@ module Ayadn
           view << "\n"
         end
         view << "Type: ".color(:cyan)
-        view << "#{ch.type}".color(Settings.options[:colors][:id])
+        view << "#{ch.type}".color(Settings.options[:colors][:index])
         view << "\n"
         if ch.type == "net.patter-app.room"
           ann = ch.annotations.select {|a| a['type'] == "net.patter-app.settings"}
@@ -284,8 +324,11 @@ module Ayadn
         end
         view << "\n\n"
       end
-      view << "\nYour account is currently linked to #{bucket.length} channels.\n\n".color(:green) unless options[:channels] || options[:id]
       puts view
+      unless options[:channels] || options[:id]
+        @status.info("info", "your account is currently linked to #{bucket.length} channels", "cyan")
+        puts "\n"
+      end
     end
 
     def render(stream, options = {}, niceranks = {})
@@ -310,7 +353,8 @@ module Ayadn
     end
 
     def page msg
-      clear_screen
+      # clear_screen
+      puts "\n"
       puts msg
       puts "\n"
     end
@@ -320,12 +364,12 @@ module Ayadn
     end
 
     def show_links(links)
-      links.each {|l| puts "#{l}\n".color(Settings.options[:colors][:link])}
+      links.each {|l| puts "#{l}".color(Settings.options[:colors][:link])}
     end
 
     def all_hashtag_links(stream, hashtag)
       clear_screen()
-      puts "Links from posts containing hashtag '##{hashtag}': \n".color(:cyan)
+      @status.info("info", "links from posts containing hashtag '##{hashtag}':", "cyan")
       links = @workers.links_from_posts(stream)
       links.uniq!
       show_links(links)
@@ -334,7 +378,7 @@ module Ayadn
 
     def all_search_links(stream, words)
       clear_screen()
-      puts "Links from posts containing word(s) '#{words}': \n".color(:cyan)
+      @status.info("info", "links from posts containing word(s) '#{words}':", "cyan")
       links = @workers.links_from_posts(stream)
       links.uniq!
       show_links(links)
@@ -343,7 +387,7 @@ module Ayadn
 
     def all_stars_links(stream)
       clear_screen()
-      puts "Links from your starred posts: \n".color(:cyan)
+      @status.info("info", "links from your starred posts:", "cyan")
       links = @workers.links_from_posts(stream)
       links.uniq!
       show_links(links)
@@ -351,18 +395,17 @@ module Ayadn
     end
 
     def infos(stream, token)
-      clear_screen()
       show_userinfos(stream, token, true)
     end
 
     def downloading(options = {})
       unless options[:raw]
         clear_screen()
-        print Status.downloading
+        @status.downloading
       end
     end
 
-    def list(what, list, target)
+    def list(what, list, target, options = {})
       clear_screen()
       case what
       when :whoreposted
@@ -370,13 +413,13 @@ module Ayadn
       when :whostarred
         show_list_starred(list, target)
       when :followings
-        show_list_followings(list, target)
+        show_list_followings(list, target, options)
       when :followers
-        show_list_followers(list, target)
+        show_list_followers(list, target, options)
       when :muted
-        show_list_muted(list)
+        show_list_muted(list, options)
       when :blocked
-        show_list_blocked(list)
+        show_list_blocked(list, options)
       end
     end
 
@@ -388,7 +431,11 @@ module Ayadn
 
     def get_broadcast_alias_from_id(event_id)
       al = Databases.get_alias_from_id(event_id)
-      al.nil? ? event_id : al
+      if al.nil? || al.empty?
+        return event_id
+      else
+        return al
+      end
     end
 
     def filter_nicerank posts, options
@@ -396,13 +443,13 @@ module Ayadn
         if Settings.options[:nicerank][:filter] == true
           filtered = {}
           posts.each do |id,content|
-            if Settings.options[:nicerank][:filter_unranked] == true
+            if Settings.options[:nicerank][:unranked] == true
               next if content[:nicerank] == false
             end
             unless content[:nicerank] == false
               next if content[:nicerank] < Settings.options[:nicerank][:threshold]
-              next if content[:is_human] == false
-              next if content[:real_person] == false
+              next if content[:is_human] == 0
+              next if content[:real_person] == 0
             end
             filtered[id] = content
           end
@@ -510,7 +557,11 @@ module Ayadn
             inter << "welcomed ".color(:green)
             inter << "you!".color(:yellow)
         end
-        inter << "\n\n"
+        if Settings.options[:timeline][:compact] == true
+          inter << "\n"
+        else  
+          inter << "\n\n"
+        end
       end
       inter
     end
@@ -589,19 +640,27 @@ module Ayadn
     def build_header(content)
       header = ""
       header << content[:handle].color(Settings.options[:colors][:username])
-      if Settings.options[:timeline][:show_real_name]
+      if Settings.options[:timeline][:name]
         header << " "
         header << content[:name].color(Settings.options[:colors][:name])
       end
-      if Settings.options[:timeline][:show_date]
+      if Settings.options[:timeline][:date]
         header << " "
-        header << content[:date].color(Settings.options[:colors][:date])
+        if Settings.global[:scrolling] == false
+          header << content[:date].color(Settings.options[:colors][:date])
+        else
+          if Settings.options[:scroll][:date] == false
+            header << content[:date_short].color(Settings.options[:colors][:date])
+          else
+            header << content[:date].color(Settings.options[:colors][:date])
+          end
+        end
       end
-      if Settings.options[:timeline][:show_source]
+      if Settings.options[:timeline][:source]
         header << " "
         header << "[#{content[:source_name]}]".color(Settings.options[:colors][:source])
       end
-      if Settings.options[:timeline][:show_symbols]
+      if Settings.options[:timeline][:symbols]
         header << " <".color(Settings.options[:colors][:symbols]) if content[:is_reply]
         header << " #{content[:num_stars]}*".color(Settings.options[:colors][:symbols]) if content[:is_starred]
         header << " #{content[:num_reposts]}x".color(Settings.options[:colors][:symbols]) if content[:num_reposts] > 0