4 Commits

Author SHA1 Message Date
bc6dc28b0a Bugfixes 2024-07-06 22:56:19 +02:00
88ba1cea73 Merge pull request '//' (#4) from refactoring into main
Reviewed-on: #4
2024-07-06 22:30:07 +02:00
92f1e3c6ee // 2024-07-06 22:23:46 +02:00
2e4a30ea01 Merge pull request 'Make sure people in the admin_role can do the setupo' (#3) from Perms into main
Reviewed-on: #3
2024-07-06 22:02:36 +02:00

View File

@ -122,10 +122,10 @@ func getUsernameFromMember(member *discordgo.Member) string {
var userName string var userName string
if member.Nick != "" { if member.Nick != "" {
userName = member.Nick userName = member.Nick
} else if member.User != nil && member.User.Username != "" { } else if member.User.GlobalName != "" {
userName = member.User.Username userName = member.User.GlobalName
} else { } else {
userName = "UnknownUser" userName = member.User.Username
} }
return userName return userName
} }
@ -330,7 +330,7 @@ var (
} }
_, err = client.ChannelMessageSendComplex(channel.ID, &discordgo.MessageSend{ _, err = client.ChannelMessageSendComplex(channel.ID, &discordgo.MessageSend{
Content: fmt.Sprintf("Reset request by %s for %s", userName, softwareType), Content: fmt.Sprintf("Reset request by <@%s> for %s", userID, softwareType),
Components: []discordgo.MessageComponent{ Components: []discordgo.MessageComponent{
discordgo.ActionsRow{ discordgo.ActionsRow{
Components: []discordgo.MessageComponent{ Components: []discordgo.MessageComponent{