ayadn 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1dbd05e3a853fb34403880501ca7fd4191ae74c
-  data.tar.gz: 5e2cd526b19ff009e127028a33fba5a21d8ea941
+  metadata.gz: 378ae34a1b17ea7a5b489e31a4f29900ca2e0e4d
+  data.tar.gz: f4156ace495c8386f163ab656c177fc3db99d130
 SHA512:
-  metadata.gz: 7c5b81ff93034553556e78699c67c17ebf552b6c07d311686ff48c762476d1083cfb1fd209488db58f4e13f3962524376988566b08ec9df95b11f0d12c6e3a4c
-  data.tar.gz: 6037b01600859172ec938f5c384a87660d5cbc8dd0e1b6dfbd456405597f50dd6dfdcb961a4059b25fffe9cdfc0af5d71b0023de3344834a0f8f49152b08772b
+  metadata.gz: c76c035e1c8b84d265326e39cad4e2b9519de784c68b35ad30c793d12b11b2e487eaca7347be6c3c03381817ed255d3f4a692bbc5f67d65a6212558a257ef4c1
+  data.tar.gz: aafcac122e8d86609a94bf8be2f6b8783224798254d20841192d6d060b6caa1c5138fa2b83c024475de043ced1ae6e31db54664695adee0ad255a0814f181e1d

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.7.0 - 'Private Investigations'
+
+- New: embed a Youtube video in a normal post with option `-Y`
+- New: embed a Vimeo video in a normal post with option `-V`
+- New: embed a movie poster in a normal post with option `-M`
+- New: force view blacklisted/muted/blocked user's posts with option `-f`
+- New: the cursor is hidden when the scroll spinning wheel is displayed
+- Change: option to embed an image in a post is now `-E` (previously -e)
+- Fixed: bookmark title; also fixed the previous fix...
+- Fixed: value displayed when setting NiceRank
+- Refactored a few classes and methods
+
 # 1.6.0 - 'Beetlejuice'
 
 - New command: 'movie'. Create a post from a movie title (with link + movie poster). Customisable hashtag (default: '#nowwatching').

data/doc/05-streams.md

@@ -95,6 +95,23 @@ Extracts all links from posts.
 
 `ayadn -was -e ericd`
 
+### FORCE
+
+Force view blacklisted/muted/blocked user's posts with `-f` option. 
+
+`ayadn -gl -f`
+
+`ayadn -gl -s -f`
+
+Differences will occur due to ADN policy:
+
+- Global stream: temporarily disables you user token (so your muted/blocked preferences don't apply), the NiceRank filter, and the Blacklist databases
+
+- User's posts and Post infos: temporarily disables you user token and the Blacklist databases
+
+- Other streams, search, tags: temporarily disables the Blacklist databases
+
+
 # GLOBAL
 
 Display the 'Global stream'.

data/doc/06-post.md

@@ -94,16 +94,51 @@ If you've already created an [alias](#alias) for the channel, you can post to it
 
 You can embed one or several pictures in a post (with `post`, `write`, `reply` and `pm`).
 
-Just add the `-e` (or `--embed`) option **at the end** of the command line, followed by one or several file paths separated by spaces.
+Just add the `-E` (or `--embed`) option **at the end** of the command line, followed by one or several file paths separated by spaces.
 
 Accepted file formats are `jpg`, `png` and `gif`.
 
 Examples:
 
 ```
-ayadn -P Meet my cat -e lolcat.jpg
-ayadn -P "@ericd Hey, meet my pets" -e ~/lolcat.jpg ./doge.jpeg
-ayadn -W -e ~/lolcat.png
-ayadn -R 23362460 -e "Desktop/dancing lolcat.gif"
-ayadn pm @ericd -e /users/dad/lol\'cat.JPG /users/mom/my\ doge.PNG
+ayadn -P Meet my cat -E lolcat.jpg
+ayadn -P "@ericd Hey, meet my pets" -E ~/lolcat.jpg ./doge.jpeg
+ayadn -W -E ~/lolcat.png
+ayadn -R 23362460 -E "Desktop/dancing lolcat.gif"
+ayadn pm @ericd -E /users/dad/lol\'cat.JPG /users/mom/my\ doge.PNG
 ```  
+
+# EMBED VIDEOS
+
+You can embed a video hosted online in a post. Currently works with Youtube and Vimeo only.
+
+Add the `-Y` option for Youtube or `-V` for Vimeo **at the end** of the command line, followed by the video URL.
+
+Examples:
+
+```
+ayadn -P wave function -Y https://www.youtube.com/watch?v=Ei8CFin00PY
+ayadn -P Elixir -V http://vimeo.com/103927232
+ayadn -W -Y https://www.youtube.com/watch?v=Ei8CFin00PY
+ayadn -R 23362460 -Y https://www.youtube.com/watch?v=Ei8CFin00PY
+ayadn pm @ericd -Y https://www.youtube.com/watch?v=Ei8CFin00PY
+```
+
+Unfortunately, very few App.net clients treat video embedding properly. So I would advise to include the video URL in the text body anyway, for better compatibility.
+
+# EMBED MOVIE POSTER
+
+You can embed a movie poster in a normal post with option `-M`.
+
+This is compatible with other options, eg embedding other images.
+
+Warning: contrary to the `movie` command, this option doesn't check with the user if the movie is valid. The poster is retrieved from IMDb and is automatically embedded in the post.
+
+Examples:
+
+```
+ayadn -P "I'll be back" -M terminator
+ayadn -W -M truman show -E ~/Pics/my_face.jpg
+ayadn -R 23362460 -M the dark knight
+```  
+

data/lib/ayadn/action.rb

@@ -19,51 +19,16 @@ module Ayadn
       at_exit { Databases.close_all }
     end
 
-    def unified(options)
-      begin
-        @stream.unified(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
-      end
-    end
-
-    def checkins(options)
-      begin
-        @stream.checkins(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
-      end
-    end
-
-    def global(settings)
-      begin
-        @stream.global(settings)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [settings]})
-      end
-    end
-
-    def trending(options)
-      begin
-        @stream.trending(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
-      end
-    end
-
-    def photos(options)
-      begin
-        @stream.photos(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
-      end
-    end
-
-    def conversations(options)
-      begin
-        @stream.conversations(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
+    def method_missing(meth, options)
+      case meth.to_s
+      when 'unified', 'checkins', 'global', 'trending', 'photos', 'conversations', 'interactions'
+        begin
+          @stream.send(meth.to_sym, options)
+        rescue => e
+          Errors.global_error({error: e, caller: caller, data: [meth, options]})
+        end
+      else
+        super
       end
     end
 
@@ -83,14 +48,6 @@ module Ayadn
       end
     end
 
-    def interactions(options)
-      begin
-        @stream.interactions(options)
-      rescue => e
-        Errors.global_error({error: e, caller: caller, data: [options]})
-      end
-    end
-
     def whatstarred(username, options)
       begin
         @stream.whatstarred(username, options)
@@ -381,6 +338,7 @@ module Ayadn
 
     def postinfo(post_id, options)
       begin
+        Settings.options[:force] = true if options[:force]
         Check.bad_post_id(post_id)
         @view.downloading(options)
         if options[:raw]
@@ -501,19 +459,13 @@ module Ayadn
       begin
         writer = Post.new
         @view.clear_screen
-        if options['embed']
-          embed = options['embed']
-          text = args.join(" ")
-          puts Status.uploading(embed)
-          resp = writer.send_embedded(text, FileOps.make_paths(embed))
-        else
-          puts Status.posting
-          resp = writer.post(args)
+        puts Status.posting
+        if options[:poster] # Returns the same options hash + poster embed
+          settings = options.dup
+          options = NowWatching.new.get_poster(settings[:poster], settings)
         end
-        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
-        @view.clear_screen
-        puts Status.yourpost
-        @view.show_posted(resp)
+        resp = writer.post({options: options, text: args.join(" ")})
+        save_and_view(resp)
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args, options]})
       end
@@ -521,26 +473,20 @@ module Ayadn
 
     def write(options)
       begin
-        files = FileOps.make_paths(options['embed']) if options['embed']
         writer = Post.new
         puts Status.writing
         puts Status.post
         lines_array = writer.compose
         writer.check_post_length(lines_array)
         text = lines_array.join("\n")
-        if options['embed']
-          @view.clear_screen
-          puts Status.uploading(options['embed'])
-          resp = writer.send_embedded(text, files)
-        else
-          resp = writer.send_post(text)
-        end
         @view.clear_screen
         puts Status.posting
-        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
-        @view.clear_screen
-        puts Status.yourpost
-        @view.show_posted(resp)
+        if options[:poster]
+          settings = options.dup
+          options = NowWatching.new.get_poster(settings[:poster], settings)
+        end
+        resp = writer.post({options: options, text: text})
+        save_and_view(resp)
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [text, options]})
       end
@@ -548,23 +494,21 @@ module Ayadn
 
     def pmess(username, options = {})
     	begin
-        files = FileOps.make_paths(options['embed']) if options['embed']
         Check.no_username(username)
         username = [@workers.add_arobase(username)]
-    		messenger = Post.new
+    		writer = Post.new
         puts Status.message_from(username)
     		puts Status.message
-    		lines_array = messenger.compose
-    		messenger.check_message_length(lines_array)
+    		lines_array = writer.compose
+    		writer.check_message_length(lines_array)
         text = lines_array.join("\n")
     		@view.clear_screen
