ayadn 1.6.0 → 1.7.0

data/lib/ayadn/app.rb

@@ -3,7 +3,7 @@ module Ayadn
   class App < Thor
     package_name "Ayadn"
 
-    %w{action stream api search descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug check nowplaying nowwatching tvshow}.each { |r| require_relative "#{r}" }
+    %w{action stream api search descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank debug check nowplaying nowwatching tvshow annotations}.each { |r| require_relative "#{r}" }
 
     ##
     # These methods are intended to be called from the CLI.
@@ -17,6 +17,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def timeline
       Action.new.unified(options)
     end
@@ -29,6 +30,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def checkins
       Action.new.checkins(options)
     end
@@ -41,6 +43,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def global
       Action.new.global(options)
     end
@@ -53,6 +56,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def trending
       Action.new.trending(options)
     end
@@ -65,6 +69,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def photos
       Action.new.photos(options)
     end
@@ -77,6 +82,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def conversations
       Action.new.conversations(options)
     end
@@ -88,6 +94,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def mentions(*username)
       Action.new.mentions(username, options)
     end
@@ -99,6 +106,7 @@ module Ayadn
     option :count, aliases: "-c", type: :numeric, desc: Descriptions.options_count
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def userposts(*username)
       Action.new.posts(username, options)
     end
@@ -144,6 +152,7 @@ module Ayadn
     option :scroll, aliases: "-s", type: :boolean, desc: "Scroll the stream"
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     long_desc Descriptions.convo
     def convo(post_id)
       Action.new.convo(post_id, options)
@@ -186,6 +195,7 @@ module Ayadn
     long_desc Descriptions.hashtag
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def hashtag(hashtag)
       Action.new.hashtag(hashtag, options)
     end
@@ -197,6 +207,7 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     option :messages, type: :boolean, desc: 'Search for WORD(S) in messages, including PMs.'
     option :users, type: :boolean, desc: 'Search for App.net users by searching WORD(S) in their bio/description.'
     option :channels, type: :boolean, desc: 'Search for App.net channels by searching WORD(S) in their description.'
@@ -225,6 +236,7 @@ module Ayadn
     map "-pi" => :postinfo
     long_desc Descriptions.postinfo
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
+    option :force, aliases: "-f", type: :boolean, desc: Descriptions.options_force
     def postinfo(post_id)
       Action.new.postinfo(post_id, options)
     end
@@ -350,7 +362,10 @@ 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"
+    option :embed, aliases: "-E", type: :array, desc: "Embed one or several pictures in the new post"
+    option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new post"
+    option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
+    option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
     def post(*args)
       Action.new.post(args, options)
     end
@@ -359,14 +374,20 @@ module Ayadn
     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"
+    option :embed, aliases: "-E", type: :array, desc: "Embed one or several pictures in the new post"
+    option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new post"
+    option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
+    option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
     def 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"
+    option :embed, aliases: "-E", type: :array, desc: "Embed one or several pictures in the new post"
+    option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new post"
+    option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
+    option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
     def pm(*username)
       Action.new.pmess(username, options)
     end
@@ -381,7 +402,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"
+    option :embed, aliases: "-E", type: :array, desc: "Embed one or several pictures in the new post"
+    option :youtube, aliases: "-Y", type: :array, desc: "Embed a Youtube video in the new post"
+    option :vimeo, aliases: "-V", type: :array, desc: "Embed a Vimeo video in the new post"
+    option :poster, aliases: "-M", type: :array, desc: "Embed a movie poster, from title, in the new post"
     def reply(id)
       ayadn = Action.new
       ayadn.reply(id, options)

data/lib/ayadn/databases.rb

@@ -77,8 +77,14 @@ module Ayadn
       @blacklist.clear
       dummy.each {|v,k| @blacklist[v] = k}
     end
-    def self.save_max_id(stream)
-      @pagination[stream['meta']['marker']['name']] = stream['meta']['max_id']
+
+    def self.save_max_id(stream, name = 'unknown')
+      if stream['meta']['marker'].nil?
+        key = name
+      else
+        key = stream['meta']['marker']['name']
+      end
+      @pagination[key] = stream['meta']['max_id']
     end
 
     def self.create_alias(channel_id, channel_alias)

data/lib/ayadn/debug.rb

@@ -22,12 +22,12 @@ module Ayadn
 
     def self.db dbs
       if Settings.options[:timeline][:show_debug] == true
-        puts "/////\nSETTINGS\n"
-        jj JSON.parse((Settings.config).to_json)
-        jj JSON.parse((Settings.options).to_json)
-        Logs.rec.debug "SETTINGS/CONFIG: #{Settings.config}"
-        Logs.rec.debug "SETTINGS/OPTIONS: #{Settings.options}"
-        puts "/////\n\n"
+        # puts "/////\nSETTINGS\n"
+        # jj JSON.parse((Settings.config).to_json)
+        # jj JSON.parse((Settings.options).to_json)
+        # Logs.rec.debug "SETTINGS/CONFIG: #{Settings.config}"
+        # Logs.rec.debug "SETTINGS/OPTIONS: #{Settings.options}"
+        # puts "/////\n\n"
 
         #puts ">>>>>\nDATABASES\n"
         dbs.each do |db|

data/lib/ayadn/descriptions.rb

@@ -16,6 +16,9 @@ module Ayadn
     def self.options_extract
       "Extract links from each object"
     end
+    def self.options_force
+      "Force retrieve posts if the user is muted/blocked"
+    end
     def self.unified
       <<-USAGE
       Show your App.net timeline, aka the Unified Stream.
@@ -732,9 +735,25 @@ module Ayadn
 
       ayadn -P Watching a movie with friends
 
+      Embed a picture:
+
+      ayadn -P "lol cat" -E ~/Pics/lolcat.jpg
+
       You don't have to put quotes around your text, but it's better to do it.
 
       The 'write' method is recommended over this one: it's more secure and offers multi-line support.
+
+      Embed an online video:
+
+      ayadn -P wave function -Y https://www.youtube.com/watch?v=Ei8CFin00PY
+
+      ayadn -P wargarbl -V http://vimeo.com/123234345
+
+      Embed a movie poster:
+
+      ayadn -P "I'll be back" -M terminator
+
+      (This is different from the 'movie' command, check the docs.)
       \n\n
       USAGE
     end
@@ -748,7 +767,23 @@ module Ayadn
 
       ayadn -W
 
+      Embed a picture:
+
+      ayadn -W -E ~/Pics/lolcat.jpg
+
       It enters the writing mode where you will type your post.
+
+      Embed an online video:
+
+      ayadn -P wave function -Y https://www.youtube.com/watch?v=Ei8CFin00PY
+
+      ayadn -P wargarbl -V http://vimeo.com/123234345
+
+      Embed a movie poster:
+
+      ayadn -P "I'll be back" -M terminator
+
+      (This is different from the 'movie' command, check the docs.)
       \n\n
       USAGE
     end
@@ -760,6 +795,10 @@ module Ayadn
 
       ayadn pm @ericd
 
+      Embed a picture:
+
+      ayadn pm -E ~/Pics/lolcat.jpg
+
       It enters the writing mode where you will type your message.
       \n\n
       USAGE
@@ -796,9 +835,23 @@ module Ayadn
 
       If you reply to a repost, Ayadn will automatically replace it by the original post.
 
-      If you just viewed a stream with the -i (--index) option, you can also reply to a post by its index.
+      If you just viewed a stream with the -i (--index) option, you can also reply to a post by its index (ex: ayadn -R 3).
+
+      Embed a picture in a reply:
+
+      ayadn -R 23365251 -E ~/Pics/lolcat.jpg
+
+      Embed an online video:
+
+      ayadn -P wave function -Y https://www.youtube.com/watch?v=Ei8CFin00PY
+
+      ayadn -P wargarbl -V http://vimeo.com/123234345
+
+      Embed a movie poster:
+
+      ayadn -P "I'll be back" -M terminator
 
-      Example: ayadn -R 3
+      (This is different from the 'movie' command, check the docs.)
       \n\n
       USAGE
     end

data/lib/ayadn/endpoints.rb

@@ -56,7 +56,11 @@ module Ayadn
       else
         API.build_query({count: Settings.options[:counts][:global]})
       end
-      "#{@posts_url}stream/global?access_token=#{Settings.user_token}#{@options_list}"
+      if Settings.options[:force]
+        "#{@posts_url}stream/global?#{@options_list}"
+      else
+        "#{@posts_url}stream/global?access_token=#{Settings.user_token}#{@options_list}"
+      end
     end
 
     def trending(options)
@@ -101,7 +105,11 @@ module Ayadn
       else
         API.build_query({count: Settings.options[:counts][:posts]})
       end
-      "#{@users_url}#{username}/posts/?access_token=#{Settings.user_token}#{@options_list}"
+      if Settings.options[:force]
+        "#{@users_url}#{username}/posts/?#{@options_list}"
+      else
+        "#{@users_url}#{username}/posts/?access_token=#{Settings.user_token}#{@options_list}"
+      end
     end
 
     def whatstarred(username, options)
@@ -248,7 +256,7 @@ module Ayadn
       "#{@channels_url}?access_token=#{Settings.user_token}#{API.build_query(options)}"
     end
 
-    def messages(channel_id, options)
+    def messages(channel_id, options = {})
       "#{@channels_url}#{channel_id}/messages?access_token=#{Settings.user_token}#{API.build_query(options)}&include_machine=1"
     end
 

data/lib/ayadn/logs.rb

@@ -17,22 +17,5 @@ module Ayadn
       end
     end
 
-    # unused (experiment)
-    # def self.send_log(from, args, content)
-    #   begin
-    #     log = {
-    #       "platform" => "#{Settings.config[:platform]}",
-    #       "date" => Time.now,
-    #       "version" => "#{Settings.config[:version]}",
-    #       "source" => from,
-    #       "args" => args,
-    #       "content" => content
-    #     }
-    #     Post.new.send_log(log)
-    #   rescue
-    #     @rec.warn("Unable to send log.")
-    #   end
-    # end
-
   end
 end

data/lib/ayadn/mark.rb

@@ -9,12 +9,13 @@ module Ayadn
       begin
         init
         unless args.empty?
-          post_id, convo_title = args[0], args[1]
+          double = args.dup
+          post_id, convo_title = double.shift, double.join(' ')
         else
           abort Status.wrong_arguments
         end
         abort Status.error_missing_post_id unless post_id.is_integer?
-        convo_title = post_id if convo_title.nil?
+        convo_title = post_id if convo_title == ''
         api, workers, view = API.new, Workers.new, View.new
         users, bucket = [], []
         view.clear_screen
@@ -52,6 +53,8 @@ module Ayadn
         puts Status.done
       rescue => e
         Errors.global_error({error: e, caller: caller, data: [args]})
+      ensure
+        Databases.close_all
       end
     end
 

data/lib/ayadn/nowplaying.rb

@@ -60,36 +60,37 @@ module Ayadn
         @view.clear_screen
         puts Status.writing
         show_nowplaying("\n#{text_to_post}", options, store)
-        unless options['no_url'] || store.nil?
+        unless options[:no_url] || store.nil?
           text_to_post += "\n \n[iTunes Store](#{store['link']})"
         end
         abort(Status.canceled) unless STDIN.getch == ("y" || "Y")
         puts "\n#{Status.yourpost}"
-        unless store.nil? || options['no_url']
+        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
           visible, track, artwork, artwork_thumb, link, artist = false
         end
-        if options['lastfm']
+        if options[:lastfm]
           source = 'Last.fm'
         else
           source = 'iTunes'
         end
         dic = {
-          'text' => text_to_post,
-          'title' => track,
-          'artist' => artist,
-          'artwork' => artwork,
-          'artwork_thumb' => artwork_thumb,
-          'width' => 1200,
-          'height' => 1200,
-          'width_thumb' => 200,
-          'height_thumb' => 200,
-          'link' => link,
-          'source' => source,
-          'visible' => visible
+          options: options,
+          text: text_to_post,
+          title: track,
+          artist: artist,
+          artwork: artwork,
+          artwork_thumb: artwork_thumb,
+          width: 1200,
+          height: 1200,
+          width_thumb: 200,
+          height_thumb: 200,
+          link: link,
+          source: source,
+          visible: visible
         }
-        @view.show_posted(Post.new.send_nowplaying(dic))
+        @view.show_posted(Post.new.post(dic))
       rescue => e
         puts Status.wtf
         Errors.global_error({error: e, caller: caller, data: [dic, store, options]})

data/lib/ayadn/nowwatching.rb

@@ -5,29 +5,54 @@ module Ayadn
 
     require 'spotlite'
 
-    def initialize view
+    def initialize view = nil
       @view = view
       @spotlite = Spotlite::Movie
     end
 
+    # -----
+
+    def get_response args, options
+      find_by_title(args, options)
+    end
+
+    def create_filename response
+      reg = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
+      "#{response.title.downcase.strip.gsub(reg, '_').split(' ').join('_')}.jpg"
+    end
+
+    # This is only for the `-M` option in the CLI
+    def get_poster args, options
+      options = options.dup
+      response = get_response(args, options)
+      filename = create_filename(response)
+      FileOps.download_url(filename, response.poster_url)
+      options[:embed] ||= []
+      options[:embed] << "#{Settings.config[:paths][:downloads]}/#{filename}"
+      return options
+    end
+
+    # -----
+
     def post args, options
+      options = options.dup
       puts "\nContacting IMDb.com...".color(:cyan)
       response = find_by_title(args, options)
       text = format_post(response)
       show_post(text)
-      reg = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
-      filename = "#{response.title.downcase.strip.gsub(reg, '_').split(' ').join('_')}.jpg"
+      filename = create_filename(response)
       FileOps.download_url(filename, response.poster_url)
       @view.clear_screen
       puts "\nPosting and uploading the movie poster...\n".color(:green)
-      file = ["#{Settings.config[:paths][:downloads]}/#{filename}"]
+      options[:embed] = ["#{Settings.config[:paths][:downloads]}/#{filename}"]
+      options[:movie] = true
       dic = {
-        'text' => text,
-        'data' => FileOps.upload_files(file),
-        'title' => response.title,
-        'source' => 'IMDb'
+        options: options,
+        text: text,
+        title: response.title,
+        source: 'IMDb'
       }
-      resp = Post.new.send_movie(dic)
+      resp = Post.new.post(dic)
       FileOps.save_post(resp) if Settings.options[:backup][:auto_save_sent_posts]
       @view.clear_screen
       puts Status.yourpost