reddit-to-telegram 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecdbf9518073fb5abee3426d73fd77d6b13348402f5d5956e0016af2b0caad17
-  data.tar.gz: fb2f9c1c27460bd39155056e18fd82014fc351493b8ea7c3e9fe8d96aa2c9bd3
+  metadata.gz: '08430693bae08f13ed579d54b5647c7a08e2f41cc9b56d5f5b81de3c2a6ae843'
+  data.tar.gz: 6e84d4876a8168ba5a7eee55b00e65529487f45a06bccc7df421a0579af3859c
 SHA512:
-  metadata.gz: 20b41766ff2cc135d314299275617faa21374064cf3fa3ce583ac39c595ef6008a84d4267514be0e020fdce89cb8f98cb191d211d8cefe8b551e4f941afffb32
-  data.tar.gz: 5743d4057fc405dcf43758b53fe4e6de1cfda2758af603e9a3eeea9cafa070ebf98e1835f2b710d5a44f4d674956b289a6e47bed7ce3204abb1e3d0d8ad9c74c
+  metadata.gz: ee7c43b1db322d243a46f555821f13d81fbdf2651fa9af8ee949bf44dacc6225dd2b63762643b5fbc3008f59985d4d1f100e883aa2bec4d4acc9c18375d8f721
+  data.tar.gz: 39b4de9770189c74240f77c8dc07be38ede2f656e9d385afbd0ee221d87c6bd1d90c482f3d8345ae74d985f39deb1a3fc4d87f8bda6218fb9bbf7bb359f7cb08

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Mark Tityuk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -22,19 +22,20 @@ Or `gem install reddit-to-telegram`. Don't forget to `require` it.
 - [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.
-| Variable Name | Description | Required |
-| ------------- | ----------- | -------- |
-| RTT_AWS_ACCESS_KEY_ID     | Your AWS access key ID. Needed for AWS SimpleDB storage                                                                                                                       | No  |
-| RTT_AWS_DOMAIN_NAME       | Domain name to use for SimpleDB                                                                                                                                               | No  |
-| RTT_AWS_REGION            | AWS region your SimpleDB will be hosted on. Beware, it's not available in all regions.                                                                                        | No  |
-| RTT_AWS_SECRET_ACCESS_KEY | Your AWS access key ID. Needed for AWS SimpleDB storage.                                                                                                                      | No  |
-| RTT_GOOGLE_API_KEY        | Your Google API key to translate posts via Google Translate.                                                                                                                  | No  |
-| RTT_MAX_STORED_POSTS      | Number of posts to store in the database to avoid duplicates, default is 25.                                                                                                  | No  |
-| RTT_REDDIT_CLIENT_ID      | Reddit app credentials to access API. Reddit allows more authenticated requests.                                                                                              | No  |
-| RTT_REDDIT_CLIENT_SECRET  | Reddit app credentials to access API. Reddit allows more authenticated requests.                                                                                              | No  |
-| RTT_STORE_TYPE            | 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 choose another store type. | No  |
-| RTT_TELEGRAM_BOT_TOKEN    | The token you've received when you've created a telegram bot.                                                                                                                 | Yes |
-| RTT_TEMP_DIR              | Directory to write temp files to without trailing `/`                                                                                                                         | No  |
+| Variable Name                 | Description                                                                                                                                                                   | Required |
+| -------------                 | -----------                                                                                                                                                                   | -------- |
+| RTT_AWS_ACCESS_KEY_ID         | Your AWS access key ID. Needed for AWS SimpleDB storage                                                                                                                       | No       |
+| RTT_AWS_DOMAIN_NAME           | Domain name to use for SimpleDB                                                                                                                                               | No       |
+| RTT_AWS_REGION                | AWS region your SimpleDB will be hosted on. Beware, it's not available in all regions.                                                                                        | No       |
+| RTT_AWS_SECRET_ACCESS_KEY     | Your AWS access key ID. Needed for AWS SimpleDB storage.                                                                                                                      | No       |
+| RTT_GOOGLE_API_KEY            | Your Google API key to translate posts via Google Translate.                                                                                                                  | No       |
+| RTT_MAX_STORED_POSTS          | Number of posts to store in the database to avoid duplicates, default is 25.                                                                                                  | No       |
+| RTT_REDDIT_CLIENT_ID          | Reddit app credentials to access API. Reddit allows more authenticated requests.                                                                                              | No       |
+| RTT_REDDIT_CLIENT_SECRET      | Reddit app credentials to access API. Reddit allows more authenticated requests.                                                                                              | No       |
+| RTT_STORE_TYPE                | 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 choose another store type. | No       |
+| RTT_TELEGRAM_BOT_TOKEN        | The token you've received when you've created a telegram bot.                                                                                                                 | Yes      |
+| RTT_TELEGRAM_ERROR_CHANNEL_ID | Telegram channel to send errors to (without `@`, only errors from Telegram API responses would be sent for now)                                                               | No       |
+| RTT_TEMP_DIR                  | Directory to write temp files to without trailing `/`                                                                                                                         | No       |
 
 
 You can also set them dynamically:

data/lib/reddit_to_telegram/reddit/output.rb

@@ -35,8 +35,10 @@ module RedditToTelegram
         end
 
         def format_image_post(data)
+          post_type = data["url"]&.split(".")&.last == "gif" ? :gif : :image
+
           base_post_format_attrs(data).merge(
-            { type: :image,
+            { type: post_type,
               media: data["url"] }
           )
         end
@@ -52,10 +54,17 @@ module RedditToTelegram
         end
 
         def format_gallery_post(data)
-          base_post_format_attrs(data).merge(
-            { type: :gallery,
-              media: prepare_gallery_links(data) }
-          )
+          gallery_links = prepare_gallery_links(data)
+
+          gallery_attrs = {
+            type: :gallery,
+            media: gallery_links.first(10)
+          }
+
+          remaining_links = gallery_links.drop(10)
+          gallery_attrs[:additional_media] = remaining_links unless remaining_links.empty?
+
+          base_post_format_attrs(data).merge(gallery_attrs)
         end
 
         def format_video_post(data)

data/lib/reddit_to_telegram/telegram/post/gallery.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require_relative "../post"
+
+module RedditToTelegram
+  module Telegram
+    class Post
+      class Gallery
+        class << self
+          def push_remaining_gallery_data(post, channel, res, opts = {})
+            if post[:additional_media]
+              push_remaining_gallery_images(post, channel, opts)
+            else
+              push_gallery_caption(post, channel, res, opts)
+            end
+          end
+
+          private
+
+          def push_remaining_gallery_images(post, channel,opts = {})
+            post[:media] = post[:additional_media].first(10)
+            remaining = post.delete(:additional_media).drop(10)
+            post[:additional_media] = remaining unless remaining.empty?
+            Post.push(post, channel, opts)
+          end
+
+          def push_gallery_caption(post, channel, res, opts = {})
+            Post.push(
+              { type: :text,
+                id: post[:id],
+                text: post[:text] },
+              channel,
+              opts.merge(gallery_caption_opts(res, opts))
+            )
+          end
+
+          def gallery_caption_opts(res)
+            gallery_caption_options = { disable_link_preview: true }
+            reply_to = res.dig("result", 0, "message_id")
+            return gallery_caption_options if reply_to.nil?
+
+            gallery_caption_options[:reply_to] = reply_to
+            gallery_caption_options
+          end
+        end
+      end
+    end
+  end
+end

data/lib/reddit_to_telegram/telegram/post.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "httparty"
+require_relative "post/gallery"
 require_relative "prepare_request"
 require_relative "video"
 require_relative "../variables"
@@ -16,6 +17,7 @@ module RedditToTelegram
       METHOD_MAP = {
         image: :photo,
         gallery: :mediagroup,
+        gif: :animation,
         text: :message,
         video: :video
       }.freeze
@@ -27,9 +29,7 @@ module RedditToTelegram
             **params(post, channel, opts)
           )
 
-          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
+          handle_response(post, channel, res, opts)
         end
 
         private
@@ -45,6 +45,31 @@ module RedditToTelegram
           pars[:multipart] = true if binary
           pars
         end
+
+        def handle_response(post, channel, res, opts = {})
+          push_error(post, channel, res, opts) unless res["ok"] || opts[:no_retry]
+          Gallery.push_remaining_gallery_data(post, channel, res, opts) if post[:type] == :gallery
+          Video.delete_file if post[:type] == :video && post.dig(:misc)&.dig(:binary)
+          res
+        end
+
+        def push_error(post, channel, res, opts = {})
+          return if Variables.telegram.error_channel_id.to_s.empty?
+
+          push(
+            {
+              type: :text,
+              id: post[:id],
+              text: "Channel: @#{channel}\n\nResponse: #{res}"
+            },
+            Variables.telegram.error_channel_id,
+            opts.merge(
+              add_reddit_link: true,
+              disable_link_preview: true,
+              no_retry: true
+            )
+          )
+        end
       end
     end
   end

data/lib/reddit_to_telegram/telegram/prepare_request.rb

@@ -8,11 +8,22 @@ module RedditToTelegram
     class PrepareRequest
       class << self
         def body(post, chat_id, opts = {})
+          body = prepare_body(post, chat_id, opts)
+          body[:link_preview_options] = { is_disabled: true } if opts[:disable_link_preview]
+          body[:reply_parameters] = { message_id: opts[:reply_to] } if opts[:reply_to]
+          body
+        end
+
+        private
+
+        def prepare_body(post, chat_id, opts = {})
           case post[:type]
           when :image
             { chat_id: "@#{chat_id}", photo: post[:media], caption: prepare_text(post, chat_id, opts) }
           when :gallery
             { chat_id: "@#{chat_id}", media: prepare_gallery_media(post), caption: prepare_text(post, chat_id, opts) }
+          when :gif
+            { chat_id: "@#{chat_id}", animation: post[:media], caption: prepare_text(post, chat_id, opts) }
           when :text
             { chat_id: "@#{chat_id}", text: prepare_text(post, chat_id, opts) }
           when :video
@@ -26,8 +37,6 @@ module RedditToTelegram
           end
         end
 
-        private
-
         def prepare_text(post, chat_id, opts = {})
           text = post[:text]
 

data/lib/reddit_to_telegram/variables.rb

@@ -104,11 +104,15 @@ module RedditToTelegram
 
     class Telegram
       class << self
-        attr_writer :bot_token
+        attr_writer :bot_token, :error_channel_id
 
         def bot_token
           @bot_token ||= ENV["RTT_TELEGRAM_BOT_TOKEN"]
         end
+
+        def error_channel_id
+          @error_channel_id ||= ENV["RTT_TELEGRAM_ERROR_CHANNEL_ID"]
+        end
       end
     end
   end

data/lib/reddit_to_telegram/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit-to-telegram
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Mark Tityuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-simpledb
@@ -63,6 +63,7 @@ files:
 - ".tool-versions"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - lib/reddit-to-telegram.rb
 - lib/reddit_to_telegram/errors.rb
@@ -77,6 +78,7 @@ files:
 - lib/reddit_to_telegram/store/memory.rb
 - lib/reddit_to_telegram/store/temp_file.rb
 - lib/reddit_to_telegram/telegram/post.rb
+- lib/reddit_to_telegram/telegram/post/gallery.rb
 - lib/reddit_to_telegram/telegram/prepare_request.rb
 - lib/reddit_to_telegram/telegram/video.rb
 - lib/reddit_to_telegram/variables.rb