reddit_bot 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52b34b7ffbd747f455238139479414c4c73575e3
-  data.tar.gz: 7b08991727037d0f91bcecfb7bca40caa5e33b81
+  metadata.gz: 678fcb0251bf04be23802b62ddea29f5ea338386
+  data.tar.gz: b65667dea035f15f24a40f2c26017374b959780d
 SHA512:
-  metadata.gz: 7ee3c17c7ce2683ca7bfce42f50bdde6af718de47a1b1093f37e9efcc6a49181574dd7d9d6222f58a76348235f5b4da58f416c4888e78e51c3f2067cc3745199
-  data.tar.gz: 5fb5186be0faeda8b551cac5354c2d558d2972cfb41631f48feca0bd0c975bfb8626305d1bed292805ae8a128864679b531b474f3151f0019a31645604cc2e8c
+  metadata.gz: 384b4e42c38453c2a3ceb90892e144824f078f81dcc91e2c2ba65c39e22ed5e95d4b7ebc8bcba080d7113a10c654295768c8c6fcf32f7089495cd4395fafd80c
+  data.tar.gz: 24b3318a50e0ad0b784a8b8b1689ab3eef7dbebc1461760bc42a8fa920d6a223e2414910d2dfc38e5b50f394a1c032632d2aca87c12ba50141c1f07d941188dd

data/.gitignore

@@ -0,0 +1,5 @@
+/examples/*/twitter.token
+temp
+*secret*
+.byebug_history
+/pkg

data/examples/dut/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
+ruby ">=2.2"
 
 gem "reddit_bot"

data/examples/dut/Gemfile.lock

@@ -3,11 +3,11 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    json (2.3.0)
+    json (2.3.1)
     nethttputils (0.4.0.0)
       addressable
     public_suffix (4.0.5)
-    reddit_bot (1.7.5)
+    reddit_bot (1.7.6)
       json
       nethttputils (~> 0.4.0.0)
 
@@ -17,5 +17,8 @@ PLATFORMS
 DEPENDENCIES
   reddit_bot
 
+RUBY VERSION
+   ruby 2.3.8p459
+
 BUNDLED WITH
    2.0.2

data/examples/dut/main.rb

@@ -1,18 +1,20 @@
 require "reddit_bot"
 subreddit = "dut".freeze
 bot = RedditBot::Bot.new YAML.load(File.read "secrets.yaml"), subreddit: subreddit
-twitter = RedditBot::Twitter.init_twitter "DUT_Tweets"
+RedditBot::Twitter.init_twitter "DUT_Tweets"
 
 loop do
-  id = bot.new_posts.find do |post|
-    /\(https:\/\/twitter\.com\/#{RedditBot::Twitter::TWITTER_ACCOUNT}\/status\/(\d{18,})\)/i =~ post["selftext"] and break $1
-  end.to_i
-  fail "no tweets found in subreddit" if id.zero? unless ENV["FIRST_RUN"]
-
-  fail unless flair = bot.json(:get, "/r/#{subreddit}/api/link_flair").find do |flair|
-    flair["text"] == "Twitter"
+  bot.json(:get, "/message/unread")["data"]["children"].each do |msg|
+    next unless %w{ nakilon technomod }.include? msg["data"]["author"]
+    abort "ordered to die" if %w{ die die } == msg["data"].values_at("subject", "body")
   end
 
+  id = bot.new_posts.flat_map do |post|
+    post["selftext"].scan(/\(https:\/\/twitter\.com\/#{RedditBot::Twitter::TWITTER_ACCOUNT}\/status\/(\d{18,})\)/i).flatten.map(&:to_i).max
+  end.find(&:itself)
+  abort "no tweets found in subreddit" if id.zero? unless ENV["FIRST_RUN"]
+  abort "flair isn't available" unless flair = bot.json(:get, "/r/#{subreddit}/api/link_flair").find{ |flair| flair["text"] == "Twitter" }
+
   timeline = RedditBot::Twitter.user_timeline
   timeline.replace timeline.take 2 if ENV["FIRST_RUN"]  # against 200 posts long flood
   timeline.reverse_each do |tweet|

data/examples/largeimages/Gemfile

@@ -2,10 +2,10 @@
 
 gem "json"
 
-gem "nokogiri", "~>1.10.8"
+gem "nokogiri"
 
 gem "nethttputils", git: "git@github.com:nakilon/nethttputils.git"
-gem "directlink", "~>0.0.8.5"
+gem "directlink", git: "git@github.com:nakilon/directlink.git"
 
-gem "gcplogger", git: "git@github.com:nakilon/gcplogger.git", tag: "v0.1.1.0"
+gem "gcplogger", git: "git@github.com:nakilon/gcplogger.git"
 gem "google-cloud-error_reporting"

data/examples/largeimages/Gemfile.lock

@@ -7,22 +7,16 @@ GIT
       google-cloud-logging (~> 1.4.0)
       public_suffix (~> 2.0)
 
-GIT
-  remote: git@github.com:nakilon/nethttputils.git
-  revision: 1eea987604cf592a62a6732eae864959f7a9fdc4
-  specs:
-    nethttputils (0.3.3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    directlink (0.0.8.5)
+    directlink (0.0.9.0)
       addressable
       fastimage (~> 2.1.3)
       kramdown
-      nethttputils (~> 0.3.3.0)
+      nethttputils (~> 0.4.0.0)
       nokogiri
       reddit_bot (~> 1.7.0)
     faraday (0.14.0)
@@ -67,7 +61,8 @@ GEM
       googleauth (>= 0.5.1, < 0.7)
     json (2.2.0)
     jwt (2.1.0)
-    kramdown (2.1.0)
+    kramdown (2.3.0)
+      rexml
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -76,13 +71,16 @@ GEM
     mini_portile2 (2.4.0)
     multi_json (1.13.1)
     multipart-post (2.0.0)
+    nethttputils (0.4.0.0)
+      addressable
     nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     os (0.9.6)
     public_suffix (2.0.5)
-    reddit_bot (1.7.3)
+    reddit_bot (1.7.6)
       json
-      nethttputils (~> 0.3.3.0)
+      nethttputils (~> 0.4.0.0)
+    rexml (3.2.4)
     rly (0.2.3)
     signet (0.8.1)
       addressable (~> 2.3)
@@ -96,12 +94,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  directlink (~> 0.0.8.5)
+  directlink (~> 0.0.9.0)
   gcplogger!
   google-cloud-error_reporting
   json
-  nethttputils!
-  nokogiri (~> 1.10.8)
+  nethttputils
+  nokogiri
 
 BUNDLED WITH
    2.0.2

data/examples/largeimages/main.rb

@@ -16,7 +16,7 @@ require "directlink"
 require "nokogiri"
 
 require "../boilerplate"
-BOT = RedditBot::Bot.new YAML.load_file "secrets.yaml"
+bot = RedditBot::Bot.new YAML.load_file "secrets.yaml"
 
 INCLUDE = %w{
     user/kjoneslol/m/sfwpornnetwork
@@ -74,7 +74,7 @@ loop do
     ]
   end ) ],
     [:source_reddit, 30000000, ( INCLUDE.flat_map do |sortasub|
-    BOT.new_posts(sortasub).take(100).map do |child|
+    bot.new_posts(sortasub).take(100).map do |child|
       next if child["is_self"]
       next if EXCLUDE.include? child["subreddit"].downcase
       child.values_at(
@@ -89,7 +89,7 @@ loop do
       next if checked.include? id
       checked << id
       # next if Gem::Platform.local.os == "darwin" # prevent concurrent posting
-      logger.info "image url for #{id}: #{url}"
+      logger.debug "image url for #{id}: #{url}"
       next logger.warn "skipped a post by /u/sjhill"          if author == "sjhill"          # opt-out
       next logger.warn "skipped a post by /u/redisforever"    if author == "redisforever"    # opt-out
       next logger.warn "skipped a post by /u/bekalaki"        if author == "bekalaki"        # 9 ways to divide a karmawhore
@@ -104,27 +104,24 @@ loop do
 
       t = begin
         DirectLink url, 60
-      rescue SocketError,
-             Net::OpenTimeout,
-             Errno::ECONNRESET,
-             NetHTTPUtils::Error,
-             FastImage::UnknownImageType,
-             FastImage::ImageFetchFailure,
-             DirectLink::ErrorNotFound,
-             DirectLink::ErrorBadLink => e
+      rescue *DirectLink::NORMAL_EXCEPTIONS => e
         next logger.error "skipped (#{e}) #{url} from http://redd.it/#{id}"
       end
       logger.debug "DirectLink: #{t.inspect}"
       tt = t.is_a?(Array) ? t : [t]
       next logger.error "probably crosspost of a self post: http://redd.it/#{id}" if tt.empty?
-      unless min_resolution <= tt.first.width * tt.first.height
-        next logger.info "skipped low resolution #{source}"
-      end
+      next logger.info "skipped low resolution #{source}" unless min_resolution <= tt.first.width * tt.first.height
       # puts "https://www.reddit.com/r/LargeImages/search.json?q=url%3A#{CGI.escape url}&restrict_sr=on"
       resolution = "[#{tt.first.width}x#{tt.first.height}]"
-      next logger.warn "already submitted #{resolution} #{id}: '#{url}'" unless
-        Gem::Platform.local.os == "darwin" || search_url[url].empty?
-      logger.warn "resolution #{resolution} got from #{id}: #{url}"
+      next logger.warn "already submitted #{resolution} #{id}: '#{url}'" unless Gem::Platform.local.os == "darwin" || search_url[url].empty?
+
+      system "curl -s '#{tt.first.url}' -o temp --retry 5" or fail
+      next logger.warn "skipped <2mb id=#{id}" if 2000000 > File.size("temp")
+      if "mapporn" == subreddit.downcase
+        `vips pngsave temp temp.png`
+        next logger.warn "skipped /r/mapporn <10mb PNG id=#{id}" if 10000000 > File.size("temp.png")
+      end
+
       title = "#{resolution}#{
         " [#{tt.size} images]" if tt.size > 1
       } #{
@@ -133,7 +130,7 @@ loop do
       } /r/#{subreddit}".gsub(/\s+\(\s+\)\s+/, " ").sub(/(?<=.{297}).+/, "...")
       logger.warn "new post #{source}: #{url} #{title.inspect}"
       unless Gem::Platform.local.os == "darwin"
-        result = BOT.json :post,
+        result = bot.json :post,
           "/api/submit",
           {
             kind: "link",
@@ -160,7 +157,7 @@ loop do
       text = [line1, line2, line3].compact.join("  \n")
       logger.info "new comment: #{text.inspect}"
       unless Gem::Platform.local.os == "darwin"
-        result = BOT.leave_a_comment "#{result["json"]["data"]["name"]}", text.sub(/(?<=.{9000}).+/m, "...")
+        result = bot.leave_a_comment "#{result["json"]["data"]["name"]}", text.sub(/(?<=.{9000}).+/m, "...")
         unless result["json"]["errors"].empty?
           logger.error result.inspect
           fail "failed to leave comment"

data/examples/unisa/Gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
+ruby ">=2.2"
 
 gem "reddit_bot"#, git: "git@github.com:nakilon/reddit_bot.git"
-
-gem "byebug"

data/examples/unisa/Gemfile.lock

@@ -3,12 +3,11 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    byebug (11.0.1)
-    json (2.3.0)
+    json (2.3.1)
     nethttputils (0.4.0.0)
       addressable
     public_suffix (4.0.5)
-    reddit_bot (1.7.5)
+    reddit_bot (1.7.6)
       json
       nethttputils (~> 0.4.0.0)
 
@@ -16,8 +15,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
   reddit_bot
 
+RUBY VERSION
+   ruby 2.3.8p459
+
 BUNDLED WITH
    2.0.2

data/examples/unisa/main.rb

@@ -1,18 +1,20 @@
 require "reddit_bot"
 subreddit = "unisa".freeze
 bot = RedditBot::Bot.new YAML.load(File.read "secrets.yaml"), subreddit: subreddit
-twitter = RedditBot::Twitter.init_twitter "unisa"
+RedditBot::Twitter.init_twitter "unisa"
 
 loop do
-  id = bot.new_posts.find do |post|
-    /\(https:\/\/twitter\.com\/#{RedditBot::Twitter::TWITTER_ACCOUNT}\/status\/(\d{18,})\)/i =~ post["selftext"] and break $1
-  end.to_i
-  fail "no tweets found in subreddit" if id.zero? unless ENV["FIRST_RUN"]
-
-  fail unless flair = bot.json(:get, "/r/#{subreddit}/api/link_flair").find do |flair|
-    flair["text"] == "Twitter"
+  bot.json(:get, "/message/unread")["data"]["children"].each do |msg|
+    next unless %w{ nakilon technomod }.include? msg["data"]["author"]
+    abort "ordered to die" if %w{ die die } == msg["data"].values_at("subject", "body")
   end
 
+  id = bot.new_posts.flat_map do |post|
+    post["selftext"].scan(/\(https:\/\/twitter\.com\/#{RedditBot::Twitter::TWITTER_ACCOUNT}\/status\/(\d{18,})\)/i).flatten.map(&:to_i).max
+  end.find(&:itself)
+  abort "no tweets found in subreddit" if id.zero? unless ENV["FIRST_RUN"]
+  abort "flair isn't available" unless flair = bot.json(:get, "/r/#{subreddit}/api/link_flair").find{ |flair| flair["text"] == "Twitter" }
+
   timeline = RedditBot::Twitter.user_timeline
   timeline.replace timeline.take 2 if ENV["FIRST_RUN"]  # against 200 posts long flood
   timeline.reverse_each do |tweet|

data/lib/reddit_bot.rb

@@ -301,14 +301,7 @@ module RedditBot
           "https://api.twitter.com/1.1/statuses/user_timeline.json",
           form: { screen_name: TWITTER_ACCOUNT, count: 200, tweet_mode: "extended" },
           header: { Authorization: "Bearer #{TWITTER_ACCESS_TOKEN}" }
-        ) do |res|
-          next unless res.key? "x-rate-limit-remaining"
-          remaining = res.fetch("x-rate-limit-remaining").to_i
-          next if 100 < remaining
-          t = (res.fetch("x-rate-limit-reset").to_i - Time.now.to_i + 1).fdiv remaining
-          puts "sleep #{t}"
-          sleep t
-        end
+        )
       rescue NetHTTPUtils::Error => e
         fail unless [500, 503].include? e.code
         sleep timeout

data/reddit_bot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "reddit_bot"
-  spec.version       = "1.7.6"
+  spec.version       = "1.7.7"
   spec.authors       = ["Victor Maslov"]
   spec.email         = ["nakilon@gmail.com"]
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   # spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "json"
-  spec.add_runtime_dependency "nethttputils", "~>0.4.0.0"
+  spec.add_runtime_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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.0
+        version: 0.4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.0
+        version: 0.4.1.0
 description: better than PRAW
 email:
 - nakilon@gmail.com
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md