lita-reddit 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d94ddc28ef86526e01c700c2ee3f0647263580a
-  data.tar.gz: bc3144fd40faf24d10782ea219c0b92d35467434
+  metadata.gz: 19e3ec79a7b9e2a976711a1d359ba97029e8cc39
+  data.tar.gz: 22faa46b29ea2e002916b243487e8b52da4727c8
 SHA512:
-  metadata.gz: 51ef41d2ced8ec2e4a9b6984dfcade18625e35e81d041d8830c2e8d1582eb30febcb807321dcb2b240dcee81a3c574c78130260ed586a1a688d32bb12d3248d4
-  data.tar.gz: eca9dcd6e808c0889ee352771373fb1219f56d428c31aae0483196422407d79935d729028922b697c534bd2ed7d13a93d122b5e08ee8e8ef08f71f496d91a0c3
+  metadata.gz: 76549b27b0e930e8e822e43edbf92be7326051b1efd91c3d032b8e0734ef5a8556b3569dc137cfac6ee49092196f7008e21690fa11ebb49d79101b7a782354b0
+  data.tar.gz: 9574ff6dab9105ba81285a856afd6cf25d200ab557f993c9216139d256443bed61b1951b9e08c40b0f6447f72c4fd4f4c248827d0d8ca4e900b8b292f3164a93

data/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
-gem "redd"
+
 gemspec

data/README.md

@@ -21,6 +21,8 @@ config.handlers.reddit.client_id = "client_from_api"
 config.handlers.reddit.client_secret = "secret_from_api"
 # The delay to wait before starting the polling in seconds (optional, defaults to 30s)
 config.handlers.reddit.startup_delay = 30
+# The interval in between requests (optional, defaults to 300s)
+config.handlers.reddit.poll_interval = 300
 ```
 
 ## Usage

data/lib/lita/handlers/reddit.rb

@@ -1,6 +1,3 @@
-require 'thread'
-require 'redd'
-
 module Lita
   module Handlers
     class Reddit < Handler
@@ -11,37 +8,68 @@ module Lita
         config :reddits, type: Array
       end
       config :startup_delay, type: Integer, default: 30
+      config :poll_interval, type: Integer, default: 300
 
       on :connected, :setup
 
+      @@user_agent = 'ruby:lita-reddit:v0.0.6 (by /u/dosman711)'
+
 
       def setup(payload)
+        update_token
         after(config.startup_delay) do
-          setup_streams
+          refresh_posts
+        end
+        every (config.poll_interval) do
+          refresh_posts
+        end
+        # update userless token once per hour
+        every (3300) do
+          update_token
+        end
+      end
+
+      def update_token
+        log.debug('updating userless oauth token')
+        request = http
+        request.basic_auth(config.client_id, config.client_secret)
+        auth_response = request.post do |req|
+          req.url 'https://www.reddit.com/api/v1/access_token'
+          req.headers['User-Agent'] = @@user_agent
+          req.body = 'grant_type=client_credentials'
         end
+        response = MultiJson.load(auth_response.body)
+        @@access_token = response['access_token']
       end
 
-      def setup_streams
-        post_text = 'From /r/%s: %s (%s)'
+      def refresh_posts
+        post_text = 'From /r/%s: %s (http://redd.it/%s)'
         base_redis_key = 'seen_list_%s_%s'
         config.reddits.each do |reddit|
-          Thread.new {
-            #new on the left
-            redis_key = base_redis_key % [reddit[:channel], reddit[:subreddit]]
-            post_limit = 3
-            seen_reddits = redis.lrange(redis_key, 0, post_limit - 1)
-            userless = Redd.it(:userless, config.client_id, config.client_secret, user_agent: 'lita-reddit/1.0')
-            Lita.logger.debug('setting up stream for %s' % [reddit[:subreddit]])
-            target = Source.new(room: reddit[:channel])
-            userless.stream :get_new, reddit[:subreddit], limit: post_limit do |post|
-              if !seen_reddits.include?(post.fullname) then
-                robot.send_message(target, post_text % [post.subreddit, post.title, post.short_url])
-                redis.lpush(redis_key, post.fullname)
-              end
-              redis.ltrim(redis_key, 0, post_limit - 1)
+          log.debug ('updating posts for /r/%s' % [reddit[:subreddit]])
+          #new on the left
+          redis_key = base_redis_key % [reddit[:channel], reddit[:subreddit]]
+          post_limit = 3
+          seen_reddits = redis.lrange(redis_key, 0, 10)
+          request = http
+          resp = request.get do |req|
+            req.url 'https://oauth.reddit.com/r/%s/new' % [reddit[:subreddit]]
+            req.headers['Authorization'] = 'bearer %s' % [@@access_token]
+            req.headers['User-Agent'] = @@user_agent
+            req.params['limit'] = post_limit
+            req.params['before'] = redis.lindex(redis_key, 0)
+          end
+          log.debug('result of request %s' % [resp.status])
+          response_body = MultiJson.load(resp.body)
+          target = Source.new(room: reddit[:channel])
+          response_body['data']['children'].reverse.each do |post|
+            if !seen_reddits.include?(post['data']['id']) then
+              robot.send_message(target, post_text % [post['data']['subreddit'], post['data']['title'], post['data']['id']])
+              redis.lpush(redis_key, post['data']['id'])
             end
-          }
-          Lita.logger.debug('finished setting up stream for %s' % [reddit[:subreddit]])
+            # keep a few extra around, 10 is still instantaneous
+            redis.ltrim(redis_key, 0, 10)
+          end
         end
       end 
     end

data/lita-reddit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-reddit"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Chris Baker"]
   spec.email         = ["dosman711@gmail.com"]
   spec.description   = %q{A Reddit handler for Lita.}
@@ -15,7 +15,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "lita", ">= 4.2"
-  spec.add_runtime_dependency "redd"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-reddit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Chris Baker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: redd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement