mtproto 0.0.32 → 0.0.34

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../schema'
+require_relative '../reader'
+require_relative '../peers'
+require_relative 'message'
+require_relative 'message_service'
 
 module MTProto
   module TL
     class Dialogs
       Dialog = Struct.new(:peer_type, :peer_id, :top_message, :unread_count, :pts, keyword_init: true)
-      Chat = Struct.new(:id, :title, :type, :access_hash, :username, keyword_init: true)
-
-      SCHEMA_PATH = File.expand_path('../../../../data/tl-schema.json', __dir__)
 
       attr_reader :dialogs, :chats, :users, :count, :message_dates
 
@@ -24,10 +24,6 @@ module MTProto
         !@count.nil?
       end
 
-      def self.schema
-        @schema ||= Schema.new(SCHEMA_PATH)
-      end
-
       def self.deserialize(data)
         constructor = data[0, 4].unpack1('L<')
 
@@ -45,22 +41,12 @@ module MTProto
 
         dialogs, offset = parse_dialogs_vector(data, offset)
         message_dates, offset = parse_messages_vector(data, offset)
-        chats, offset = parse_chats_vector(data, offset)
-        users, = parse_users_vector(data, offset)
+        chats, offset = Peers.chats_at(data, offset)
+        users, = Peers.users_at(data, offset)
 
         new(dialogs: dialogs, chats: chats, users: users, count: count, message_dates: message_dates)
       end
 
-      # Parse a chats:Vector<Chat> / users:Vector<User> at an arbitrary offset.
-      # Reused by UpdatesDifference — the same vectors appear in updates.difference.
-      def self.chats_at(data, offset)
-        parse_chats_vector(data, offset)
-      end
-
-      def self.users_at(data, offset)
-        parse_users_vector(data, offset)
-      end
-
       class << self
         private
 
@@ -84,14 +70,14 @@ module MTProto
           offset += 4
 
           unless constructor == Constructors::DIALOG
-            offset = schema.skip_params(data, offset, constructor)
+            offset = Reader.schema.skip_params(data, offset, constructor)
             return [nil, offset]
           end
 
           flags = data[offset, 4].unpack1('L<')
           offset += 4
 
-          peer_type, peer_id, offset = parse_peer(data, offset)
+          peer_type, peer_id, offset = Reader.parse_peer(data, offset)
 
           top_message = data[offset, 4].unpack1('L<')
           offset += 4
@@ -106,14 +92,14 @@ module MTProto
           offset += 4 # unread_reactions_count
           offset += 4 # unread_poll_votes_count (added in layer 227)
 
-          offset = schema.skip(data, offset) # notify_settings (PeerNotifySettings)
+          offset = Reader.schema.skip(data, offset) # notify_settings (PeerNotifySettings)
 
           pts = nil
           if flags.anybits?(1 << 0)
             pts = data[offset, 4].unpack1('L<')
             offset += 4
           end
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 1) # draft (DraftMessage)
+          offset = Reader.schema.skip(data, offset) if flags.anybits?(1 << 1) # draft (DraftMessage)
           offset += 4 if flags.anybits?(1 << 4) # folder_id
           offset += 4 if flags.anybits?(1 << 5) # ttl_period
 
@@ -121,39 +107,8 @@ module MTProto
             top_message: top_message, unread_count: unread_count, pts: pts), offset]
         end
 
-        def parse_peer(data, offset)
-          constructor = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          case constructor
-          when Constructors::PEER_USER
-            [:user, data[offset, 8].unpack1('Q<'), offset + 8]
-          when Constructors::PEER_CHAT
-            [:chat, data[offset, 8].unpack1('Q<'), offset + 8]
-          when Constructors::PEER_CHANNEL
-            [:channel, data[offset, 8].unpack1('Q<'), offset + 8]
-          else
-            raise "Unknown peer constructor: 0x#{constructor.to_s(16)}"
-          end
-        end
-
         # --- Messages vector ---
 
