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

formatting: fix username parsing and insertion

Browse Source 
Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
This commit is contained in:
Sumner Evans
2024-09-10 00:08:00 -06:00
parent 50ab23423f
commit 87f9f008e6
1 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/client.go
+14 -27
View File
@@ -222,23 +222,17 @@ func NewTelegramClient(ctx context.Context, tc *TelegramConnector, login *bridge
return userInfo, nil return userInfo, nil
}, },
GetUserInfoByUsername: func(ctx context.Context, username string) (telegramfmt.UserInfo, error) { GetUserInfoByUsername: func(ctx context.Context, username string) (telegramfmt.UserInfo, error) {
// FIXME this should just query telegram_user_metadata by username if userID, err := client.ScopedStore.GetUserIDByUsername(ctx, username); err != nil {
ghosts, err := tc.Bridge.DB.Ghost.GetByMetadata(ctx, "username", username)
if err != nil {
return telegramfmt.UserInfo{}, err return telegramfmt.UserInfo{}, err
} } else if ghost, err := tc.Bridge.GetGhostByID(ctx, ids.MakeUserID(userID)); err != nil {
if len(ghosts) != 1 {
return telegramfmt.UserInfo{}, fmt.Errorf("username %s not found", username)
}
ghost, err := tc.Bridge.GetGhostByID(ctx, ghosts[0].ID)
if err != nil {
return telegramfmt.UserInfo{}, err return telegramfmt.UserInfo{}, err
} else {
userInfo := telegramfmt.UserInfo{MXID: ghost.Intent.GetMXID(), Name: ghost.Name}
if ghost.ID == client.userID {
userInfo.MXID = client.userLogin.UserMXID
}
return userInfo, nil
} }
userInfo := telegramfmt.UserInfo{MXID: ghost.Intent.GetMXID(), Name: ghost.Name}
if ghosts[0].ID == client.userID {
userInfo.MXID = client.userLogin.UserMXID
}
return userInfo, nil
}, },
NormalizeURL: func(ctx context.Context, url string) string { NormalizeURL: func(ctx context.Context, url string) string {
log := zerolog.Ctx(ctx).With(). log := zerolog.Ctx(ctx).With().
@@ -298,24 +292,17 @@ func NewTelegramClient(ctx context.Context, tc *TelegramConnector, login *bridge
} }
client.matrixParser = &matrixfmt.HTMLParser{ client.matrixParser = &matrixfmt.HTMLParser{
GetGhostDetails: func(ctx context.Context, ui id.UserID) (networkid.UserID, string, int64, bool) { GetGhostDetails: func(ctx context.Context, ui id.UserID) (networkid.UserID, string, int64, bool) {
userID, ok := tc.Bridge.Matrix.ParseGhostMXID(ui) if userID, ok := tc.Bridge.Matrix.ParseGhostMXID(ui); !ok {
if !ok {
return "", "", 0, false return "", "", 0, false
} } else if telegramUserID, err := ids.ParseUserID(userID); err != nil {
telegramUserID, err := ids.ParseUserID(userID)
if err != nil {
return "", "", 0, false return "", "", 0, false
} } else if accessHash, err := client.ScopedStore.GetAccessHash(ctx, telegramUserID); err != nil || accessHash == 0 {
ss := tc.Store.GetScopedStore(telegramUserID)
accessHash, err := ss.GetAccessHash(ctx, telegramUserID)
if err != nil || accessHash == 0 {
return "", "", 0, false return "", "", 0, false
} } else if username, err := client.ScopedStore.GetUsername(ctx, telegramUserID); err != nil {
username, err := ss.GetUsername(ctx, telegramUserID)
if err != nil {
return "", "", 0, false return "", "", 0, false
} else {
return userID, username, accessHash, true
} }
return userID, username, accessHash, true
}, },
} }