reddit_bot 1.7.3 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd7532e6902bd9f58fde5dcf8151c9dc408bae4
-  data.tar.gz: 276fb95038900de070d338744929b9812f77fc88
+  metadata.gz: a79ccb6940bda2173afa1e2e1814e89bb0793b72
+  data.tar.gz: a7b8a729599ad509480782cffaf5351d5444ac73
 SHA512:
-  metadata.gz: 557ea06453ad91faf028dbd42a1b49b1417d34026fb2363e16046d6722dcb159306fe5ed1d5ab6680fc4d7ea1d07445c97b9e4461b1f6bd0c6c2542307e345bb
-  data.tar.gz: ba95209b0e3ad5abe387f455729334dd6dad6e754b11a581b19ca0ffbf50b1535bde0425340996319f88ebcf9c6c343c0202dabd20981d337072d9f4fd683d18
+  metadata.gz: d8aa5d6fd2e4e8f1319eaba631bff0a00f1309e9258917f8d154f6d2a08a9c4751ef14b2ce4c0ad174d55db6dc9a950637eed77748ac3993ec447b88923e50a2
+  data.tar.gz: 496c9948ad1a8ddae3a19d12e6280f4f59024f6f2200a8719a8ce2060efdc5264e8a6f6fd198639701cea1eeaf5e2dbb86acc651279c9091bdfaee766a02c5c9

data/lib/reddit_bot.rb

@@ -3,11 +3,10 @@ STDOUT.sync = true
 
 require "openssl"
 require "json"
+require "yaml"
 
 require "nethttputils"
 
-require_relative "reddit_bot/version" # TODO: deprecate this
-
 module RedditBot
   require "logger"
   class << self
@@ -153,7 +152,9 @@ module RedditBot
                                                   result["data"].keys == %w{ modhash dist children after before }
           @@skip_erroneous_descending_ids[ result["data"]["children"].map do |post|
             fail "unknown type post['kind']: #{post["kind"]}" unless post["kind"] == "t3"
-            post["data"]
+            post["data"].dup.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 ].each do |data|
             e << data
           end
@@ -204,7 +205,7 @@ module RedditBot
           username: @name,
           password: @secret_password,
         }, {
-          "User-Agent" => "bot/#{@user_agent || @name}/#{RedditBot::VERSION} by /u/nakilon",
+          "User-Agent" => "bot/#{@user_agent || @name}/#{Gem::Specification::load("#{__dir__}/../reddit_bot.gemspec").version} by /u/nakilon",
         }, @secret_auth
       unless @token_cached = response["access_token"]
         fail "bot #{@name} isn't a 'developer' of app at https://www.reddit.com/prefs/apps/" if response == {"error"=>"invalid_grant"}
@@ -231,13 +232,13 @@ module RedditBot
       begin
         reddit_resp mtd, "https://oauth.reddit.com" + path, form, {
           "Authorization" => "bearer #{token}",
-          "User-Agent" => "bot/#{@user_agent || @name}/#{RedditBot::VERSION} by /u/nakilon",
+          "User-Agent" => "bot/#{@user_agent || @name}/#{Gem::Specification::load("#{__dir__}/../reddit_bot.gemspec").version} by /u/nakilon",
         }
       rescue NetHTTPUtils::Error => e
+        raise unless e.code == 401
         sleep timeout
         Module.nesting[1].logger.info "sleeping #{timeout} seconds because of #{e.code}"
         timeout *= 2
-        raise unless e.code == 401
         @token_cached = nil
         retry
       end
@@ -247,21 +248,7 @@ module RedditBot
       mtd, url, form, headers, basic_auth = *args
       headers["Cookie:"] = "over18=1"
       begin
-        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"
-            Module.nesting[1].logger.debug %w{
-              x-ratelimit-remaining
-              x-ratelimit-used
-              x-ratelimit-reset
-            }.map{ |key| "#{key}=#{response.to_hash[key]}" }.join ", "
-          end
-          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
-          Module.nesting[1].logger.info "sleeping #{t} seconds because of x-ratelimit"
-          sleep t
-        end
+        NetHTTPUtils.request_data url, mtd, form: form, header: headers, auth: basic_auth
       rescue NetHTTPUtils::Error => e
         sleep 5
         raise unless e.code.to_s.start_with? "50"
@@ -271,4 +258,59 @@ module RedditBot
     end
 
   end
+
+  module Twitter
+    require "json"
+
+    def self.init_twitter twitter
+      const_set :TWITTER_ACCOUNT, twitter
+      const_set :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"]
+    end
+
+    require "cgi"
+    def self.tweet2titleNtext tweet
+      text = ""
+      contains_media = false
+      up = ->s{ s.split.map{ |w| "^#{w}" }.join " " }
+      if tweet["extended_entities"] && !tweet["extended_entities"]["media"].empty?
+        contains_media = true
+        tweet["extended_entities"]["media"].each_with_index do |media, i|
+          text.concat "* [Image #{i + 1}](#{media["media_url_https"]})\n\n"
+        end
+      end
+      if !tweet["entities"]["urls"].empty?
+        contains_media = true
+        tweet["entities"]["urls"].each_with_index do |url, i|
+          text.concat "* [Link #{i + 1}](#{url["expanded_url"]})\n\n"
+        end
+      end
+      text.concat "^- #{
+        up[tweet["user"]["name"]]
+      } [^\\(@#{TWITTER_ACCOUNT}\\)](https://twitter.com/#{TWITTER_ACCOUNT}) ^| [#{
+        up[Date.parse(tweet["created_at"]).strftime "%B %-d, %Y"]
+      }](https://twitter.com/#{TWITTER_ACCOUNT}/status/#{tweet["id"]})"
+      [CGI::unescapeHTML(tweet["full_text"]).sub(/( https:\/\/t\.co\/[0-9a-zA-Z]{10})*\z/, ""), text, contains_media]
+    end
+
+    def self.user_timeline
+      timeout = 1
+      JSON.load begin
+        NetHTTPUtils.request_data(
+          "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}" }
+        )
+      rescue NetHTTPUtils::Error => e
+        fail unless [500, 503].include? e.code
+        sleep timeout
+        timeout *= 2
+        retry
+      end
+    end
+  end
+
 end

data/reddit_bot.gemspec

@@ -1,25 +1,21 @@
-require_relative "lib/reddit_bot/version"
-
 Gem::Specification.new do |spec|
   spec.name          = "reddit_bot"
-  spec.version       = RedditBot::VERSION
-  spec.authors       = ["Victor Maslov"]
-  spec.email         = ["nakilon@gmail.com"]
+  spec.version       = "1.7.8"
+  spec.summary       = "Simple library for Reddit bots"
 
-  spec.summary       = "Library for Reddit bots"
-  spec.description   = "better than PRAW"
-  spec.homepage      = "https://github.com/Nakilon/reddit_bot"
+  spec.author        = "Victor Maslov aka Nakilon"
+  spec.email         = "nakilon@gmail.com"
   spec.license       = "MIT"
+  spec.metadata      = {"source_code_uri" => "https://github.com/Nakilon/reddit_bot"}
 
-  spec.files         = `git ls-files -z`.split("\x0")#.reject { |f| f.match(%r{^(test|spec|features)/})/ }
-  # spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "json"
-  spec.add_runtime_dependency "nethttputils", "~>0.3.3.0"
+  spec.add_dependency "json"
+  spec.add_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"
   spec.required_ruby_version = ">= 2.0.0"
+
+  spec.files         = %w{ LICENSE.txt reddit_bot.gemspec lib/reddit_bot.rb }
 end
 
   # spec.test_files    = ["spec/"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_bot
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.8
 platform: ruby
 authors:
