reddit_bot 1.6.9 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9fe401e7fa3a403a2c276a8a9fe37fbffe8d46e
-  data.tar.gz: 3f33f456f87949f8011d63bc0e8775e0ad032fc8
+  metadata.gz: f8aaacf7ddc5b651ab7dc97b62a723d666c6207f
+  data.tar.gz: c01bcc87927f9c44e839f58f6f9244d8c73548ab
 SHA512:
-  metadata.gz: ac3f31a9303dd9b9392dbed30f50e448673de69cd822144d5b922ba84b0d93e39f97c1d2f1ebe8d6e2cf422773a81710e71d1a1cdd93daf2178229af31149b12
-  data.tar.gz: 7cbd0088c5a9ab734aa29a96544c743a36bc35400d0511189f68856fa4be1b44a3f6c246cce6cd13da858e377d2404a49bd65a08f0dd688f8dc98a96db33fd4d
+  metadata.gz: 46b32b8d7619c6064e7a0f8720411b67fc3961e942b398dc881c913188b6a158d5015eccd5d91c1ef4c5873ca7d3bdd3d01f0a1e1e95c67a402eda05cc4758a6
+  data.tar.gz: 5dd0e963c86be5fefbbc2f6dec48c6faaf3f59e3cb60295361b61124bbd08a5a44b888eef076469275adda25c27e1cb926c2809695532f850ba5ce5eaf555959

data/examples/johnnymarr/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "reddit_bot", git: "git@github.com:nakilon/reddit_bot.git"
+gem "reddit_bot"

data/examples/johnnymarr/Gemfile.lock

@@ -1,22 +1,17 @@
-GIT
-  remote: git@github.com:nakilon/reddit_bot.git
-  revision: 0a0649b20ff0b1a28366a17ec7c037e481e850b3
-  specs:
-    reddit_bot (1.6.7)
-      json
-      nethttputils (~> 0.2.4.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
     json (2.1.0)
-    nethttputils (0.2.4.2)
+    nethttputils (0.2.5.1)
+    reddit_bot (1.6.10)
+      json
+      nethttputils (~> 0.2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  reddit_bot!
+  reddit_bot
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

data/examples/largeimages/Gemfile.lock

@@ -80,14 +80,14 @@ GEM
     mini_portile2 (2.3.0)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nethttputils (0.2.4.2)
+    nethttputils (0.2.5.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     os (0.9.6)
     public_suffix (2.0.5)
-    reddit_bot (1.6.7)
+    reddit_bot (1.6.10)
       json
-      nethttputils (~> 0.2.4.1)
+      nethttputils (~> 0.2.5.1)
     rly (0.2.3)
     signet (0.8.1)
       addressable (~> 2.3)
@@ -110,4 +110,4 @@ DEPENDENCIES
   reddit_bot
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

data/examples/realtimeww2/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "reddit_bot", git: "git@github.com:nakilon/reddit_bot.git"
+gem "reddit_bot"

data/examples/realtimeww2/Gemfile.lock

@@ -1,22 +1,17 @@
-GIT
-  remote: git@github.com:nakilon/reddit_bot.git
-  revision: 351c559e507289aa6385e769eb6d5c6de80ba629
-  specs:
-    reddit_bot (1.6.7)
-      json
-      nethttputils (~> 0.2.4.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
     json (2.1.0)
-    nethttputils (0.2.4.2)
+    nethttputils (0.2.5.1)
+    reddit_bot (1.6.10)
+      json
+      nethttputils (~> 0.2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  reddit_bot!
+  reddit_bot
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

data/examples/realtimeww2/main.rb

@@ -86,7 +86,7 @@ loop do
     flair["text"] == "Contains Media"
   end
 
-  timeout = 0
+  timeout = 1
   JSON.load( begin
     NetHTTPUtils.request_data(
       "https://api.twitter.com/1.1/statuses/user_timeline.json",
@@ -102,7 +102,8 @@ loop do
     end
   rescue NetHTTPUtils::Error => e
     fail if e.code != 503
-    sleep(timeout += 1)
+    sleep timeout
+    timeout *= 2
     retry
   end ).reverse_each do |tweet|
     next if tweet["id"] <= id

data/lib/reddit_bot.rb

@@ -111,6 +111,25 @@ module RedditBot
       end
     end
 
+    @@skip_erroneous_descending_ids = lambda do |array|
+      array.reverse.each_with_object([]) do |item, result|
+        unless result.empty?
+          a, b = [item["id"], result.first["id"]]
+          next if a == b || a.size < b.size || !(a.size > b.size) && a < b
+        end
+        result.unshift item
+      end
+    end
+    fail unless p(@@skip_erroneous_descending_ids[[
+      {"id" => "0h"},
+      {"id" => "g"},
+      {"id" => "f"},
+      {"id" => "i"},
+      {"id" => "e"},
+      {"id" => "b"},
+      {"id" => "c"},
+      {"id" => "d"},
+    ]].flat_map(&:values)) == %w{ 0h i e d }
     # :yields: JSON objects: ["data"] part of post or self.post
     def new_posts subreddit = nil, caching = false
       cache = lambda do |id, &block|
@@ -133,14 +152,16 @@ module RedditBot
           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 }
-          result["data"]["children"].each do |post|
+          @@skip_erroneous_descending_ids[ result["data"]["children"].map do |post|
             fail "unknown type post['kind']: #{post["kind"]}" unless post["kind"] == "t3"
-            e << post["data"]
+            post["data"]
+          end ].each do |data|
+            e << data
           end
           break unless marker = result["data"]["after"]
           after = {after: marker}
         end
-      end
+      end.to_a.sort_by{ |post| post["id"] }.reverse
     end
 
     # :yields: JSON objects: ["data"] part of post or self.post, top level comment (["children"] element)

data/lib/reddit_bot/version.rb

@@ -1,3 +1,3 @@
 module RedditBot
-  VERSION = "1.6.9" # :nodoc:
+  VERSION = "1.6.11" # :nodoc:
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.11
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json