reddit-to-telegram 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c7b26fa99c0cd58ee1e6bc13e4bc357d20aa30c3efbc4ca1df02a75948afbc
-  data.tar.gz: '00183a34218ed5e32012af4b7614438bec200ecf1443cb3a5f4db649aa8dac19'
+  metadata.gz: cf7cd73ace4a26347b3bdca75b782e28d635617d2952d33cf39ef7ee015a64cf
+  data.tar.gz: b1bee46a1cf4f490b58258d321e4e6949c393c0d116a5be638b34feadf85b713
 SHA512:
-  metadata.gz: 1f5a3a2c3d03f37ff932245225e84c7ffd35c79051db95816598323456e95fa88ab710f66f1b01e9927b897db4df2227cc1a44673431e0eee655be8f5bde897a
-  data.tar.gz: 43a98d11dc600a57ede04ff2d6279373a3965be64b27084d761e9ffc3f943f4e94147e0f0293504d33ad6ae857ef4cb117f1a0c53964157b533f4240efe62d63
+  metadata.gz: 073d10eb8a45293ed6aa3c8b6779f50965655accfc234cd89ea43c628f71c93448835457c220fcafa20a17e7ef517f61389a102c1c2dca031e853751d62bbe01
+  data.tar.gz: e53497c36c061d3ba2758e3dddb97c358d2a62bc8c2469ac2417da83991e0675718b1109ff25f2daa61403aaf6c26757aa49aee89e5de7b1af1d89dd402bfa24

data/.rubocop.yml

@@ -1,6 +1,9 @@
 Metrics/MethodLength:
   Max: 20
 
+Naming/VariableNumber:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/README.md

@@ -4,7 +4,7 @@
 
 #### Fetches hot posts from chosen subreddits and pushes them to Telegram channels.
 
-Beware, this is remotely not production-ready, you'll see lots of bugs and it may break at any time.
+Beware, this is remotely not production-ready, API will change, you'll see lots of bugs and it may break at any time.
 Be sure to check for gem updates.
 
 ## Installation
@@ -14,12 +14,12 @@ gem "reddit-to-telegram"
 ```
 Then run `bundle install`.
 
-Or `gem install reddit-to-telegram`, but don't forget to `require` it first then.
+Or `gem install reddit-to-telegram`. Don't forget to `require` it.
 
 ## Prerequisites
-- You need an AWS account to host a free SimpleDB (memory and local file storage options are available, but no way to switch for now)
-- (Optionally) Create a Reddit app, which would allow more requests to reddit
-- [Obtain](https://core.telegram.org/bots/tutorial#obtain-your-bot-token) a telegram bot token
+- (Optionally) You'll need an [AWS account](https://aws.amazon.com/) to host a free SimpleDB (best available storage type, also default one). I also recommend hosting the bot on AWS lambda, since it would be free.
+- (Optionally) [Create a Reddit app](https://www.reddit.com/prefs/apps), which would allow more requests to reddit
+- [Obtain a telegram bot token](https://core.telegram.org/bots/tutorial#obtain-your-bot-token)
 
 To run it, you'll need some env variables set.
 ```
@@ -45,12 +45,19 @@ Check out `lib/variables` for list of all available variables.
 ## Usage
 
 1. Add the bot as administrator to Telegram channels you'd like to post to.
-2.
+2a. To fetch latest hot post which hasn't been pushed yet:
 ```
-RedditToTelegram.post(
+RedditToTelegram.hot(
     subreddit_name_1: :telegram_channel_id_1,
     subreddit_name_2: :telegram_channel_id_2
   )
-
+```
+2b. To push one specific post:
+```
+RedditToTelegram.single("regular_link_to_post", :telegram_channel_id)
 ```
 Use `:telegram_channel_id` without the `@`.
+
+## Planned features
+- Upload Imgur gifv links as videos/gifs
+- Error handling

data/lib/reddit-to-telegram.rb

@@ -1,39 +1,20 @@
 # frozen_string_literal: true
 
-require "pry"
-
-require_relative "reddit_to_telegram/reddit/fetch"
-require_relative "reddit_to_telegram/store"
-require_relative "reddit_to_telegram/telegram/post"
+require_relative "reddit_to_telegram/post"
 require_relative "reddit_to_telegram/version"
 
 module RedditToTelegram
   class << self
-    def post(sources)
-      return if sources.empty?
-
-      Store.setup
-
-      sources.each do |subreddit, telegram_chat_id|
-        res = Reddit::Fetch.hot(subreddit)
-        handle_res(res, subreddit, telegram_chat_id)
-      end
-    end
-
-    private
-
-    def handle_res(res, subreddit, telegram_chat_id)
-      return if res.nil?
+    extend Forwardable
 
-      post = find_new_post(subreddit, res)
-      return if post.nil?
+    def_delegators :post, :hot, :single
 
-      Telegram::Post.push(post, telegram_chat_id)
-      Store::Posts.add(subreddit, post[:id])
+    def post
+      Post
     end
 
-    def find_new_post(subreddit, posts)
-      posts.find { |post| !Store::Posts.dup?(subreddit, post[:id]) }
+    def version
+      VERSION
     end
   end
 end

data/lib/reddit_to_telegram/post.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative "reddit/fetch"
+require_relative "store"
+require_relative "telegram/post"
+require_relative "variables"
+
+module RedditToTelegram
+  class Post
+    class << self
+      def hot(sources)
+        return if sources.empty?
+
+        Store.setup
+
+        sources.each do |subreddit, telegram_chat_id|
+          res = Reddit::Fetch.hot(subreddit)
+          handle_res(res, subreddit, telegram_chat_id)
+        end
+      end
+
+      def single(link, telegram_chat_id)
+        return if link.empty?
+
+        Variables.store.type = :memory
+        Store.setup
+
+        res = Reddit::Fetch.post(link)
+        Telegram::Post.push(res, telegram_chat_id)
+      end
+
+      private
+
+      def handle_res(res, subreddit, telegram_chat_id)
+        return if res.nil?
+
+        post = find_new_post(subreddit, res)
+        return if post.nil?
+
+        Telegram::Post.push(post, telegram_chat_id)
+        Store::Posts.add(subreddit, post[:id])
+      end
+
+      def find_new_post(subreddit, posts)
+        posts.find { |post| !Store::Posts.dup?(subreddit, post[:id]) }
+      end
+    end
+  end
+end

data/lib/reddit_to_telegram/reddit/fetch.rb

@@ -12,7 +12,9 @@ module RedditToTelegram
       include HTTParty
 
       BASE_URI = "https://oauth.reddit.com/r"
