reddit_bot 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b982ca68fe28189b57f07c597c68d0db80541f
-  data.tar.gz: f25148fd86d9cc67f93651b16298d1d902bb0567
+  metadata.gz: 99ebebd30c2e4bfa221cc6b78c6521f4eb2e5c7b
+  data.tar.gz: 79b8d91f910d5ca649f8350f1009bb6c21afd702
 SHA512:
-  metadata.gz: fbdd04f798cc039e66a32639bf4949887de5b9875c57ff5f63291730ca903afb2437b91440e7eb8449374589249d3dd4808cbc29385ffbdb65c4faa509d01b65
-  data.tar.gz: 1125779a8c6a4aa55ba98ecb50f6b54ebfd3c4496b983adc09a575aba247d98c6c4583208c5668b58aa86014bf5064e2f24afc150bb4befd8e8b4dd8ca8c48a9
+  metadata.gz: 9049548db4c55006a9fd9dd7fef394cb3b973ea3df7047a25528dcd2495e230acaa8217fd17ffa8128e9f23784bd292875d6e01015c785d465c3acc7c51db0b9
+  data.tar.gz: 6e9849c6d4d3c7ed2eacc8b404f256764e0756e773d567ab7004d7f0a041bbdb5b722106d4fbba281b1ef0f8b6898d551b7742b19a232b942058523e8235a669

data/lib/reddit_bot.rb

@@ -1,5 +1,4 @@
 STDOUT.sync = true
-# require "pp"
 
 require "openssl"
 require "json"
@@ -15,12 +14,8 @@ module RedditBot
   self.logger = Logger.new STDOUT
 
   class Bot
-
-    # bot's Reddit username; set via constructor parameter secrets[:login]
     attr_reader :name
 
-    # [secrets] +Hash+ with keys :client_id, :client_secret, :password: and :login
-    # [kwargs] keyword params may include :subreddit for clever methods
     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
@@ -28,12 +23,14 @@ module RedditBot
       @subreddit = kwargs[:subreddit]
     end
 
-    # [mtd] +Symbol+ :get or :post
-    # [path] +String+ an API method
-    # [_form] +Array+ or +Hash+ API method params
     def json mtd, path, _form = []
       form = Hash[_form]
-      response = JSON.load resp_with_token mtd, path, form.merge({api_type: "json"})
+      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?
         Module.nesting[1].logger.error "ERROR OCCURED on #{[mtd, path]}"
@@ -70,8 +67,6 @@ module RedditBot
     #   # ["previous", result["data"]["children"].last["id"]],
     # end
 
-    # [reason] :nodoc:
-    # [thing_id] +String+ fullname of a "link, commenr or message"
     def report reason, thing_id
       Module.nesting[1].logger.warn "reporting '#{thing_id}'"
       json :post, "/api/report",
@@ -80,9 +75,6 @@ module RedditBot
         thing_id: thing_id
     end
 
-    # [post] JSON object of a post of self.post
-    # [link_flair_css_class] :nodoc:
-    # [link_flair_text] :nodoc:
     def set_post_flair post, link_flair_css_class, link_flair_text
       Module.nesting[1].logger.warn "setting flair '#{link_flair_css_class}' with text '#{link_flair_text}' to post '#{post["name"]}'"
       if {"error"=>403} == @flairselector_choices ||= json(:post, "/r/#{@subreddit}/api/flairselector", link: post["name"])
@@ -97,8 +89,6 @@ module RedditBot
         }["flair_template_id"]
     end
 
-    # [thing_id] +String+ fullname of a post (or self.post?), comment (and private message?)
-    # [text] :nodoc:
     def leave_a_comment thing_id, text
       Module.nesting[1].logger.warn "leaving a comment on '#{thing_id}'"
       json(:post, "/api/comment",
@@ -164,7 +154,6 @@ module RedditBot
       end
     end
 
-    # :yields: JSON objects: ["data"] part of post or self.post, top level comment (["children"] element)
     def each_new_post_with_top_level_comments
       # TODO add keys assertion like in method above?
       json(:get, "/r/#{@subreddit}/new")["data"]["children"].each do |post|
@@ -178,7 +167,6 @@ module RedditBot
       end
     end
 
-    # [article] +String+ ID36 of a post or self.post
     def each_comment_of_the_post_thread article
       Enumerator.new do |e|
         f = lambda do |smth|
@@ -194,6 +182,27 @@ module RedditBot
       end
     end
 
+    def subreddit_iterate what, **kwargs
+      Enumerator.new do |e|
+        after = {}
+        loop do
+          break unless marker = json(:get, "/r/#{@subreddit}/#{what}", {limit: 100}.merge(after).merge(kwargs)).tap do |result|
+            fail if %w{ kind data } != result.keys
+            fail if "Listing" != result["kind"]
+            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 }
+            result["data"]["children"].each do |post|
+              fail "unknown type post['kind']: #{post["kind"]}" unless post["kind"] == "t3"
+              e << ( post["data"].tap do |data|
+                data["url"] = "https://www.reddit.com" + data["url"] if /\A\/r\/[0-9a-zA-Z_]+\/comments\/[0-9a-z]{5,6}\// =~ data["url"] if data["crosspost_parent"]
+              end )
+            end
+          end["data"]["after"]
+          after = {after: marker}
+        end
+      end
+    end
+
     private
 
     def token

data/reddit_bot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "reddit_bot"
-  spec.version       = "1.8.0"
+  spec.version       = "1.9.0"
   spec.summary       = "Simple library for Reddit bots"
 
   spec.author        = "Victor Maslov aka Nakilon"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure