From 4d58fc5f883774b0f08824d281786649002a90e6 Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Fri, 28 Nov 2025 16:34:39 +0000
Subject: [PATCH] telegram: fix linking on sign-up

fixes #440.
---
 api-messages.go |  8 +++++---
 api-userpage.go |  8 +++++---
 storage.go      |  7 ++-----
 telegram.go     | 12 +++++++-----
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/api-messages.go b/api-messages.go
index 0abc4e6..0b72330 100644
--- a/api-messages.go
+++ b/api-messages.go
@@ -254,9 +254,11 @@ func (app *appContext) TelegramAddUser(gc *gin.Context) {
 		return
 	}
 	tgUser := TelegramUser{
-		ChatID:   tgToken.ChatID,
-		Username: tgToken.Username,
-		Contact:  true,
+		TelegramVerifiedToken: TelegramVerifiedToken{
+			ChatID:   tgToken.ChatID,
+			Username: tgToken.Username,
+		},
+		Contact: true,
 	}
 	if lang, ok := app.telegram.languages[tgToken.ChatID]; ok {
 		tgUser.Lang = lang
diff --git a/api-userpage.go b/api-userpage.go
index f25dd8a..7b86d9b 100644
--- a/api-userpage.go
+++ b/api-userpage.go
@@ -394,9 +394,11 @@ func (app *appContext) MyTelegramVerifiedInvite(gc *gin.Context) {
 		return
 	}
 	tgUser := TelegramUser{
-		ChatID:   token.ChatID,
-		Username: token.Username,
-		Contact:  true,
+		TelegramVerifiedToken: TelegramVerifiedToken{
+			ChatID:   token.ChatID,
+			Username: token.Username,
+		},
+		Contact: true,
 	}
 	if lang, ok := app.telegram.languages[tgUser.ChatID]; ok {
 		tgUser.Lang = lang
diff --git a/storage.go b/storage.go
index 232e53a..9e4e9b1 100644
--- a/storage.go
+++ b/storage.go
@@ -670,11 +670,8 @@ type DiscordUser struct {
 
 type TelegramUser struct {
 	TelegramVerifiedToken
-	JellyfinID string `badgerhold:"key"`
-	ChatID     int64  `badgerhold:"index"`
-	Username   string `badgerhold:"index"`
-	Lang       string
-	Contact    bool // Whether to contact through telegram or not
+	Lang    string
+	Contact bool // Whether to contact through telegram or not
 }
 
 type MatrixUser struct {
diff --git a/telegram.go b/telegram.go
index 384efc6..068673d 100644
--- a/telegram.go
+++ b/telegram.go
@@ -30,11 +30,13 @@ func (tv TelegramVerifiedToken) ToUser() *TelegramUser {
 
 func EmptyTelegramUser() *TelegramUser {
 	return &TelegramUser{
-		JellyfinID: "",
-		ChatID:     0,
-		Username:   "",
-		Lang:       "",
-		Contact:    false,
+		TelegramVerifiedToken: TelegramVerifiedToken{
+			JellyfinID: "",
+			ChatID:     0,
+			Username:   "",
+		},
+		Lang:    "",
+		Contact: false,
 	}
 }