reddit_bot 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2cc85bddbbc5aeee82fd5084eae257f1413340
-  data.tar.gz: 1de2e501873e4fa303e0223ceeed4a9b9c367334
+  metadata.gz: dd7aa171b0722398964a733d385b956e488758fc
+  data.tar.gz: 94a8959747d7d93c27722be9f4bf279ea69fe75b
 SHA512:
-  metadata.gz: b25c329d7d3ee4f87651a6f4deff8e76abff139b924f15d24168d9c0132edbe7dad46acbfce38ccd7af8fc2ebb13bed2f3978b7182926247e129a969691437a5
-  data.tar.gz: b14a6b1ab5f03bbaff46aa013a217f7dffb9aa9ba9bfe1fc702c454d2c2f46c8800441a07066859b781859f8707666744c7e5a3e887a51425337c7f9867d0e68
+  metadata.gz: 1b1f6ecf337874ef91c24f8ab25ec2a6037739c22faecb27ba0b35932e655b5ea13af3ee3f1b94fb29400a51693b20ea2e93e89d46cb2d9787bb49ec23358eb9
+  data.tar.gz: 68ae0ad1d581fdc6932ec56049f4afe73de1d183dfb807326c0909d2a3e0221f98fd91ef9f5a7ef7b60ed35b42a82b5717a4f7254776f7c45eadc2635472d2aa

data/examples/boilerplate.rb

@@ -1,14 +1,14 @@
 STDOUT.sync = true
 require "pp"
 
-require "net_http_utils" if Gem.loaded_specs.include? "net_http_utils"
-
-if ENV["DEV"]
-  require_relative "../lib/reddit_bot"
+if Gem.loaded_specs.include? "net_http_utils"
+  require "net_http_utils"
 else
-  require "reddit_bot"
+  require_relative "net_http_utils"
 end
 
-require_relative "#{Dir.home}/beat.rb" unless Gem::Platform.local.os == "darwin"
+require "reddit_bot"
+
+require_relative "#{Dir.home}/beat" unless Gem::Platform.local.os == "darwin"
 
 require "yaml"

data/examples/councilofricks/Gemfile.lock

@@ -7,8 +7,8 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    json (2.0.2)
-    reddit_bot (1.2.0)
+    json (2.0.3)
+    reddit_bot (1.2.2)
       json
 
 PLATFORMS

data/examples/mlgtv/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 gem "reddit_bot", "~>1.2.0"
-gem "net_http_utils", ?0, gist: "97549ceb58d21e1fcbc0e6cdaf92fce8"
+# gem "net_http_utils", ?0, gist: "97549ceb58d21e1fcbc0e6cdaf92fce8"

data/examples/mlgtv/Gemfile.lock

@@ -1,9 +1,3 @@
-GIT
-  remote: https://gist.github.com/97549ceb58d21e1fcbc0e6cdaf92fce8.git
-  revision: 54c47ab3f9665f3e35a8e94fdd267e3743c736a9
-  specs:
-    net_http_utils (0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -15,7 +9,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  net_http_utils (= 0)!
   reddit_bot (~> 1.2.0)
 
 BUNDLED WITH

data/examples/mlgtv/main.rb

@@ -43,7 +43,10 @@ loop do
         "Call of Duty 4: Modern Warfare",
       ].each do |game|
         (begin
-          JSON.parse NetHTTPUtils.request_data "https://api.twitch.tv/kraken/streams?game=#{CGI::escape game}&access_token=#{File.read("twitch.token").strip}&client_id=#{File.read("client.id").strip}&channel=Ricky,ACHES,Lacefield,Clayster,Enable,Zoomaa,Attach,TheFEARS,PHiZZURP,MiRx1,SaintsRF,StuDyy,SpaceLyTV,NAMELESS,Scump,FORMAL,Crimsix,Karma,Loony,Slacked,Octane,MJChino,Diabolic_TV,ImTheIvy,Senderxz,Jkap,John,SlasheRAL,Apathy,ColtHavok,MikeSwarley,ParasiteTV,TyreeLegal,Silly,Blfire,methodz,TwiZzyTV,Mochila,Remy,Xotic16,AquA,Faccento,Nagafen,Tylerfelo,TheoryCoD,ColeChanTV,happyy97,goonjar,Burns,Dedo,Neslo,TeeCM,K1lla93,NeLsoNNaTeR,ProoFy,Whea7s,MBoZe,Merk,Nadeshot,ReeP,Sharp,TeePee,Braaain2015,Nolsonn,QwiKeRTHaNu,Zedenyer1,Jurd,Tommey,Swanny,MadCatEU,Rated_EU1,BsportJoshh,Sy_Vortex,TheMarkyB,Peatie95,urbandm,TreiZer0,iDqvee,Tojor,MethodZ_TV,Gotaga,WailersWL,TCM_Moose,RampageSkrapz,Reedy,fighta71,Swiftazor,BacabecNZ,Zeuss_Gaming,Hopeyy,GuydraCOD,mattmrx,Maven,CouRageJD,Revan,BriceyHD,Benson,PHILWHI7"
+          begin
+            t = NetHTTPUtils.get_response "https://api.twitch.tv/kraken/streams?game=#{CGI::escape game}&access_token=#{File.read("twitch.token").strip}&client_id=#{File.read("client.id").strip}&channel=Ricky,ACHES,Lacefield,Clayster,Enable,Zoomaa,Attach,TheFEARS,MiRx1,SaintsRF,StuDyy,SpaceLyTV,NAMELESS,Scump,FORMAL,Crimsix,Karma,Loony,Slacked,Octane,MJChino,Diabolic_TV,ImTheIvy,Senderxz,Jkap,John,SlasheRAL,Apathy,ColtHavok,MikeSwarley,ParasiteTV,TyreeLegal,Silly,Blfire,methodz,TwiZzyTV,Mochila,Remy,Xotic16,AquA,Faccento,Nagafen,Tylerfelo,TheoryCoD,ColeChanTV,happyy97,goonjar,Burns,Dedo,Neslo,TeeCM,K1lla93,NeLsoNNaTeR,ProoFy,Whea7s,MBoZe,Merk,Nadeshot,ReeP,Sharp,TeePee,Braaain2015,Nolsonn,QwiKeRTHaNu,Zedenyer1,Jurd,Tommey,Swanny,MadCatEU,Rated_EU1,BsportJoshh,Sy_Vortex,TheMarkyB,Peatie95,urbandm,TreiZer0,iDqvee,Tojor,MethodZ_TV,Gotaga,WailersWL,TCM_Moose,skrapzq,Reedy,fighta71,Swiftazor,BacabecNZ,Zeuss_Gaming,Hopeyy,GuydraCOD,mattmrx,Maven,CouRageJD,Revan,BriceyHD,Benson,PHILWHI7,MLG,mlgbravo,Multiplay_CoD,UMGEvents,GfinityTV,WorldGaming,FemaleProLeague,Arcitys,Prestinni,Maux,priestahh,Vilesyder,benbance"
+          end while t.code == 500
+          JSON.parse t.body
         rescue JSON::ParserError
           puts "JSON::ParserError"
           sleep 60
@@ -72,12 +75,12 @@ loop do
     settings["allow_top"] = settings["allow_top"]
     settings.delete "default_set"
 
-    prefix, postfix = settings["description"].split(/(?<=\n#####)\s*Live Streams.+?(?=\n#+)/im)
+    prefix, postfix = CGI.unescapeHTML(settings["description"]).split(/(?<=\n#####)\s*Live Streams.+?(?=\n#+)/im)
     unless postfix
       puts "!!! can't parse sidebar !!!"
       throw :loop
     end
-    next puts "nothing to change" if prefix + text + postfix == settings["description"]
+    next puts "nothing to change" if prefix + text + postfix == CGI.unescapeHTML(settings["description"])
 
     puts "updating sidebar..."
     settings["description"] = prefix + text + postfix

data/examples/net_http_utils.rb

@@ -0,0 +1,146 @@
+require "net/http"
+require "openssl"
+
+require "logger"
+
+
+module NetHTTPUtils
+  class << self
+
+    attr_accessor :logger
+
+    # private?
+    def get_response url, mtd = :get, form: {}, header: [], auth: nil, timeout: 30, patch_request: nil, &block
+      # form = Hash[form.map{ |k, v| [k.to_s, v] }]
+      uri = URI.parse url
+      cookies = {}
+      prepare_request = lambda do |uri|
+        case mtd
+          when :get    ; Net::HTTP::Get
+          when :post   ; Net::HTTP::Post
+          when :put    ; Net::HTTP::Put
+          when :delete ; Net::HTTP::Delete
+          else         ; raise "unknown method #{mtd}"
+        end.new(uri).tap do |request| # somehow Get eats even raw url, not URI object
+          patch_request.call uri, form, request if patch_request
+          request.basic_auth *auth if auth
+          header.each{ |k, v| request[k] = v }
+          request["cookie"] = [*request["cookie"], cookies.map{ |k, v| "#{k}=#{v}" }].join "; " unless cookies.empty?
+          request.set_form_data form unless form.empty?
+          stack = caller.reverse.map do |level|
+            /((?:[^\/:]+\/)?[^\/:]+):([^:]+)/.match(level).captures
+          end.chunk(&:first).map do |file, group|
+            "#{file}:#{group.map(&:last).chunk{|_|_}.map(&:first).join(",")}"
+          end
+          logger.info request.path
+          logger.debug request.each_header.to_a.to_s
+          logger.debug stack.join " -> "
+          logger.debug request
+        end
+      end
+      request = prepare_request[uri]
+      start_http = lambda do |uri|
+        begin
+          Net::HTTP.start(
+            uri.host, uri.port,
+            use_ssl: uri.scheme == "https",
+            verify_mode: OpenSSL::SSL::VERIFY_NONE,
+            # read_timeout: 5,
+          ).tap do |http|
+            http.read_timeout = timeout #if timeout
+            http.open_timeout = timeout #if timeout
+            http.set_debug_output STDERR if logger.level == Logger::DEBUG # use `logger.debug?`?
+          end
+        rescue Errno::ECONNREFUSED => e
+          e.message.concat " to #{uri}" # puts "#{e} to #{uri}"
+          raise e
+        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ECONNRESET, SocketError, OpenSSL::SSL::SSLError => e
+          logger.warn "retrying in 5 seconds because of #{e.class}"
+          sleep 5
+          retry
+        rescue Errno::ETIMEDOUT
+          logger.warn "ETIMEDOUT, retrying in 5 minutes"
+          sleep 300
+          retry
+        end
+      end
+      http = start_http[uri]
+      do_request = lambda do |request|
+        response = begin
+          http.request request, &block
+        rescue Errno::ECONNRESET, Errno::ECONNREFUSED, Net::ReadTimeout, Net::OpenTimeout, Zlib::BufError, OpenSSL::SSL::SSLError => e
+          logger.error "retrying in 30 seconds because of #{e.class} at: #{request.uri}"
+          sleep 30
+          retry
+        end
+        response.to_hash.fetch("set-cookie", []).each{ |c| k, v = c.split(?=); cookies[k] = v[/[^;]+/] }
+        case response.code
+        when /\A3\d\d$/
+          logger.info "redirect: #{response["location"]}"
+          new_uri = URI.join(request.uri, response["location"])
+          new_host = new_uri.host
+          if http.address != new_host ||
+             http.port != new_uri.port ||
+             http.use_ssl? != (new_uri.scheme == "https")
+            logger.debug "changing host from '#{http.address}' to '#{new_host}'"
+            http = start_http[new_uri]
+          end
+          do_request.call prepare_request[new_uri]
+        when "404"
+          logger.error "404 at #{request.method} #{request.uri} with body: #{
+            response.body.is_a?(Net::ReadAdapter) ? "impossible to reread Net::ReadAdapter -- check the IO you've used in block form" : response.body.tap do |body|
+              body.replace body.strip.gsub(/<[^>]*>/, "") if body["<html>"]
+            end.inspect
+          }"
+          response
+        when /\A50\d$/
+          logger.error "#{response.code} at #{request.method} #{request.uri} with body: #{response.body.inspect}"
+          response
+        else
+          logger.info "code #{response.code} at #{request.method} #{request.uri}#{
+            " and so #{url}" if request.uri.to_s != url
+          } from #{
+            [__FILE__, caller.map{ |i| i[/\d+/] }].join ?:
+          } with body: #{
+            response.body.tap do |body|
+              body.replace body.strip.gsub(/<[^>]*>/, "") if body["<html>"]
+            end.inspect
+          }" unless response.code.start_with? "20"
+          response
+        end
+      end
+      do_request[request].tap do |response|
+        cookies.each{ |k, v| response.add_field "Set-Cookie", "#{k}=#{v};" }
+        logger.debug response.to_hash
+      end
+    end
+
+    def request_data *args
+      response = get_response *args
+      throw :"404" if "404" == response.code
+      throw :"500" if "500" == response.code
+      response.body
+    end
+
+  end
+  self.logger = Logger.new STDOUT
+  self.logger.level = ENV["LOGLEVEL_#{name}"] ? Logger.const_get(ENV["LOGLEVEL_#{name}"]) : Logger::WARN
+  self.logger.formatter = lambda do |severity, datetime, progname, msg|
+    "#{severity.to_s[0]} #{datetime.strftime "%y%m%d %H%M%S"} : #{name} : #{msg}\n"
+  end
+end
+
+
+if $0 == __FILE__
+  print "self testing... "
+
+  fail unless NetHTTPUtils.request_data("http://httpstat.us/200") == "200 OK"
+  fail unless NetHTTPUtils.get_response("http://httpstat.us/404").body == "404 Not Found"
+  catch(:"404"){ fail NetHTTPUtils.request_data "http://httpstat.us/404" }
+  # TODO raise?
+  fail unless NetHTTPUtils.request_data("http://httpstat.us/400") == "400 Bad Request"
+  fail unless NetHTTPUtils.get_response("http://httpstat.us/500").body == "500 Internal Server Error"
+  catch(:"500"){ fail NetHTTPUtils.request_data "http://httpstat.us/500" }
+
+  puts "OK #{__FILE__}"
+end

data/examples/yayornay/main.rb

@@ -12,6 +12,7 @@ loop do
     nay = []
     comments.each do |comment|
       yay |= [comment["author"]] if comment["body"][/\A\s*yay/i]
+      yay |= [comment["author"]] if comment["body"][/\A\s*yea/i]
       nay |= [comment["author"]] if comment["body"][/\A\s*nay/i]
     end
     p [post["id"], yay, nay] if Gem::Platform.local.os == "darwin"

data/lib/reddit_bot.rb

@@ -8,7 +8,7 @@ require "json"
 
 
 module RedditBot
-  VERSION = "1.2.2" # :nodoc:
+  VERSION = "1.3.0" # :nodoc:
 
   class Bot
 
@@ -16,12 +16,12 @@ module RedditBot
     attr_reader :name
 
     # [secrets] +Hash+ with keys :client_id, :client_secret, :password: and :login
-    # [kwargs] keyword params may include :ignore_captcha that is true by default and :subreddit for clever methods
+    # [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]
-      @ignore_captcha = true
-      @ignore_captcha = kwargs[:ignore_captcha] if kwargs.has_key?(:ignore_captcha)
+      # @ignore_captcha = true
+      # @ignore_captcha = kwargs[:ignore_captcha] if kwargs.has_key?(:ignore_captcha)
       @subreddit = kwargs[:subreddit]
     end
 
@@ -38,11 +38,11 @@ module RedditBot
           puts "error: #{[error, description]}"
           case error
           when "ALREADY_SUB" ; puts "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],
-              captcha: @iden_and_captcha[1],
-            } ) unless @ignore_captcha
+          # when "BAD_CAPTCHA" ; update_captcha
+          #   json mtd, path, form.merger( {
+          #     iden: @iden_and_captcha[0],
+          #     captcha: @iden_and_captcha[1],
+          #   } ) unless @ignore_captcha
           else ; fail error
           end
         end
