ayadn 3.0 → 4.0

data/lib/ayadn/descriptions.rb

@@ -1150,7 +1150,7 @@ module Ayadn
 
       You can block several users at once:
 
-      `ayadn -MU @spammer @myex @thickhead`
+      `ayadn -BL @spammer @myex @thickhead`
       \n\n
       USAGE
     end
@@ -1305,12 +1305,6 @@ module Ayadn
       `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
@@ -1337,12 +1331,6 @@ module Ayadn
       `ayadn -W -Y https://www.youtube.com/watch?v=Ei8CFin00PY`
 
       `ayadn -W -V http://vimeo.com/123234345`
-
-      Embed a movie poster:
-
-      `ayadn -W -M terminator`
-
-      (This is different from the 'movie' command, check the docs.)
       \n\n
       USAGE
     end
@@ -1366,10 +1354,6 @@ module Ayadn
 
       `ayadn pm @ericd -V http://vimeo.com/123234345`
 
-      Embed a movie poster:
-
-      `ayadn pm @ericd -M terminator`
-
       It enters the writing mode where you will type your message.
 
       Ayadn will mark your PM channel as read after running this command.
@@ -1410,10 +1394,6 @@ module Ayadn
 
       `ayadn -C 46217 -V http://vimeo.com/123234345`
 
-      Embed a movie poster:
-
-      `ayadn -C 46217 -M terminator`
-
       It enters the writing mode where you will type your message.
 
       Ayadn will mark your PM channel as read after running this command.
@@ -1461,12 +1441,6 @@ module Ayadn
       `ayadn -R23365251 -Y https://www.youtube.com/watch?v=Ei8CFin00PY`
 
       `ayadn -R23365251 -V http://vimeo.com/123234345`
-
-      Embed a movie poster:
-
-      `ayadn -R23365251 -M terminator`
-
-      (This is different from the 'movie' command, check the docs.)
       \n\n
       USAGE
     end
@@ -1790,78 +1764,6 @@ module Ayadn
       \n\n
       USAGE
     end
-    def self.nowwatching
-      <<-USAGE
-      Create a post from (part of) a movie title. Includes movie poster and IMDb url.
-
-      Usage:
-
-      `ayadn movie ghost in the shell`
-
-      `ayadn -NW beetlejuice`
-
-      If the movie is not the one you're looking for, you can specify the 'alt' option to force find an alternative.
-
-      This is useful for remakes:
-
-      `ayadn -NW solaris`
-
-      (gives the 2002 version)
-
-      `ayadn -NW solaris --alt`
-
-      (gives the 1972 version)
-
-      Hashtag:
-
-      You can modify the default hashtag with 'set':
-
-      `ayadn set movie hashtag movietime`
-
-      `ayadn set movie hashtag adnmovieclub`
-
-      (default is 'nowwatching')
-      \n\n
-      USAGE
-    end
-    def self.tvshow
-      <<-USAGE
-      Create a post from (part of) a TV show title. Includes show poster and IMDb url.
-
-      Usage:
-
-      `ayadn tvshow magnum`
-
-      `ayadn -TV game of thrones`
-
-      If the show is not the one you're looking for, you can specify the 'alt' option to force find an alternative.
-
-      `ayadn -TV whose line`
-
-      (gives the US version)
-
-      `ayadn -TV whose line --alt`
-
-      (gives the UK version)
-
-      Hashtag:
-
-      You can modify the default hashtag with 'set':
-
-      `ayadn set tvshow hashtag showtime`
-
-      `ayadn set tvshow hashtag tvshow`
-
-      (default is 'nowwatching')
-
-      Banner:
-
-      Use the `--banner` (-b) options to insert a banner instead of a poster:
-
-      `ayadn -TV magnum --banner`
-      \n\n
-      USAGE
-    end
     def self.random_posts
       <<-USAGE
       Show random posts from App.net.

data/lib/ayadn/diagnostics.rb

@@ -47,7 +47,7 @@ module Ayadn
 
   class CheckBase
 
-    attr_accessor :response, :status
+    attr_accessor :response, :status, :baseURL
 
     def initialize
       @status = Status.new
@@ -110,7 +110,7 @@ module Ayadn
       begin
         check_root_api
         @status.say_header "checking ADN server response"
-        get_response "https://api.app.net/config"
+        get_response "#{@baseURL}/config"
         check_response_code
         body = JSON.parse(@response.body)
         if body.blank? || body["data"].blank?
@@ -128,12 +128,12 @@ module Ayadn
     def check_root_api
       @status.say_header("default root API endpoint")
       api_file = Dir.home + "/ayadn/.api.yml"
-      baseURL = if File.exist?(api_file)
+      @baseURL = if File.exist?(api_file)
         YAML.load(File.read(api_file))[:root]
       else
         "https://api.app.net"
       end
-      @status.say_green(:url, baseURL)
+      @status.say_green(:url, @baseURL)
     end
   end
 
@@ -149,7 +149,7 @@ module Ayadn
     def check
       begin
         @status.say_header("checking accounts database")
-        if find_active_account == true
+        if find_active_account
           users = @db.execute("SELECT * FROM Accounts")
           if users.blank?
             @status.say_red(:abort, "no registered Ayadn users")
@@ -164,7 +164,7 @@ module Ayadn
               check_paths
               check_config
               @status.say_header("checking #{@handle}'s account database")
-              if find_active_tables == true
+              if find_active_tables
                 check_tables_schemas
               end
             end
@@ -202,17 +202,17 @@ module Ayadn
           @status.say_info "checking table #{table[0]}"
           case table[0]
           when "Bookmarks"
-            break if check_bookmarks(table) == false
+            break if !check_bookmarks(table)
           when "Aliases"
-            break if check_aliases(table) == false
+            break if !check_aliases(table)
           when "Blacklist"
-            break if check_blacklist(table) == false
+            break if !check_blacklist(table)
           when "Users"
-            break if check_users(table) == false
+            break if !check_users(table)
           when "Pagination"
-            break if check_pagination(table) == false
+            break if !check_pagination(table)
           when "TLIndex"
-            break if check_TLIndex(table) == false
+            break if !check_TLIndex(table)
           end
         end
       end
@@ -350,6 +350,7 @@ module Ayadn
           @status.say_green(:pass, "current user is using default values")
         else
           diff.each do |key, value|
+            skip if key == :movie || key == :tvshow # those are deprecated, not missing
             if value.is_a?(Hash)
               value.each do |inner_key, inner_value|
                 default = inner_value[0].nil? ? "none" : inner_value[0]
@@ -362,10 +363,11 @@ module Ayadn
               end
             else
               default = value[0].nil? ? "none" : value[0]
-              if value[1].nil?
+              val = value[1]
+              if val.nil?
                 @status.say_red(:missing, "#{key} - Default: #{default}, Current: none")
               else
-                @status.say_green(:changed, "#{key} - Default: #{default}, Current: #{value[1]}")
+                @status.say_green(:changed, "#{key} - Default: #{default}, Current: #{val}")
               end
             end
           end
@@ -376,7 +378,6 @@ module Ayadn
     def check_id_handle
       id = @active_account[1]
       @status.say_green(:id, id)
-      # username = @active_account[0]
       @handle = @active_account[2]
       @status.say_green(:username, @handle)
     end

data/lib/ayadn/endpoints.rb

@@ -4,11 +4,7 @@ module Ayadn
 
     attr_accessor :ayadn_callback_url, :base_url, :config_api_url, :posts_url, :users_url, :files_url, :token_url, :channels_url, :pm_url
 
-    # Warning
-    # comment next line
     require_relative "ids"
-    # uncomment and insert your own URL
-    # CALLBACK_URL = ""
 
     def initialize
       @ayadn_callback_url = CALLBACK_URL
@@ -65,23 +61,23 @@ module Ayadn
 
     def unified(options)
       make_options_list(options) do
-        API.build_query({count: Settings.options[:counts][:unified]})
+        API.build_query({count: Settings.options.counts.unified})
       end
       "#{@posts_url}stream/unified?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def checkins(options)
       make_options_list(options) do
-        API.build_query({count: Settings.options[:counts][:checkins]})
+        API.build_query({count: Settings.options.counts.checkins})
       end
       "#{@posts_url}stream/explore/checkins?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def global(options)
       make_options_list(options) do
-        API.build_query({count: Settings.options[:counts][:global]})
+        API.build_query({count: Settings.options.counts.global})
       end
-      if Settings.global[:force] == true
+      if Settings.global.force
         "#{@posts_url}stream/global?#{@options_list}"
       else
         "#{@posts_url}stream/global?access_token=#{Settings.user_token}#{@options_list}"
@@ -90,37 +86,37 @@ module Ayadn
 
     def trending(options)
       make_options_list(options) do
-        API.build_query({count: Settings.options[:counts][:trending]})
+        API.build_query({count: Settings.options.counts.trending})
       end
       "#{@posts_url}stream/explore/trending?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def photos(options)
       make_options_list(options) do
-        API.build_query({count: Settings.options[:counts][:photos]})
+        API.build_query({count: Settings.options.counts.photos})
       end
       "#{@posts_url}stream/explore/photos?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def conversations(options)
       make_options_list(options) do
-        API.build_query({count: Settings.options[:counts][:conversations]})
+        API.build_query({count: Settings.options.counts.conversations})
       end
       "#{@posts_url}stream/explore/conversations?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def mentions(username, options)
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:mentions]})
+        API.build_query({count: Settings.options.counts.mentions})
       end
       "#{@users_url}#{username}/mentions/?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def posts(username, options)
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:posts]})
+        API.build_query({count: Settings.options.counts.posts})
       end
-      if Settings.global[:force] == true
+      if Settings.global.force
         "#{@users_url}#{username}/posts/?#{@options_list}"
       else
         "#{@users_url}#{username}/posts/?access_token=#{Settings.user_token}#{@options_list}"
@@ -129,7 +125,7 @@ module Ayadn
 
     def whatstarred(username, options)
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:default]})
+        API.build_query({count: Settings.options.counts.default})
       end
       "#{@users_url}#{username}/stars/?access_token=#{Settings.user_token}#{@options_list}"
     end
@@ -148,7 +144,7 @@ module Ayadn
 
     def convo(post_id, options)
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:convo]})
+        API.build_query({count: Settings.options.counts.convo})
       end
       "#{@posts_url}#{post_id}/replies/?access_token=#{Settings.user_token}#{@options_list}"
     end
@@ -175,34 +171,34 @@ module Ayadn
 
     def search(words, options)
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options.counts.search})
       end
       "#{@posts_url}search?text=#{words}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_users words, options
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options.counts.search})
       end
       "#{@users_url}search?q=#{words}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_annotations anno, options
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options.counts.search})
       end
       "#{@posts_url}search?annotation_types=#{anno}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_messages channel_id, words, options
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options.counts.search})
       end
       "#{@channels_url}messages/search?query=#{words}&channel_ids=#{channel_id}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_channels words, options
-        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+        @options_list = API.build_query({count: Settings.options.counts.search})
       "#{@channels_url}search?q=#{words}&order=popularity&access_token=#{Settings.user_token}#{@options_list}"
     end
 
@@ -220,7 +216,7 @@ module Ayadn
 
     def files_list(options)
       make_options_list_simple(options) do
-        API.build_query({count: Settings.options[:counts][:files]})
+        API.build_query({count: Settings.options.counts.files})
       end
       "#{@users_url}me/files?access_token=#{Settings.user_token}#{@options_list}"
     end

data/lib/ayadn/errors.rb

@@ -19,7 +19,7 @@ module Ayadn
       end
       Logs.rec.debug "STACK: #{stack}"
       Logs.rec.error "--END--"
-      thor.say_status :error, "logged in #{Settings.config[:paths][:log]}/ayadn.log", :red
+      thor.say_status :error, "logged in #{Settings.config.paths.log}/ayadn.log", :red
       puts "\n"
       Debug.err(args[:error], stack)
       exit

data/lib/ayadn/fileops.rb

@@ -3,11 +3,11 @@ module Ayadn
   class FileOps
 
     def self.cache_list(list, name)
-      File.write(Settings.config[:paths][:lists] + "/.#{name}", list.to_json)
+      File.write(Settings.config.paths.lists + "/.#{name}", list.to_json)
     end
 
     def self.cached_list(name)
-      file_path = Settings.config[:paths][:lists] + "/.#{name}"
+      file_path = Settings.config.paths.lists + "/.#{name}"
       if File.exist?(file_path)
         data = File.read(file_path)
         JSON.load(data)
@@ -17,35 +17,35 @@ module Ayadn
     end
 
     def self.save_links(obj, name)
-      File.write(Settings.config[:paths][:lists] + "/#{name}", obj.to_json)
+      File.write(Settings.config.paths.lists + "/#{name}", obj.to_json)
     end
 
     def self.save_post(resp)
-      File.write(Settings.config[:paths][:posts] + "/#{resp['data']['id']}.json", resp['data'].to_json)
+      File.write(Settings.config.paths.posts + "/#{resp['data']['id']}.json", resp['data'].to_json)
     end
 
     def self.save_message(resp)
-      File.write(Settings.config[:paths][:messages] + "/#{resp['data']['id']}.json", resp['data'].to_json)
+      File.write(Settings.config.paths.messages + "/#{resp['data']['id']}.json", resp['data'].to_json)
     end
 
     def self.save_followings_list(list)
       fg = get_users(list)
-      File.write(Settings.config[:paths][:lists] + "/followings.json", fg.to_json)
+      File.write(Settings.config.paths.lists + "/followings.json", fg.to_json)
     end
 
     def self.save_followers_list(list)
       fr = get_users(list)
-      File.write(Settings.config[:paths][:lists] + "/followers.json", fr.to_json)
+      File.write(Settings.config.paths.lists + "/followers.json", fr.to_json)
     end
 
     def self.save_muted_list(list)
       mt = get_users(list)
-      File.write(Settings.config[:paths][:lists] + "/muted.json", mt.to_json)
+      File.write(Settings.config.paths.lists + "/muted.json", mt.to_json)
     end
 
     def self.download_url(name, url)
       file = CNX.get_response_from(url)
-      File.write(Settings.config[:paths][:downloads] + "/#{name}", file)
+      File.write(Settings.config.paths.downloads + "/#{name}", file)
     end
 
     def self.upload_files files
@@ -59,11 +59,11 @@ module Ayadn
       begin
         case File.extname(file).downcase
         when ".png"
-          `curl -k -H 'Authorization: BEARER #{token}' #{Settings.config[:api][:baseURL]}/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/png" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' #{Settings.config.api.baseURL}/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}' #{Settings.config[:api][:baseURL]}/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/gif" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' #{Settings.config.api.baseURL}/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}' #{Settings.config[:api][:baseURL]}/files -F 'type=com.ayadn.files' -F "content=@#{file}" -F 'public=true' -X POST`
+          `curl -k -H 'Authorization: BEARER #{token}' #{Settings.config.api.baseURL}/files -F 'type=com.ayadn.files' -F "content=@#{file}" -F 'public=true' -X POST`
         end
       rescue Errno::ENOENT
         Status.new.no_curl