chat_sdk-telegram 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60abf34d37d9ea64b17959fb9a53264cc3d1ab67407cd1b05e4c5ece105137a0
-  data.tar.gz: 9e41b3269dc1116e2bc7169b146770337e8f9bbb6020b85f7f36c575828cf678
+  metadata.gz: 8a2c77efea728df0e0f77552d2d709d7824f653e2137ae88678ddd7baa6b2415
+  data.tar.gz: 51854b5c55aacf5504e16a70e0f5120e188800572cd4da6eecc5bbd4ec205e28
 SHA512:
-  metadata.gz: 6dc0d5c433b711162a3a5cb8e66e0604686f254bafe906a8c7a11cebc0d4526d9427800e50a752cbc55ba95e77714d66ba7c4a7accb5f43e7732f86db68f1ac2
-  data.tar.gz: 9843eee8e48fab1a345487035beac68a014bc558e343346dc1cfe6a170f7799b9170f9cff2e10d9bc8fdb738c4cc73fa118731558508baf8970509e54aeea3e2
+  metadata.gz: d222b99e2557c94c16465cff57e2858fb9aba5eda536446fee542502539414f76e9a55485b4706f5c8cedee6662325c7eb20c49e91059a37f67bc5a6a47c4de2
+  data.tar.gz: af031c32d6518ac316888941ebc34a216ad05ec3d847cbdee2a3e9cd7418d66157213a59cf0d29616f99c719990a3cb04aadfa441d8d94df3ed163ec7cd18090

data/lib/chat_sdk/telegram/adapter.rb

@@ -6,14 +6,21 @@ module ChatSDK
   module Telegram
     class Adapter < ChatSDK::Adapter::Base
       capabilities :edit_messages, :delete_messages, :reactions, :file_uploads,
-        :typing_indicator, :streaming_edit, :direct_messages
+        :typing_indicator, :streaming_edit, :direct_messages, :replies
 
       attr_reader :client
 
-      def initialize(bot_token: nil, secret_token: nil, bot_username: nil)
+      def initialize(bot_token: nil, secret_token: nil, bot_username: nil, allowed_user_ids: nil, allow_unverified_webhooks: nil)
         @bot_token = bot_token || ENV["TELEGRAM_BOT_TOKEN"]
         @secret_token = secret_token || ENV["TELEGRAM_WEBHOOK_SECRET_TOKEN"]
         @bot_username = bot_username || ENV["TELEGRAM_BOT_USERNAME"]
+        configured_user_ids = allowed_user_ids || ENV["TELEGRAM_ALLOWED_USER_IDS"]&.split(",")
+        @allowed_user_ids = configured_user_ids&.map(&:to_s)&.to_set
+        @allow_unverified_webhooks = if allow_unverified_webhooks.nil?
+          ENV["TELEGRAM_ALLOW_UNVERIFIED_WEBHOOKS"] == "true"
+        else
+          allow_unverified_webhooks
+        end
 
         raise ChatSDK::ConfigurationError, "Telegram bot_token required" unless @bot_token
 
@@ -27,7 +34,12 @@ module ChatSDK
 
       # Inbound
       def verify_request!(rack_request)
-        return true unless @secret_token
+        return true if !@secret_token && @allow_unverified_webhooks
+
+        unless @secret_token
+          raise ChatSDK::SignatureVerificationError,
+            "Telegram secret_token required; set allow_unverified_webhooks: true to explicitly disable verification"
+        end
 
         header_token = rack_request.get_header("HTTP_X_TELEGRAM_BOT_API_SECRET_TOKEN")
 
@@ -48,6 +60,8 @@ module ChatSDK
 
       def parse_events(rack_request)
         payload = read_json_body(rack_request)
+        return [] unless allowed_user?(payload)
+
         EventParser.parse(payload, bot_username: @bot_username)
       rescue JSON::ParserError
         []
@@ -67,6 +81,18 @@ module ChatSDK
         parse_telegram_message(result, channel_id)
       end
 
+      def reply_message(channel_id:, message_id:, message:, thread_id: nil)
+        text, reply_markup = prepare_message_payload(message)
+        result = @client.send_message(
+          chat_id: channel_id,
+          text: text,
+          reply_markup: reply_markup,
+          reply_to_message_id: message_id
+        )
+
+        parse_telegram_message(result, channel_id)
+      end
+
       def edit_message(channel_id:, message_id:, message:)
         text, reply_markup = prepare_message_payload(message)
 
@@ -150,6 +176,8 @@ module ChatSDK
           updates = updates.is_a?(Array) ? updates : []
           updates.each do |update|
             offset = update["update_id"] + 1
+            next unless allowed_user?(update)
+
             events = EventParser.parse(update, bot_username: @bot_username)
             events.each { |event| block.call(event) }
           end
@@ -158,6 +186,18 @@ module ChatSDK
 
       private
 
+      def allowed_user?(payload)
+        return true unless @allowed_user_ids
+
+        user_id = payload.dig("callback_query", "from", "id") ||
+          payload.dig("message_reaction", "user", "id") ||
+          payload.dig("message", "from", "id") ||
+          payload.dig("edited_message", "from", "id") ||
+          payload.dig("channel_post", "from", "id") ||
+          payload.dig("edited_channel_post", "from", "id")
+        user_id && @allowed_user_ids.include?(user_id.to_s)
+      end
+
       def prepare_message_payload(message)
         msg = ChatSDK::PostableMessage.from(message)
         text = msg.text || msg.card&.fallback_text || ""

data/lib/chat_sdk/telegram/event_parser.rb

@@ -36,6 +36,7 @@ module ChatSDK
             thread_id: thread_id,
             channel_id: chat_id,
             platform: :telegram,
+            reply_to: build_reply_to(message["reply_to_message"], chat_id),
             raw: message
           )
 
@@ -145,7 +146,28 @@ module ChatSDK
         def mention?(text, bot_username)
           return false unless bot_username
 
-          text.include?("@#{bot_username}")
+          /(?<!\w)@#{Regexp.escape(bot_username)}(?![\w-])/i.match?(text)
+        end
+
+        def build_reply_to(reply, chat_id)
+          return unless reply
+
+          user = extract_user(reply)
+          ChatSDK::Message.new(
+            id: reply["message_id"]&.to_s,
+            text: reply["text"] || reply["caption"] || "",
+            author: ChatSDK::Author.new(
+              id: user[:id],
+              name: user[:name],
+              platform: :telegram,
+              bot: !!reply.dig("from", "is_bot"),
+              locale: user[:locale]
+            ),
+            thread_id: resolve_thread_id(reply),
+            channel_id: chat_id,
+            platform: :telegram,
+            raw: reply
+          )
         end
 
         def parse_bot_command(message, user, chat_id, thread_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-telegram
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Quentin Rousseau