mtproto 0.0.32 → 0.0.34

data/lib/mtproto/updates/event_builder.rb

@@ -2,6 +2,7 @@
 
 require_relative '../tl/reader'
 require_relative '../tl/objects/message'
+require_relative '../tl/objects/message_service'
 require_relative '../tl/objects/updates'
 require_relative 'event'
 
@@ -27,7 +28,6 @@ module MTProto
       UPDATE_BOT_GUEST_CHAT_QUERY = 0xcdd4093d
       UPDATE_MANAGED_BOT = 0x4880ed9a
 
-      MESSAGE_SERVICE = 0x7a800e0a
       ACTION_CHAT_ADD_USER = 0x15cefd00
       ACTION_JOINED_BY_LINK = 0x031224c3
       ACTION_CHAT_DELETE_USER = 0xa43f30cc
@@ -76,16 +76,13 @@ module MTProto
                   bot_id: data[offset + 12, 8].unpack1('Q<'))
       end
 
-      # A Vector<Message> entry (a difference's new_messages) → a :message / :join /
-      # :leave Event WITHOUT pts (the protocol omits per-message pts there), or nil.
+      # One message — an entry of a Vector<Message>, or the one inside an
+      # updateNew(Channel)Message — → a :message / :join / :leave Event, or nil.
       # `channel` is the envelope's kind (true for a channelDifference), since the
       # message itself doesn't say.
-      def message_or_service(data, offset, ctor, channel:)
-        if ctor == TL::Constructors::MESSAGE
-          message_event(data, offset, ctor, kind: :message, channel: channel, pts: nil, pts_count: nil)
-        elsif ctor == MESSAGE_SERVICE
-          service_event(data, offset, channel: channel, pts: nil, pts_count: nil)
-        end
+      def message_or_service(data, offset, ctor, channel:, pts:, pts_count:)
+        message_event(data, offset, ctor, kind: :message, channel: channel, pts: pts, pts_count: pts_count) ||
+          service_event(data, offset, ctor, channel: channel, pts: pts, pts_count: pts_count)
       end
 
       # updateNew(Channel)Message: the update tag, an inner Message (plain message, or
@@ -95,11 +92,7 @@ module MTProto
         inner_ctor = data[inner_off, 4].unpack1('L<')
         pts, pts_count = pts_after(data, inner_off)
 
-        if inner_ctor == TL::Constructors::MESSAGE
-          message_event(data, inner_off, inner_ctor, kind: :message, channel: channel, pts: pts, pts_count: pts_count)
-        elsif inner_ctor == MESSAGE_SERVICE
-          service_event(data, inner_off, channel: channel, pts: pts, pts_count: pts_count)
-        end
+        message_or_service(data, inner_off, inner_ctor, channel: channel, pts: pts, pts_count: pts_count)
       end
 
       def edit_message(data, offset, channel:)
@@ -127,19 +120,11 @@ module MTProto
 
       # messageService carrying a membership action → a :join / :leave Event, else nil.
       # peer_id is the service message's own chat (where the event happened).
-      def service_event(data, offset, channel:, pts:, pts_count:)
-        io = offset + 4
-        flags = data[io, 4].unpack1('L<')
-        io += 8 # flags + id
-        _from_type, from_id, io = TL::Reader.parse_peer(data, io) if flags.anybits?(1 << 8) # from_id
-        peer_type, peer_id, io = TL::Reader.parse_peer(data, io)
-        io = TL::Reader.schema.skip(data, io) if flags.anybits?(1 << 28) # saved_peer_id
-        io = TL::Reader.schema.skip(data, io) if flags.anybits?(1 << 3)  # reply_to
-        io += 4 # date
-        action = data[io, 4].unpack1('L<')
-        id = data[offset + 8, 4].unpack1('l<')
+      def service_event(data, offset, ctor, channel:, pts:, pts_count:)
+        header = TL::MessageService.deserialize(data, offset, ctor)
+        return unless header
 
-        event = membership_event(data, io, action, from_id, peer_type, peer_id, id)
+        event = membership_event(data, header)
         return unless event
 
         event.channel = channel
@@ -150,19 +135,22 @@ module MTProto
         nil
       end
 
-      def membership_event(data, io, action, from_id, peer_type, peer_id, id)
-        case action
+      def membership_event(data, header)
+        io = header.action_offset
+        case data[io, 4].unpack1('L<')
         when ACTION_CHAT_ADD_USER
-          joined = from_id
+          joined = header.from_id
           if data[io + 4, 4].unpack1('L<') == VECTOR && data[io + 8, 4].unpack1('L<').positive?
             joined = data[io + 12, 8].unpack1('Q<')
           end
-          Event.new(kind: :join, joined_user_id: joined, peer_type: peer_type, peer_id: peer_id, msg_id: id)
+          Event.new(kind: :join, joined_user_id: joined,
+            peer_type: header.peer_type, peer_id: header.peer_id, msg_id: header.id)
         when ACTION_JOINED_BY_LINK
-          Event.new(kind: :join, joined_user_id: from_id, peer_type: peer_type, peer_id: peer_id, msg_id: id)
+          Event.new(kind: :join, joined_user_id: header.from_id,
+            peer_type: header.peer_type, peer_id: header.peer_id, msg_id: header.id)
         when ACTION_CHAT_DELETE_USER
           Event.new(kind: :leave, left_user_id: data[io + 4, 8].unpack1('Q<'),
-            peer_type: peer_type, peer_id: peer_id, msg_id: id)
+            peer_type: header.peer_type, peer_id: header.peer_id, msg_id: header.id)
         end
       end
 

data/lib/mtproto/updates/parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../tl/reader'
-require_relative '../tl/objects/dialogs'
+require_relative '../tl/peers'
 require_relative '../tl/objects/updates_state'
 require_relative 'event_builder'
 
@@ -74,8 +74,8 @@ module MTProto
       # (updatesCombined only inserts seq_start before the trailing seq, past date).
       def parse_updates(data)
         events, channel_too_long, offset = updates_vector(data, 4)
