reddit_bot 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 99ebebd30c2e4bfa221cc6b78c6521f4eb2e5c7b
-  data.tar.gz: 79b8d91f910d5ca649f8350f1009bb6c21afd702
+SHA256:
+  metadata.gz: 3c3199231c10b288c884d65c85854b15ee912c98e24cac2399f723f774d20739
+  data.tar.gz: '09030416b2e85f8b7925f1b587c438a1f14647e548e9538cce4e4ac541b54f2a'
 SHA512:
-  metadata.gz: 9049548db4c55006a9fd9dd7fef394cb3b973ea3df7047a25528dcd2495e230acaa8217fd17ffa8128e9f23784bd292875d6e01015c785d465c3acc7c51db0b9
-  data.tar.gz: 6e9849c6d4d3c7ed2eacc8b404f256764e0756e773d567ab7004d7f0a041bbdb5b722106d4fbba281b1ef0f8b6898d551b7742b19a232b942058523e8235a669
+  metadata.gz: 41e7d08da3df2bc5e81aa05f19ac6262ba8bd03904c8c019de7da0236f432982b1d1940a623d211e0cfae3f4a2127c29b68d9dffe74c5b81eb8581e370a5c865
+  data.tar.gz: 79859fd99f824e8ed7771cf016b7001b90592c3d02d395a8f5c8ef686758b2788009cb7bb0b2ad95ffeb1303d22ea26a637f0dc691506c7c6b965d05abe8730c

data/lib/reddit_bot.rb

@@ -1,58 +1,48 @@
-STDOUT.sync = true
-
-require "openssl"
 require "json"
 require "yaml"
 
 require "nethttputils"
 
 module RedditBot
-  require "logger"
   class << self
-    attr_accessor :logger
+    attr_reader :logger
   end
-  self.logger = Logger.new STDOUT
+  require "logger"
+  @logger = Logger.new STDOUT
+  @logger.level = Logger::WARN
+  @logger.level = ENV["LOGLEVEL_#{name}"].to_sym if ENV.include? "LOGLEVEL_#{name}"
 
   class Bot
     attr_reader :name
 
     def initialize secrets, **kwargs
       @name, @secret_password, @user_agent, *@secret_auth = secrets.values_at *%i{ login password user_agent client_id client_secret }
-      # @ignore_captcha = true
-      # @ignore_captcha = kwargs[:ignore_captcha] if kwargs.has_key?(:ignore_captcha)
       @subreddit = kwargs[:subreddit]
     end
 
     def json mtd, path, _form = []
-      form = Hash[_form]
+      form = _form.to_h
       response = begin
         JSON.load resp_with_token mtd, path, form.merge({api_type: "json"})
       rescue JSON::ParserError
         $!.message.slice! 1000..-1
         raise
       end
-      if response.is_a?(Hash) && response["json"] && # for example, flairlist.json and {"error": 403} do not have it
-         !response["json"]["errors"].empty?
+      return response unless response.is_a?(Hash) && response["json"] && !response["json"]["errors"].empty?
+      # for example, flairlist.json and {"error": 403} do not have it
         Module.nesting[1].logger.error "ERROR OCCURED on #{[mtd, path]}"
         fail "unknown how to handle multiple errors" if 1 < response["json"]["errors"].size
         Module.nesting[1].logger.error "error: #{response["json"]["errors"]}"
         error, description = response["json"]["errors"].first
-          case error
+      case error
           when "ALREADY_SUB" ; Module.nesting[1].logger.warn "was rejected by moderator if you didn't see in dups"
-          # when "BAD_CAPTCHA" ; update_captcha
-          #   json mtd, path, form.merger( {
-          #     iden: @iden_and_captcha[0],
-          #     captcha: @iden_and_captcha[1],
-          #   } ) unless @ignore_captcha
           when "RATELIMIT"
             fail error unless description[/\Ayou are doing that too much\. try again in (\d) minutes\.\z/]
             Module.nesting[1].logger.info "retrying in #{$1.to_i + 1} minutes"
             sleep ($1.to_i + 1) * 60
             return json mtd, path, _form
           else ; fail error
-          end
       end
-      response
     end
 
     # # [subreddit] +String+ subreddit name without "/r" prefix
@@ -138,8 +128,11 @@ module RedditBot
           result = cache.call(args){ json *args }
           fail if result.keys != %w{ kind data }
           fail if result["kind"] != "Listing"
-          fail result["data"].keys.inspect unless result["data"].keys == %w{ after dist modhash whitelist_status children before } ||
-                                                  result["data"].keys == %w{ modhash dist children after before }
+          fail result["data"].keys.inspect unless [
+                                                    %w{ after dist modhash whitelist_status children before },
+                                                    %w{ modhash dist children after before },
+                                                    %w{ after dist modhash geo_filter children before },
+                                                  ].include? result["data"].keys
           @@skip_erroneous_descending_ids[ result["data"]["children"].map do |post|
             fail "unknown type post['kind']: #{post["kind"]}" unless post["kind"] == "t3"
             post["data"].dup.tap do |data|
@@ -282,6 +275,7 @@ module RedditBot
 
     require "cgi"
     def self.tweet2titleNtext tweet
+      pp tweet if ENV["TEST"]
       text = ""
       contains_media = false
       up = ->s{ s.split.map{ |w| "^#{w}" }.join " " }

data/reddit_bot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "reddit_bot"
-  spec.version       = "1.9.0"
+  spec.version       = "1.11.0"
   spec.summary       = "Simple library for Reddit bots"
 
   spec.author        = "Victor Maslov aka Nakilon"
@@ -9,14 +9,8 @@ Gem::Specification.new do |spec|
   spec.metadata      = {"source_code_uri" => "https://github.com/Nakilon/reddit_bot"}
 
   spec.add_dependency "json_pure"
-  spec.add_dependency "nethttputils", "~>0.4.1.0"
-  # spec.add_development_dependency "bundler", "~> 1.11"
-  # spec.add_development_dependency "rake", "~> 10.0"
-  # spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency "nethttputils", "~>0.4.4.0"
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.files         = %w{ LICENSE.txt reddit_bot.gemspec lib/reddit_bot.rb }
 end
-
-  # spec.test_files    = ["spec/"]
-  # spec.post_install_message = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1.0
+        version: 0.4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1.0
+        version: 0.4.4.0
 description: 
 email: nakilon@gmail.com
 executables: []
@@ -67,8 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Simple library for Reddit bots