diff --git a/discord/register.go b/discord/register.go index 23388fa..0161ae2 100644 --- a/discord/register.go +++ b/discord/register.go @@ -19,7 +19,7 @@ func init() { commands = append(commands, &command{ name: "register", validate: func(cmd commandInit) bool { - return len(cmd.message.Member.Roles) <= 1 + return len(cmd.message.Member.Roles) == 0 }, run: func(cmd commandInit) (string, error) { args := strings.Fields(cmd.message.Content) @@ -67,17 +67,12 @@ func init() { return "No application found for that player", nil } } - } else if len(cmd.message.Member.Roles) == 0 { - if len(apps) > 0 { - if apps[0].Accepted != nil && *apps[0].Accepted { - return fmt.Sprintf("Please join the server at `%s` and then re-try this command", cmd.config.Register.URL), nil - } - } else { - return "No player or applications found for that username", nil - } } - accepted := apps[0].Accepted + if len(apps) == 0 { + return "No player or applications found for that username", nil + } + accepted := apps[0].Accepted if accepted == nil { return "Your application is still being reviewed, hang tight", nil } else if !*accepted {