-        # message#7600b9d3 flags:# flags2:#
-        #   id:int from_id:flags.8?Peer from_boosts_applied:flags.29?int
-        #   from_rank:flags2.12?string peer_id:Peer saved_peer_id:flags.28?Peer
-        #   fwd_from:flags.2?MessageFwdHeader via_bot_id:flags.11?long
-        #   via_business_bot_id:flags2.0?long guestchat_via_from:flags2.19?Peer
-        #   reply_to:flags.3?MessageReplyHeader date:int ...
-        #
-        # messageService#2b085862 flags:#
-        #   id:int from_id:flags.8?Peer peer_id:Peer
-        #   saved_peer_id:flags.28?Peer reply_to:flags.3?MessageReplyHeader
-        #   date:int ...
-        MESSAGE_CONSTRUCTOR = Constructors::MESSAGE
-        MESSAGE_SERVICE = 0x7a800e0a
-        MESSAGE_EMPTY = 0x90a6ca84
-
         def parse_messages_vector(data, offset)
           offset += 4 # vector constructor
           count = data[offset, 4].unpack1('L<')
@@ -165,308 +120,15 @@ module MTProto
             id_date = extract_message_id_date(data, offset, constructor)
             dates[id_date[0]] = id_date[1] if id_date
 
-            offset = schema.skip(data, offset)
+            offset = Reader.schema.skip(data, offset)
           end
           [dates, offset]
         end
 
         def extract_message_id_date(data, offset, constructor)
-          case constructor
-          when MESSAGE_CONSTRUCTOR
-            extract_message_date(data, offset)
-          when MESSAGE_SERVICE
-            extract_message_service_date(data, offset)
-          end
-        end
-
-        def extract_message_date(data, offset)
-          offset += 4 # constructor
-          flags = data[offset, 4].unpack1('L<')
-          offset += 4
-          flags2 = data[offset, 4].unpack1('L<')
-          offset += 4
-          id = data[offset, 4].unpack1('l<')
-          offset += 4
-
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 8) # from_id (Peer)
-          offset += 4 if flags.anybits?(1 << 29) # from_boosts_applied
-          _, offset = read_tl_string(data, offset) if flags2.anybits?(1 << 12) # from_rank (layer 227)
-          offset = schema.skip(data, offset) # peer_id (Peer, always present)
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 28) # saved_peer_id
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 2) # fwd_from
-          offset += 8 if flags.anybits?(1 << 11) # via_bot_id
-          offset += 8 if flags2.anybits?(1 << 0) # via_business_bot_id
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 19) # guestchat_via_from (layer 227, Peer)
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 3) # reply_to
-
-          date = data[offset, 4].unpack1('L<')
-          [id, date]
-        end
-
-        def extract_message_service_date(data, offset)
-          offset += 4 # constructor
-          flags = data[offset, 4].unpack1('L<')
-          offset += 4
-          id = data[offset, 4].unpack1('l<')
-          offset += 4
-
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 8) # from_id (Peer)
-          offset = schema.skip(data, offset) # peer_id (Peer, always present)
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 28) # saved_peer_id
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 3) # reply_to
-
-          date = data[offset, 4].unpack1('L<')
-          [id, date]
-        end
-
-        # --- Chats vector ---
-
-        def parse_chats_vector(data, offset)
-          offset += 4 # vector constructor
-          count = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          chats = []
-          count.times do
-            chat, offset = parse_chat(data, offset)
-            chats << chat if chat
-          end
-          [chats, offset]
-        end
-
-        def parse_chat(data, offset)
-          constructor = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          case constructor
-          when Constructors::CHAT
-            parse_basic_chat(data, offset)
-          when Constructors::CHANNEL
-            parse_channel(data, offset)
-          when Constructors::CHAT_FORBIDDEN
-            parse_chat_forbidden(data, offset)
-          when Constructors::CHANNEL_FORBIDDEN
-            parse_channel_forbidden(data, offset)
-          when CHAT_EMPTY
-            id = data[offset, 8].unpack1('Q<')
-            offset += 8
-            [Chat.new(id: id, title: '(empty)', type: :chat_empty), offset]
-          else
-            raise "Unknown Chat constructor: 0x#{constructor.to_s(16).rjust(8, '0')}"
-          end
-        end
-
-        CHAT_EMPTY = 0x29562865
-
-        # chat#41cbf256 flags:#
-        #   id:long title:string photo:ChatPhoto
-        #   participants_count:int date:int version:int
-        #   migrated_to:flags.6?InputChannel
-        #   admin_rights:flags.14?ChatAdminRights
-        #   default_banned_rights:flags.18?ChatBannedRights
-        def parse_basic_chat(data, offset)
-          flags = data[offset, 4].unpack1('L<')
-          offset += 4
-          id = data[offset, 8].unpack1('Q<')
-          offset += 8
-          title, offset = read_tl_string(data, offset)
-          offset = schema.skip(data, offset) # photo (ChatPhoto)
-          offset += 4 # participants_count
-          offset += 4 # date
-          offset += 4 # version
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 6) # migrated_to (InputChannel)
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 14) # admin_rights
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 18) # default_banned_rights
-
-          [Chat.new(id: id, title: title, type: :chat), offset]
-        end
-
-        # channel#1c32b11c flags:# flags2:#
-        #   id:long access_hash:flags.13?long title:string
-        #   username:flags.6?string photo:ChatPhoto date:int
-        #   restriction_reason:flags.9?Vector<RestrictionReason>
-        #   admin_rights:flags.14?ChatAdminRights
-        #   banned_rights:flags.15?ChatBannedRights
-        #   default_banned_rights:flags.18?ChatBannedRights
-        #   participants_count:flags.17?int
-        #   usernames:flags2.0?Vector<Username>
-        #   stories_max_id:flags2.4?int
-        #   color:flags2.7?PeerColor profile_color:flags2.8?PeerColor
-        #   emoji_status:flags2.9?EmojiStatus
-        #   level:flags2.10?int subscription_until_date:flags2.11?int
-        #   bot_verification_icon:flags2.13?long
-        #   send_paid_messages_stars:flags2.14?long
-        #   linked_monoforum_id:flags2.18?long
-        def parse_channel(data, offset)
-          flags = data[offset, 4].unpack1('L<')
-          offset += 4
-          flags2 = data[offset, 4].unpack1('L<')
-          offset += 4
-          id = data[offset, 8].unpack1('Q<')
-          offset += 8
-          access_hash = nil
-          if flags.anybits?(1 << 13)
-            access_hash = data[offset, 8].unpack1('Q<')
-            offset += 8
-          end
-          title, offset = read_tl_string(data, offset)
-          username = nil
-          username, offset = read_tl_string(data, offset) if flags.anybits?(1 << 6) # username
-          offset = schema.skip(data, offset) # photo (ChatPhoto)
-          offset += 4 # date
-          if flags.anybits?(1 << 9) # restriction_reason Vector<RestrictionReason>
-            offset = schema.skip_vector(data, offset) { |d, o| schema.skip(d, o) }
-          end
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 14) # admin_rights
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 15) # banned_rights
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 18) # default_banned_rights
-          offset += 4 if flags.anybits?(1 << 17) # participants_count
-          if flags2.anybits?(1 << 0) # usernames Vector<Username>
-            offset = schema.skip_vector(data, offset) { |d, o| schema.skip(d, o) }
-          end
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 4) # stories_max_id (layer 227: RecentStory)
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 7) # color (PeerColor)
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 8) # profile_color (PeerColor)
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 9) # emoji_status
-          offset += 4 if flags2.anybits?(1 << 10) # level
-          offset += 4 if flags2.anybits?(1 << 11) # subscription_until_date
-          offset += 8 if flags2.anybits?(1 << 13) # bot_verification_icon (long)
-          offset += 8 if flags2.anybits?(1 << 14) # send_paid_messages_stars (long)
-          offset += 8 if flags2.anybits?(1 << 18) # linked_monoforum_id (long)
-
-          type = flags.anybits?(1 << 8) ? :supergroup : :channel
-          [Chat.new(id: id, title: title, type: type, access_hash: access_hash, username: username), offset]
-        end
-
-        # chatForbidden#6592a1a7 id:long title:string
-        def parse_chat_forbidden(data, offset)
-          id = data[offset, 8].unpack1('Q<')
-          offset += 8
-          title, offset = read_tl_string(data, offset)
-          [Chat.new(id: id, title: title, type: :chat_forbidden), offset]
-        end
-
-        # channelForbidden#17d493d5 flags:#
-        #   id:long access_hash:long title:string until_date:flags.16?int
-        def parse_channel_forbidden(data, offset)
-          flags = data[offset, 4].unpack1('L<')
-          offset += 4
-          id = data[offset, 8].unpack1('Q<')
-          offset += 8
-          access_hash = data[offset, 8].unpack1('Q<')
-          offset += 8
-          title, offset = read_tl_string(data, offset)
-          offset += 4 if flags.anybits?(1 << 16) # until_date
-          [Chat.new(id: id, title: title, type: :channel_forbidden, access_hash: access_hash), offset]
-        end
-
-        # --- Users vector ---
-
-        def parse_users_vector(data, offset)
-          offset += 4 # vector constructor
-          count = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          users = []
-          count.times do
-            user, offset = parse_user(data, offset)
-            users << user if user
-          end
-          [users, offset]
-        end
-
-        USER_EMPTY = 0xd3bc4b7a
-
-        # user#31774388 flags:# flags2:#
-        #   id:long access_hash:flags.0?long
-        #   first_name:flags.1?string last_name:flags.2?string
-        #   username:flags.3?string phone:flags.4?string
-        #   photo:flags.5?UserProfilePhoto status:flags.6?UserStatus
-        #   bot_info_version:flags.14?int
-        #   restriction_reason:flags.18?Vector<RestrictionReason>
-        #   bot_inline_placeholder:flags.19?string
-        #   lang_code:flags.22?string
-        #   emoji_status:flags.30?EmojiStatus
-        #   usernames:flags2.0?Vector<Username>
-        #   stories_max_id:flags2.5?int
-        #   color:flags2.8?PeerColor profile_color:flags2.9?PeerColor
-        #   bot_active_users:flags2.12?int
-        #   bot_verification_icon:flags2.14?long
-        #   send_paid_messages_stars:flags2.15?long
-        def parse_user(data, offset)
-          constructor = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          if constructor == USER_EMPTY
-            offset += 8 # id (long)
-            return [nil, offset]
-          end
-
-          raise "Unknown User constructor: 0x#{constructor.to_s(16)}" unless constructor == Constructors::USER
-
-          flags = data[offset, 4].unpack1('L<')
-          offset += 4
-          flags2 = data[offset, 4].unpack1('L<')
-          offset += 4
-          id = data[offset, 8].unpack1('Q<')
-          offset += 8
-          access_hash = nil
-          if flags.anybits?(1 << 0)
-            access_hash = data[offset, 8].unpack1('Q<')
-            offset += 8
-          end
-
-          first_name = nil
-          first_name, offset = read_tl_string(data, offset) if flags.anybits?(1 << 1)
-
-          last_name = nil
-          last_name, offset = read_tl_string(data, offset) if flags.anybits?(1 << 2)
-
-          username = nil
-          username, offset = read_tl_string(data, offset) if flags.anybits?(1 << 3) # username
-
-          offset = skip_tl_string(data, offset) if flags.anybits?(1 << 4) # phone
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 5) # photo
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 6) # status
-          offset += 4 if flags.anybits?(1 << 14) # bot_info_version
-          if flags.anybits?(1 << 18) # restriction_reason
-            offset = schema.skip_vector(data, offset) { |d, o| schema.skip(d, o) }
-          end
-          offset = skip_tl_string(data, offset) if flags.anybits?(1 << 19) # bot_inline_placeholder
-          offset = skip_tl_string(data, offset) if flags.anybits?(1 << 22) # lang_code
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 30) # emoji_status
-          offset = schema.skip_vector(data, offset) { |d, o| schema.skip(d, o) } if flags2.anybits?(1 << 0) # usernames
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 5) # stories_max_id (layer 227: RecentStory)
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 8) # color
-          offset = schema.skip(data, offset) if flags2.anybits?(1 << 9) # profile_color
-          offset += 4 if flags2.anybits?(1 << 12) # bot_active_users
-          offset += 8 if flags2.anybits?(1 << 14) # bot_verification_icon
-          offset += 8 if flags2.anybits?(1 << 15) # send_paid_messages_stars
-
-          [{ id: id, first_name: first_name, last_name: last_name, username: username,
-             is_bot: flags.anybits?(1 << 14), access_hash: access_hash }, offset]
-        end
-
-        # --- TL string ---
-
-        def read_tl_string(data, offset)
-          first_byte = data.getbyte(offset)
-          if first_byte == 254
-            len = data.getbyte(offset + 1) |
-                  (data.getbyte(offset + 2) << 8) |
-                  (data.getbyte(offset + 3) << 16)
-            total = 4 + len
-          else
-            len = first_byte
-            total = 1 + len
-          end
-          padding = (4 - (total % 4)) % 4
-          [data[offset + (total - len), len].force_encoding('UTF-8'), offset + total + padding]
-        end
-
-        def skip_tl_string(data, offset)
-          _, new_offset = read_tl_string(data, offset)
-          new_offset
+          msg = Message.deserialize(data, offset, constructor) ||
+                MessageService.deserialize(data, offset, constructor)
+          [msg.id, msg.date] if msg
         end
       end
     end

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

@@ -35,7 +35,7 @@ module MTProto
       private
 
       def entities?
-        @entities && !@entities.empty?
+        !@entities.nil?
       end
 
       def serialize_input_peer

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module MTProto
+  module TL
+    # The pieces every media-carrying call writes the same way: who it is addressed to,
+    # the file just uploaded, and the strings around it.
+    #
+    # Held together here because an album is sent in two calls — one to turn each upload
+    # into a photo Telegram holds, one to send them as a group — and both write the same
+    # peer and the same file.
+    module MediaParts
+      include Binary
+
+      INPUT_MEDIA_PHOTO = 0xe3af4434
+      INPUT_PHOTO = 0x3bb3b94a
+
+      def serialize_peer(peer)
+        case peer[:type]
+        when :self
+          u32_b(Constructors::INPUT_PEER_SELF)
+        when :user
+          u32_b(Constructors::INPUT_PEER_USER) + u64_b(peer[:id]) + u64_b(peer[:access_hash] || 0)
+        when :chat
+          u32_b(Constructors::INPUT_PEER_CHAT) + u64_b(peer[:id])
+        when :channel
+          u32_b(Constructors::INPUT_PEER_CHANNEL) + u64_b(peer[:id]) + u64_b(peer[:access_hash] || 0)
+        else
+          raise "Unknown peer type: #{peer[:type]}"
+        end
+      end
+
+      def serialize_uploaded_photo(file)
+        u32_b(Constructors::INPUT_MEDIA_UPLOADED_PHOTO) + u32_b(0) + serialize_file(file)
+      end
+
+      # A photo Telegram already holds, named by what it answered when the upload was
+      # handed to it.
+      def serialize_held_photo(photo)
+        u32_b(INPUT_MEDIA_PHOTO) + u32_b(0) +
+          u32_b(INPUT_PHOTO) + u64_b(photo[:id]) + u64_b(photo[:access_hash]) +
+          serialize_raw(photo[:file_reference])
+      end
+
+      def serialize_file(file)
+        return u32_b(Constructors::INPUT_FILE_BIG) + u64_b(file[:id]) + u32_b(file[:parts]) +
+               serialize_text(file[:name].to_s) if file[:big]
+
+        u32_b(Constructors::INPUT_FILE) + u64_b(file[:id]) + u32_b(file[:parts]) +
+          serialize_text(file[:name].to_s) + serialize_text(file[:md5_checksum].to_s)
+      end
+
+      def serialize_text(str)
+        serialize_byte_array(str.encode('UTF-8').bytes)
+      end
+
+      def serialize_raw(raw)
+        serialize_byte_array(raw.to_s.b.bytes)
+      end
+
+      def serialize_byte_array(bytes)
+        length = bytes.length
+        head = length <= 253 ? [length] : [254] + u32_b(length)[0, 3]
+        padded = head + bytes
+        padded + [0] * ((4 - (padded.length % 4)) % 4)
+      end
+    end
+  end
+end

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

@@ -92,6 +92,20 @@ module MTProto
             fwd_channel_post: fwd_channel_post)
         end
 
+        def vector_at(data, offset)
+          offset += 4 # vector constructor
+          count = data[offset, 4].unpack1('L<')
+          offset += 4
+
+          messages = []
+          count.times do
+            msg = deserialize(data, offset, data[offset, 4].unpack1('L<'))
+            messages << msg if msg
+            offset = Reader.schema.skip(data, offset)
+          end
+          [messages, offset]
+        end
+
         private
 
         # entities (flags.7) sit past media (flags.9) and reply_markup (flags.6) in the

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require_relative '../reader'
+
+module MTProto
+  module TL
+    # The header of `messageService#7a800e0a` — the chat event (a join, a leave, a
+    # title change) that rides the same Vector<Message> as a plain `message`. The
+    # walk stops at the MessageAction, whose meaning belongs to the caller: it reads
+    # the action itself, from `action_offset`.
+    module MessageService
+      module_function
+
+      MESSAGE_SERVICE = 0x7a800e0a
+
+      Header = Struct.new(:id, :date, :from_id, :peer_type, :peer_id, :action_offset, keyword_init: true)
+
+      def deserialize(data, offset, constructor)
+        return unless constructor == MESSAGE_SERVICE
+
+        offset += 4 # constructor
+        flags = data[offset, 4].unpack1('L<')
+        offset += 4
+        id = data[offset, 4].unpack1('l<')
+        offset += 4
+
+        from_id = nil
+        _from_type, from_id, offset = Reader.parse_peer(data, offset) if flags.anybits?(1 << 8) # from_id (Peer)
+        peer_type, peer_id, offset = Reader.parse_peer(data, offset)
+        offset = Reader.schema.skip(data, offset) if flags.anybits?(1 << 28) # saved_peer_id
+        offset = Reader.schema.skip(data, offset) if flags.anybits?(1 << 3) # reply_to
+
+        date = data[offset, 4].unpack1('L<')
+
+        Header.new(id: id, date: date, from_id: from_id,
+          peer_type: peer_type, peer_id: peer_id, action_offset: offset + 4)
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../schema'
+require_relative '../reader'
+require_relative '../peers'
 require_relative 'message'
-require_relative 'dialogs'
 
 module MTProto
   module TL
@@ -29,12 +29,6 @@ module MTProto
         !@count.nil?
       end
 
-      def self.schema
-        @schema ||= Schema.new(
-          File.expand_path('../../../../data/tl-schema.json', __dir__)
-        )
-      end
-
       def self.deserialize(data)
         constructor = data[0, 4].unpack1('L<')
         raise UnexpectedConstructorError, constructor unless VALID_CONSTRUCTORS.include?(constructor)
@@ -54,7 +48,7 @@ module MTProto
           offset += 4
           offset += 4 if flags.anybits?(1 << 0) # next_rate
           offset += 4 if flags.anybits?(1 << 2) # offset_id_offset
-          offset = schema.skip(data, offset) if flags.anybits?(1 << 3) # search_flood
+          offset = Reader.schema.skip(data, offset) if flags.anybits?(1 << 3) # search_flood
         when MESSAGES_CHANNEL
           # flags:# pts:int count:int offset_id_offset:flags.2?int
           # messages:Vector<Message> topics:Vector<ForumTopic> ...
@@ -66,35 +60,16 @@ module MTProto
           offset += 4 if flags.anybits?(1 << 2) # offset_id_offset
         end
 
-        messages, offset = parse_messages_vector(data, offset)
+        messages, offset = Message.vector_at(data, offset)
 
         # topics:Vector<ForumTopic> precedes chats/users in all three constructors
-        offset = schema.skip_vector(data, offset) { |d, o| schema.skip(d, o) }
+        offset = Reader.schema.skip_vector(data, offset)
 
-        chats, offset = Dialogs.chats_at(data, offset)
-        users, = Dialogs.users_at(data, offset)
+        chats, offset = Peers.chats_at(data, offset)
+        users, = Peers.users_at(data, offset)
 
         new(messages: messages, count: count, users: users, chats: chats)
       end
-
-      class << self
-        private
-
-        def parse_messages_vector(data, offset)
-          offset += 4 # vector constructor
-          count = data[offset, 4].unpack1('L<')
-          offset += 4
-
-          messages = []
-          count.times do
-            constructor = data[offset, 4].unpack1('L<')
-            msg = Message.deserialize(data, offset, constructor)
-            messages << msg if msg
-            offset = schema.skip(data, offset)
-          end
-          [messages, offset]
-        end
-      end
     end
   end
 end