ayadn 3.0 → 4.0

data/lib/ayadn/switch.rb

@@ -2,8 +2,8 @@
 module Ayadn
   class Switch
 
-    def initialize
-      @status = Status.new
+    def initialize status = Status.new
+      @status = status
       begin
         @acc_db = Amalgalite::Database.new(Dir.home + "/ayadn/accounts.sqlite")
       rescue Amalgalite::SQLite3::Error => e

data/lib/ayadn/user_object.rb

@@ -0,0 +1,116 @@
+# encoding: utf-8
+module Ayadn
+
+  class UserMetaObject
+
+    attr_reader :input, :code
+
+    def initialize hash, username = nil
+      @input = hash["meta"].nil? ? {} : hash["meta"]
+      @code = @input["code"]
+      if code == 404
+        Status.new.user_404(username)
+        Errors.info("User #{username} doesn't exist")
+        exit
+      end
+    end
+  end
+
+  class UserCountsObject 
+
+    attr_reader :input, :following, :posts, :followers, :stars
+
+    def initialize hash
+      @input = hash["counts"]
+      @following = @input["following"]
+      @posts = @input["posts"]
+      @followers = @input["followers"]
+      @stars = @input["stars"]
+    end
+  end
+
+  class UserAnnotationObject
+
+    attr_reader :input, :type, :value
+
+    def initialize hash
+      @input = hash
+      @type = @input["type"]
+      @value = @input["value"]
+    end
+  end
+
+  class AvatarImageObject
+
+    attr_reader :input, :url, :width, :is_default, :height
+
+    def initialize hash
+      @input = hash["avatar_image"]
+      @url = @input["url"]
+      @width = @input["width"]
+      @is_default = @input["is_default"]
+      @height = @input["height"]
+    end
+  end
+
+  class CoverImageObject
+
+    attr_reader :input, :url, :width, :is_default, :height
+
+    def initialize hash
+      @input = hash["cover_image"]
+      @url = @input["url"]
+      @width = @input["width"]
+      @is_default = @input["is_default"]
+      @height = @input["height"]
+    end
+  end
+
+  class UserDescriptionObject
+
+    attr_reader :input, :text, :entities
+
+    def initialize hash
+      @input = hash["description"].nil? ? {} : hash["description"]
+      @text = @input["text"].nil? ? "" : @input["text"]
+      @entities = EntitiesObject.new(@input)
+    end
+  end
+
+  class UserObject
+
+    attr_accessor :input, :you_muted, :you_can_subscribe, :is_following, :is_follower, :timezone, :you_follow, :counts, :canonical_url, :id, :locale, :type, :annotations, :username, :avatar_image, :description, :is_muted, :follows_you, :you_can_follow, :name, :created_at, :you_blocked, :cover_image, :verified_domain, :meta
+
+    def initialize hash, username = nil
+      @input = hash['data'].nil? ? hash : hash['data']
+      @meta = UserMetaObject.new(hash, username)
+      @you_muted = @input["you_muted"]
+      @you_can_subscribe = @input["you_can_subscribe"]
+      @is_follower = @input["is_follower"]
+      @is_following = @input["is_following"]
+      @timezone = @input["timezone"]
+      @you_follow = @input["you_follow"]
+      @counts = UserCountsObject.new(@input) unless @input.empty?
+      @canonical_url = @input["canonical_url"]
+      @id = @input["id"]
+      @locale = @input["locale"]
+      @type = @input["type"]
+      if !@input["annotations"].nil?
+        @annotations = @input["annotations"].map { |hash| UserAnnotationObject.new(hash) }
+      else
+        @annotations = []
+      end
+      @username = @input["username"]
+      @avatar_image = AvatarImageObject.new(@input) unless @input.empty?
+      @description = UserDescriptionObject.new(@input) unless @input.empty?
+      @is_muted = @input["is_muted"]
+      @follows_you = @input["follows_you"]
+      @you_can_follow = @input["you_can_follow"]
+      @name = @input["name"].to_s.force_encoding("UTF-8")
+      @created_at = @input["created_at"]
+      @you_blocked = @input["you_blocked"]
+      @cover_image = CoverImageObject.new(@input) unless @input.empty?
+      @verified_domain = @input["verified_domain"]
+    end
+  end
+end

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -2,9 +2,9 @@
 module Ayadn
   class View
 
-    def initialize
-      @workers = Workers.new
-      @status = Status.new
+    def initialize status = Status.new, workers = nil
+      @status = status
+      @workers = workers.nil? ? Workers.new(status) : workers
     end
 
     def show_cursor
@@ -16,13 +16,18 @@ module Ayadn
     end
 
     def show_posts_with_index(data, options = {}, niceranks = {})
-      posts, view = build_stream_with_index(data, options, niceranks)
+      posts, view = build_stream_with_index(data.posts, options, niceranks)
       puts view unless view == ""
       Databases.save_indexed_posts(posts)
     end
 
     def show_posts(data, options = {}, niceranks = {})
-      resp = build_stream_without_index(data, options, niceranks)
+      resp = build_stream_without_index(data.posts, options, niceranks)
+      puts resp unless resp == ""
+    end
+
+    def show_messages messages
+      resp = build_stream_without_index(messages, {}, {})
       puts resp unless resp == ""
     end
 
@@ -34,7 +39,14 @@ module Ayadn
     end
 
     def show_raw(stream, options = {})
-      #puts stream.to_json
+      if stream.is_a? Hash
+        show_direct_raw stream
+      else
+        jj stream.input
+      end
+    end
+
+    def show_direct_raw(stream, options = {})
       jj stream
     end
 
@@ -43,7 +55,7 @@ module Ayadn
     end
 
     def show_posted(resp)
-      show_simple_post([resp['data']], {})
+      show_simple_post([PostObject.new(resp['data'])], {})
       puts "\n" if timeline_is_compact
     end
 
@@ -61,57 +73,7 @@ module Ayadn
 
     def show_list_followings(list, target, options = {})
       if options["lastpost"]
-        clear_screen()
-        bucket = []
-        list.each do |k,v|
-          bucket << [k, v[0], v[1], v[2], v[3], v[4], v[5]]
-        end
-        count = bucket.size
-        if options[:username]
-          bucket.sort_by! { |obj| obj[1] }
-        elsif options[:name]
-          bucket.sort_by! { |obj| obj[2] }
-        elsif options[:posts]
-          bucket.sort_by! { |obj| [obj[5], obj[1]] }.reverse!
-        elsif options[:date]
-          bucket.keep_if { |obj| !obj[6].nil? }
-          bucket.sort_by! { |obj| obj[6]["created_at"] }.reverse!
-        end
-        title = if target == "me"
-            "Last post of users you're following".color(:cyan)
-          else
-            "Last post of users ".color(:cyan) + "#{target}".color(:red) + " is following ".color(:cyan)
-          end
-        puts "\t#{title}\n\n"
-        bucket.each.with_index(1) do |obj,index|
-          username = "@#{obj[1]}"
-          colored_username = username.color(color_username)
-          if obj[6].nil?
-            @workers.thor.say_status :warning, "user #{colored_username} has no posts, ignored", :red
-            newline() 
-            next
-          end
-          date = @workers.parsed_time(obj[6]["created_at"])
-          mentions = @workers.extract_mentions(obj[6])
-          hashtags = @workers.extract_hashtags(obj[6])
-          text = @workers.colorize_text(obj[6]["text"], mentions, hashtags)
-          total = "(#{obj[5]} posts)"
-          name = obj[2] == "" ? "(no name)" : obj[2]
-          colored_total = total.color(color_link)
-          colored_name = name.color(color_name)
-          colored_date = date.color(color_date)
-          puts "#{colored_username} #{colored_name} #{colored_date} #{colored_total}\n"
-          newline()
-          puts text
-          unless index == count
-            newline()
-            puts "----------\n"
-            newline()
-          else
-            puts "\n"
-            newline()
-          end
-        end
+        show_list_with_lastpost(list, target, options)
       else
         puts @workers.build_followings_list(list, target, options)
         puts "\n"
@@ -143,44 +105,13 @@ module Ayadn
     end
 
     def show_settings
-      table = Terminal::Table.new do |t|
-        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.each do |x,y|
-            t << :separator if @iter >= 1 && timeline_is_compact == false
-            unless y.is_a?(Hash)
-              t << [ k.to_s.color(:cyan), x.to_s.color(:yellow), y.to_s.color(:green) ]
-            else
-              y.each do |c|
-                yk = c[0]
-                tempv = c[1].to_s
-                if tempv.size > 10
-                  yv = "#{tempv[0..7]}..."
-                else
-                  yv = tempv
-                end
-                t << [ k.to_s.color(:cyan), x.to_s.color(:yellow), "#{yk} = #{yv}".color(:green) ]
-              end
-            end
-            @iter += 1
-          end
-        end
-      end
       clear_screen()