-- Victor Maslov
+- Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,90 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3.0
+        version: 0.4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3.0
-description: better than PRAW
-email:
-- nakilon@gmail.com
+        version: 0.4.1.0
+description: 
+email: nakilon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - LICENSE.txt
-- README.md
-- Rakefile
-- examples/.bashrc
-- examples/.gitignore
-- examples/Gemfile.lock
-- examples/boilerplate.rb
-- examples/councilofricks/Gemfile
-- examples/councilofricks/Gemfile.lock
-- examples/councilofricks/main.rb
-- examples/cptflairbot3/.bashrc
-- examples/cptflairbot3/Code.gs
-- examples/cptflairbot3/Gemfile
-- examples/cptflairbot3/Gemfile.lock
-- examples/cptflairbot3/app.js
-- examples/cptflairbot3/casual/casualpokemontrades.htm
-- examples/cptflairbot3/casual/script.js
-- examples/cptflairbot3/casual/style.css
-- examples/cptflairbot3/log.htm
-- examples/cptflairbot3/main.rb
-- examples/cptflairbot3/package.json
-- examples/cptflairbot3/pubsub.rb
-- examples/cptflairbot3/update_gas_hook_secret.rb
-- examples/devflairbot/Gemfile
-- examples/devflairbot/Gemfile.lock
-- examples/devflairbot/main.rb
-- examples/get_dimensions.rb
-- 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
-- examples/largeimagesreview/Gemfile
-- examples/largeimagesreview/Gemfile.lock
-- examples/largeimagesreview/main.rb
-- examples/mlgtv/Gemfile
-- examples/mlgtv/Gemfile.lock
-- examples/mlgtv/channels.txt
-- examples/mlgtv/main.rb
-- examples/net_http_utils.rb
-- examples/oneplus/Gemfile
-- examples/oneplus/Gemfile.lock
-- examples/oneplus/main.rb
-- examples/realtimeww2/.bashrc
-- examples/realtimeww2/Gemfile
-- examples/realtimeww2/Gemfile.lock
-- examples/realtimeww2/main.rb
-- examples/sexypizza/Gemfile
-- examples/sexypizza/Gemfile.lock
-- examples/sexypizza/main.rb
-- examples/wallpaper/Gemfile
-- examples/wallpaper/Gemfile.lock
-- examples/wallpaper/main.rb
-- examples/yayornay/Gemfile
-- examples/yayornay/Gemfile.lock
-- examples/yayornay/main.rb
 - lib/reddit_bot.rb
-- lib/reddit_bot/version.rb
 - reddit_bot.gemspec
-homepage: https://github.com/Nakilon/reddit_bot
+homepage: 
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/Nakilon/reddit_bot
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -133,5 +71,5 @@ rubyforge_project:
 rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
-summary: Library for Reddit bots
+summary: Simple library for Reddit bots
 test_files: []

data/Gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-# git: "git@github.com:Nakilon/nethttputils.git", tag: "v0.0.1.4"

data/README.md

@@ -1,101 +0,0 @@
-# RedditBot
-
-[![Join the chat at https://gitter.im/Nakilon/reddit_bot](https://badges.gitter.im/Nakilon/reddit_bot.svg)](https://gitter.im/Nakilon/reddit_bot)
-[![Gem Version](https://badge.fury.io/rb/reddit_bot.svg)](http://badge.fury.io/rb/reddit_bot)
-
-### What
-
-This library provides an easy way to run bots and scripts that use Reddit API.  
-I ([/u/nakilon](https://www.reddit.com/u/nakilon)) currently run near 10 bots with it.
-
-### Why
-
-Python (and so PRAW) sucks.
-
-### Examples
-
-I'm not usually publish every program (since there are thousand of them and adequate programmer knows that publishing everything is like throwing trash on street) but I'll add bots here so you could see how to use the library.  
-The [examples folder](examples) includes:
-
-* **sexypizza** -- bot that updates wiki page with current flairs statistics
-* **devflairbot** -- bot that flairs posts when some specifically flaired user comments there
-* **mlgtv** -- bot that updates sidebar with currently streaming twitch channels
-* **councilofricks** -- bot that flairs users according to Google Spreadsheet
-* **wallpaper** -- bot that reports images with dimensions being not the same as in title
-* **cptflairbot3** -- bot that sets user flair according to request submitted via web form  
-  also publishes its activily log here http://www.nakilon.pro/casualpokemontrades/log.htm via Google Cloud Platform automations (Apps Script and Functions)
-* **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:
-
-             pics            Total: 98     Quality: 19%  
-          wallpapers         Total: 69     Quality: 52%  
-          wallpaper          Total: 45     Quality: 51%  
-           woahdude          Total: 30     Quality: 66%  
-           CityPorn          Total: 17     Quality: 82%  
-           FoodPorn          Total: 13     Quality: 7%  
-           MapPorn           Total: 13     Quality: 46%  
-           SkyPorn           Total: 11     Quality: 45%  
-           carporn           Total: 11     Quality: 45%  
-      InfrastructurePorn     Total: 9      Quality: 77%  
-
-         EarthPorn      Total: 23  Quality: 82%   ✅⛔✅✅✅✅⛔✅✅✅✅✅⛔⛔✅✅✅✅✅✅✅✅✅  
-          FoodPorn      Total: 5   Quality: 0%    ⛔⛔⛔⛔⛔                   
-          carporn       Total: 4   Quality: 0%    ⛔⛔⛔⛔                    
-          CityPorn      Total: 4   Quality: 100%  ✅✅✅✅                    
-         spaceporn      Total: 4   Quality: 100%  ✅✅✅✅                    
-          MapPorn       Total: 4   Quality: 50%   ✅⛔✅⛔                    
-       BotanicalPorn    Total: 3   Quality: 66%   ✅✅⛔                     
-        CemeteryPorn    Total: 2   Quality: 0%    ⛔⛔                      
-        MilitaryPorn    Total: 2   Quality: 50%   ✅⛔                      
-        DessertPorn     Total: 2   Quality: 50%   ⛔✅                      
-            pic         Total: 2   Quality: 100%  ✅✅                      
-      ArchitecturePorn  Total: 2   Quality: 50%   ✅⛔                      
-       AbandonedPorn    Total: 2   Quality: 100%  ✅✅                      
-
-### Usage
-
-    $ gem install reddit_bot
-
-or via Gemfile:
-
-    source "https://rubygems.org"
-    gem "reddit_bot"
-
-helloworld.rb:
-
-```ruby
-require "reddit_bot"
-```
-
-You obviously can't run these examples as is, because they use local configs that are not in git repo, like `secrets.yaml` file for Reddit authorization of the following format:
-
-    :client_id: Kb9.......6wBw
-    :client_secret: Fqo.....................AFI
-    :password: mybotpassword
-    :login: MyBotUsername
-    # :user_agent: optional_custom_useragent_to_bypass_reddit_spam_protection
-
-To change log level:
-
-```ruby
-RedditBot.logger.level = Logger::ERROR
-```
-
-To update the gem version in Gemfile.lock when using Gemfile like this: `gem "reddit_bot", "~>1.1.0"`, do the:
-
-    $ bundle update reddit_bot
-
-### Contributing and License
-
-Bug reports and pull requests are welcome.  
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
-### TODO
-
-* write more usage instructions here
-* manual on how to create bots with Reddit web interface and run via bash console
-* about NetHTTPUtils dependency; and that get_response returns String code not Integer like request_data

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-
-# require "rspec/core/rake_task"
-# RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/examples/.bashrc

@@ -1,2 +0,0 @@
-echo "for get_dimensions.rb self-test: bundle exec ruby get_dimensions.rb"
-source ./secrets

data/examples/.gitignore

@@ -1,2 +0,0 @@
-secrets
-secrets.yaml

data/examples/Gemfile.lock

@@ -1,17 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    json (2.1.0)
-    nethttputils (0.2.5.1)
-    reddit_bot (1.6.13)
-      json
-      nethttputils (~> 0.2.5.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  reddit_bot
-
-BUNDLED WITH
-   1.17.1

data/examples/boilerplate.rb

@@ -1,12 +0,0 @@
-STDOUT.sync = true
-require "pp"
-
-if Gem.loaded_specs.include? "nethttputils"
-  require "nethttputils"
-else
-  require_relative "net_http_utils"
-end
-
-require "reddit_bot"
-
-require "yaml"