ayadn 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ca97ccdd5de6aeed988a3553764dfaeffd2cb6
-  data.tar.gz: d1cfff95ffc3d561bb66d19198530efcbdf945f5
+  metadata.gz: 6276f752eb491dd844708b87857de9e31ce9e908
+  data.tar.gz: 53d08a3828136827d3125f47cdd340d924b6d55f
 SHA512:
-  metadata.gz: 08706585750bc87fe826d5dff980c8736c67263051404cf8079f58240205be753aea42d7ab24e7308c13b1ef129914cdeeadf4c5b1e7bd33a1dac90bf2a9fa65
-  data.tar.gz: d39427719037015468568672dec0950fe2e231accaf9e0db8821c72e014743c774352bf1cb0af38ac5117d72b1041ab4c8810bb0062d12b661329a598ec01072
+  metadata.gz: 7b629af3a71e42b0e9fa1b4d6082dba04cc744ba5effa5609eca9d0cc3f8bbd8ad14ca5eab57144323c6c1acd9f03806250d00009f8bc816fec2d52611365964
+  data.tar.gz: a4c36beb941ee96e3215783ec75fca897e62e0708e09a4238016d4ea2e6088b0073adf7c1d4e1447ecf407b39077b0d7e171f723101c49fcaf24cec5275ef86d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.4.0 - 'Florian'
+
+- New feature: embed one or several pictures within a post (in write, post, reply, and pm)
+- Nowplaying inserts preview URL and album art from iTunes Store (you can prevent this with: `--no-url`)
+
 # 1.3.2 - 'Max'
 
 - Fixed: Global stream crashed if NiceRank was enabled but unreachable

data/lib/ayadn/action.rb

@@ -732,22 +732,6 @@ module Ayadn
       end
     end
 
-    def post(args)
-      begin
-        @view.clear_screen
-        puts Status.posting
-        resp = Post.new.post(args)
-        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
-        @view.clear_screen
-        puts Status.yourpost
-        @view.show_posted(resp)
-      rescue => e
-        Errors.global_error("action/post", args, e)
-      ensure
-        Databases.close_all
-      end
-    end
-
     def auto(options)
       begin
         @view.clear_screen
@@ -769,29 +753,60 @@ module Ayadn
       end
     end
 
-    def write
+    def post(args, options)
       begin
+        writer = Post.new
+        @view.clear_screen
+        if options['embed']
+          puts Status.uploading(options['embed'])
+          resp = writer.send_embedded(args.join(" "), FileOps.make_paths(options['embed']))
+        else
+          puts Status.posting
+          resp = writer.post(args)
+        end
+        FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
+        @view.clear_screen
+        puts Status.yourpost
+        @view.show_posted(resp)
+      rescue => e
+        Errors.global_error("action/post", [args, options], e)
+      ensure
+        Databases.close_all
+      end
+    end
+
+    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
-        resp = writer.send_post(lines_array.join("\n"))
         FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
         @view.clear_screen
         puts Status.yourpost
         @view.show_posted(resp)
       rescue => e
-        Errors.global_error("action/write", lines_array.join(" "), e)
+        Errors.global_error("action/write", [text, options], e)
       ensure
         Databases.close_all
       end
     end
 
-    def pmess(username)
+    def pmess(username, options = {})
     	begin
+        files = FileOps.make_paths(options['embed']) if options['embed']
         missing_username if username.empty?
         temp = Workers.add_arobase_if_missing(username)
         username = [temp]
@@ -800,15 +815,21 @@ module Ayadn
     		puts Status.message
     		lines_array = messenger.compose
     		messenger.check_message_length(lines_array)
+        text = lines_array.join("\n")
     		@view.clear_screen
-    		puts Status.posting
-    		resp = messenger.send_pm(username, lines_array.join("\n"))
+        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)
+        end
         FileOps.save_message(resp) if Settings.options[:backup][:auto_save_sent_messages]
     		@view.clear_screen
     		puts Status.yourmessage
     		@view.show_posted(resp)
     	rescue => e
-        Errors.global_error("action/pmess", username, e)
+        Errors.global_error("action/pmess", [username, options], e)
   		ensure
   		  Databases.close_all
     	end
