reddit_bot 1.6.6 → 1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0c92530c0139f3abcf98680613b118ab21eeb8
-  data.tar.gz: 68ff542161f8ea0e73bbeb0ca3ecd2a3fef6d618
+  metadata.gz: 125c3fc98ca91c87bbfbf759229f01a04ab866f8
+  data.tar.gz: 49bef2ef0766f1926013bb735e772d9dcac4042f
 SHA512:
-  metadata.gz: 6f162ba96a47e7ea121f26dc2a1e4a79a23c5448355fdf931b6c518216881758aa527880957e608f8b356a1340dd00999154440678105517b44540d893e4e134
-  data.tar.gz: 9143a8d2ba251a0871097ab726eab1fdae48449a678363ae1c58c73a98baa204cb7f12d5b325bdc4d87a561f7bbf8e2c100540b96dee32681f8ed82b7034148b
+  metadata.gz: e0b083b817628c284c18ff17f5f13e7e5e8de2a35b335024412b34c866774643f5e12409650affb9ffc9db9773e943cb3412767409339783caf73a3068797bef
+  data.tar.gz: 1855665d51f7c148035bb64ccd3e928966c3c6aa0efea8a09e6e6078793acfc4e8ba40fb389e6bcd490c4579446fa8ee25c5813fc389807af1ae1e45ad20d356

data/README.md

@@ -27,6 +27,7 @@ The [examples folder](examples) includes:
 * **oneplus** -- bot that removes and modmails about links to 1080x1920 images
 * **yayornay** -- bot that flairs posts according to voting in top level comments
 * **realtimeww2** -- bot that posts tweets to a subreddit from a Twitter user timeline
+* **johnnymarr** -- another Twitter timeline streaming bot working in the similar way
 * **largeimages** -- this was my first bot -- it uses two approaches to track the most high resolution photos posted anywhere on Reddit to x-post them to [subreddit /r/largeimages](https://www.reddit.com/r/largeimages)
 * **largeimagesreview** -- script that was used /r/largeimages to calculates quality of x-posts from different subreddits based on mods activity (remove/approve) so it showed that /r/pics and /r/foodporn should better be excluded:
 

data/examples/boilerplate.rb

@@ -9,6 +9,4 @@ end
 
 require "reddit_bot"
 
-require_relative "#{Dir.home}/beat" unless Gem::Platform.local.os == "darwin"
-
 require "yaml"

data/examples/devflairbot/Gemfile

@@ -1,4 +1,6 @@
 source "https://rubygems.org"
 
-gem "reddit_bot", "~>1.5.4"
-gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.0.4"
+gem "reddit_bot", "~>1.6.6"
+
+gem "public_suffix", "<3.0"                     # Ruby 2.0
+gem "google-cloud-error_reporting", "~>0.27.0"  # Ruby 2.0

data/examples/devflairbot/Gemfile.lock

@@ -1,23 +1,74 @@
-GIT
-  remote: git@github.com:Nakilon/nethttputils.git
-  revision: 6cb2b6a2422d82e266e08b16da4fa29e809fd260
-  tag: v0.1.0.4
-  specs:
-    nethttputils (0.1.0.4)
-
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
+    google-cloud-core (1.2.1)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.0.2)
+      faraday (~> 0.11)
+    google-cloud-error_reporting (0.27.0)
+      google-cloud-core (~> 1.0)
+      google-gax (~> 0.8.0)
+      stackdriver-core (~> 1.2)
+    google-gax (0.8.12)
+      google-protobuf (~> 3.2)
+      googleapis-common-protos (~> 1.3.5)
+      googleauth (~> 0.5.1)
+      grpc (~> 1.6.6)
+      rly (~> 0.2.3)
+    google-protobuf (3.6.0)
+    googleapis-common-protos (1.3.7)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos-types (~> 1.0)
+      grpc (~> 1.0)
+    googleapis-common-protos-types (1.0.1)
+      google-protobuf (~> 3.0)
+    googleauth (0.5.3)
+      faraday (~> 0.12)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    grpc (1.6.7)
+      google-protobuf (~> 3.1)
+      googleapis-common-protos-types (~> 1.0.0)
+      googleauth (~> 0.5.1)
     json (2.1.0)