@@ -174,19 +174,19 @@ module RedditBot
         fail response.inspect
       end
       puts "new token is: #{@token_cached}"
-      update_captcha if "true" == resp_with_token(:get, "/api/needs_captcha", {})
+      # update_captcha if "true" == resp_with_token(:get, "/api/needs_captcha", {})
       @token_cached
     end
 
-    def update_captcha
-      return if @ignore_captcha
-      pp iden_json = json(:post, "/api/new_captcha")
-      iden = iden_json["json"]["data"]["iden"]
-      # return @iden_and_captcha = [iden, "\n"] if @ignore_captcha
-      # pp resp_with_token(:get, "/captcha/#{iden_json["json"]["data"]["iden"]}", {})
-      puts "CAPTCHA: https://reddit.com/captcha/#{iden}"
-      @iden_and_captcha = [iden, gets.strip]
-    end
+    # def update_captcha
+    #   return if @ignore_captcha
+    #   pp iden_json = json(:post, "/api/new_captcha")
+    #   iden = iden_json["json"]["data"]["iden"]
+    #   # return @iden_and_captcha = [iden, "\n"] if @ignore_captcha
+    #   # pp resp_with_token(:get, "/captcha/#{iden_json["json"]["data"]["iden"]}", {})
+    #   puts "CAPTCHA: https://reddit.com/captcha/#{iden}"
+    #   @iden_and_captcha = [iden, gets.strip]
+    # end
 
     def resp_with_token mtd, path, form
       nil until _ = catch(:"401") do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -55,6 +55,7 @@ files:
 - examples/mlgtv/Gemfile
 - examples/mlgtv/Gemfile.lock
 - examples/mlgtv/main.rb
+- examples/net_http_utils.rb
 - examples/oneplus/Gemfile
 - examples/oneplus/Gemfile.lock
 - examples/oneplus/main.rb
@@ -94,4 +95,3 @@ signing_key:
 specification_version: 4
 summary: Library for Reddit bots
 test_files: []
-has_rdoc: