mtproto 0.0.17 → 0.0.20

data/lib/mtproto/tl/objects/send_message.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'securerandom'
+require_relative '../message_entity'
 
 module MTProto
   module TL
@@ -8,36 +9,69 @@ module MTProto
       include Binary
 
       INPUT_REPLY_TO_MESSAGE = 0x3bd4b7c2
+      INPUT_RICH_MESSAGE_MARKDOWN = 0x004b572c
 
-      def initialize(peer:, message:, random_id: nil, reply_to: nil, reply_markup: nil, silent: false)
+      def initialize(peer:, message: '', random_id: nil, reply_to: nil, reply_markup: nil, silent: false,
+                     entities: nil, rich_markdown: nil, quote_text: nil, quote_offset: nil)
         @peer = peer
         @message = message
         @random_id = random_id || SecureRandom.random_number(2**63)
         @reply_to = reply_to
         @reply_markup = reply_markup
         @silent = silent
+        @entities = entities
+        @rich_markdown = rich_markdown
+        @quote_text = quote_text
+        @quote_offset = quote_offset
       end
 
       def serialize
         flags = 0
         flags |= (1 << 0) if @reply_to
         flags |= (1 << 2) if @reply_markup
+        flags |= (1 << 3) if entities?
         flags |= (1 << 5) if @silent
+        flags |= (1 << 23) if @rich_markdown # rich_message
 
         result = u32_b(Constructors::MESSAGES_SEND_MESSAGE)
         result += u32_b(flags)
         result += serialize_input_peer
         result += serialize_reply_to if @reply_to
-        result += serialize_tl_string(@message)
+        # Server-side rich markdown carries the whole message; the text field goes
+        # empty and no entities are sent (matches Telegram Desktop's sendRichMessage).
+        result += serialize_tl_string(@rich_markdown ? '' : @message)
         result += u64_b(@random_id)
         result += @reply_markup.serialize if @reply_markup
+        result += MessageEntities.serialize(@entities) if entities?
+        result += serialize_rich_markdown if @rich_markdown
         result
       end
 
       private
 
+      def entities?
+        @entities && !@entities.empty? && !@rich_markdown
+      end
+
+      # inputRichMessageMarkdown#004b572c flags:# rtl:flags.0?true noautolink:flags.1?true
+      # markdown:string files:flags.2?Vector<InputRichFile>. Text-only: flags=0, no files.
+      def serialize_rich_markdown
+        u32_b(INPUT_RICH_MESSAGE_MARKDOWN) + u32_b(0) + serialize_tl_string(@rich_markdown)
+      end
+
+      # inputReplyToMessage#3bd4b7c2 flags:# reply_to_msg_id:int quote_text:flags.2?string
+      # quote_offset:flags.4?int. A quote replies to @reply_to while pinning the exact
+      # fragment (@quote_text at @quote_offset in that message); Telegram validates the
+      # text against the original at the offset.
       def serialize_reply_to
-        u32_b(INPUT_REPLY_TO_MESSAGE) + u32_b(0) + u32_b(@reply_to)
+        flags = 0
+        flags |= (1 << 2) if @quote_text
+        flags |= (1 << 4) unless @quote_offset.nil?
+
+        result = u32_b(INPUT_REPLY_TO_MESSAGE) + u32_b(flags) + u32_b(@reply_to)
+        result += serialize_tl_string(@quote_text) if @quote_text
+        result += u32_b(@quote_offset) unless @quote_offset.nil?
+        result
       end
 
       def serialize_input_peer

data/lib/mtproto/tl/objects/update.rb

@@ -23,6 +23,21 @@ module MTProto
         end
       end
 
+      # Whether a top-level pushed message (as delivered to Client#on_update with
+      # its outer constructor and body) carries an updateLoginToken — the signal
+      # that a QR login token was scanned and accepted. Arrives bare or, in
+      # practice, wrapped in updateShort.
+      def self.login_token?(constructor, body)
+        case constructor
+        when Constructors::UPDATE_LOGIN_TOKEN
+          true
+        when Constructors::UPDATE_SHORT
+          UpdateShort.deserialize(body).update.type == 'login_token'
+        else
+          false
+        end
+      end
+
       class << self
         private
 

data/lib/mtproto/tl/reader.rb

@@ -41,21 +41,48 @@ module MTProto
         end
       end
 
-      # messageReplyHeader: ctor, flags, reply_to_msg_id:flags.4?int (first payload
-      # field). A plain message in a forum topic carries this header (forum_topic
-      # flags.3) but is a reply only when it targets a message in the topic
-      # (reply_to_top_id flags.1). => [reply_to_msg_id, is_reply]
+      # messageReplyHeader#1b97dd66: flags, then (in wire order) reply_to_msg_id
+      # flags.4?int, reply_to_peer_id flags.0?Peer, reply_from flags.5?MessageFwdHeader,
+      # reply_media flags.8?MessageMedia, reply_to_top_id flags.1?int, quote_text
+      # flags.6?string, quote_entities flags.7?Vector<MessageEntity>, quote_offset
+      # flags.10?int. A manual quote sets flags.9 and carries quote_text/offset — the
+      # fragment the user selected out of the replied-to message. The quote fields sit
+      # past the variable-length reply_from/reply_media, so we walk the whole header to
+      # reach them (reply_from/reply_media are sized via the schema). A plain message
+      # in a forum topic carries this header (forum_topic flags.3) but is a reply only
+      # when it targets a message in the topic (reply_to_top_id flags.1). Returns a
+      # descriptor hash, or nil for a non-messageReplyHeader (e.g. a story reply).
       def parse_reply_to(data, offset)
-        return [nil, false] unless data[offset, 4].unpack1('L<') == MESSAGE_REPLY_HEADER
+        return unless data[offset, 4].unpack1('L<') == MESSAGE_REPLY_HEADER
 
         io = offset + 4
         flags = data[io, 4].unpack1('L<')
         io += 4
         forum_topic = flags.anybits?(1 << 3)
-        msg_id = flags.anybits?(1 << 4) ? data[io, 4].unpack1('l<') : nil
-        [msg_id, forum_topic ? flags.anybits?(1 << 1) : true]
+
+        msg_id = nil
+        if flags.anybits?(1 << 4) # reply_to_msg_id
+          msg_id = data[io, 4].unpack1('l<')
+          io += 4
+        end
+
+        peer_type = peer_id = nil
+        peer_type, peer_id, io = parse_peer(data, io) if flags.anybits?(1 << 0) # reply_to_peer_id
+
+        io = schema.skip(data, io) if flags.anybits?(1 << 5) # reply_from
+        io = schema.skip(data, io) if flags.anybits?(1 << 8) # reply_media
+        io += 4 if flags.anybits?(1 << 1) # reply_to_top_id
+
+        quote_text = nil
+        quote_text, io = read_tl_string(data, io) if flags.anybits?(1 << 6)
+        io = schema.skip_vector(data, io) if flags.anybits?(1 << 7) # quote_entities
+        quote_offset = flags.anybits?(1 << 10) ? data[io, 4].unpack1('l<') : nil
+
+        { msg_id: msg_id, is_reply: forum_topic ? flags.anybits?(1 << 1) : true,
+          is_quote: flags.anybits?(1 << 9), quote_text: quote_text, quote_offset: quote_offset,
+          peer_type: peer_type, peer_id: peer_id }
       rescue StandardError
-        [nil, false]
+        nil
       end
 
       # Classify message media into :photo / :video / :audio / :document, or nil.

data/lib/mtproto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MTProto
-  VERSION = '0.0.17'
+  VERSION = '0.0.20'
 end

data/lib/mtproto.rb

@@ -3,6 +3,7 @@
 require_relative 'mtproto/version'
 require_relative 'mtproto/errors'
 require_relative 'mtproto/binary'
+require_relative 'mtproto/dc'
 require_relative 'mtproto/delegate_methods'
 require_relative 'mtproto/transport/errors'
 require_relative 'mtproto/transport/packet'
