reddit-to-telegram 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667847008d3eeff44d452a47a6bcc0737cef0c3ecb75554c01c8ea7104a87d49
-  data.tar.gz: 0e0a9e231c2dfe7c40c09511a4d7ec4a5cf82e759b3731473921d4c649ceb368
+  metadata.gz: '08430693bae08f13ed579d54b5647c7a08e2f41cc9b56d5f5b81de3c2a6ae843'
+  data.tar.gz: 6e84d4876a8168ba5a7eee55b00e65529487f45a06bccc7df421a0579af3859c
 SHA512:
-  metadata.gz: 472c7cfda620d8d19871204fed27fc117a84fec638ab4a7c53820c15e650d7752c7fd9ad34813fb3286424939f1e619914593373a8d12de20edabc4bc02e4b12
-  data.tar.gz: 1afd6608049236795ca77ee797d9b2c4f3ce811e9c7caed9688abb3b8639a8bb5108b77e3712cb2209ee8e6f1f12a70c4dbddcd7547e394a47026927fd8bf6fd
+  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/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
@@ -46,24 +48,11 @@ module RedditToTelegram
 
         def handle_response(post, channel, res, opts = {})
           push_error(post, channel, res, opts) unless res["ok"] || opts[:no_retry]
-          push_gallery_caption(post, channel, res, opts) if post[:type] == :gallery
+          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_gallery_caption(post, channel, res, opts = {})
-          push({ type: :text, id: post[:id], text: post[:text] }, channel, opts.merge(gallery_caption_opts(res)))
-        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
-
         def push_error(post, channel, res, opts = {})
           return if Variables.telegram.error_channel_id.to_s.empty?
 

data/lib/reddit_to_telegram/telegram/prepare_request.rb

@@ -22,6 +22,8 @@ module RedditToTelegram
             { 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

data/lib/reddit_to_telegram/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedditToTelegram
-  VERSION = "0.7.0"
+  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.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mark Tityuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-16 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