Updated Discord username validator
This commit is contained in:
@ -112,7 +112,7 @@ func (user *User) Edit(ctx aero.Context, key string, value reflect.Value, newVal
|
||||
}
|
||||
|
||||
if !validate.DiscordNick(newNick) {
|
||||
return true, errors.New("Discord username must include your name and the 4-digit Discord tag (e.g. Yandere#1234)")
|
||||
return true, errors.New("Not a valid Discord username")
|
||||
}
|
||||
|
||||
// Trim spaces
|
||||
|
@ -22,7 +22,7 @@ const (
|
||||
)
|
||||
|
||||
var (
|
||||
discordNickRegex = regexp.MustCompile(`^([^#]{2,32})#(\d{4})$`)
|
||||
discordNickRegex = regexp.MustCompile(`^([^#]{2,32})$`)
|
||||
emailRegex = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$")
|
||||
)
|
||||
|
||||
|
@ -30,7 +30,7 @@ const (
|
||||
|
||||
// Verify verifies that the given user has an account on notify.moe.
|
||||
func Verify(s *discordgo.Session, msg *discordgo.MessageCreate) bool {
|
||||
discordTag := msg.Author.Username + "#" + msg.Author.Discriminator
|
||||
discordTag := msg.Author.Username
|
||||
|
||||
if msg.Content == "!verify" {
|
||||
_, err := s.ChannelMessageSend(msg.ChannelID, fmt.Sprintf("To verify your account, first add `%s` as your Discord account on https://notify.moe/settings/accounts, then type `!verify` followed by your username on notify.moe, e.g. `!verify MyName`", discordTag))
|
||||
|
Reference in New Issue
Block a user