astra/telegram-join-approval-nuzzles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add @ to username

Browse source
This commit is contained in:
Astra 2026-02-03 19:37:51 +00:00
parent 4a76b9c212
commit 7135e39beb
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
main.go
View file

@ -108,7 +108,7 @@ func (bot *Bot) handleJoinRequestResponse(user *ExtendedChatJoinRequest, update
if user.From.UserName != "" { if user.From.UserName != "" {
userString = "@" + user.From.UserName userString = "@" + user.From.UserName
} else { } 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, edit := api.NewEditMessageText(bot.Config.AdminChatId, user.JoinRequestMessageID,
fmt.Sprintf(AdminJoinRequestMsg, fmt.Sprintf(AdminJoinRequestMsg,
@ -139,7 +139,7 @@ func (bot *Bot) handleJoinRequest(request *api.ChatJoinRequest) {
if request.From.UserName != "" { if request.From.UserName != "" {
userString = "@" + request.From.UserName userString = "@" + request.From.UserName
} else { } 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, m = api.NewMessage(bot.Config.AdminChatId,
fmt.Sprintf(AdminJoinRequestMsg, userString, request.From.ID, "(awaiting user response)")) fmt.Sprintf(AdminJoinRequestMsg, userString, request.From.ID, "(awaiting user response)"))
@ -197,9 +197,16 @@ func (bot *Bot) handleCallbackQuery(query *api.CallbackQuery) {
return 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, edit := api.NewEditMessageText(bot.Config.AdminChatId, user.JoinRequestMessageID,
fmt.Sprintf(AdminApprovedMsg, 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 edit.ParseMode = api.ModeHTML
bot.API.Send(edit) bot.API.Send(edit)
@ -238,9 +245,17 @@ func (bot *Bot) handleCallbackQuery(query *api.CallbackQuery) {
return 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, edit := api.NewEditMessageText(bot.Config.AdminChatId, user.JoinRequestMessageID,
fmt.Sprintf(AdminDeclinedMsg, 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 edit.ParseMode = api.ModeHTML
bot.API.Send(edit) bot.API.Send(edit)