From cd0d9408892c1fdfb317e74e69ef292030192449 Mon Sep 17 00:00:00 2001
From: Sumner Evans <sumner.evans@automattic.com>
Date: Mon, 9 Sep 2024 21:47:19 -0600
Subject: [PATCH] connector/login: normalize phone number on finalize

Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
---
 pkg/connector/login.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/connector/login.go b/pkg/connector/login.go
index 7b2ed2cf..99a68a88 100644
--- a/pkg/connector/login.go
+++ b/pkg/connector/login.go
@@ -19,6 +19,7 @@ package connector
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/gotd/td/tg"
 	"maunium.net/go/mautrix/bridge/status"
@@ -92,9 +93,10 @@ func finalizeLogin(ctx context.Context, user *bridgev2.User, authorization *tg.A
 	if username == "" && len(me.Usernames) > 0 {
 		username = me.Usernames[0].Username
 	}
+	normalizedPhone := "+" + strings.TrimPrefix(me.Phone, "+")
 	remoteName := username
 	if remoteName == "" {
-		remoteName = me.Phone
+		remoteName = normalizedPhone
 	}
 	if remoteName == "" {
 		remoteName = fullName