lib/ayadn/view.rb in ayadn-1.2.7 vs lib/ayadn/view.rb in ayadn-1.2.8

- old
+ new

@@ -180,13 +180,13 @@ puts view end - def show_channels(resp) + def show_channels(resp, options = {}) view = "" - bucket = @workers.build_channels(resp['data']) + 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}" @@ -209,13 +209,15 @@ view << "Owner: ".color(:cyan) view << "@#{ch.owner['username']}".color(Settings.options[:colors][:username]) # + (#{ch.owner['name']}) if ch.owner['name'] view << "\n" end - view << "Writers: ".color(:cyan) - view << "#{ch.writers}".color(Settings.options[:colors][:name]) - view << "\n" + unless options[:channels] # unless the request comes from Search + view << "Writers: ".color(:cyan) + view << "#{ch.writers}".color(Settings.options[:colors][:name]) + view << "\n" + end view << "Type: ".color(:cyan) view << "#{ch.type}".color(Settings.options[:colors][:id]) view << "\n" if ch.type == "net.patter-app.room" ann = ch.annotations.select {|a| a['type'] == "net.patter-app.settings"} @@ -256,11 +258,11 @@ view << ann[0]['value']['content'] view << "\n" end view << "\n\n" end - view << "\nYour account is currently linked to #{bucket.length} channels.\n\n".color(:green) + view << "\nYour account is currently linked to #{bucket.length} channels.\n\n".color(:green) unless options[:channels] puts view end def clear_screen puts "\e[H\e[2J" @@ -458,11 +460,11 @@ if Settings.options[:timeline][:show_real_name] header << " " header << content[:name].color(Settings.options[:colors][:name]) end - if Settings.options[:timeline][:show_nicerank] && content[:nicerank] + if Settings.options[:timeline][:show_nicerank] == true && content[:nicerank] if Settings.options[:nicerank][:filter] == true header << " " header << "[#{content[:nicerank]}]".color(Settings.options[:colors][:nicerank]) end end @@ -476,11 +478,11 @@ header << "[#{content[:source_name]}]".color(Settings.options[:colors][:source]) end if Settings.options[:timeline][:show_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 << " >".color(Settings.options[:colors][:symbols]) if content[:num_replies] > 0 header << " #{content[:num_reposts]}x".color(Settings.options[:colors][:symbols]) if content[:num_reposts] > 0 + header << " >".color(Settings.options[:colors][:symbols]) if content[:num_replies] > 0 end header << "\n" end def build_checkins(content)