-    reddit_bot (1.5.4)
+    jwt (1.5.6)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.16.0)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    nethttputils (0.2.4.1)
+    os (0.9.6)
+    public_suffix (2.0.5)
+    reddit_bot (1.6.6)
       json
+      nethttputils (~> 0.2.4.1)
+    rly (0.2.3)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    stackdriver-core (1.3.0)
+      google-cloud-core (~> 1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  nethttputils!
-  reddit_bot (~> 1.5.4)
+  google-cloud-error_reporting (~> 0.27.0)
+  public_suffix (< 3.0)
+  reddit_bot (~> 1.6.6)
 
 BUNDLED WITH
    1.16.1

data/examples/devflairbot/main.rb

@@ -1,14 +1,34 @@
-require_relative "../boilerplate"
+# The bot changes the post flair class with one with "dev" prefix
+#   if there is response from someone with "developer" user flair in comments.
+# Seems like in current implementation it reads 10 last comments per subreddit
+#   so it's possible to miss if bot is down for a while but in fact it's enough stable and does not go down.
 
+require_relative "../boilerplate"
 BOT = RedditBot::Bot.new YAML.load File.read "secrets.yaml"
 
+fail("no ENV['ERROR_REPORTING_KEYFILE'] specified") unless ENV["ERROR_REPORTING_KEYFILE"]
+require "google/cloud/error_reporting"
+Google::Cloud::ErrorReporting.configure do |config|
+  config.project_id = (JSON.load File.read ENV["ERROR_REPORTING_KEYFILE"])["project_id"]
+end
+
+reported = []
 loop do
   puts "LOOP #{Time.now}"
 
+  moderated = BOT.json(:get, "/subreddits/mine/moderator")["data"]["children"].map do |child|
+    fail unless child["kind"] == "t5"
+    child["data"]["display_name"].downcase
+  end
   [
-    ["ion", "Developer"],
+    # ["ion", "Developer"],
     # ["survivetheculling", "Developer"],
+    ["vigorgame", "Developer"],
+    ["insurgency", "Developer"],
+    ["Battalion1944", "Developer"],
   ].each do |subreddit, developer_class|
+    subreddit.downcase!
+    next puts "!!! can't moderate #{subreddit} !!!" unless moderated.include? subreddit
     puts "sub: #{subreddit}"
 
     JSON.parse( begin
@@ -20,13 +40,13 @@ loop do
     end )["data"]["children"].each do |comment|
       id = comment["data"]["link_id"][3..-1]
       commenter_flair = comment["data"]["author_flair_css_class"]
-      # puts "flair: #{commenter_flair}" if commenter_flair
+      puts "flair: #{commenter_flair}" if commenter_flair
       next unless developer_class == commenter_flair
       puts "https://reddit.com/r/#{subreddit}/comments/#{id}/#{comment["data"]["id"]} '#{commenter_flair}'"
       flairselector = BOT.json :post, "/api/flairselector", { link: comment["data"]["link_id"] }
-      existing_flair_class = flairselector["current"]["flair_css_class"]
-      puts "https://reddit.com/#{id} '#{existing_flair_class}'"
-      next unless target = case existing_flair_class
+      current_flair_class = flairselector["current"]["flair_css_class"]
+      puts "existing https://reddit.com/#{id} #{current_flair_class.inspect}"
+      next unless target = case current_flair_class
         when           nil  then "untaggeddev"
         when         "news" then "newsdev"
         when   "discussion" then "discussiondev"
@@ -36,10 +56,16 @@ loop do
         when          "bug" then "bugdev"
         when "announcement" then "announcementdev"
         when   "suggestion" then "suggestiondev"
-        else puts "ignored https://reddit.com/#{id} '#{existing_flair_class}'"
+        else puts "ignored https://reddit.com/#{id} #{current_flair_class.inspect}"
+      end
+      unless choice = flairselector["choices"].find{ |choice| choice["flair_css_class"] == target }
+        next if reported.include? comment["data"]["link_id"]
+        Google::Cloud::ErrorReporting.report RuntimeError.new("no '#{target}' link flair in /r/#{subreddit}").tap{ |_| _.set_backtrace caller }
+        reported.push comment["data"]["link_id"]
+        next
       end
-      choice = flairselector["choices"].find{ |choice| choice["flair_css_class"] == target }
       puts "assigning '#{target}' (#{choice}) flair to post https://reddit.com/#{id}"
+      next if ENV["TEST"]
       _ = BOT.json :post,
         "/api/selectflair", {
           flair_template_id: choice["flair_template_id"],

data/examples/get_dimensions.rb

@@ -1,4 +1,6 @@
-# TODO maybe activate raise_on_failure optional FastImage param
+# TODO deprecate in favor of the gem directlink
+
+# TODO maybe activate raise_on_failure optional FastImage param
 
 require "pp"
 # require "json"

data/examples/johnnymarr/Gemfile

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

data/examples/johnnymarr/Gemfile.lock

@@ -0,0 +1,22 @@
+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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  reddit_bot!
+
+BUNDLED WITH
+   1.16.1

data/examples/johnnymarr/main.rb

@@ -0,0 +1,54 @@
+require_relative "../boilerplate"
+SUBREDDIT = "JohnnyMarr"
+BOT = RedditBot::Bot.new YAML.load(File.read "secrets.yaml"), subreddit: SUBREDDIT
+
+TWITTER = "Johnny_Marr"
+require_relative "twitter"
+
+loop do
+  id = BOT.new_posts.find do |post|
+    /\(https:\/\/twitter\.com\/#{TWITTER}\/status\/(\d{18,})\)/i =~ post["selftext"] and break $1
+  end.to_i
+  n = if id.zero?
+    fail "no tweets found in subreddit" unless [ "#{SUBREDDIT}_TEST" ].include?(SUBREDDIT) || ENV["START"]
+    10
+  else
+    200
+  end
+
+  fail unless flair = BOT.json(:get, "/r/#{SUBREDDIT}/api/link_flair").find do |flair|
+    flair["text"] == "Twitter"
+  end
+
+  timeout = 0
+  JSON.load( begin
+    NetHTTPUtils.request_data(
+      "https://api.twitter.com/1.1/statuses/user_timeline.json",
+      form: { screen_name: TWITTER, count: n, tweet_mode: "extended" },
+      header: { Authorization: "Bearer #{TWITTER_ACCESS_TOKEN}" }
+    )
+  rescue NetHTTPUtils::Error => e
+    fail if e.code != 503
+    sleep timeout += 1
+    retry
+  end ).sort_by{ |tweet| -tweet["id"] }.take_while do |tweet|
+    tweet["id"] > id && (!File.exist?("id") || tweet["id"] > File.read("id").to_i)
+  end.reverse_each do |tweet|
+    title, text, contains_media = Tweet2titleNtext[tweet]
+    result = BOT.json :post, "/api/submit", {
+      sr: SUBREDDIT,
+      kind: "self",
+      title: title,
+      text: text,
+    }.tap{ |h| h.merge!({ flair_id: flair["id"] }) }
+    unless result["json"]["errors"].empty?
+      fail unless result["json"]["errors"].map(&:first) == ["ALREADY_SUB"]
+      puts "ALREADY_SUB error for #{tweet["id"]}"
+    end
+    File.write "id", tweet["id"]
+    abort if ENV["ONCE"]
+  end
+
+  puts "END LOOP #{Time.now}"
+  sleep 300
+end

data/examples/johnnymarr/twitter.rb

@@ -0,0 +1,80 @@
+require "json"
+require "nethttputils"
+
+TWITTER_ACCESS_TOKEN = JSON.load(
+  NetHTTPUtils.request_data "https://api.twitter.com/oauth2/token", :post,
+    auth: File.read("twitter.token").split,
+    form: {grant_type: :client_credentials}
+)["access_token"]
+
+Tweet2titleNtext = lambda do |tweet|
+  pp tweet if ENV["TEST"]
+  text = ""
+  contains_media = false
+  up = ->s{ s.split.map{ |w| "^#{w}" }.join " " }
+
+  tweet_to_get_media_from = tweet["retweeted_status"] || tweet
+  if tweet_to_get_media_from["extended_entities"] && !tweet_to_get_media_from["extended_entities"]["media"].empty?
+    contains_media = true
+    tweet_to_get_media_from["extended_entities"]["media"].each_with_index do |media, i|
+      text.concat "* [Image #{i + 1}](#{media["media_url_https"]})\n\n"
+    end
+  end
+  if !tweet_to_get_media_from["entities"]["urls"].empty?
+    contains_media = true
+    tweet_to_get_media_from["entities"]["urls"].each_with_index do |url, i|
+      text.concat "* [Link #{i + 1}](#{url["expanded_url"]})\n\n"
+    end
+  end
+
+  require "date"
+  text.concat "^- #{
+    up[tweet["user"]["name"]]
+  } [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [#{
+    up[Date.parse(tweet["created_at"]).strftime "%B %-d, %Y"]
+  }](https://twitter.com/#{TWITTER}/status/#{tweet["id"]})"
+  require "cgi"
+  # [CGI::unescapeHTML(tweet["full_text"]).sub(/( https:\/\/t\.co\/[0-9a-zA-Z]{10})*\z/, ""), text, contains_media]
+  [CGI::unescapeHTML(tweet["retweeted_status"] ? "RT: #{tweet["retweeted_status"]["full_text"]}" : tweet["full_text"]).sub(/(\s+https:\/\/t\.co\/[0-9a-zA-Z]{10})*\z/, ""), text, contains_media]
+end
+[
+  [905764294687633408,   true, "The Polish government & military high command is now evacuating Warsaw for Brest, 120 miles east: German armies are too close to the capital",   "* [Image 1](https://pbs.twimg.com/media/DJHq71BXYAA6KJ0.jpg)\n\n"                                                              "^- ^WW2 ^Tweets ^from ^1940 [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [^""September ^7, ^2017](https://twitter.com/#{TWITTER}/status/905764294687633408)"],
+  [915534673471733760,   true, "In east Poland (now Soviet Ukraine) industry & farms to be collectivised, political parties banned, aristocrats & capitalists \"re-educated\".", "* [Image 1](https://pbs.twimg.com/media/DLSh2J9W4AACcOG.jpg)\n\n* [Image 2](https://pbs.twimg.com/media/DLSh4sKX0AEBaXq.jpg)\n\n^- ^WW2 ^Tweets ^from ^1940 [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [^"  "October ^4, ^2017](https://twitter.com/#{TWITTER}/status/915534673471733760)"],
+  [915208866408824832,   true, "For 1st time, RAF planes dropping propaganda leaflets on Berlin itself, entitled \"Germans: these are your leaders!\"",                          "* [Image 1](https://pbs.twimg.com/media/DLN5jJ-XkAEUz9M.jpg)\n\n* [Link 1](https://www.psywar.org/product_1939EH158.php)\n\n"  "^- ^WW2 ^Tweets ^from ^1940 [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [^"  "October ^3, ^2017](https://twitter.com/#{TWITTER}/status/915208866408824832)"],
+  [914577848891006978,   true, "\"In Poland, Russia pursued a cold policy of selfinterest. But clearly necessary for Russia… against Nazi menace.\"",                            "* [Link 1](https://www.youtube.com/watch?v=ygmP5A3n2JA)\n\n"                                                                   "^- ^WW2 ^Tweets ^from ^1940 [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [^"  "October ^1, ^2017](https://twitter.com/#{TWITTER}/status/914577848891006978)"],
+  [926581977372942336,  false, "Finland rejects Soviet demand to surrender land near Leningrad & give Red Navy base in Hanko; Soviets now claim Finns' manner \"warlike\".",                                                                                                                                     "^- ^WW2 ^Tweets ^from ^1940 [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [^" "November ^3, ^2017](https://twitter.com/#{TWITTER}/status/926581977372942336)"],
+  [1007650044441329664,  true, "RT: SOLD OUT | Tonight’s @Johnny_Marr signing at Rough Trade East is now completely sold out! Catch you in a bit. ‘Call The Comet’ is out now:", "* [Image 1](https://pbs.twimg.com/media/DfvdN1_WsAE_a3r.jpg)\n\n* [Link 1](https://roughtrade.com/gb/music/johnny-marr-call-the-comet)\n\n^- ^Johnny ^Marr [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [^June ^15, ^2018](https://twitter.com/#{TWITTER}/status/1007650044441329664)"],
+  [1007155648612581376,  true, "Tomorrow. #CallTheComet",                                                                                                                        "* [Image 1](https://pbs.twimg.com/ext_tw_video_thumb/1007155601913204736/pu/img/IREVPkgUVHoQHfBB.jpg)\n\n"                               "^- ^Johnny ^Marr [^\\(@#{TWITTER}\\)](https://twitter.com/#{TWITTER}) ^| [^June ^14, ^2018](https://twitter.com/#{TWITTER}/status/1007155648612581376)"],
+].each do |id, contains_media_, title_, text_|
+  title, text, contains_media = Tweet2titleNtext[ JSON.load NetHTTPUtils.request_data(
+    "https://api.twitter.com/1.1/statuses/show.json",
+    form: { id: id, tweet_mode: "extended" },
+    header: { Authorization: "Bearer #{TWITTER_ACCESS_TOKEN}" },
+  ) ]
+  unless contains_media_ == contains_media
+    puts "expected: #{contains_media_}"
+    puts "got: #{contains_media}"
+    abort "CONTAINS_MEDIA ERROR"
+  end
+  unless title_ == title
+    puts "expected:\n#{title_.inspect}"
+    puts "got:\n#{title.inspect}"
+    abort "TITLE FORMATTING ERROR"
+  end
+  unless text_ == text
+    puts "expected:\n#{text_.inspect}"
+    puts "got:\n#{text.inspect}"
+    abort "TEXT FORMATTING ERROR"
+  end
+  if ENV["TEST_POST"]
+    pp BOT.json :post, "/api/submit", {
+      sr: "#{SUBREDDIT}_TEST",
+      kind: "self",
+      title: title,
+      text: text,
+    }.tap{ |h| h.merge!({ flair_id: BOT.json(:get, "/r/#{SUBREDDIT}_TEST/api/link_flair").find{ |flair|
+      flair["text"] == "Contains Media"
+    }["id"] }) if contains_media }
+  end
+end
+abort "OK" if ENV["TEST"]

data/examples/largeimages/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git@github.com:Nakilon/directlink.git
-  revision: 18b1544dcbdee3d9f5c2ad685e4eaf134773e5a1
+  revision: b22cb9f103d474742f773b9434747f9cf5a09ed0
   specs:
-    directlink (0.0.2.0)
+    directlink (0.0.3.0)
       fastimage (~> 2.1.3)
       nethttputils (~> 0.2.4.0)
 
@@ -83,7 +83,7 @@ GEM
     mini_portile2 (2.1.0)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nethttputils (0.2.4.0)
+    nethttputils (0.2.4.2)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     os (0.9.6)

data/examples/largeimages/main.rb

@@ -37,7 +37,13 @@ EXCLUDE = %w{ foodporn powerwashingporn }
 checked = []
 
 search_url = lambda do |url|
-  JSON.load(NetHTTPUtils.request_data "https://www.reddit.com/r/largeimages/search.json", form: {q: "url:#{url}", restrict_sr: "on"}, header: ["User-Agent", "ajsdjasdasd"])["data"]["children"]
+  JSON.load( begin
+    NetHTTPUtils.request_data "https://www.reddit.com/r/largeimages/search.json", form: {q: "url:#{url}", restrict_sr: "on"}, header: ["User-Agent", "ajsdjasdasd"]
+  rescue NetHTTPUtils::Error => e
+    raise unless [503].include? e.code
+    sleep 60
+    retry
+  end )["data"]["children"]
 end
 fail unless 1 == search_url["https://i.imgur.com/9JTxtjW.jpg"].size
 
@@ -88,12 +94,12 @@ loop do
       next logger.warn "skipped a post by /u/bekalaki"     if author == "bekalaki"      # 9 ways to divide a karmawhore
 
       t = begin
-        DirectLink url
-      rescue NetHTTPUtils::Error,
-             SocketError,
+        DirectLink url, 60
+      rescue SocketError,
+             Net::OpenTimeout,
+             NetHTTPUtils::Error,
              FastImage::UnknownImageType,
              FastImage::ImageFetchFailure,
-             # DirectLink::ErrorMissingEnvVar,
              DirectLink::ErrorNotFound,
              DirectLink::ErrorBadLink => e
         next logger.error "skipped (#{e}) #{url} from http://redd.it/#{id}"
@@ -112,10 +118,8 @@ loop do
         " [#{tt.size} images]" if tt.size > 1
       } #{
         title.sub(/\s*\[?#{tt.first.width}\s*[*x×]\s*#{tt.first.height}\]?\s*/i, " ").
-              sub("[OC]", " ").gsub(/\s+/, " ").strip.
-              gsub(/(?<=.{190 - subreddit.size}).+/, "...")
-      } /r/#{subreddit}".
-        gsub(/\s+\(\s+\)\s+/, " ")
+              sub("[OC]", " ").gsub(/\s+/, " ").strip
+      } /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,

data/examples/net_http_utils.rb

@@ -1,3 +1,5 @@
+# TODO deprecate in favor of the gem nethttputils
+
 require "net/http"
 require "openssl"
 

data/examples/realtimeww2/Gemfile

@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 
-gem "reddit_bot", "~>1.6.4"
-gem "nethttputils", git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.1.0.4"
+gem "reddit_bot", git: "git@github.com:nakilon/reddit_bot.git"

data/examples/realtimeww2/Gemfile.lock

@@ -1,23 +1,22 @@
 GIT
-  remote: git@github.com:Nakilon/nethttputils.git
-  revision: 6cb2b6a2422d82e266e08b16da4fa29e809fd260
-  tag: v0.1.0.4
+  remote: git@github.com:nakilon/reddit_bot.git
+  revision: 351c559e507289aa6385e769eb6d5c6de80ba629
   specs:
-    nethttputils (0.1.0.4)
+    reddit_bot (1.6.7)
+      json
+      nethttputils (~> 0.2.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     json (2.1.0)
-    reddit_bot (1.6.4)
-      json
+    nethttputils (0.2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  nethttputils!
-  reddit_bot (~> 1.6.4)
+  reddit_bot!
 
 BUNDLED WITH
    1.16.1

data/lib/reddit_bot.rb

@@ -7,8 +7,15 @@ require "json"
 
 require "nethttputils"
 
-require_relative "reddit_bot/version"
+require_relative "reddit_bot/version" # TODO: deprecate this
+
 module RedditBot
+  require "logger"
+  class << self
+    attr_accessor :logger
+  end
+  self.logger = Logger.new STDOUT
+
   class Bot
 
     # bot's Reddit username; set via constructor parameter secrets[:login]
@@ -31,12 +38,12 @@ module RedditBot
       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
          !response["json"]["errors"].empty?
-        puts "ERROR OCCURED on #{[mtd, path]}"
+        Module.nesting[1].logger.error "ERROR OCCURED on #{[mtd, path]}"
         fail "unknown how to handle multiple errors" if 1 < response["json"]["errors"].size
-        puts "error: #{response["json"]["errors"]}"
+        Module.nesting[1].logger.error "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 "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],
@@ -44,7 +51,7 @@ module RedditBot
           #   } ) 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"
+            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
@@ -68,7 +75,7 @@ module RedditBot
     # [reason] :nodoc:
     # [thing_id] +String+ fullname of a "link, commenr or message"
     def report reason, thing_id
-      puts "reporting '#{thing_id}'"
+      Module.nesting[1].logger.warn "reporting '#{thing_id}'"
       json :post, "/api/report",
         reason: "other",
         other_reason: reason,
@@ -79,8 +86,11 @@ module RedditBot
     # [link_flair_css_class] :nodoc:
     # [link_flair_text] :nodoc:
     def set_post_flair post, link_flair_css_class, link_flair_text
-      puts "setting flair '#{link_flair_css_class}' with text '#{link_flair_text}' to post '#{post["name"]}'"
-      return puts "possibly not enough permissions for /r/#{@subreddit}/api/flairselector" if {"error"=>403} == @flairselector_choices ||= json(:post, "/r/#{@subreddit}/api/flairselector", link: post["name"])
+      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"])
+        Module.nesting[1].logger.error "possibly not enough permissions for /r/#{@subreddit}/api/flairselector"
+        return
+      end
       json :post, "/api/selectflair",
         link: post["name"],
         text: link_flair_text,
@@ -92,7 +102,7 @@ module RedditBot
     # [thing_id] +String+ fullname of a post (or self.post?), comment (and private message?)
     # [text] :nodoc:
     def leave_a_comment thing_id, text
-      puts "leaving a comment on '#{thing_id}'"
+      Module.nesting[1].logger.warn "leaving a comment on '#{thing_id}'"
       json(:post, "/api/comment",
         thing_id: thing_id,
         text: text,
@@ -180,7 +190,7 @@ module RedditBot
         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}"
+      Module.nesting[1].logger.info "new token is: #{@token_cached}"
       # update_captcha if "true" == resp_with_token(:get, "/api/needs_captcha", {})
       @token_cached
     end
@@ -216,7 +226,7 @@ module RedditBot
         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{
+            Module.nesting[1].logger.debug %w{
               x-ratelimit-remaining
               x-ratelimit-used
               x-ratelimit-reset
@@ -225,13 +235,13 @@ module RedditBot
           fail remaining[0] if remaining[0].size < 4
           next if remaining[0].size > 4
           t = (response.to_hash["x-ratelimit-reset"][0].to_f + 1) / [remaining[0].to_f - 10, 1].max + 1
-          puts "sleeping #{t} seconds because of x-ratelimit"
+          Module.nesting[1].logger.info "sleeping #{t} seconds because of x-ratelimit"
           sleep t
         end
       rescue NetHTTPUtils::Error => e
         sleep 5
-        raise unless e.code == 503 || e.code == 502
-        puts "API ERROR 503"
+        raise unless e.code.to_s.start_with? "50"
+        Module.nesting[1].logger.error "API ERROR 50*"
         retry
       end
     end

data/lib/reddit_bot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -77,6 +77,10 @@ files:
 - examples/iostroubleshooting/Gemfile
 - examples/iostroubleshooting/Gemfile.lock
 - examples/iostroubleshooting/main.rb
+- examples/johnnymarr/Gemfile
+- examples/johnnymarr/Gemfile.lock
+- examples/johnnymarr/main.rb
+- examples/johnnymarr/twitter.rb
 - examples/largeimages/Gemfile
 - examples/largeimages/Gemfile.lock
 - examples/largeimages/main.rb