rubydium 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06454492015a165a13f48b512e35f28d01c23d971f2e747a63db539f99a74dba'
-  data.tar.gz: 992290fd34805a84438d848067e2281b13d6542e80671160bbf46f8699cdb353
+  metadata.gz: ac65f322ea7e39ffe45816fa3c6bca190d5b54cf9b9df4a924812cb75149cbef
+  data.tar.gz: 67adfbef15a582969df215dd3d1dce9ff3d64f72eccc6a1047451dcbb343b9a5
 SHA512:
-  metadata.gz: ce02e7b72e9459d4fa11deb91a26a40e8987831e6169019f5c6376796effda5207dfff30ea6216b8f481439665a89987708d368109233fe0e07d46236ace3d12
-  data.tar.gz: 2bb0b1579d55d817779ede9f4a672517a9630f2a84274901018b9d31286cf44541dc3b777cf0377ef482dca68f99bea5ce51ad0113b224a7491fa7cf3fd37cec
+  metadata.gz: 07fb47c76b5ea68fb15c0941bc9258dca98b97ec93efc672b42ccbb00f1a776de79c91255c4f44fa23e7b4a68b2632409b4f4c3c9e72d9f6474b48297677323d
+  data.tar.gz: 1e58b30bd79d21a8ce3c3dce06d3c40a57e1cb43f08f61ea17e321d3b8cbbb5b61f3f7701b045991a51e439061e01f4b6bb32ad61c644b53505306f66b539963

data/lib/rubydium/bot.rb

@@ -43,7 +43,7 @@ module Rubydium
       @user = @msg.from
       @chat = @msg.chat
       @topic_id = @msg.message_thread_id if @chat.is_forum
-      @replies_to = @msg.reply_to_message unless @msg.reply_to_message.id == @topic_id
+      @replies_to = @msg.reply_to_message unless @msg.reply_to_message&.message_id == @topic_id
       @target = @replies_to&.from
       @text = @msg.text.to_s
       @message_id = @msg.message_id

data/lib/rubydium/mixins/message_sending.rb

@@ -4,13 +4,38 @@ module Rubydium
   module Mixins
     # Shorthand methods for sending messages in different ways.
     module MessageSending
-      def send_message(text, **kwargs)
+      MAX_MESSAGE_SIZE = 4096
+
+      def chunks(string, size)
+        (string.length / size.to_f).ceil.times.map { |i| string[i * size, size] }
+      end
+
+      def send_message(text, split: false **kwargs)
+        return send_many_messages(text, **kwargs) if split
+
         @api.send_message(
           chat_id: @chat.id,
           message_thread_id: @topic_id,
-          text: text,
+          text: chunk,
           **kwargs
         )
+      rescue Telegram::Bot::Exceptions::ResponseError => e
+        data = e.send(:data)
+        raise e unless data["error_code"] == 429
+
+        retry_after = data.dig("parameters", "retry_after")
+        raise e unless retry_after && retry_after > 0
+
+        sleep retry_after
+        retry
+      end
+
+      def send_many_messages(text, **kwargs)
+        text_chunks = chunks(text, MAX_MESSAGE_SIZE)
+
+        text_chunks.map do |chunk|
+          send_message(text, **kwargs)
+        end
       end
 
       def send_sticker(sticker, action: nil, **kwargs)
@@ -63,9 +88,7 @@ module Rubydium
       end
 
       def reply(text, **args)
-        @api.send_message(
-          chat_id: @chat.id,
-          message_thread_id: @topic_id,
+        send_message(
           reply_to_message_id: @message_id,
           text: text,
           **args
@@ -77,9 +100,7 @@ module Rubydium
       end
 
       def reply_to_target(text)
-        @api.send_message(
-          chat_id: @chat.id,
-          message_thread_id: @topic_id,
+        send_message(
           reply_to_message_id: @replies_to.message_id,
           text: text
         )

data/lib/rubydium/mixins/other_actions.rb

@@ -1,11 +1,17 @@
 module Rubydium
   module Mixins
     module OtherActions
-      def safe_delete(message)
-        return false unless (message = definitely_message(message))
-        return false unless bot_can_delete_messages? || message&.from&.id == config.bot_id
+      def safe_delete(maybe_message)
+        message = definitely_message(maybe_message)
+        return false unless message&.from&.id == config.bot_id # also returns if it's nil
 
-        result = @api.delete_message(chat_id: @chat.id, message_id: message.message_id)
+        safe_delete_by_id(message.id)
+      end
+
+      def safe_delete_by_id(id)
+        return false unless bot_can_delete_messages?
+
+        result = @api.delete_message(chat_id: @chat.id, message_id: id)
         result["ok"]
       rescue Telegram::Bot::Exceptions::ResponseError
         false

data/lib/rubydium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubydium
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydium
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - bulgakke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-17 00:00:00.000000000 Z
+date: 2023-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: telegram-bot-ruby