iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chatinfo: log when chats have no or unknown photo types

Browse Source
This commit is contained in:
Nick Mills-Barrett
2025-04-07 13:57:52 +01:00
parent b955252a6a
commit 10b8c4b635
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/chatinfo.go
+8 -4
View File
@@ -186,8 +186,12 @@ func (t *TelegramClient) getGroupChatInfo(fullChat *tg.MessagesChatFull, chatID
return &chatInfo, isBroadcastChannel, nil return &chatInfo, isBroadcastChannel, nil
} }
func (t *TelegramClient) avatarFromPhoto(photo tg.PhotoClass) *bridgev2.Avatar { func (t *TelegramClient) avatarFromPhoto(ctx context.Context, photo tg.PhotoClass) *bridgev2.Avatar {
if photo == nil || photo.TypeID() != tg.PhotoTypeID { if photo == nil {
zerolog.Ctx(ctx).Trace().Msg("Chat photo is nil, returning no avatar")
return nil
} else if photo.TypeID() != tg.PhotoTypeID {
zerolog.Ctx(ctx).Warn().Uint32("type_id", photo.TypeID()).Msg("Chat photo type unknown, returning no avatar")
return nil return nil
} }
return &bridgev2.Avatar{ return &bridgev2.Avatar{
@@ -256,7 +260,7 @@ func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta
if !ok { if !ok {
return nil, fmt.Errorf("full chat is %T not *tg.ChatFull", fullChat.FullChat) return nil, fmt.Errorf("full chat is %T not *tg.ChatFull", fullChat.FullChat)
} }
chatInfo.Avatar = t.avatarFromPhoto(chatFull.ChatPhoto) chatInfo.Avatar = t.avatarFromPhoto(ctx, chatFull.ChatPhoto)
if chatFull.Participants.TypeID() == tg.ChatParticipantsForbiddenTypeID { if chatFull.Participants.TypeID() == tg.ChatParticipantsForbiddenTypeID {
chatInfo.Members.IsFull = false chatInfo.Members.IsFull = false
@@ -320,7 +324,7 @@ func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta
return nil, fmt.Errorf("too many participants (%d) in chat %d", channelFull.ParticipantsCount, id) return nil, fmt.Errorf("too many participants (%d) in chat %d", channelFull.ParticipantsCount, id)
} }
chatInfo.Avatar = t.avatarFromPhoto(channelFull.ChatPhoto) chatInfo.Avatar = t.avatarFromPhoto(ctx, channelFull.ChatPhoto)
// TODO save available reactions? // TODO save available reactions?
// TODO save reactions limit? // TODO save reactions limit?
pkg/connector/telegram.go
+1 -1
View File
@@ -191,7 +191,7 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, entities tg.Ent
case *tg.MessageActionChatEditPhoto: case *tg.MessageActionChatEditPhoto:
t.main.Bridge.QueueRemoteEvent(t.userLogin, &simplevent.ChatInfoChange{ t.main.Bridge.QueueRemoteEvent(t.userLogin, &simplevent.ChatInfoChange{
EventMeta: eventMeta.WithType(bridgev2.RemoteEventChatInfoChange), EventMeta: eventMeta.WithType(bridgev2.RemoteEventChatInfoChange),
ChatInfoChange: &bridgev2.ChatInfoChange{ChatInfo: &bridgev2.ChatInfo{Avatar: t.avatarFromPhoto(action.Photo)}}, ChatInfoChange: &bridgev2.ChatInfoChange{ChatInfo: &bridgev2.ChatInfo{Avatar: t.avatarFromPhoto(ctx, action.Photo)}},
}) })
case *tg.MessageActionChatDeletePhoto: case *tg.MessageActionChatDeletePhoto:
t.main.Bridge.QueueRemoteEvent(t.userLogin, &simplevent.ChatInfoChange{ t.main.Bridge.QueueRemoteEvent(t.userLogin, &simplevent.ChatInfoChange{