-      QUERY = { g: "GLOBAL", limit: Variables.store.max_stored_posts }.freeze
+      WEBSITE_URI = "https://www.reddit.com/r"
+      QUERY_FOR_POST = { g: "GLOBAL" }.freeze
+      QUERY_FOR_SUBREDDIT = QUERY_FOR_POST.merge(limit: Variables.store.max_stored_posts).freeze
       BASE_HEADERS = {
         "Content-Type" => "application/json",
         "Accept" => "application/json"
@@ -23,26 +25,50 @@ module RedditToTelegram
           headers = BASE_HEADERS.merge("Authorization" => "Bearer #{Store::Reddit.token}")
           res = HTTParty.get(
             "#{BASE_URI}/#{subreddit}/hot.json",
-            query: QUERY,
+            query: QUERY_FOR_SUBREDDIT,
             headers:
           )
-          handle_response(res, subreddit, retries_left)
+          handle_response(res, hot: [subreddit, retries_left])
+        end
+
+        def post(link, retries_left = 5)
+          headers = BASE_HEADERS.merge("Authorization" => "Bearer #{Store::Reddit.token}")
+          res = HTTParty.get(
+            "#{link.gsub('www', 'oauth')}.json",
+            query: QUERY_FOR_POST,
+            headers:
+          )
+          handle_response(res, post: retries_left)
         end
 
         private
 
-        def handle_response(res, subreddit, retries_left)
+        def handle_response(res, func)
+          func_name = func.keys.first
+          func_args = Array(func.values.first)
+
           case res.code
           when 401
-            Store::Reddit.token = Auth.token
-            hot(subreddit, retries_left) if retries_left > 0
+            handle_401(func_name, func_args)
           when 429
-            sleep(10 / retries_left) if retries_left > 0
-            hot(subreddit, retries_left - 1) if retries_left > 0
+            handle_429(func_name, func_args)
           when 200
             Output.format_response(res)
           end
         end
+
+        def handle_401(func_name, func_args)
+          Store::Reddit.token = Auth.token
+          send(func_name, *func_args) if func_args.last > 0
+        end
+
+        def handle_429(func_name, func_args)
+          retries_left = func_args.last
+
+          sleep(10 / retries_left) if retries_left > 0
+          func_args[func_args.length - 1] = retries_left - 1
+          send(func_name, *func_args) if retries_left > 0
+        end
       end
     end
   end

data/lib/reddit_to_telegram/reddit/output.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require "cgi"
+
 module RedditToTelegram
   module Reddit
     class Output
       class << self
         def format_response(res)
+          return format_post(res[0]["data"]["children"][0]) if single_post?(res)
+
           posts = res["data"]["children"]
           posts.reject! { |post| post["data"]["stickied"] == true }
           posts.map { |post| format_post(post) }.compact
@@ -12,6 +16,10 @@ module RedditToTelegram
 
         private
 
+        def single_post?(res)
+          res.parsed_response.is_a?(Array) && res[0]["data"]["dist"] == 1
+        end
+
         def format_post(post)
           data = post["data"]
           if data["post_hint"] == "image"
@@ -61,7 +69,9 @@ module RedditToTelegram
               type: :video,
               media: video_url,
               misc: {
-                binary: video_data["has_audio"] || false
+                binary: video_data["has_audio"] || false,
+                video_height: video_data["height"],
+                video_width: video_data["width"]
               }
             }
           )
@@ -69,12 +79,14 @@ module RedditToTelegram
 
         def base_post_format_attrs(data)
           { id: data["name"],
-            text: data["title"] }
+            text: CGI.unescapeHTML(data["title"]) }
         end
 
         def prepare_gallery_links(data)
-          data["media_metadata"].map do |image|
-            image[1]["p"][0]["u"].split("?").first.gsub("preview", "i")
+          data["gallery_data"]["items"].map do |image|
+            data["media_metadata"].find do |key, _|
+              key == image["media_id"]
+            end[1]["s"]["u"].split("?").first.gsub("preview", "i")
           end
         end
       end

data/lib/reddit_to_telegram/telegram/prepare_request.rb

@@ -15,7 +15,13 @@ module RedditToTelegram
           when :text
             { chat_id: "@#{chat_id}", text: prepare_text(post, chat_id) }
           when :video
-            { chat_id: "@#{chat_id}", video: prepare_video(post), caption: prepare_text(post, chat_id) }
+            {
+              chat_id: "@#{chat_id}",
+              video: prepare_video(post),
+              height: post[:misc][:video_height],
+              width: post[:misc][:video_width],
+              caption: prepare_text(post, chat_id)
+            }
           end
         end
 

data/lib/reddit_to_telegram/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedditToTelegram
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit-to-telegram
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Tityuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-simpledb
@@ -66,6 +66,7 @@ files:
 - README.md
 - lib/reddit-to-telegram.rb
 - lib/reddit_to_telegram/errors.rb
+- lib/reddit_to_telegram/post.rb
 - lib/reddit_to_telegram/reddit/auth.rb
 - lib/reddit_to_telegram/reddit/fetch.rb
 - lib/reddit_to_telegram/reddit/output.rb