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

connector/client: convert some bad credentials to unknown errors

Browse Source 
Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
This commit is contained in:
Sumner Evans
2024-10-30 14:27:28 -06:00
parent bda33687af
commit 15fdd89e3d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/client.go
+12 -8
View File
@@ -391,6 +391,14 @@ func (t *TelegramClient) sendBadCredentials(message string) {
}) })
} }
func (t *TelegramClient) sendUnknownError(message string) {
t.userLogin.BridgeState.Send(status.BridgeState{
StateEvent: status.StateUnknownError,
Error: "tg-not-authenticated",
Message: message,
})
}
func (t *TelegramClient) onConnectionStateChange(reason string) func() { func (t *TelegramClient) onConnectionStateChange(reason string) func() {
return func() { return func() {
log := t.main.Bridge.Log.With(). log := t.main.Bridge.Log.With().
@@ -403,11 +411,7 @@ func (t *TelegramClient) onConnectionStateChange(reason string) func() {
authStatus, err := t.client.Auth().Status(ctx) authStatus, err := t.client.Auth().Status(ctx)
if err != nil { if err != nil {
t.userLogin.BridgeState.Send(status.BridgeState{ t.sendUnknownError(err.Error())
StateEvent: status.StateUnknownError,
Error: "tg-not-authenticated",
Message: err.Error(),
})
t.userLogin.Metadata.(*UserLoginMetadata).Session.AuthKey = nil t.userLogin.Metadata.(*UserLoginMetadata).Session.AuthKey = nil
if err := t.userLogin.Save(ctx); err != nil { if err := t.userLogin.Save(ctx); err != nil {
log.Err(err).Msg("failed to save user login") log.Err(err).Msg("failed to save user login")
@@ -441,7 +445,7 @@ func (t *TelegramClient) Connect(ctx context.Context) error {
var err error var err error
ctx, t.clientCancel, err = connectTelegramClient(ctx, t.client) ctx, t.clientCancel, err = connectTelegramClient(ctx, t.client)
if err != nil { if err != nil {
t.sendBadCredentials(err.Error()) t.sendUnknownError(err.Error())
return nil return nil
} }
go func() { go func() {
@@ -455,9 +459,9 @@ func (t *TelegramClient) Connect(ctx context.Context) error {
// Update the logged-in user's ghost info (this also updates the user // Update the logged-in user's ghost info (this also updates the user
// login's remote name and profile). // login's remote name and profile).
if me, err := t.client.Self(ctx); err != nil { if me, err := t.client.Self(ctx); err != nil {
t.sendBadCredentials(fmt.Sprintf("failed to get self: %v", err)) t.sendUnknownError(fmt.Sprintf("failed to get self: %v", err))
} else if _, err := t.updateGhost(ctx, t.telegramUserID, me); err != nil { } else if _, err := t.updateGhost(ctx, t.telegramUserID, me); err != nil {
t.sendBadCredentials(fmt.Sprintf("failed to update own ghost: %v", err)) t.sendUnknownError(fmt.Sprintf("failed to update own ghost: %v", err))
} else { } else {
t.userLogin.BridgeState.Send(status.BridgeState{StateEvent: status.StateConnected}) t.userLogin.BridgeState.Send(status.BridgeState{StateEvent: status.StateConnected})
} }