reddit-to-telegram 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7cd73ace4a26347b3bdca75b782e28d635617d2952d33cf39ef7ee015a64cf
-  data.tar.gz: b1bee46a1cf4f490b58258d321e4e6949c393c0d116a5be638b34feadf85b713
+  metadata.gz: 81b0c79fce533367384f2a5bce697b0fafa0e914f772ce23e7ac903aeeec1577
+  data.tar.gz: aac0c0448ab4964df36acf62819e2c73e1d7f90d750091fa88b43a1605612580
 SHA512:
-  metadata.gz: 073d10eb8a45293ed6aa3c8b6779f50965655accfc234cd89ea43c628f71c93448835457c220fcafa20a17e7ef517f61389a102c1c2dca031e853751d62bbe01
-  data.tar.gz: e53497c36c061d3ba2758e3dddb97c358d2a62bc8c2469ac2417da83991e0675718b1109ff25f2daa61403aaf6c26757aa49aee89e5de7b1af1d89dd402bfa24
+  metadata.gz: 1b0f0c32452b4784a50ed4f0557bf1347d84e0fb3f0bc6ba6af1baa0c2426f066283ad9c0a30f22e1232462c2aa2e45f44e637e942208548130152bf5611d081
+  data.tar.gz: 54807fe38f1a4f03e6baff998dc517b1fd3835f435837e75e1ca23809df7b5edef768106a4477f43f9490af63d3df280273e420c153004760e7f19680856aa8b

data/.rubocop.yml

@@ -18,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

@@ -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,19 +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.
-2a. To fetch latest hot post which hasn't been pushed yet:
+2. To fetch latest hot post which hasn't been pushed yet:
 ```
 RedditToTelegram.hot(
     subreddit_name_1: :telegram_channel_id_1,
     subreddit_name_2: :telegram_channel_id_2
   )
 ```
-2b. To push one specific post:
+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 `@`.
-
-## Planned features
-- Upload Imgur gifv links as videos/gifs
-- Error handling

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

@@ -37,8 +37,9 @@ module RedditToTelegram
         post = find_new_post(subreddit, res)
         return if post.nil?
 
-        Telegram::Post.push(post, telegram_chat_id)
+        res = Telegram::Post.push(post, telegram_chat_id)
         Store::Posts.add(subreddit, post[:id])
+        res
       end
 
       def find_new_post(subreddit, posts)

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,6 +1,7 @@
 # frozen_string_literal: true
 
 require "cgi"
+require_relative "output/imgur"
 
 module RedditToTelegram
   module Reddit
@@ -41,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']}" }

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/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.4.0"
+  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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Tityuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-simpledb
@@ -70,6 +70,7 @@ files:
 - 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