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

handletelegram: stop returning unnecessary errors

Browse Source
This commit is contained in:
Tulir Asokan
2025-07-31 14:12:14 +03:00
parent 0bc1bd04c5
commit f5bfe421d1
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/reactions.go
+2 -1
View File
@@ -135,7 +135,8 @@ func (t *TelegramClient) handleTelegramReactions(ctx context.Context, msg *tg.Me
emojiID, emoji, err := computeEmojiAndID(reaction.Reaction, customEmojis) emojiID, emoji, err := computeEmojiAndID(reaction.Reaction, customEmojis)
if err != nil { if err != nil {
return fmt.Errorf("failed to compute emoji and ID: %w", err) log.Err(err).Msg("Failed to compute emoji and ID for reaction")
continue
} }
users[userID].Reactions = append(users[userID].Reactions, &bridgev2.BackfillReaction{ users[userID].Reactions = append(users[userID].Reactions, &bridgev2.BackfillReaction{
pkg/connector/telegram.go
+8 -5
View File
@@ -92,9 +92,9 @@ func (t *TelegramClient) onUpdateChannel(ctx context.Context, e tg.Entities, upd
if tgerr.Is(err, tg.ErrChannelInvalid, tg.ErrChannelPrivate) { if tgerr.Is(err, tg.ErrChannelInvalid, tg.ErrChannelPrivate) {
return t.selfLeaveChat(portalKey) return t.selfLeaveChat(portalKey)
} }
return fmt.Errorf("failed to get channel: %w", err) log.Err(err).Msg("Failed to get channel info after UpdateChannel event")
} else if len(chats.GetChats()) != 1 { } else if len(chats.GetChats()) != 1 {
return fmt.Errorf("expected 1 chat, got %d", len(chats.GetChats())) log.Warn().Int("chat_count", len(chats.GetChats())).Msg("Got more than 1 chat in GetChannels response")
} else if channel, ok := chats.GetChats()[0].(*tg.Channel); !ok { } else if channel, ok := chats.GetChats()[0].(*tg.Channel); !ok {
log.Error().Type("chat_type", chats.GetChats()[0]).Msg("Expected channel, got something else. Leaving the channel.") log.Error().Type("chat_type", chats.GetChats()[0]).Msg("Expected channel, got something else. Leaving the channel.")
return t.selfLeaveChat(portalKey) return t.selfLeaveChat(portalKey)
@@ -404,7 +404,8 @@ func (t *TelegramClient) onUpdateNewMessage(ctx context.Context, entities tg.Ent
case tg.PhoneCallDiscardReasonBusyTypeID: case tg.PhoneCallDiscardReasonBusyTypeID:
body.WriteString("rejected") body.WriteString("rejected")
default: default:
return fmt.Errorf("unknown call end reason %T", action.Reason) log.Warn().Stringer("end_reason", action.Reason).Msg("Unknown call end reason")
return nil
} }
if action.Duration > 0 { if action.Duration > 0 {
@@ -1236,7 +1237,8 @@ func (t *TelegramClient) onPeerBlocked(ctx context.Context, e tg.Entities, updat
if peer, ok := update.PeerID.(*tg.PeerUser); ok { if peer, ok := update.PeerID.(*tg.PeerUser); ok {
userID = ids.MakeUserID(peer.UserID) userID = ids.MakeUserID(peer.UserID)
} else { } else {
return fmt.Errorf("unexpected peer type in peer blocked update %T", update.PeerID) zerolog.Ctx(ctx).Warn().Type("peer_type", update.PeerID).Msg("Unexpected peer type in peer blocked update")
return nil
} }
// Update the ghost // Update the ghost
@@ -1279,7 +1281,8 @@ func (t *TelegramClient) onPhoneCall(ctx context.Context, e tg.Entities, update
log.Info().Type("type", update.PhoneCall).Msg("Unhandled phone call update class") log.Info().Type("type", update.PhoneCall).Msg("Unhandled phone call update class")
return nil return nil
} else if call.ParticipantID != t.telegramUserID { } else if call.ParticipantID != t.telegramUserID {
return fmt.Errorf("received phone call for user that is not us") log.Warn().Msg("Received phone call for user that is not us")
return nil
} }
var body strings.Builder var body strings.Builder