From 612fb2bae7b10fa6edb6586096f81776dab832b9 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 25 Aug 2023 20:45:01 +0300 Subject: [PATCH] Adjust some logs --- libgm/event_handler.go | 5 ++++- libgm/gmproto/events.proto | 26 +++++++++----------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/libgm/event_handler.go b/libgm/event_handler.go index 3d39e8d..4b7c833 100644 --- a/libgm/event_handler.go +++ b/libgm/event_handler.go @@ -218,6 +218,9 @@ func (c *Client) handleUpdatesEvent(msg *IncomingRPCMessage) { Msg("Got unknown event type") } default: - c.Logger.Debug().Str("action_type", msg.Message.Action.String()).Msg("Got unexpected response") + c.Logger.Debug(). + Str("request_id", msg.Message.SessionID). + Str("action_type", msg.Message.Action.String()). + Msg("Got unexpected response") } } diff --git a/libgm/gmproto/events.proto b/libgm/gmproto/events.proto index 73a6905..d27dd1a 100644 --- a/libgm/gmproto/events.proto +++ b/libgm/gmproto/events.proto @@ -7,23 +7,6 @@ import "conversations.proto"; import "authentication.proto"; import "settings.proto"; - -/* - - ConversationEvent = 2 - MessageEvent = 3 - TypingEvent = 4 - SettingsEvent = 5 - UserAlertEvent = 6 - BrowserPresenceCheckEvent = 7 - ParticipantsEvent = 8 - ConversationTypeEvent = 9 - FavoriteStickersEvent = 10 - RecentStickerEvent = 11 - CloudStoreInfoEvent = 12 - BlobForAttachmentProgressUpdate = 13 -*/ - message UpdateEvents { oneof event { ConversationEvent conversationEvent = 2; @@ -31,6 +14,13 @@ message UpdateEvents { TypingEvent typingEvent = 4; settings.Settings settingsEvent = 5; UserAlertEvent userAlertEvent = 6; + BrowserPresenceCheckEvent browserPresenceCheckEvent = 7; + //ParticipantsEvent participantsEvent = 8; + //ConversationTypeEvent conversationTypeEvent = 9; + //FavoriteStickersEvent favoriteStickersEvent = 10; + //RecentStickerEvent recentStickerEvent = 11; + //CloudStoreInfoEvent cloudStoreInfoEvent = 12; + //BlobForAttachmentProgressUpdate blobForAttachmentProgressUpdate = 13; } } @@ -50,6 +40,8 @@ message UserAlertEvent { AlertType alertType = 2; } +message BrowserPresenceCheckEvent {} + message TypingData { string conversationID = 1; User user = 2;