@@ -836,8 +857,9 @@ module Ayadn
     	end
     end
 
-    def reply(post_id)
+    def reply(post_id, options = {})
       begin
+        files = FileOps.make_paths(options['embed']) if options['embed']
         post_id = get_real_post_id(post_id)
       	puts Status.replying_to(post_id)
       	replied_to = @api.get_details(post_id)
@@ -856,36 +878,58 @@ module Ayadn
         poster.check_post_length(lines_array)
         @view.clear_screen
         reply = poster.reply(lines_array.join("\n"), Workers.new.build_posts([replied_to['data']]))
-        puts Status.posting
-        resp = poster.send_reply(reply, post_id)
+        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)
+        end
         FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
         @view.clear_screen
         puts Status.done
         render_view(@api.get_convo(post_id, {}), {})
       rescue => e
-        Errors.global_error("action/reply", post_id, e)
+        Errors.global_error("action/reply", [post_id, options], e)
       ensure
         Databases.close_all
       end
     end
 
-    def nowplaying
+    def nowplaying(options = {})
       begin
         Databases.close_all
         abort(Status.error_only_osx) unless Settings.config[:platform] =~ /darwin/
-        itunes = get_track_infos
+        itunes = get_track_infos()
         itunes.each {|el| abort(Status.empty_fields) if el.length == 0}
         @view.clear_screen
-        text_to_post = "#nowplaying\nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’"
+        unless options['no_url']
+          store = itunes_request(itunes)
+        end
+        text_to_post = "#nowplaying\n \nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’"
         puts Status.writing
-        show_nowplaying(text_to_post)
+        show_nowplaying("\n#{text_to_post}", options, store)
+        text_to_post += "\n \n[> Listen](#{store['preview']})" unless options['no_url']
         unless STDIN.getch == ("y" || "Y")
           puts "\nCanceled.\n\n".color(:red)
           exit
         end
         puts "\n"
         puts Status.yourpost
-        @view.show_posted(Post.new.post([text_to_post]))
+        if options['no_url'].nil?
+          visible, track, artwork = true, store['track'], store['artwork']
+        else
+          visible, track, artwork = false, false, false
+        end
+        dic = {
+          'text' => text_to_post,
+          'title' => track,
+          'artwork' => artwork,
+          'width' => 1200,
+          'height' => 1200,
+          'visible' => visible
+        }
+        @view.show_posted(Post.new.send_nowplaying(dic))
       rescue => e
         puts Status.wtf
         Errors.global_error("action/nowplaying", itunes, e)
@@ -927,6 +971,24 @@ module Ayadn
 
     private
 
+    def itunes_request itunes
+      regex_exotics = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
+      store_artist = itunes.artist.gsub(regex_exotics, ' ').split(' ').join('+')
+      store_track = itunes.track.gsub(regex_exotics, ' ').split(' ').join('+')
+      #store_album = itunes.album.gsub(regex_exotics, ' ').split(' ').join('+')
+      itunes_url = "https://itunes.apple.com/search?term=#{store_artist}&term=#{store_track}&media=music&entity=musicTrack"
+      results = JSON.load(CNX.download(itunes_url))['results']
+      candidate = results[0]
+      {
+        'artist' => candidate['artistName'],
+        'track' => candidate['trackName'],
+        'preview' => candidate['previewUrl'],
+        'artwork' => candidate['artworkUrl100'].gsub('100x100', '1200x1200'),
+        'request' => itunes_url,
+        'results' => results
+      }
+    end
+
     def splitter_all words
       [words].collect {|w| w.split(' ')}
     end
@@ -1228,9 +1290,13 @@ module Ayadn
       maker.new(artist.chomp!, album.chomp!, track.chomp!)
     end
 
-    def show_nowplaying(text)
+    def show_nowplaying(text, options, store)
       puts "\nYour post:\n".color(:cyan)
-      puts text + "\n\n"
+      if options['no_url']
+        puts text + "\n\n\n"
+      else
+        puts text + "\n\nAlbum artwork + 30 sec preview for track '#{store['track']}' by '#{store['artist']}' will be inserted in the post.\n\n\n".color(:green)
+      end
       puts "Do you confirm? (y/N) ".color(:yellow)
     end
 