@@ -13,6 +14,8 @@ require_relative 'mtproto/unencrypted_message'
 require_relative 'mtproto/tl/constructors'
 require_relative 'mtproto/tl/constructor_names'
 require_relative 'mtproto/tl/reader'
+require_relative 'mtproto/tl/message_entity'
+require_relative 'mtproto/markdown'
 require_relative 'mtproto/tl/object'
 require_relative 'mtproto/tl/objects/update'
 require_relative 'mtproto/tl/objects/update_short'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtproto
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.20
 platform: ruby
 authors:
 - Artem Levenkov
@@ -65,6 +65,8 @@ files:
 - lib/mtproto/client/api/check_password.rb
 - lib/mtproto/client/api/export_authorization.rb
 - lib/mtproto/client/api/export_login_token.rb
+- lib/mtproto/client/api/get_bot_callback_answer.rb
+- lib/mtproto/client/api/get_channel_difference.rb
 - lib/mtproto/client/api/get_contacts.rb
 - lib/mtproto/client/api/get_dialogs.rb
 - lib/mtproto/client/api/get_history.rb
@@ -72,6 +74,7 @@ files:
 - lib/mtproto/client/api/get_updates_state.rb
 - lib/mtproto/client/api/get_users.rb
 - lib/mtproto/client/api/import_authorization.rb
+- lib/mtproto/client/api/import_bot_authorization.rb
 - lib/mtproto/client/api/import_login_token.rb
 - lib/mtproto/client/api/send_code.rb
 - lib/mtproto/client/api/send_message.rb
@@ -87,21 +90,27 @@ files:
 - lib/mtproto/crypto/rsa_key.rb
 - lib/mtproto/crypto/rsa_pad.rb
 - lib/mtproto/crypto/srp.rb
+- lib/mtproto/dc.rb
 - lib/mtproto/delegate_methods.rb
 - lib/mtproto/encrypted_message.rb
 - lib/mtproto/errors.rb
 - lib/mtproto/file_downloader.rb
+- lib/mtproto/markdown.rb
 - lib/mtproto/message_id.rb
 - lib/mtproto/session.rb
 - lib/mtproto/tl/constructor_names.rb
 - lib/mtproto/tl/constructors.rb
+- lib/mtproto/tl/message_entity.rb
 - lib/mtproto/tl/object.rb
 - lib/mtproto/tl/objects/account_password.rb
 - lib/mtproto/tl/objects/authorization.rb
+- lib/mtproto/tl/objects/bot_callback_answer.rb
 - lib/mtproto/tl/objects/bot_command_scope.rb
+- lib/mtproto/tl/objects/channel_difference.rb
 - lib/mtproto/tl/objects/channels_create_channel.rb
 - lib/mtproto/tl/objects/channels_delete_messages.rb
 - lib/mtproto/tl/objects/channels_delete_participant_history.rb
+- lib/mtproto/tl/objects/channels_edit_admin.rb
 - lib/mtproto/tl/objects/channels_edit_banned.rb
 - lib/mtproto/tl/objects/channels_get_messages.rb
 - lib/mtproto/tl/objects/channels_get_participant.rb
@@ -127,6 +136,7 @@ files:
 - lib/mtproto/tl/objects/get_access_settings.rb
 - lib/mtproto/tl/objects/get_bot_callback_answer.rb
 - lib/mtproto/tl/objects/get_bot_commands.rb
+- lib/mtproto/tl/objects/get_bot_info.rb
 - lib/mtproto/tl/objects/get_channel_difference.rb
 - lib/mtproto/tl/objects/get_config.rb
 - lib/mtproto/tl/objects/get_contacts.rb
@@ -153,6 +163,8 @@ files:
 - lib/mtproto/tl/objects/login_token.rb
 - lib/mtproto/tl/objects/message.rb
 - lib/mtproto/tl/objects/messages.rb
+- lib/mtproto/tl/objects/messages_add_chat_user.rb
+- lib/mtproto/tl/objects/messages_create_chat.rb
 - lib/mtproto/tl/objects/messages_get_messages.rb
 - lib/mtproto/tl/objects/msg_container.rb
 - lib/mtproto/tl/objects/new_session_created.rb