-        users, offset = TL::Dialogs.users_at(data, offset)
-        chats, offset = TL::Dialogs.chats_at(data, offset)
+        users, offset = TL::Peers.users_at(data, offset)
+        chats, offset = TL::Peers.chats_at(data, offset)
         date = data[offset, 4].unpack1('L<')
         attach_peers(events, users, chats)
         Batch.new(events: events, users: users, chats: chats,
@@ -128,8 +128,8 @@ module MTProto
         msg_events, offset = messages_vector(data, 4, channel: false)
         offset = TL::Reader.schema.skip_vector(data, offset) # new_encrypted_messages
         upd_events, channel_too_long, offset = updates_vector(data, offset)
-        chats, offset = TL::Dialogs.chats_at(data, offset)
-        users, offset = TL::Dialogs.users_at(data, offset)
+        chats, offset = TL::Peers.chats_at(data, offset)
+        users, offset = TL::Peers.users_at(data, offset)
         state = TL::UpdatesState.deserialize(data[offset..])
 
         events = msg_events + upd_events
@@ -151,8 +151,8 @@ module MTProto
 
         msg_events, offset = messages_vector(data, offset, channel: true)
         upd_events, channel_too_long, offset = updates_vector(data, offset)
-        chats, offset = TL::Dialogs.chats_at(data, offset)
-        users, = TL::Dialogs.users_at(data, offset)
+        chats, offset = TL::Peers.chats_at(data, offset)
+        users, = TL::Peers.users_at(data, offset)
 
         events = msg_events + upd_events
         attach_peers(events, users, chats)
@@ -169,7 +169,8 @@ module MTProto
 
         events = []
         count.times do
-          event = EventBuilder.message_or_service(data, offset, data[offset, 4].unpack1('L<'), channel: channel)
+          event = EventBuilder.message_or_service(data, offset, data[offset, 4].unpack1('L<'),
+            channel: channel, pts: nil, pts_count: nil)
           events << event if event
           offset = TL::Reader.schema.skip(data, offset)
         end

data/lib/mtproto/updates/state_machine.rb

@@ -51,14 +51,14 @@ module MTProto
 
       def dispatch(batch, &)
         remember_channels(batch.chats)
-        batch.events.each { |event| ingest(event, &) }
+        batch.events.each { |event| ingest(event, batch, &) }
         batch.channel_too_long.each { |channel_id| recover_channel(channel_id, &) }
         catch_up(&) if batch.too_long
       end
 
-      def ingest(event, &)
+      def ingest(event, batch, &)
         detect_gap(event, &)
-        emit(event, &)
+        emit(event, batch, &)
       end
 
       # A live update whose pts jumps past our stored position means updates were
@@ -80,11 +80,11 @@ module MTProto
       # host's transaction (atomic with the host's own handling); the in-memory @pts is
       # advanced only AFTER the transaction commits, so a rollback can never leave the
       # cache ahead of the store and silently drop later account updates.
-      def emit(event, &block)
+      def emit(event, batch, &block)
         return if outdated?(event)
 
         @store.transaction do
-          block.call(event)
+          block.call(event, batch)
           checkpoint(event)
         end
         cache_account_position(event)
@@ -142,7 +142,7 @@ module MTProto
 
       def apply_difference(diff, &)
         remember_channels(diff.chats)
-        diff.events.each { |event| emit(event, &) }
+        diff.events.each { |event| emit(event, diff, &) }
         diff.channel_too_long.each { |channel_id| recover_channel(channel_id, &) }
         @pts = diff.pts if diff.pts
         @qts = diff.qts if diff.qts
@@ -164,7 +164,7 @@ module MTProto
           return catch_up(&) if diff.type == :too_long
 
           remember_channels(diff.chats)
-          diff.events.each { |event| emit(event, &) }
+          diff.events.each { |event| emit(event, diff, &) }
           if diff.pts&.positive?
             from = diff.pts
             @store.set_channel_pts(channel_id, diff.pts)

data/lib/mtproto/version.rb

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

data/lib/mtproto.rb

@@ -14,6 +14,7 @@ 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/peers'
 require_relative 'mtproto/tl/message_entity'
 require_relative 'mtproto/markdown'
 require_relative 'mtproto/tl/object'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtproto
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.34
 platform: ruby
 authors:
 - Artem Levenkov
@@ -80,10 +80,12 @@ files:
 - lib/mtproto/client/api/import_bot_authorization.rb
 - lib/mtproto/client/api/import_login_token.rb
 - lib/mtproto/client/api/pin_message.rb
+- lib/mtproto/client/api/resolve_username.rb
 - lib/mtproto/client/api/send_code.rb
 - lib/mtproto/client/api/send_message.rb
 - lib/mtproto/client/api/set_typing.rb
 - lib/mtproto/client/api/sign_in.rb
+- lib/mtproto/client/api/stream_draft.rb
 - lib/mtproto/client/api/unpin_all_messages.rb
 - lib/mtproto/client/rpc.rb
 - lib/mtproto/client/rpc/response.rb
@@ -99,6 +101,7 @@ files:
 - lib/mtproto/crypto/srp.rb
 - lib/mtproto/dc.rb
 - lib/mtproto/delegate_methods.rb
+- lib/mtproto/draft_stream.rb
 - lib/mtproto/encrypted_message.rb
 - lib/mtproto/errors.rb
 - lib/mtproto/file_downloader.rb
@@ -169,7 +172,9 @@ files:
 - lib/mtproto/tl/objects/invoke_with_layer.rb
 - lib/mtproto/tl/objects/keyboard_button_callback.rb
 - lib/mtproto/tl/objects/login_token.rb
+- lib/mtproto/tl/objects/media_parts.rb
 - lib/mtproto/tl/objects/message.rb
+- lib/mtproto/tl/objects/message_service.rb
 - lib/mtproto/tl/objects/messages.rb
 - lib/mtproto/tl/objects/messages_add_chat_user.rb
 - lib/mtproto/tl/objects/messages_create_chat.rb
@@ -179,6 +184,7 @@ files:
 - lib/mtproto/tl/objects/pq_inner_data.rb
 - lib/mtproto/tl/objects/raw_response.rb
 - lib/mtproto/tl/objects/reply_inline_markup.rb
+- lib/mtproto/tl/objects/reply_keyboard_force_reply.rb
 - lib/mtproto/tl/objects/reply_keyboard_markup.rb
 - lib/mtproto/tl/objects/req_dh_params.rb
 - lib/mtproto/tl/objects/req_pq_multi.rb
@@ -186,6 +192,7 @@ files:
 - lib/mtproto/tl/objects/res_pq.rb
 - lib/mtproto/tl/objects/reset_bot_commands.rb
 - lib/mtproto/tl/objects/resolve_username.rb
+- lib/mtproto/tl/objects/resolved_peer.rb
 - lib/mtproto/tl/objects/rpc_error.rb
 - lib/mtproto/tl/objects/save_big_file_part.rb
 - lib/mtproto/tl/objects/save_file_part.rb
@@ -195,6 +202,8 @@ files:
 - lib/mtproto/tl/objects/send_media.rb
 - lib/mtproto/tl/objects/send_message.rb
 - lib/mtproto/tl/objects/send_message_action.rb
+- lib/mtproto/tl/objects/send_message_text_draft_action.rb
+- lib/mtproto/tl/objects/send_multi_media.rb
 - lib/mtproto/tl/objects/send_reaction.rb
 - lib/mtproto/tl/objects/sent_code.rb
 - lib/mtproto/tl/objects/server_dh_inner_data.rb
@@ -217,8 +226,10 @@ files:
 - lib/mtproto/tl/objects/updates.rb
 - lib/mtproto/tl/objects/updates_difference.rb
 - lib/mtproto/tl/objects/updates_state.rb
+- lib/mtproto/tl/objects/upload_media.rb
 - lib/mtproto/tl/objects/upload_profile_photo.rb
 - lib/mtproto/tl/objects/users.rb
+- lib/mtproto/tl/peers.rb
 - lib/mtproto/tl/reader.rb
 - lib/mtproto/tl/schema.rb
 - lib/mtproto/transport/abridged_packet_codec.rb