-      puts table
+      puts Settings.options.to_table
       puts "\n"
     end
 
-    def show_userinfos(content, token, show_ranks = false)
-      if timeline_is_compact == true
+    def show_userinfos(user, token, show_ranks = false)
+      if timeline_is_compact
         padding = "\n"
         view = "\n"
       else
@@ -188,106 +119,92 @@ module Ayadn
         view = ""
       end
 
-      if content['name']
-        view << "Name\t\t\t".color(:cyan) + content['name'].color(color_name)
+      if !user.name.blank?
+        view << "Name\t\t\t".color(:cyan) + user.name.color(color_name)
       else
         view << "Name\t\t\t".color(:cyan) + "(no name)".color(:red)
       end
 
-      view << "#{padding}Username\t\t".color(:cyan) + "@#{content['username']}".color(color_username)
+      view << "#{padding}Username\t\t".color(:cyan) + "@#{user.username}".color(color_username)
 
-      view << "#{padding}ID\t\t\t".color(:cyan) + content['id'].color(color_id)
+      view << "#{padding}ID\t\t\t".color(:cyan) + user.id.color(color_id)
 
-      view << "#{padding}URL\t\t\t".color(:cyan) + content['canonical_url'].color(color_link)
+      view << "#{padding}URL\t\t\t".color(:cyan) + user.canonical_url.color(color_link)
 
-      unless content['verified_domain'].nil?
-        if content['verified_domain'] =~ (/http/ || /https/)
-           domain = content['verified_domain']
+      unless user.verified_domain.nil?
+        if user.verified_domain =~ (/http/ || /https/)
+           domain = user.verified_domain
         else
-          domain = "http://#{content['verified_domain']}"
+          domain = "http://#{user.verified_domain}"
         end
         view << "\nVerified domain\t\t".color(:cyan) + domain.color(color_link)
       end
 
 
-      view << "#{padding}Account creation\t".color(:cyan) + @workers.parsed_time(content['created_at']).color(color_excerpt)
-      view << "#{padding}TimeZone\t\t".color(:cyan) + content['timezone'].color(color_excerpt)
-      view << "\nLocale\t\t\t".color(:cyan) + content['locale'].color(color_excerpt)
-
-      view << "#{padding}Posts\t\t\t".color(:cyan) + content['counts']['posts'].to_s.color(color_excerpt)
-
+      view << "#{padding}Account creation\t".color(:cyan) + @workers.parsed_time(user.created_at).color(color_excerpt)
+      view << "#{padding}TimeZone\t\t".color(:cyan) + user.timezone.color(color_excerpt)
+      view << "\nLocale\t\t\t".color(:cyan) + user.locale.color(color_excerpt)
 
-      # unless show_ranks == false
-      #   # this is ok for one user, but do not call this in a loop
-      #   # do call them all at once instead if many
-      #   ranks = NiceRank.new.get_posts_day([content['id'].to_i])
-      #   unless ranks.empty?
-      #     view << "#{padding}Posts/day\t\t".color(:cyan) + ranks[0][:posts_day].to_s.color(color_excerpt)
-      #   end
-      # end
+      view << "#{padding}Posts\t\t\t".color(:cyan) + user.counts.posts.to_s.color(color_excerpt)
 
-      view << "#{padding}Following\t\t".color(:cyan) + content['counts']['following'].to_s.color(color_excerpt)
-      view << "\nFollowers\t\t".color(:cyan) + content['counts']['followers'].to_s.color(color_excerpt)
+      view << "#{padding}Following\t\t".color(:cyan) + user.counts.following.to_s.color(color_excerpt)
+      view << "\nFollowers\t\t".color(:cyan) + user.counts.followers.to_s.color(color_excerpt)
 
-      if content['username'] == Settings.config[:identity][:username] && !token.nil?
+      if user.username == Settings.config.identity.username && !token.nil?
         view << "#{padding}Storage used\t\t".color(:cyan) + "#{token['storage']['used'].to_filesize}".color(color_excerpt)
         view << "\nStorage available\t".color(:cyan) + "#{token['storage']['available'].to_filesize}".color(color_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 << "#{padding}You follow ".color(:cyan) + "@#{content['username']}".color(color_username)
+      unless user.username == Settings.config.identity.username
+        if user.you_follow
+          view << "#{padding}You follow ".color(:cyan) + "@#{user.username}".color(color_username)
         else
-          view << "#{padding}You don't follow ".color(:cyan) + "@#{content['username']}".color(color_username)
+          view << "#{padding}You don't follow ".color(:cyan) + "@#{user.username}".color(color_username)
         end
-        if content['follows_you']
-          view << "\n" + "@#{content['username']}".color(color_username) + " follows you".color(:cyan)
+        if user.follows_you
+          view << "\n" + "@#{user.username}".color(color_username) + " follows you".color(:cyan)
         else
-          view << "\n" + "@#{content['username']}".color(color_username) + " doesn't follow you".color(:cyan)
+          view << "\n" + "@#{user.username}".color(color_username) + " doesn't follow you".color(:cyan)
         end
-        if content['you_muted']
-          view << "\nYou muted " + "@#{content['username']}".color(color_username)
+        if user.you_muted
+          view << "\nYou muted " + "@#{user.username}".color(color_username)
         end
-        if content['you_blocked']
-          view << "\nYou blocked " + "@#{content['username']}".color(color_username)
+        if user.you_blocked
+          view << "\nYou blocked " + "@#{user.username}".color(color_username)
         end
       end
 
-      unless content['annotations'].empty?
-        view << "\n" unless timeline_is_compact == true
+      unless user.annotations.empty?
+        view << "\n" unless timeline_is_compact
       end
-      content['annotations'].each do |anno|
-        case anno['type']
+      user.annotations.each do |anno|
+        case anno.type
         when "net.app.core.directory.blog"
-          view << "\nBlog\t\t\t".color(:cyan) + "#{anno['value']['url']}".color(color_link)
+          view << "\nBlog\t\t\t".color(:cyan) + "#{anno.value['url']}".color(color_link)
         when "net.app.core.directory.twitter"
-          view << "\nTwitter\t\t\t".color(:cyan) + "#{anno['value']['username']}".color(:green)
+          view << "\nTwitter\t\t\t".color(:cyan) + "#{anno.value['username']}".color(:green)
         when "com.appnetizens.userinput.birthday"
-          view << "\nBirthday\t\t".color(:cyan) + "#{anno['value']['birthday']}".color(:green)
+          view << "\nBirthday\t\t".color(:cyan) + "#{anno.value['birthday']}".color(:green)
         end
       end
 
-
-      #view << "#{padding}Avatar URL\t\t".color(:cyan) + content['avatar_image']['url']
-
-      if content['description']
-        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 timeline_is_compact == true
+      if !user.description.blank?
+        mentions = user.description.entities.mentions.map {|m| "@#{m.name}"}
+        hashtags = user.description.entities.hashtags.map {|m| m.name}
+        view << "#{padding}#{@workers.colorize_text(user.description.text, mentions, hashtags)}\n"
+        view << "\n" unless timeline_is_compact
       end
 
-      view << "\n" if timeline_is_compact == true
+      view << "\n" if timeline_is_compact
 
       puts view
 
     end
 
-    def show_channels(resp, options = {})
+    def show_channels(stream, options = {})
       view = ""
-      bucket = @workers.build_channels(resp['data'], options)
+      bucket = @workers.build_channels(stream, options)
+
       bucket.reverse.each do |ch|
         if options[:broadcasts]
           next if ch.type != "net.app.core.broadcast"
@@ -331,8 +248,7 @@ module Ayadn
         view << "\n"
         if ch.owner
           view << "Owner: ".color(:cyan)
-          view << "@#{ch.owner['username']}".color(color_username)
-          # + (#{ch.owner['name']}) if ch.owner['name']
+          view << "@#{ch.owner.username}".color(color_username)
           view << "\n"
         end
         unless options[:channels] # unless the request comes from Search
@@ -344,42 +260,42 @@ module Ayadn
         view << "#{ch.type}".color(color_index)
         view << "\n"
         if ch.type == "net.patter-app.room"
-          ann = ch.annotations.select {|a| a['type'] == "net.patter-app.settings"}
+          ann = ch.annotations.select {|a| a.type == "net.patter-app.settings"}
           view << "Name: ".color(:cyan)
-          view << "#{ann[0]['value']['name']}".color(color_link)
+          view << "#{ann[0].value['name']}".color(color_link)
           view << "\n"
           view << "Description: ".color(:cyan)
-          view << "#{ann[0]['value']['blurb']}".color(color_username)
+          view << "#{ann[0].value['blurb']}".color(color_username)
           view << "\n"
-          ann = ch.annotations.select {|a| a['type'] == "net.app.core.fallback_url"}
+          ann = ch.annotations.select {|a| a.type == "net.app.core.fallback_url"}
           view << "URL: ".color(:cyan)
-          view << "#{ann[0]['value']['url']}".color(color_link)
+          view << "#{ann[0].value['url']}".color(color_link)
           view << "\n"
         end
         if ch.type == "net.app.core.broadcast"
-          ann = ch.annotations.select {|a| a['type'] == "net.app.core.broadcast.metadata"}
+          ann = ch.annotations.select {|a| a.type == "net.app.core.broadcast.metadata"}
           view << "Title: ".color(:cyan)
-          view << "#{ann[0]['value']['title']}".color(color_link)
+          view << "#{ann[0].value['title']}".color(color_link)
           view << "\n"
           view << "Description: ".color(:cyan)
-          view << "#{ann[0]['value']['description']}".color(color_username)
+          view << "#{ann[0].value['description']}".color(color_username)
           view << "\n"
-          ann = ch.annotations.select {|a| a['type'] == "net.app.core.fallback_url"}
+          ann = ch.annotations.select {|a| a.type == "net.app.core.fallback_url"}
           view << "URL: ".color(:cyan)
-          view << "#{ann[0]['value']['url']}".color(color_link)
+          view << "#{ann[0].value['url']}".color(color_link)
           view << "\n"
         end
         unless ch.recent_message.nil?
-          unless ch.recent_message['text'].nil?
-            view << "Most recent message (#{@workers.parsed_time(ch.recent_message['created_at'])}): ".color(:cyan)
+          unless ch.recent_message.text.nil?
+            view << "Most recent message (#{@workers.parsed_time(ch.recent_message.created_at)}): ".color(:cyan)
             view << "\n"
-            view << "---\n#{ch.recent_message['text']}\n---"
+            view << "---\n#{ch.recent_message.text}\n---"
           end
         end
         if ch.type == "net.paste-app.clips"
-          ann = ch.recent_message['annotations'].select {|a| a['type'] == "net.paste-app.clip"}
+          ann = ch.recent_message.annotations.select {|a| a.type == "net.paste-app.clip"}
           view << "\n\n"
-          view << ann[0]['value']['content']
+          view << ann[0].value['content']
           view << "\n"
         end
         view << "\n\n"
@@ -393,18 +309,18 @@ module Ayadn
 
     def render(stream, options = {}, niceranks = {})
       unless options[:raw]
-        get(stream['data'], options, niceranks)
+        get(stream, options, niceranks)
       else
         show_raw(stream)
       end
     end
 
-    def get(stream, options = {}, niceranks = {})
+    def get(data, options = {}, niceranks = {})
       clear_screen()
       if options[:index]
-        show_posts_with_index(stream, options, niceranks)
+        show_posts_with_index(data, options, niceranks)
       else
-        show_posts(stream, options, niceranks)
+        show_posts(data, options, niceranks)
       end
     end
 
@@ -428,30 +344,15 @@ module Ayadn
     end
 
     def all_hashtag_links(stream, hashtag)
-      clear_screen()
-      @status.info("info", "links from posts containing hashtag '##{hashtag}':", "cyan")
-      links = @workers.links_from_posts(stream)
-      links.uniq!
-      show_links(links)
-      @workers.save_links(links, "hashtag", hashtag)
+      all_links(stream, "hashtag", hashtag)
     end
 
     def all_search_links(stream, words)
-      clear_screen()
-      @status.info("info", "links from posts containing word(s) '#{words}':", "cyan")
-      links = @workers.links_from_posts(stream)
-      links.uniq!
-      show_links(links)
-      @workers.save_links(links, "search", words)
+      all_links(stream, "search", hashtag)
     end
 
     def all_stars_links(stream)
-      clear_screen()
-      @status.info("info", "links from your starred posts:", "cyan")
-      links = @workers.links_from_posts(stream)
-      links.uniq!
-      show_links(links)
-      @workers.save_links(links, 'starred')
+      all_links(stream, "starred")
     end
 
     def infos(stream, token)
@@ -489,8 +390,83 @@ module Ayadn
 
     private
 
+    def all_links stream, type, arg = nil
+      clear_screen()
+      case type
+      when "hashtag"
+        @status.all_hashtag_links(arg)
+      when "search"
+        @status.all_search_links(arg)
+      when "starred"
+        @status.all_stars_links
+      end
+      links = @workers.links_from_posts(stream)
+      links.uniq!
+      show_links(links)
+      arg.nil? ? @workers.save_links(links, type) : @workers.save_links(links, type, arg)
+    end
+
+    ### list = id => [username, name, bool, bool, int, message]
+    def show_list_with_lastpost(list, target, options)
+      clear_screen()
+      bucket = []
+      list.each do |k,v|
+        if !v[5].nil?
+          bucket << [k, v[0], v[1], v[2], v[3], v[4], PostObject.new(v[5])]
+        else
+          bucket << [k, v[0], v[1], v[2], v[3], v[4], nil]
+        end
+      end
+      count = bucket.size
+      if options[:username]
+        bucket.sort_by! { |obj| obj[1] }
+      elsif options[:name]
+        bucket.sort_by! { |obj| obj[2] }
+      elsif options[:posts]
+        bucket.sort_by! { |obj| [obj[5], obj[1]] }.reverse!
+      elsif options[:date]
+        bucket.keep_if { |obj| !obj[6].nil? }
+        bucket.sort_by! { |obj| obj[6].created_at }.reverse!
+      end
+      title = if target == "me"
+          "Last post of users you're following".color(:cyan)
+        else
+          "Last post of users ".color(:cyan) + "#{target}".color(:red) + " is following ".color(:cyan)
+        end
+      puts "\t#{title}\n\n"
+      bucket.each.with_index(1) do |obj,index|
+        username = "@#{obj[1]}"
+        colored_username = username.color(color_username)
+        if obj[6].nil?
+          @status.thor.say_status :warning, "user #{colored_username} has no posts, ignored", :red
+          newline() 
+          next
+        end
+        date = @workers.parsed_time(obj[6].created_at)
+        mentions = @workers.extract_mentions(obj[6])
+        hashtags = @workers.extract_hashtags(obj[6])
+        text = @workers.colorize_text(obj[6].text, mentions, hashtags)
+        total = "(#{obj[5]} posts)"
+        name = obj[2].blank? ? "(no name)" : obj[2]
+        colored_total = total.color(color_link)
+        colored_name = name.color(color_name)
+        colored_date = date.color(color_date)
+        puts "#{colored_username} #{colored_name} #{colored_date} #{colored_total}\n"
+        newline()
+        puts text
+        unless index == count
+          newline()
+          puts "----------\n"
+          newline()
+        else
+          puts "\n"
+          newline()
+        end
+      end
+    end
+
     def newline
-      puts "\n" unless timeline_is_compact == true 
+      puts "\n" unless timeline_is_compact 
     end
 
     def get_broadcast_alias_from_id(event_id)
@@ -503,78 +479,78 @@ module Ayadn
     end
 
     def filter_nicerank posts, options
-      if options[:filter] == true # if this option is true in Action (it's only for global, actually)
-        if Settings.options[:nicerank][:filter] == true
-          filtered = {}
-          posts.each do |id,content|
-            if Settings.options[:nicerank][:unranked] == true
-              next if content[:nicerank] == false
+      if options[:filter] # if this option is true in Action (it's only for global, actually)
+        if Settings.options.nicerank.filter
+          bucket = []
+          posts.each do |post|
+            if Settings.options.nicerank.unranked
+              next if !post.nicerank # .nicerank is False or Fixnum (yeah...)
             end
-            unless content[:nicerank] == false
-              next if content[:nicerank] < Settings.options[:nicerank][:threshold]
-              next if content[:is_human] == 0
+            unless !post.nicerank
+              next if post.nicerank < Settings.options.nicerank.threshold
+              next if post.is_human == 0
             end
-            filtered[id] = content
+            bucket << post
           end
-          return filtered
+          return bucket
         end
       end
       return posts
     end
 
-    def build_stream_with_index(data, options, niceranks) #expects an array
+    def build_stream_with_index(posts, options, niceranks)
       @view = ""
-      posts = filter_nicerank(@workers.build_posts(data.reverse, niceranks), options)
-      posts.each do |id,content|
-        format = "%03d" % content[:count]
-        arrow = arrow_count(options, content)
+      posts = filter_nicerank(@workers.build_posts(posts.reverse, niceranks), options)
+      posts.each do |post|
+        format = "%03d" % post.count
+        arrow = arrow_count(options, post)
         count = "#{arrow}#{format}"
-        if content[:username] == Settings.config[:identity][:username]
+        if post.username == Settings.config.identity.username
           @view << count.color(color_index).inverse
-        elsif content[:mentions].include?(Settings.config[:identity][:username]) && options[:in_mentions].nil?
+        elsif post.mentions.include?(Settings.config.identity.username) && options[:in_mentions].nil?
           @view << count.color(color_mention).inverse
         else
           @view << count.color(color_index)
         end
         @view << ": ".color(color_index)
-        @view << build_content(content)
+        @view << build_content(post)
       end
       return posts, @view
     end
 
-    def build_stream_without_index(data, options, niceranks) #expects an array
+    def build_stream_without_index(posts, options, niceranks)
       @view = ""
-      posts = filter_nicerank(@workers.build_posts(data.reverse, niceranks), options)
-      posts.each do |id,content|
-        content[:id] = arrow_id(options, content)
-        if content[:username] == Settings.config[:identity][:username]
-          @view << content[:id].color(color_id).inverse + " "
-        elsif content[:mentions].include?(Settings.config[:identity][:username]) && options[:in_mentions].nil?
-          @view << content[:id].color(color_mention).inverse + " "
+      posts = filter_nicerank(@workers.build_posts(posts.reverse, niceranks), options)
+      posts.each do |post|
+        post.id = arrow_id(options, post)
+        if post.username == Settings.config.identity.username
+          @view << post.id.color(Settings.options.colors.id).inverse + " "
+        elsif post.mentions.include?(Settings.config.identity.username) && options[:in_mentions].nil?
+          @view << post.id.color(color_mention).inverse + " "
         else
-          @view << content[:id].color(color_id) + " "
+          @view << post.id.color(Settings.options.colors.id) + " "
         end
-        @view << build_content(content)
+        @view << build_content(post)
       end
       @view
     end
 
-    def arrow_count options, content
+    def arrow_count options, post
       if options[:reply_to]
-        return '⬇︎ ' if options[:reply_to] == content[:id]
-        return '⬆︎ ' if options[:post_id] == content[:id]
+        return '⬇︎ ' if options[:reply_to] == post.id
+        return '⬆︎ ' if options[:post_id] == post.id
         return ''
       end
       ''
     end
 
-    def arrow_id options, content
+    def arrow_id options, post
       if options[:reply_to]
-        return content[:id].to_s.prepend('⬇︎ ') if options[:reply_to] == content[:id]
-        return content[:id].to_s.prepend('⬆︎ ') if options[:post_id] == content[:id]
-        return content[:id].to_s
+        return post.id.to_s.prepend('⬇︎ ') if options[:reply_to] == post.id
+        return post.id.to_s.prepend('⬆︎ ') if options[:post_id] == post.id
+        return post.id.to_s
       end
-      content[:id].to_s
+      post.id.to_s
     end
 
     def build_interactions_stream(data)
@@ -620,7 +596,7 @@ module Ayadn
             inter << "welcomed ".color(:green)
             inter << "you!".color(:yellow)
         end
-        if timeline_is_compact == true
+        if timeline_is_compact
           inter << "\n"
         else  
           inter << "\n\n"
@@ -672,25 +648,25 @@ module Ayadn
       view
     end
 
-    def build_content(content)
+    def build_content(post)
       view = ""
-      view << build_header(content)
-      view << "\n" unless timeline_is_compact == true
-      view << content[:text]
-      view << "\n" unless timeline_is_compact == true
-      if content[:has_checkins]
-        view << build_checkins(content)
-        view << "\n" unless timeline_is_compact == true
-      end
-      unless content[:links].empty?
+      view << build_header(post)
+      view << "\n" unless timeline_is_compact
+      view << post.text
+      view << "\n" unless timeline_is_compact
+      if post.has_checkins
+        view << build_checkins(post)
+        view << "\n" unless timeline_is_compact
+      end
+      unless post.links.empty?
         view << "\n"
-        content[:links].each do |link|
+        post.links.each do |link|
           view << link.color(color_link)
           view << "\n"
         end
       end
-      if timeline_is_compact == true
-        if content[:links].empty?
+      if timeline_is_compact
+        if post.links.empty?
           view << "\n"
         else
           view
@@ -700,75 +676,76 @@ module Ayadn
       end
     end
 
-    def build_header(content)
+    def build_header(post)
       header = ""
-      header << content[:handle].color(color_username)
-      if Settings.options[:timeline][:name]
+      header << post.handle.color(color_username)
+      if Settings.options.timeline.name
         header << " "
-        header << content[:name].color(color_name)
+        header << post.name.color(color_name)
       end
-      if Settings.options[:timeline][:date]
+      if Settings.options.timeline.date
         header << " "
-        if Settings.global[:scrolling] == false
-          header << content[:date].color(color_date)
+        if !Settings.global.scrolling
+          header << post.date.color(color_date)
         else
-          if Settings.options[:scroll][:date] == false
-            header << content[:date_short].color(color_date)
+          if !Settings.options.scroll.date
+            header << post.date_short.color(color_date)
           else
-            header << content[:date].color(color_date)
+            header << post.date.color(color_date)
           end
         end
       end
-      if Settings.options[:timeline][:source]
+      if Settings.options.timeline.source
         header << " "
-        header << "[#{content[:source_name]}]".color(color_source)
+        header << "[#{post.source_name}]".color(color_source)
       end
-      if Settings.options[:timeline][:symbols]
-        header << " <".color(color_symbols) if content[:is_reply]
-        header << " #{content[:num_stars]}*".color(color_symbols) if content[:is_starred]
-        header << " #{content[:num_reposts]}x".color(color_symbols) if content[:num_reposts] > 0
-        header << " >".color(color_symbols) if content[:num_replies] > 0
+      if Settings.options.timeline.symbols
+        header << " <".color(color_symbols) if post.is_reply
+        header << " #{post.num_stars}*".color(color_symbols) if post.is_starred
+        header << " #{post.num_reposts}x".color(color_symbols) if post.num_reposts > 0
+        header << " >".color(color_symbols) if post.num_replies > 0
       end
       header << "\n"
     end
 
-    def build_checkins(content)
-      unless content[:checkins][:name].nil?
-        num_dots = content[:checkins][:name].length
+    def build_checkins(post)
+      unless post.checkins['name'].nil?
+        num_dots = post.checkins['name'].length
       else
         num_dots = 10
       end
-      if timeline_is_compact == true
+      if timeline_is_compact
         hd = "\n"
       else
         hd = (".".color(color_dots)) * num_dots
         hd << "\n"
       end
       formatted = { header: hd }
-      content[:checkins].each do |key, val|
+      post.checkins.each do |key, val|
           formatted[key] = val
       end
 
       formatted[:name] = "" if formatted[:name].nil?
       chk = formatted[:header]
+
       unless formatted[:name] == ""
         chk << formatted[:name].color(color_dots)
         chk << "\n"
       end
-      unless formatted[:title].nil? || formatted[:title] == formatted[:name]
+      unless formatted[:title].blank? || formatted[:title] == formatted[:name]
         chk << formatted[:title]
         chk << "\n"
       end
-      unless formatted[:address].nil?
+      unless formatted[:address].blank?
         chk << formatted[:address]
         chk << "\n"
       end
+
       unless formatted[:address_extended].nil?
         chk << formatted[:address_extended]
         chk << "\n"
       end
-
-      unless formatted[:postcode].nil?
+      unless formatted[:postcode].blank?
         unless formatted[:locality].nil?
           chk << "#{formatted[:postcode]}, #{formatted[:locality]}"
         else
@@ -817,51 +794,51 @@ module Ayadn
     private
 
     def color_username
-      Settings.options[:colors][:username]
+      Settings.options.colors.username
     end
 
     def color_name
-      Settings.options[:colors][:name]
+      Settings.options.colors.name
     end
 
     def color_link
-      Settings.options[:colors][:link]
+      Settings.options.colors.link
     end
 
     def color_date
-      Settings.options[:colors][:date]
+      Settings.options.colors.date
     end
 
     def color_id
-      Settings.options[:colors][:id]
+      Settings.options.colors.id
     end
 
     def color_excerpt
-      Settings.options[:colors][:excerpt]
+      Settings.options.colors.excerpt
     end
 
     def color_symbols
-      Settings.options[:colors][:symbols]
+      Settings.options.colors.symbols
     end
 
     def color_index
-      Settings.options[:colors][:index]
+      Settings.options.colors.index
     end
 
     def color_mention
-      Settings.options[:colors][:mentions]
+      Settings.options.colors.mentions
     end
 
     def color_source
-      Settings.options[:colors][:source]
+      Settings.options.colors.source
     end
 
     def color_dots
-      Settings.options[:colors][:dots]
+      Settings.options.colors.dots
     end
 
     def timeline_is_compact
-      Settings.options[:timeline][:compact]
+      Settings.options.timeline.compact
     end
 
   end