reddit_bot 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe3593cb266098860316251a4126efdccced3c0
-  data.tar.gz: bcf920ee2ccf254f5f84aeef64c5a5471400165d
+  metadata.gz: fb0c92530c0139f3abcf98680613b118ab21eeb8
+  data.tar.gz: 68ff542161f8ea0e73bbeb0ca3ecd2a3fef6d618
 SHA512:
-  metadata.gz: 00c876b7cde3299b2ec06ac5c8f7a34e2299a651ac91c7815d168e547c220c3c4a6317a4eab544c2e81656263ce9d2cf7687dcec062f90952a20d8092e2a6185
-  data.tar.gz: c74d1fac23dafb7ed17165875b164ceec1f2cde7f21f1defc590661f2f6de86c1ec4b446e69320d2dce72491b42a4081cda2b0e5d8d5e979537697de7d8cf6f0
+  metadata.gz: 6f162ba96a47e7ea121f26dc2a1e4a79a23c5448355fdf931b6c518216881758aa527880957e608f8b356a1340dd00999154440678105517b44540d893e4e134
+  data.tar.gz: 9143a8d2ba251a0871097ab726eab1fdae48449a678363ae1c58c73a98baa204cb7f12d5b325bdc4d87a561f7bbf8e2c100540b96dee32681f8ed82b7034148b

data/README.md

@@ -74,6 +74,7 @@ You obviously can't run these examples as is, because they use some dependencies
     :client_secret: Fqo.....................AFI
     :password: mybotpassword
     :login: MyBotUsername
+    # :user_agent: optional_custom_useragent_to_bypass_reddit_spam_protection
 
 To update the gem version in Gemfile.lock when using Gemfile like this: `gem "reddit_bot", "~>1.1.0"`, do the:
 

data/lib/reddit_bot/version.rb

@@ -1,3 +1,3 @@
 module RedditBot
-  VERSION = "1.6.5" # :nodoc:
+  VERSION = "1.6.6" # :nodoc:
 end

data/lib/reddit_bot.rb

@@ -17,8 +17,7 @@ module RedditBot
     # [secrets] +Hash+ with keys :client_id, :client_secret, :password: and :login
     # [kwargs] keyword params may include :subreddit for clever methods
     def initialize secrets, **kwargs
-      @secrets = secrets.values_at *%i{ client_id client_secret password login }
-      @name = secrets[:login]
+      @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]
@@ -30,11 +29,12 @@ module RedditBot
     def json mtd, path, _form = []
       form = Hash[_form]
       response = JSON.parse resp_with_token mtd, path, form.merge({api_type: "json"})
-      if response.is_a?(Hash) && response["json"] # for example, flairlist.json and {"error": 403} do not have it
-        puts "ERROR OCCURED on #{[mtd, path]}" unless response["json"]["errors"].empty?
-        # pp response["json"]
-        response["json"]["errors"].each do |error, description|
-          puts "error: #{[error, description]}"
+      if response.is_a?(Hash) && response["json"] && # for example, flairlist.json and {"error": 403} do not have it
+         !response["json"]["errors"].empty?
+        puts "ERROR OCCURED on #{[mtd, path]}"
+        fail "unknown how to handle multiple errors" if 1 < response["json"]["errors"].size
+        puts "error: #{response["json"]["errors"]}"
+        error, description = response["json"]["errors"].first
           case error
           when "ALREADY_SUB" ; puts "was rejected by moderator if you didn't see in dups"
           # when "BAD_CAPTCHA" ; update_captcha
@@ -42,9 +42,13 @@ module RedditBot
           #     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/]
+            puts "retrying in #{$1.to_i + 1} minutes"
+            sleep ($1.to_i + 1) * 60
+            return json mtd, path, _form
           else ; fail error
           end
-        end
       end
       response
     end
@@ -163,16 +167,17 @@ module RedditBot
 
     def token
       return @token_cached if @token_cached
+      # TODO handle with nive error message if we get 403 -- it's probably because of bad user agent
       response = JSON.parse reddit_resp :post,
         "https://www.reddit.com/api/v1/access_token", {
           grant_type: "password",
-          username: @username = @secrets[3],
-          password: @secrets[2],
+          username: @name,
+          password: @secret_password,
         }, {
-          "User-Agent" => "bot/#{@username}/#{RedditBot::VERSION} by /u/nakilon",
-        }, [@secrets[0], @secrets[1]]
+          "User-Agent" => "bot/#{@user_agent || @name}/#{RedditBot::VERSION} by /u/nakilon",
+        }, @secret_auth
       unless @token_cached = response["access_token"]
-        fail "bot #{@username} isn't a 'developer' of app at https://www.reddit.com/prefs/apps/" if response == {"error"=>"invalid_grant"}
+        fail "bot #{@name} isn't a 'developer' of app at https://www.reddit.com/prefs/apps/" if response == {"error"=>"invalid_grant"}
         fail response.inspect
       end
       puts "new token is: #{@token_cached}"
@@ -195,10 +200,10 @@ module RedditBot
       begin
         reddit_resp mtd, "https://oauth.reddit.com" + path, form, {
           "Authorization" => "bearer #{token}",
-          "User-Agent" => "bot/#{@username}/#{RedditBot::VERSION} by /u/nakilon",
+          "User-Agent" => "bot/#{@user_agent || @name}/#{RedditBot::VERSION} by /u/nakilon",
         }
       rescue NetHTTPUtils::Error => e
-        # sleep 5
+        sleep 5
         raise unless e.code == 401
         @token_cached = nil
         retry
@@ -206,9 +211,9 @@ module RedditBot
     end
 
     def reddit_resp *args
-      mtd, url, form, headers, base_auth = *args
+      mtd, url, form, headers, basic_auth = *args
       begin
-        NetHTTPUtils.request_data(url, mtd, form: form, header: headers, auth: base_auth) do |response|
+        NetHTTPUtils.request_data(url, mtd, form: form, header: headers, auth: basic_auth) do |response|
           next unless remaining = response.to_hash["x-ratelimit-remaining"]
           if Gem::Platform.local.os == "darwin"
             puts %w{

data/reddit_bot.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   # spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "json"
+  spec.add_runtime_dependency "nethttputils", "~> 0.2.4.1"
   # spec.add_development_dependency "bundler", "~> 1.11"
   # spec.add_development_dependency "rake", "~> 10.0"
   # spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nethttputils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4.1
 description: better than PRAW
 email:
 - nakilon@gmail.com