-        if options['embed']
-          puts Status.uploading(options['embed'])
-          resp = messenger.send_pm_embedded(username, text, files)
-        else
-          puts Status.posting
-          resp = messenger.send_pm(username, text)
+        puts Status.posting
+        if options[:poster]
+          settings = options.dup
+          options = NowWatching.new.get_poster(settings[:poster], settings)
         end
+        resp = writer.pm({options: options, text: text, username: username})
         FileOps.save_message(resp) if Settings.options[:backup][:auto_save_sent_messages]
     		@view.clear_screen
     		puts Status.yourmessage(username[0])
@@ -574,29 +518,8 @@ module Ayadn
     	end
     end
 
-    def send_to_channel(channel_id)
-    	begin
-        channel_id = @workers.get_channel_id_from_alias(channel_id)
-  			messenger = Post.new
-        puts Status.writing
-  			puts Status.post
-  			lines_array = messenger.compose
-  			messenger.check_message_length(lines_array)
-  			@view.clear_screen
-  			puts Status.posting
-  			resp = messenger.send_message(channel_id, lines_array.join("\n"))
-        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]})
-    	end
-    end
-
     def reply(post_id, options = {})
       begin
-        files = FileOps.make_paths(options['embed']) if options['embed']
         post_id = @workers.get_real_post_id(post_id)
       	puts Status.replying_to(post_id)
       	replied_to = @api.get_details(post_id)
@@ -608,36 +531,49 @@ module Ayadn
             Check.no_post(replied_to, post_id)
           end
         end
-        poster = Post.new
+        # ----
+        writer = Post.new
         puts Status.writing
         puts Status.reply
-        lines_array = poster.compose
-        poster.check_post_length(lines_array)
+        lines_array = writer.compose
+        writer.check_post_length(lines_array)
         @view.clear_screen
-        reply = poster.reply(lines_array.join("\n"), @workers.build_posts([replied_to['data']]))
-        if options['embed']
-          puts Status.uploading(options['embed'])
-          resp = poster.send_reply_embedded(reply, post_id, files)
-        else
-          puts Status.posting
-          resp = poster.send_reply(reply, post_id)
+        text = lines_array.join("\n")
+        replied_to = @workers.build_posts([replied_to['data']])
+        if options[:poster]
+          settings = options.dup
+          options = NowWatching.new.get_poster(settings[:poster], settings)
         end
-        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
-        @view.clear_screen
-        puts Status.done
-
+        resp = writer.reply({options: options, text: text, id: post_id, reply_to: replied_to})
+        # ----
         options = options.dup
         unless resp['data']['reply_to'].nil?
           options[:reply_to] = resp['data']['reply_to'].to_i
         end
         options[:post_id] = resp['data']['id'].to_i
-
         @view.render(@api.get_convo(post_id), options)
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [post_id, options]})
       end
     end
 
+    def send_to_channel(channel_id)
+      begin
+        channel_id = @workers.get_channel_id_from_alias(channel_id)
+        writer = Post.new
+        puts Status.writing
+        puts Status.post
+        lines_array = writer.compose
+        writer.check_message_length(lines_array)
+        @view.clear_screen
+        puts Status.posting
+        resp = writer.message({id: channel_id, text: lines_array.join("\n")})
+        save_and_view(resp)
+      rescue => e
+        Errors.global_error({error: e, caller: caller, data: [channel_id]})
+      end
+    end
+
     def nowplaying(options = {})
       np = NowPlaying.new(@api, @view, @workers)
       options['lastfm'] ? np.lastfm(options) : np.itunes(options)
@@ -693,5 +629,14 @@ module Ayadn
       end
     end
 
+    private
+
+    def save_and_view(resp)
+      FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
+      @view.clear_screen
+      puts Status.yourpost
+      @view.show_posted(resp)
+    end
+
   end
 end

data/lib/ayadn/annotations.rb

@@ -0,0 +1,191 @@
+# encoding: utf-8
+
+module Ayadn
+
+  class Annotations
+
+    attr_accessor :content
+
+    def initialize(dic)
+      dic[:options] = {} if dic[:options].nil?
+      @content = base()
+      @content += files(dic) if dic[:options][:embed]
+      @content += youtube(dic) if dic[:options][:youtube]
+      @content += vimeo(dic) if dic[:options][:vimeo]
+      @content += nowplaying(dic) if dic[:options][:nowplaying]
+      @content += movie(dic) if dic[:options][:movie]
+      @content += tvshow(dic) if dic[:options][:tvshow]
+    end
+
+    def base
+      [
+        {
+        "type" => "com.ayadn.user",
+        "value" => {
+          "+net.app.core.user" => {
+              "user_id" => "#{Settings.config[:identity][:handle]}",
+              "format" => "basic"
+            }
+          }
+        },
+        {
+        "type" => "com.ayadn.client",
+        "value" => {
+          "url" => "http://ayadn-app.net",
+          "author" => {
+              "name" => "Eric Dejonckheere",
+              "username" => "ericd",
+              "id" => "69904",
+              "email" => "eric@aya.io"
+            },
+          "version" => "#{Settings.config[:version]}"
+          }
+        }
+      ]
+    end
+
+    def files(dic)
+      files = FileOps.make_paths(dic[:options][:embed])
+      data = FileOps.upload_files(files)
+      data.map do |obj|
+        {
+          "type" => "net.app.core.oembed",
+          "value" => {
+             "+net.app.core.file" => {
+                "file_id" => obj['data']['id'],
+                "file_token" => obj['data']['file_token'],
+                "format" => "oembed"
+             }
+          }
+        }
+      end
+    end
+
+    def youtube(dic)
+      dic['link'] = dic[:options][:youtube][0]
+      req_url = "http://www.youtube.com/oembed?url=#{dic['link']}&format=json"
+      dic.merge!(JSON.parse(CNX.download(req_url)))
+      [{
+        "type" => "net.app.core.oembed",
+        "value" => {
+          "version" => "1.0",
+          "type" => "video",
+          "provider_name" => "YouTube",
+          "provider_url" => "http://youtube.com/",
+          "width" => dic['width'],
+          "height" => dic['height'],
+          "title" => dic['title'],
+          "author_name" => dic['author_name'],
+          "author_url" => dic['author_url'],
+          "embeddable_url" => dic['link'],
+          "html" => dic['html'],
+          "thumbnail_url" => dic['thumbnail_url'],
+          "thumbnail_height" => dic['thumbnail_height'],
+          "thumbnail_width" => dic['thumbnail_width']
+        }
+      },
+      {
+        "type" => "com.ayadn.youtube",
+          "value" => {
+            "title" => dic['title'],
+            "link" => dic['link']
+          }
+      }]
+    end
+
+    def vimeo(dic)
+      dic[:link] = dic[:options][:vimeo][0]
+      req_url = "http://vimeo.com/api/oembed.json?url=#{dic[:link]}"
+      dic.merge!(JSON.parse(CNX.download(req_url)))
+      [{
+        "type" => "net.app.core.oembed",
+        "value" => {
+          "version" => "1.0",
+          "type" => "video",
+          "provider_name" => "Vimeo",
+          "provider_url" => "http://vimeo.com/",
+          "width" => dic['width'],
+          "height" => dic['height'],
+          "title" => dic['title'],
+          "author_name" => dic['author_name'],
+          "author_url" => dic['author_url'],
+          "embeddable_url" => dic[:link],
+          "html" => dic['html'],
+          "thumbnail_url" => dic['thumbnail_url'],
+          "thumbnail_height" => dic['thumbnail_height'],
+          "thumbnail_width" => dic['thumbnail_width']
+        }
+      },
+      {
+        "type" => "com.ayadn.vimeo",
+          "value" => {
+            "title" => dic['title'],
+            "link" => dic[:link]
+          }
+      }]
+    end
+
+    def movie(dic)
+      [{
+        "type" => "com.ayadn.movie",
+          "value" => {
+            "title" => dic[:title],
+            "source" => dic[:source]
+          }
+      }]
+    end
+
+    def tvshow(dic)
+      [{
+        "type" => "com.ayadn.tvshow",
+          "value" => {
+            "title" => dic[:title],
+            "source" => dic[:source]
+          }
+      }]
+    end
+
+    def nowplaying_silent(dic)
+      [{
+        "type" => "com.ayadn.nowplaying",
+          "value" => {
+            "status" => "no-url",
+            "source" => dic[:source]
+          }
+      }]
+    end
+
+    def nowplaying(dic)
+      return nowplaying_silent(dic) if dic[:options][:no_url]
+      [{
+        "type" => "com.ayadn.nowplaying",
+          "value" => {
+            "title" => dic[:title],
+            "artist" => dic[:artist],
+            "artwork" => dic[:artwork],
+            "link" => dic[:link],
+            "source" => dic[:source]
+          }
+      },
+      {
+        "type" => "net.app.core.oembed",
+        "value" => {
+          "version" => "1.0",
+          "type" => "photo",
+          "width" => dic[:width],
+          "height" => dic[:height],
+          "title" => dic[:title],
+          "url" => dic[:artwork],
+          "embeddable_url" => dic[:artwork],
+          "provider_url" => "https://itunes.apple.com",
+          "provider_name" => "iTunes",
+          "thumbnail_url" => dic[:artwork_thumb],
+          "thumbnail_width" => dic[:width_thumb],
+          "thumbnail_height" => dic[:height_thumb]
+        }
+      }]
+    end
+
+  end
+
+end