Merge branch 'main' into welcome

Fix nickname check
2022-01-19 19:50:59 +00:00 · 2022-01-19 19:48:59 +00:00
1 changed files with 1 additions and 1 deletions
--- a/discord/register.go
+++ b/discord/register.go
@ -90,8 +90,8 @@ func init() {
 			for _, member := range guild.Members {
 				nick := member.Nick
 				if nick == "" {
+					nick = member.User.Username
 				}
-				nick = member.User.Username
 				if strings.EqualFold(nickname, nick) && cmd.message.Author.ID != member.User.ID {
 					return "A member with that name already exists in this Discord. Please contact staff.", nil
 				}
Author	SHA1	Message	Date
jolheiser	c5e1fb1abf	Merge branch 'main' into welcome	2022-01-19 19:50:59 +00:00
jolheiser	a15bb13ba5	Fix nickname check	2022-01-19 19:48:59 +00:00