reddit-to-telegram 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e02f076f3c1b878452f2b871436a34c0b195fea3047f2e85dcb9c8af90a9205
-  data.tar.gz: 544ab98c2f0599d01429956f5ca0ffef0af593272c929f3652a10cfb3e4f1b6f
+  metadata.gz: 81b0c79fce533367384f2a5bce697b0fafa0e914f772ce23e7ac903aeeec1577
+  data.tar.gz: aac0c0448ab4964df36acf62819e2c73e1d7f90d750091fa88b43a1605612580
 SHA512:
-  metadata.gz: fdedc48421d1398506c6b4f1e0841e8173db20db22083e1a4861b8f0177eb40bd17091eb24728031ca04bb146e72a9682953637b302df58f8f561ee06eef3e1e
-  data.tar.gz: d1bc0f40dca38bc40d0180056b79f169d88082f1345961ebb89e86d0d521e10109cda6c7614edf110b7af16905f39dc53fe7c8fdc2615f1e0dd5511a25cf9e50
+  metadata.gz: 1b0f0c32452b4784a50ed4f0557bf1347d84e0fb3f0bc6ba6af1baa0c2426f066283ad9c0a30f22e1232462c2aa2e45f44e637e942208548130152bf5611d081
+  data.tar.gz: 54807fe38f1a4f03e6baff998dc517b1fd3835f435837e75e1ca23809df7b5edef768106a4477f43f9490af63d3df280273e420c153004760e7f19680856aa8b

data/.rubocop.yml

@@ -1,6 +1,9 @@
 Metrics/MethodLength:
   Max: 20
 
+Naming/VariableNumber:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 
@@ -15,3 +18,6 @@ Style/StringLiterals:
 
 Style/RaiseArgs:
   Enabled: false
+
+Style/RedundantRegexpEscape:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reddit-to-telegram (0.2.1)
+    reddit-to-telegram (0.5.0)
       aws-sdk-simpledb
       httparty
 

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
@@ -23,21 +23,21 @@ Or `gem install reddit-to-telegram`. Don't forget to `require` it.
 
 To run it, you'll need some env variables set.
 ```
-RTT_AWS_ACCESS_KEY_ID= # Your AWS access key ID. Needed for AWS SimpleDB storage.
+RTT_AWS_ACCESS_KEY_ID= # (Optional) Your AWS access key ID. Needed for AWS SimpleDB storage.
 RTT_AWS_DOMAIN_NAME= # (Optional) Domain name to use for SimpleDB
-RTT_AWS_REGION= # AWS region your SimpleDB will be hosted on. Beware, it's not available in all regions.
-RTT_AWS_SECRET_ACCESS_KEY= # Your AWS access key ID. Needed for AWS SimpleDB storage.
+RTT_AWS_REGION= # (Optional) AWS region your SimpleDB will be hosted on. Beware, it's not available in all regions.
+RTT_AWS_SECRET_ACCESS_KEY= # (Optional) Your AWS access key ID. Needed for AWS SimpleDB storage.
 RTT_MAX_STORED_POSTS= # (Optional) Number of posts to store in the database to avoid duplicates, default is 25.
 RTT_REDDIT_CLIENT_ID= # Reddit app credentials to access API. Might not be needed depending on setup, reddit allows some requests without authentication.
 RTT_REDDIT_CLIENT_SECRET= # Reddit app credentials to access API. Might not be needed depending on setup, reddit allows some requests without authentication.
-RTT_STORE_TYPE= # (Optional) Choose between aws_simple_db, memory or temp_file
+RTT_STORE_TYPE= # (Optional) Choose between aws_simple_db, memory or temp_file. Default is aws_simple_db, so if you're not specifying your AWS credentials, you have to specify another store type.
 RTT_TELEGRAM_BOT_TOKEN= # The token you've received when you've created a telegram bot.
 RTT_TEMP_DIR= (Optional) # Directory to write temp files to without trailing /
 ```
 
 You can also set them dynamically:
 ```
-RedditToTelegram::Variables.aws.aws_access_key_id =
+RedditToTelegram::Variables.aws.access_key_id =
 RedditToTelegram::Variables.telegram.bot_token =
 ```
 Check out `lib/variables` for list of all available variables.
@@ -45,12 +45,15 @@ 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.
+2. 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
   )