data/lib/ayadn/app.rb

@@ -347,22 +347,25 @@ module Ayadn
     desc "post Your text", "Simple post to App.net (-P)"
     map "-P" => :post
     long_desc Descriptions.post
+    option :embed, aliases: "-e", type: :array, desc: "Embed one or several pictures in the new post"
     def post(*args)
-      Action.new.post(args)
+      Action.new.post(args, options)
     end
 
     desc "write", "Multi-line post to App.net (-W)"
     map "compose" => :write
     map "-W" => :write
     long_desc Descriptions.write
+    option :embed, aliases: "-e", type: :array, desc: "Embed one or several pictures in the new post"
     def write
-      Action.new.write
+      Action.new.write(options)
     end
 
     desc "pm @USERNAME", "Send a private message to @username"
     long_desc Descriptions.pmess
+    option :embed, aliases: "-e", type: :array, desc: "Embed one or several pictures in the new post"
     def pm(*username)
-      Action.new.pmess(username)
+      Action.new.pmess(username, options)
     end
 
     desc "send CHANNEL", "Send a message to a CHANNEL (-C)"
@@ -375,9 +378,10 @@ module Ayadn
     desc "reply POST", "Reply to post n°POST (-R)"
     map "-R" => :reply
     long_desc Descriptions.reply
+    option :embed, aliases: "-e", type: :array, desc: "Embed one or several pictures in the new post"
     def reply(id)
       ayadn = Action.new
-      ayadn.reply(id)
+      ayadn.reply(id, options)
     end
 
     desc "auto", "Auto post every line of input to App.net"
@@ -415,8 +419,9 @@ module Ayadn
     desc "nowplaying", "Post the current iTunes track (-np)"
     map "-np" => :nowplaying
     long_desc Descriptions.nowplaying
+    option :no_url, type: :boolean, desc: "Don't append preview or album art at the end of the post"
     def nowplaying
-      Action.new.nowplaying
+      Action.new.nowplaying(options)
     end
 
     desc "random", "Show random posts from App.net (-rnd)"

data/lib/ayadn/cnx.rb

@@ -2,6 +2,14 @@
 module Ayadn
   class CNX
 
+    def self.download url
+      begin
+        RestClient.get(url) {|response, request, result| response}
+      rescue => e
+        Errors.global_error("cnx.rb/download", url, e)
+      end
+    end
+
     def self.get url
       working = true
       begin

data/lib/ayadn/fileops.rb

@@ -34,6 +34,36 @@ module Ayadn
       Dir.exist?(Dir.home + "/ayadn/data")
     end
 
+    def self.upload_files files
+      files.map do |file|
+        puts "\n#{file}\n\n"
+        JSON.load(self.upload(file, Settings.user_token))
+      end
+    end
+
+    def self.upload(path, token)
+      begin
+        file = Regexp.escape(path).gsub!('\.', '.')
+        case File.extname(path).downcase
+        when ".png"
+          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/png" -F 'public=true' -X POST`
+        when ".gif"
+          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/gif" -F 'public=true' -X POST`
+        else #jpg or jpeg or JPG or JPEG, automatically recognized as such
+          `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F content=@#{file} -F 'public=true' -X POST`
+        end
+      rescue Errno::ENOENT
+        abort(Status.no_curl)
+      end
+    end
+
+    def self.make_paths(files_array)
+      files_array.map do |file|
+        abort(Status.bad_path) unless File.exist?(file)
+        File.absolute_path(file)
+      end
+    end
+
     private
 
     def get_users(list)

data/lib/ayadn/post.rb

@@ -21,6 +21,102 @@ module Ayadn
       # post
     end
 
+    def send_embedded text, files
+      send_embedded_pictures({'text' => text, 'data' => FileOps.upload_files(files)})
+    end
+
+    def send_reply_embedded text, reply_to, files
+      send_reply_embedded_pictures({'text' => text, 'reply_to' => reply_to, 'data' => FileOps.upload_files(files)})
+    end
+
+    def send_pm_embedded username, text, files
+      send_pm_embedded_pictures({'text' => text, 'username' => username, 'data' => FileOps.upload_files(files)})
+    end
+
+    def send_embedded_pictures dic
+      send_content(Endpoints.new.posts_url, payload_embedded(dic))
+    end
+
+    def send_reply_embedded_pictures dic
+      send_content(Endpoints.new.posts_url, payload_reply_embedded(dic))
+    end
+
+    def send_pm_embedded_pictures dic
+      url = Endpoints.new.pm_url
+      url << "?include_annotations=1&access_token=#{Ayadn::Settings.user_token}"
+      send_content(url, payload_pm_embedded(dic))
+    end
+
+    def send_nowplaying dic
+      send_content(Endpoints.new.posts_url, payload_nowplaying(dic))
+    end
+
+    def payload_nowplaying dic
+      ann = annotations()
+      if dic['visible'] == true
+        ann << {
+          "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']
+          }
+        }
+      end
+      {
+        "text" => dic['text'],
+        "entities" => entities,
+        "annotations" => ann
+      }
+    end
+
+    def payload_embedded dic
+      {
+        "text" => dic['text'],
+        "entities" => entities,
+        "annotations" => annotations_embedded(dic)
+      }
+    end
+
+    def payload_reply_embedded dic
+      {
+        "text" => dic['text'],
+        "reply_to" => dic['reply_to'],
+        "entities" => entities,
+        "annotations" => annotations_embedded(dic)
+      }
+    end
+
+    def payload_pm_embedded dic
+      {
+        "text" => dic['text'],
+        "entities" => entities,
+        "destinations" => dic['username'],
+        "annotations" => annotations_embedded(dic)
+      }
+    end
+
+    def annotations_embedded dic
+      base = annotations()
+      dic['data'].each do |obj|
+        base << {
+          "type" => "net.app.core.oembed",
+          "value" => {
+             "+net.app.core.file" => {
+                "file_id" => obj['data']['id'],
+                "file_token" => obj['data']['file_token'],
+                "format" => "oembed"
+             }
+          }
+        }
+      end
+      return base
+    end
+
     # def auto_classic
     #   loop do
     #     begin
@@ -82,14 +178,11 @@ module Ayadn
     end
 
     def send_pm(username, text)
-      url = Endpoints.new.pm_url
-      url << "?include_annotations=1&access_token=#{Ayadn::Settings.user_token}"
-      send_content(url, payload_pm(username, text))
+      send_content(Endpoints.new.pm_url, payload_pm(username, text))
     end
 
     def send_message(channel_id, text)
-      url = Endpoints.new.messages(channel_id, {})
-      send_content(url, payload_basic(text))
+      send_content(Endpoints.new.messages(channel_id, {}), payload_basic(text))
     end
 
     # def send_log(data)
@@ -98,13 +191,11 @@ module Ayadn
     # end
 
     def send_post(text)
-      url = Endpoints.new.posts_url
-      send_content(url, payload_basic(text))
+      send_content(Endpoints.new.posts_url, payload_basic(text))
     end
 
     def send_reply(text, post_id)
-      url = Endpoints.new.posts_url
-      send_content(url, payload_reply(text, post_id))
+      send_content(Endpoints.new.posts_url, payload_reply(text, post_id))
     end
 
     def send_content(url, payload)
@@ -185,6 +276,8 @@ module Ayadn
       }
     end
 
+
+
     def payload_basic(text)
       {
         "text" => text,

data/lib/ayadn/status.rb

@@ -10,6 +10,10 @@ module Ayadn
     def self.downloading
       "Downloading from ADN...\n\n".inverse
     end
+    def self.uploading files
+      files.length > 1 ? pl = "s" : pl = ""
+      "\nUploading file#{pl} to ADN...".color(:cyan)
+    end
     def self.posting
       "Posting to ADN...\n\n".inverse
     end
@@ -277,5 +281,11 @@ module Ayadn
     def self.no_text
       "\n\nYou should provide some text.\n\n".color(:red)
     end
+    def self.bad_path
+      "\n\nCouldn't upload this file (path seems wrong).\n\n".color(:red)
+    end
+    def self.no_curl
+      "\n\nAyadn needs 'curl' to upload files. Please install 'curl' (or check that it's properly declared in your $PATH).\n\n".color(:red)
+    end
   end
 end

data/lib/ayadn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor