From 7135e39beb4ce991d5a49eaeca416f42c4dabd42 Mon Sep 17 00:00:00 2001
From: Astra <astra@zio.sh>
Date: Tue, 3 Feb 2026 19:37:51 +0000
Subject: [PATCH] Add @ to username

---
 main.go | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index bb03174..33834e8 100644
--- a/main.go
+++ b/main.go
@@ -108,7 +108,7 @@ func (bot *Bot) handleJoinRequestResponse(user *ExtendedChatJoinRequest, update
 		if user.From.UserName != "" {
 			userString = "@" + user.From.UserName
 		} else {
-			userString = fmt.Sprintf("%s %s (no username)", user.From.FirstName, user.From.LastName)
+			userString = fmt.Sprintf("%s %s", user.From.FirstName, user.From.LastName)
 		}
 		edit := api.NewEditMessageText(bot.Config.AdminChatId, user.JoinRequestMessageID,
 			fmt.Sprintf(AdminJoinRequestMsg,
@@ -139,7 +139,7 @@ func (bot *Bot) handleJoinRequest(request *api.ChatJoinRequest) {
 	if request.From.UserName != "" {
 		userString = "@" + request.From.UserName
 	} else {
-		userString = fmt.Sprintf("%s %s (no username)", request.From.FirstName, request.From.LastName)
+		userString = fmt.Sprintf("%s %s", request.From.FirstName, request.From.LastName)
 	}
 	m = api.NewMessage(bot.Config.AdminChatId,
 		fmt.Sprintf(AdminJoinRequestMsg, userString, request.From.ID, "(awaiting user response)"))
@@ -197,9 +197,16 @@ func (bot *Bot) handleCallbackQuery(query *api.CallbackQuery) {
 				return
 			}
 
+			approveUserString := ""
+			if query.From.UserName != "" {
+				approveUserString = "@" + query.From.UserName
+			} else {
+				approveUserString = fmt.Sprintf("%s %s", query.From.FirstName, query.From.LastName)
+			}
+
 			edit := api.NewEditMessageText(bot.Config.AdminChatId, user.JoinRequestMessageID,
 				fmt.Sprintf(AdminApprovedMsg,
-					userString, user.From.ID, user.JoinReason, query.From.String(), time.Now().Format("2006-01-02 15:04:05")))
+					userString, user.From.ID, user.JoinReason, approveUserString, time.Now().Format("2006-01-02 15:04:05")))
 			edit.ParseMode = api.ModeHTML
 			bot.API.Send(edit)
 
@@ -238,9 +245,17 @@ func (bot *Bot) handleCallbackQuery(query *api.CallbackQuery) {
 				return
 			}
 
+			declinedUserString := ""
+			if query.From.UserName != "" {
+				declinedUserString = "@" + query.From.UserName
+			} else {
+				declinedUserString = fmt.Sprintf("%s %s", query.From.FirstName, query.From.LastName)
+			}
+
 			edit := api.NewEditMessageText(bot.Config.AdminChatId, user.JoinRequestMessageID,
 				fmt.Sprintf(AdminDeclinedMsg,
-					userString, user.From.ID, user.JoinReason, query.From.String(), time.Now().Format("2006-01-02 15:04:05"), "(no reason provided, reply to this to send one, prepend with + to also send to user)"))
+					userString, user.From.ID, user.JoinReason, declinedUserString, time.Now().Format("2006-01-02 15:04:05"),
+					"(no reason provided, reply to this to send one, prepend with + to also send to user)"))
 			edit.ParseMode = api.ModeHTML
 			bot.API.Send(edit)