seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add debug logs for pending attachments

Browse source
This commit is contained in:
Tulir Asokan 2023-09-01 21:30:29 +03:00
parent 101fad5ca6
commit 2439be0f71
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
portal.go
View file

@ -427,8 +427,37 @@ func (portal *Portal) handleExistingMessageUpdate(ctx context.Context, source *U
log := *zerolog.Ctx(ctx) log := *zerolog.Ctx(ctx)
newStatus := evt.GetMessageStatus().GetStatus() newStatus := evt.GetMessageStatus().GetStatus()
chatIDChanged := dbMsg.Chat.ID != portal.ID chatIDChanged := dbMsg.Chat.ID != portal.ID
if dbMsg.Status.Type == newStatus && !chatIDChanged && !(dbMsg.Status.HasPendingMediaParts() && !hasInProgressMedia(evt)) { hasPendingMedia := dbMsg.Status.HasPendingMediaParts()
log.Debug().Msg("Nothing changed in message update, just syncing reactions") updatedMediaIsComplete := !hasInProgressMedia(evt)
if dbMsg.Status.Type == newStatus && !chatIDChanged && !(hasPendingMedia && updatedMediaIsComplete) {
logEvt := log.Debug().
Str("old_status", dbMsg.Status.Type.String()).
Bool("has_pending_media", hasPendingMedia).
Bool("updated_media_is_complete", updatedMediaIsComplete)
if hasPendingMedia {
debugData := zerolog.Dict()
for _, part := range evt.MessageInfo {
media, ok := part.GetData().(*gmproto.MessageInfo_MediaContent)
if ok {
debugData.Dict(
part.GetActionMessageID(),
zerolog.Dict().
Str("media_id_1", media.MediaContent.GetMediaID()).
Str("media_id_2", media.MediaContent.GetMediaID2()).
Int64("size", media.MediaContent.GetSize()).
Int64("width", media.MediaContent.GetDimensions().GetWidth()).
Int64("height", media.MediaContent.GetDimensions().GetHeight()).
Bool("has_key_1", len(media.MediaContent.GetDecryptionKey()) > 0).
Bool("has_key_2", len(media.MediaContent.GetDecryptionKey2()) > 0).
Bool("has_unknown_fields", len(media.MediaContent.ProtoReflect().GetUnknown()) > 0),
)
} else {
debugData.Str(part.GetActionMessageID(), "not media")
}
}
logEvt = logEvt.Dict("pending_media_debug_data", debugData)
}
logEvt.Msg("Nothing changed in message update, just syncing reactions")
portal.syncReactions(ctx, source, dbMsg, evt.Reactions) portal.syncReactions(ctx, source, dbMsg, evt.Reactions)
return return
} }
@ -463,7 +492,7 @@ func (portal *Portal) handleExistingMessageUpdate(ctx context.Context, source *U
return return
case chatIDChanged, case chatIDChanged,
dbMsg.Status.MediaStatus != downloadPendingStatusMessage(newStatus), dbMsg.Status.MediaStatus != downloadPendingStatusMessage(newStatus),
dbMsg.Status.HasPendingMediaParts() && !hasInProgressMedia(evt), hasPendingMedia && updatedMediaIsComplete,
dbMsg.Status.PartCount != len(evt.MessageInfo): dbMsg.Status.PartCount != len(evt.MessageInfo):
converted := portal.convertGoogleMessage(ctx, source, evt, false, raw) converted := portal.convertGoogleMessage(ctx, source, evt, false, raw)
dbMsg.Status.MediaStatus = converted.MediaStatus dbMsg.Status.MediaStatus = converted.MediaStatus