ayadn 1.7.7 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be6bf71c51621964932bfa952f50e7622cf90d1f
-  data.tar.gz: 772b97b6a9f4257ef2e9bc56f67690c238e49ff4
+  metadata.gz: 080c008e1d5732b1310756187a89ad3995504abe
+  data.tar.gz: 085cae4dcd6c0758c77c77f553d4cb55d24ab0a7
 SHA512:
-  metadata.gz: 88b558768373966f568626ddbbfb9c2bc6cec3d96f45f48a0786d374e0d0bb44aef7eefe488cff17badf4f6eff0912e5532d019eab9e741ce1372f7cede6ad6f
-  data.tar.gz: 75e1ff70e91f48e29340256f2e0db255dfd3555c5fecdbf7271b66281d5133ace8d3f13a275548e51c784f878534dbfd7b68efd1e982ccbe66d57b5d162b2826
+  metadata.gz: 96318e16dee9df86808ad68267d9319e589ec7de004c6be8c208917dda19665b496d34560b4a3214a19d9318eae7c57fecf0c0c92c3d209f49eae9b672ed6239
+  data.tar.gz: 6a52b3b2cdb1ec73dc647fe47b1625ecfcb25460222c01f29b03d9f0a4045dfb011115715b56dc06efb918c907405e68e91e97d947b85cfbf04622df38b85fa7

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.8.0 - 2014-10-29 - 'Cascadeur'
+
+- New: command to view all unread PMs
+- New: channel commands can update unread status (default: true)
+- Fix: nowplaying iTunes Store results are much more accurate
+- Fix: faster follow/mute/block/delete actions
+- Fix: root post of conversation shows "has replies" symbol
+- Fix: clear screen before showing spinner in scroll
+- Fix: save lists if backup enabled
+- Update: debug info included in posts annotations
+- Update: gem dependencies
+
 # 1.7.7 - 2014-10-26 - 'The Twins'
 
 - Fix: max characters information when sending to a channel

data/ayadn.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "thor", "~> 0.18"
-  spec.add_dependency "rest-client", "~> 1.6"
+  spec.add_dependency "thor", "~> 0.19"
+  spec.add_dependency "rest-client", "~> 1.7"
   spec.add_dependency "rainbow", "~> 2.0"
   spec.add_dependency "terminal-table", "~> 1.4"
   spec.add_dependency "daybreak", "~> 0.3"
@@ -32,12 +32,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "spotlite", "~> 0.8"
   spec.add_dependency "tvdb_party", "~> 0.7"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake", "~> 10.3"
+  spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "rb-fsevent", "~> 0.9"
-  spec.add_development_dependency "guard-rspec", "~> 4.2"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "guard-rspec", "~> 4.3"
+  spec.add_development_dependency "coveralls", "~> 0.7"
   #spec.add_development_dependency "fakefs", "~> 0.5"
 
   spec.post_install_message = "Thank you for installing Ayadn!"

data/doc/05-streams.md

@@ -219,8 +219,36 @@ You can replace the channel id with its alias if you previously defined one:
 
 `ayadn -ms mychannelalias`  
 
+By default, Ayadn will mark the channel as read after running the `messages` command.
+
+You can pass an option to avoid this for the time of the command:
+
+`ayadn -ms -z 46217`
+
+Or you can set it off permanently:
+
+`ayadn set marker update_messages false`
+
 Since version 1.7.7, Ayadn shows the full oembed links in messages if any. As these links can be quite long and complex, you can remove them from the view if you want with `ayadn set timeline show_channel_oembed false`.  
 
+# UNREAD MESSAGES
+
+Show *all* unread messages.
+
+`ayadn messages_unread`
+
+`ayadn -pmu`
+
+Ayadn will mark all your PM channels as read after running this command.
+
+You can pass an option to avoid this for the time of the command:
+
+`ayadn -pmu -z`
+
+Or you can set it off permanently:
+
+`ayadn set marker update_messages false`  
+
 # WHATSTARRED
 
 Show posts starred by a specific user.

data/doc/06-post.md

@@ -83,7 +83,17 @@ Send a private message to a specific user.
 
 `ayadn pm @ericd`
 
-Ayadn will then show you the *write* prompt.  
+Ayadn will then show you the *write* prompt.
+
+By default, Ayadn will mark this private messages channel as read once the message has been sent.
+
+You can pass an option to avoid this for the time of the command:
+
+`ayadn pm -z @ericd`
+
+Or even invert this behaviour permanently with `set`:
+
+`ayadn set marker update_messages false`  
 
 # SEND
 
@@ -95,6 +105,16 @@ Send a message to an App.net CHANNEL.
 
 Ayadn will then show you the *write* prompt.
 
+By default, Ayadn will mark this channel as read once the message has been sent.
+
+You can pass an option to avoid this for the time of the command:
+
+`ayadn -C -z 46217`
+
+Or even invert this behaviour permanently with `set`:
+
+`ayadn set marker update_messages false`  
+
 If you've already created an [alias](#alias) for the channel, you can post to it with:
 
 `ayadn send mychannelalias`

data/lib/ayadn/action.rb

@@ -11,6 +11,7 @@ module Ayadn
       @workers = Workers.new
       @stream = Stream.new(@api, @view, @workers)
       @search = Search.new(@api, @view, @workers)
+      @shell = Thor::Shell::Color.new
       Settings.load_config
       Settings.get_token
       Settings.init_config
@@ -88,7 +89,6 @@ module Ayadn
           print Status.deleting_post(post_id)
           resp = @api.delete_post(post_id)
           Check.has_been_deleted(post_id, resp)
-          sleep 1 unless ids.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [post_id]})
@@ -107,7 +107,6 @@ module Ayadn
           print Status.deleting_message(message_id)
           resp = @api.delete_message(channel_id, message_id)
           Check.message_has_been_deleted(message_id, resp)
-          sleep 1 unless ids.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [message_id]})
@@ -122,7 +121,6 @@ module Ayadn
         users.each do |user|
           resp = @api.unfollow(user)
           Check.has_been_unfollowed(user, resp)
-          sleep 1 unless users.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [usernames]})
@@ -137,7 +135,6 @@ module Ayadn
         users.each do |user|
           resp = @api.follow(user)
           Check.has_been_followed(user, resp)
-          sleep 1 unless users.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [usernames]})
@@ -152,7 +149,6 @@ module Ayadn
         users.each do |user|
           resp = @api.unmute(user)
           Check.has_been_unmuted(user, resp)
-          sleep 1 unless users.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [usernames]})
@@ -167,7 +163,6 @@ module Ayadn
         users.each do |user|
           resp = @api.mute(user)
           Check.has_been_muted(user, resp)
-          sleep 1 unless users.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [usernames]})
@@ -182,7 +177,6 @@ module Ayadn
         users.each do |user|
           resp = @api.unblock(user)
           Check.has_been_unblocked(user, resp)
-          sleep 1 unless users.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [usernames]})
@@ -197,7 +191,6 @@ module Ayadn
         users.each do |user|
           resp = @api.block(user)
           Check.has_been_blocked(user, resp)
-          sleep 1 unless users.length == 1
         end
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [usernames]})
@@ -451,6 +444,67 @@ module Ayadn
       end
     end
 
+    def messages_unread(options)
+      begin
+        if options[:silent]
+          Settings.options[:marker][:update_messages] = false
+        end
+        puts "\n"
+        @shell.say_status :searching, "channels with unread PMs"
+        response = @api.get_channels
+        unread_channels = []
+        response['data'].map do |ch|
+          if ch['type'] == "net.app.core.pm" && ch['has_unread'] == true
+            unread_channels << ch['id']
+          end
+        end
+        abort(Status.no_new_messages) if unread_channels.empty?
+        unread_messages = {}
+        unread_channels.each do |id|
+          @shell.say_status :downloading, "messages from channel #{id}"
+          since = Databases.pagination["channel:#{id}"]
+          unless since.nil?
+            api_options = {count: 20, since_id: since}
+          else
+            api_options = {count: 20}
+          end
+          ch = @api.get_messages(id, api_options)
+          last_read_id = ch['meta']['marker']['last_read_id'].to_i
+          last_message_id = ch['meta']['max_id']
+          messages = []
+          ch['data'].each do |msg|
+            messages << msg if msg['id'].to_i > last_read_id
+          end
+          unread_messages[id] = [messages, last_message_id]
+        end
+        if Settings.options[:marker][:update_messages] == true
+          unread_messages.each do |k,v|
+            name = "channel:#{k}"
+            Databases.pagination[name] = v[1]
+            resp = @api.update_marker(name, v[1])
+            res = JSON.parse(resp)
+            if res['meta']['code'] != 200
+              @shell.say_status :error, "couldn't update channel #{k} as read", :red
+            else
+              @shell.say_status :updated, "channel #{k} as read", :green
+            end
+          end
+        end
+        @view.clear_screen
+        unread_messages.each do |k,v|
+          if v[0].length == 1
+            puts "\nUnread message from channel #{k}:\n".color(Settings.options[:colors][:unread]).inverse
+          else
+            puts "\nUnread messages from channel #{k}:\n".color(Settings.options[:colors][:unread]).inverse
+          end
+          @view.show_posts(v[0])
+        end
+        puts "\n" if Settings.options[:timeline][:compact]
+      rescue => e
+        Errors.global_error({error: e, caller: caller, data: [options]})
+      end
+    end
+
     def pin(post_id, usertags)
       require 'pinboard'
       require 'base64'
@@ -530,6 +584,9 @@ module Ayadn
 
     def pmess(username, options = {})
     	begin
+        if options[:silent]
+          Settings.options[:marker][:update_messages] = false
+        end
         Check.no_username(username)
         username = [@workers.add_arobase(username)]
     		writer = Post.new
@@ -545,6 +602,18 @@ module Ayadn
           options = NowWatching.new.get_poster(settings[:poster], settings)
         end
         resp = writer.pm({options: options, text: text, username: username})
+        if Settings.options[:marker][:update_messages] == true
+          if resp['meta']['code'] == 200
+            data = resp['data']
+            name = "channel:#{data['channel_id']}"
+            Databases.pagination[name] = data['id']
+            marked = @api.update_marker(name, data['id'])
+            updated = JSON.parse(marked)
+            if updated['meta']['code'] != 200
+              raise "couldn't update channel #{data['channel_id']} as read"
+            end
+          end
+        end
         FileOps.save_message(resp) if Settings.options[:backup][:auto_save_sent_messages]
     		@view.clear_screen
     		puts Status.yourmessage(username[0])
@@ -598,6 +667,9 @@ module Ayadn
 
     def send_to_channel(channel_id, options = {})
       begin
+        if options[:silent]
+          Settings.options[:marker][:update_messages] = false
+        end
         channel_id = @workers.get_channel_id_from_alias(channel_id)
         writer = Post.new
         puts Status.writing
@@ -611,12 +683,24 @@ module Ayadn
           options = NowWatching.new.get_poster(settings[:poster], settings)
         end
         resp = writer.message({options: options, id: channel_id, text: lines_array.join("\n")})
+        if Settings.options[:marker][:update_messages] == true
+          if resp['meta']['code'] == 200
+            data = resp['data']
+            name = "channel:#{data['channel_id']}"
+            Databases.pagination[name] = data['id']
+            marked = @api.update_marker(name, data['id'])
+            updated = JSON.parse(marked)
+            if updated['meta']['code'] != 200
+              raise "couldn't update channel #{data['channel_id']} as read"
+            end
+          end
+        end
         FileOps.save_message(resp) if Settings.options[:backup][:auto_save_sent_messages]
         @view.clear_screen
         puts Status.yourpost
         @view.show_posted(resp)
       rescue => e
-        Errors.global_error({error: e, caller: caller, data: [channel_id]})
+        Errors.global_error({error: e, caller: caller, data: [channel_id, options]})
       end
     end
 

data/lib/ayadn/annotations.rb

@@ -23,8 +23,13 @@ module Ayadn
         "type" => "com.ayadn.user",
         "value" => {
           "+net.app.core.user" => {
-              "user_id" => "#{Settings.config[:identity][:handle]}",
+              "user_id" => Settings.config[:identity][:handle],
               "format" => "basic"
+            },
+            "env" => {
+              "platform" => Settings.config[:platform],
+              "ruby" => Settings.config[:ruby],
+              "locale" => Settings.config[:locale]
             }
           }
         },
@@ -38,7 +43,7 @@ module Ayadn
               "id" => "69904",
               "email" => "eric@aya.io"
             },
-          "version" => "#{Settings.config[:version]}"
+          "version" => Settings.config[:version]
           }
         }
       ]

data/lib/ayadn/api.rb

@@ -225,7 +225,7 @@ module Ayadn
       # big
     end
 
-    def get_channel channel_id, options
+    def get_channel channel_id, options = {}
       options = {:recent_message => 1, :annotations => 1, :before_id => nil}
       get_parsed_response(Endpoints.new.channel(channel_id, options))
     end
@@ -247,6 +247,15 @@ module Ayadn
       end
     end
 
+    def update_marker(name, last_read_id)
+      obj = {
+        'name' => name,
+        'id' => last_read_id
+      }
+      url = Endpoints.new.update_marker
+      CNX.post(url, obj)
+    end
+
     def self.build_query(arg)
       if arg[:count].to_s.is_integer?
         count = arg[:count]

data/lib/ayadn/app.rb

@@ -366,10 +366,19 @@ module Ayadn
     option :new, aliases: "-n", type: :boolean, desc: Descriptions.options_new
     option :count, aliases: "-c", type: :numeric, desc: "Specify the number of messages to retrieve"
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channel as read"
     def messages(channel_id)
       Action.new.messages(channel_id, options)
     end
 
+    desc "messages_unread", "Show your unread private messages (-pmu)"
+    map "-pmu" => :messages_unread
+    option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channels as read"
+    long_desc Descriptions.messages_unread
+    def messages_unread
+        Action.new.messages_unread(options)
+    end
+
     desc "pin POST TAG(S)", "Export a post's link and text with tags to Pinboard"
     long_desc Descriptions.pin
     def pin(post_id, *tags)
@@ -405,6 +414,7 @@ module Ayadn
     option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new message"
     option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new message"
     option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new message"
+    option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channel as read"
     def pm(*username)
       Action.new.pmess(username, options)
     end
@@ -416,6 +426,7 @@ module Ayadn
     option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new message"
     option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new message"
     option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new message"
+    option :silent, aliases: "-z", type: :boolean, desc: "Do not mark the channel as read"
     def send_to_channel(channel_id)
       Action.new.send_to_channel(channel_id, options)
     end

data/lib/ayadn/databases.rb

@@ -4,7 +4,7 @@ module Ayadn
   class Databases
 
     class << self
-      attr_accessor :users, :index, :pagination, :aliases, :blacklist, :bookmarks, :nicerank
+      attr_accessor :users, :index, :pagination, :aliases, :blacklist, :bookmarks, :nicerank, :channels
     end
 
     def self.open_databases
@@ -18,13 +18,14 @@ module Ayadn
       @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"
+      @channels = self.init "#{Settings.config[:paths][:db]}/channels.db"
       if Settings.options[:timeline][:show_debug] == true
         puts "\n-Done-\n"
       end
     end
 
     def self.all_dbs
-      [@users, @index, @pagination, @aliases, @blacklist, @bookmarks, @nicerank]
+      [@users, @index, @pagination, @aliases, @blacklist, @bookmarks, @nicerank, @channels]
     end
 
     def self.close_all
@@ -176,6 +177,14 @@ module Ayadn
       @bookmarks[post_id][:title] = new_title
     end
 
+    def self.add_channel_object channel
+      @channels[channel['id']] = channel
+    end
+
+    def self.remove_channel channel_id
+      @channels.delete channel_id
+    end
+
   end
 
 end

data/lib/ayadn/descriptions.rb

@@ -733,7 +733,41 @@ module Ayadn
 
       ayadn -ms -s 46217
 
-      If you've set an alias for the channel, you can display its messages with 'ayadn -ms my_alias'
+      Ayadn will mark this PM channel as read after running this command.
+
+      You can pass an option, `-z`, to avoid this for the time of the command:
+
+      ayadn -ms -z 46217
+
+      Or you can set it off permanently:
+
+      ayadn set marker update_messages false
+
+      If you've set an alias for the channel, you can use it instead of the channel id:
+
+      ayadn -ms my_alias
+      \n\n
+      USAGE
+    end
+    def self.messages_unread
+      <<-USAGE
+      Shows your unread private messages.
+
+      Usage:
+
+      ayadn messages_unread
+
+      ayadn -pmu
+
+      Ayadn will mark all your PM channels as read after running this command.
+
+      You can pass an option, `-z`, to avoid this for the time of the command:
+
+      ayadn -pmu -z
+
+      Or you can set it off permanently:
+
+      ayadn set marker update_messages false
       \n\n
       USAGE
     end
@@ -1195,13 +1229,19 @@ module Ayadn
       <<-USAGE
       Post the track you're listening to.
 
-      Usage:
+      Ayadn will insert the album cover, a link and a description.
+
+      Usage with iTunes (Mac Os X only):
 
       ayadn nowplaying
 
       ayadn -np
 
-      (works only with iTunes and Mac Os X)
+      Usage with Last.fm:
+
+      ayadn nowplaying -l
+
+      ayadn -np -l
       \n\n
       USAGE
     end

data/lib/ayadn/endpoints.rb

@@ -257,11 +257,11 @@ module Ayadn
     end
 
     def channel(channel_id, options = {})
-      "#{@channels_url}?ids=#{channel_id.join(',')}&access_token=#{Settings.user_token}#{API.build_query(options)}"
+      "#{@channels_url}?ids=#{channel_id.join(',')}&access_token=#{Settings.user_token}#{API.build_query(options)}&include_marker=1"
     end
 
     def messages(channel_id, options = {})
-      "#{@channels_url}#{channel_id}/messages?access_token=#{Settings.user_token}#{API.build_query(options)}&include_machine=1"
+      "#{@channels_url}#{channel_id}/messages?access_token=#{Settings.user_token}#{API.build_query(options)}&include_machine=1&include_marker=1"
     end
 
     def avatar
@@ -272,5 +272,9 @@ module Ayadn
       "#{@users_url}me/cover"
     end
 
+    def update_marker
+      "#{@posts_url}marker?access_token=#{Settings.user_token}"
+    end
+
   end
 end

data/lib/ayadn/fileops.rb

@@ -83,9 +83,7 @@ module Ayadn
       end
     end
 
-    private
-
-    def get_users(list)
+    def self.get_users(list)
       h = {}
       list.each {|k,v| h[k] = { username: v[0], name: v[1] }}
       h

data/lib/ayadn/nowplaying.rb

@@ -65,10 +65,10 @@ module Ayadn
         end
         abort(Status.canceled) unless STDIN.getch == ("y" || "Y")
         puts "\n#{Status.yourpost}"
-        unless store.nil? || options[:no_url]
-          visible, track, artwork, artwork_thumb, link, artist = true, store['track'], store['artwork'], store['artwork_thumb'], store['link'], store['artist']
-        else
+        if store.nil? || options[:no_url]
           visible, track, artwork, artwork_thumb, link, artist = false
+        else
+          visible, track, artwork, artwork_thumb, link, artist = true, store['track'], store['artwork'], store['artwork_thumb'], store['link'], store['artist']
         end
         options = options.dup
         options[:nowplaying] = true
@@ -130,9 +130,35 @@ module Ayadn
 
     def get_itunes_store url, artist, track
       results = JSON.load(CNX.download(URI.escape(url)))['results']
+
       unless results.empty? || results.nil?
 
-        resp = results.select {|obj| obj['artistName'] == artist && obj['trackName'] == track}
+        results.keep_if do |obj|
+          unless obj['artistName'].nil?
+            obj['artistName'].downcase == artist.downcase
+          end
+        end
+
+        if results.empty?
+          return {
+            'code' => 404,
+            'request' => url
+          }
+        end
+
+        if results.length > 1
+          resp = results.select {|obj| obj['trackName'].downcase == track.downcase}
+        else
+          resp = results
+        end
+
+        if resp.empty?
+          return {
+            'code' => 404,
+            'request' => url
+          }
+        end
+
         candidate = resp[0] || results[0]
 
         return {

data/lib/ayadn/scroll.rb

@@ -93,6 +93,15 @@ module Ayadn
           stream = @api.get_messages(channel_id, options)
           Debug.stream stream, options, channel_id
           show_if_new(stream, options, "channel:#{channel_id}")
+          if Settings.options[:marker][:update_messages] == true
+            unless resp['meta']['max_id'].nil?
+              marked = @api.update_marker("channel:#{channel_id}", stream['meta']['max_id'])
+              updated = JSON.parse(marked)
+              if updated['meta']['code'] != 200
+                Errors.warn "couldn't update channel #{channel_id} as read"
+              end
+            end
+          end
           options = save_then_return(stream, options, "channel:#{channel_id}")
           countdown
         rescue Interrupt