-
+```
+Or to push one specific post (the only thing you need to set up for this is your telegram bot token):
+```
+RedditToTelegram.single("regular_link_to_post", :telegram_channel_id)
 ```
 Use `:telegram_channel_id` without the `@`.

data/lib/reddit-to-telegram.rb

@@ -1,37 +1,20 @@
 # frozen_string_literal: true
 
-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?
+    extend Forwardable
 
-      Store.setup
+    def_delegators :post, :hot, :single
 
-      sources.each do |subreddit, telegram_chat_id|
-        res = Reddit::Fetch.hot(subreddit)
-        handle_res(res, subreddit, telegram_chat_id)
-      end
+    def post
+      Post
     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]) }
+    def version
+      VERSION
     end
   end
 end

data/lib/reddit_to_telegram/errors.rb

@@ -3,4 +3,5 @@
 module RedditToTelegram
   class RedditToTelegramError < StandardError; end
   class InvalidStoreType < RedditToTelegramError; end
+  class MissingVariables < RedditToTelegramError; end
 end

data/lib/reddit_to_telegram/post.rb

@@ -0,0 +1,50 @@
+# 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?
+
+        res = Telegram::Post.push(post, telegram_chat_id)
+        Store::Posts.add(subreddit, post[:id])
+        res
+      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/imgur.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module RedditToTelegram
+  module Reddit
+    class Output
+      class Imgur
+        class << self
+          def try_extract(data)
+            full_url = decode_imgur_url(data)
+            video_url = extract_video_url(full_url)
+            width = extract_video_width(full_url)
+            return if video_url.nil? || width.nil?
+
+            format_imgur_post(data, video_url, width)
+          end
+
+          private
+
+          def decode_imgur_url(data)
+            encoded_url = data
+                          .dig("media_embed", "content")
+                          &.match(/src=\"\S+schema=imgur\"/)&.to_s
+                          &.gsub(/src=\"|\"/, 'src=\"' => "", '\"' => "")
+            CGI.unescape(encoded_url)
+          end
+
+          def extract_video_url(full_url)
+            video_url_arr = full_url&.match(/image=(\S+\?|&)/)&.to_s&.send(:[], 6..-2)&.split(".")
+            return if Array(video_url_arr).empty?
+
+            video_url_arr[video_url_arr.length - 1] = "mp4"
+            video_url_arr.join(".")
+          end
+
+          def extract_video_width(full_url)
+            full_url&.match(/w=(\w+)/)&.to_s&.send(:[], 2..)
+          end
+
+          def format_imgur_post(data, video_url, width)
+            RedditToTelegram::Reddit::Output.send(
+              :base_post_format_attrs, data
+            ).merge(
+              {
+                type: :video,
+                media: video_url,
+                misc: {
+                  binary: false,
+                  video_width: width
+                }
+              }
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/reddit_to_telegram/reddit/output.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
+require "cgi"
+require_relative "output/imgur"
+
 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 +17,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"
@@ -33,6 +42,9 @@ module RedditToTelegram
         end
 
         def format_link_post(data)
+          res = Imgur.try_extract(data) if data["domain"] == "imgur.com"
+          return res unless res.nil?
+
           base_post_format_attrs(data).merge(
             { type: :text,
               text: "#{data['title']}\n\n#{data['url']}" }
@@ -61,7 +73,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 +83,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/store/aws_simple_db.rb

@@ -2,6 +2,7 @@
 
 require "aws-sdk-simpledb"
 require "json"
+require_relative "../errors"
 require_relative "../variables"
 
 module RedditToTelegram
@@ -23,10 +24,20 @@ module RedditToTelegram
         attr_reader :reddit_token
 
         def setup
+          check_credentials
           create_domain unless client.list_domains.domain_names.include?(Variables.aws.domain_name)
           read_db
         end
 
+        def check_credentials
+          return unless Variables.store.type == :aws_simple_db
+
+          return if Variables.aws.all_present?
+
+          raise(MissingVariables.new("Missing AWS credentials. "\
+            "Set them up or change store type to anything other than aws_simple_db"))
+        end
+
         def reddit_token=(val)
           @reddit_token = val
           write_db

data/lib/reddit_to_telegram/telegram/post.rb

@@ -22,13 +22,14 @@ module RedditToTelegram
 
       class << self
         def push(post, channel)
-          HTTParty.post(
+          res = HTTParty.post(
             "#{BASE_URI}#{Variables.telegram.bot_token}/send#{METHOD_MAP[post[:type]]}",
             **params(post, channel)
           )
 
           push({ type: :text, id: post[:id], text: post[:text] }, channel) if post[:type] == :gallery
           Video.delete_file if post[:type] == :video && post.dig(:misc)&.dig(:binary)
+          res
         end
 
         private

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/variables.rb

@@ -42,10 +42,11 @@ module RedditToTelegram
     end
 
     class AWS
+      ATTRS = %i[access_key_id secret_access_key region domain_name].freeze
       DEFAULT_DOMAIN_NAME = "reddit_to_telegram"
 
       class << self
-        attr_writer :access_key_id, :secret_access_key, :region, :domain_name
+        attr_writer(*ATTRS)
 
         def access_key_id
           @access_key_id ||= ENV["RTT_AWS_ACCESS_KEY_ID"]
@@ -62,6 +63,10 @@ module RedditToTelegram
         def domain_name
           @domain_name ||= ENV["RTT_AWS_DOMAIN_NAME"] || DEFAULT_DOMAIN_NAME
         end
+
+        def set_up?
+          ATTRS.all? { |a| !a.empty? }
+        end
       end
     end
 

data/lib/reddit_to_telegram/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit-to-telegram
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Tityuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-simpledb
@@ -66,9 +66,11 @@ 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
+- lib/reddit_to_telegram/reddit/output/imgur.rb
 - lib/reddit_to_telegram/store.rb
 - lib/reddit_to_telegram/store/aws_simple_db.rb
 - lib/reddit_to_telegram/store/memory.rb