diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
| commit | 848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09 (patch) | |
| tree | 98390442e8052b8e02469e5ccf7596e22b7ea07f /model/utils.go | |
| parent | e87adce4a059b97a65198b326be6304abdf4e657 (diff) | |
| parent | bee26e3f2654ce7acce647818847480569236343 (diff) | |
| download | chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.gz chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.bz2 chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.zip | |
fixing merge conflicts
Diffstat (limited to 'model/utils.go')
| -rw-r--r-- | model/utils.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/model/utils.go b/model/utils.go index 465901a09..38592b984 100644 --- a/model/utils.go +++ b/model/utils.go @@ -148,7 +148,7 @@ func IsValidEmail(email string) bool { return false } -var reservedDomains = []string{ +var reservedName = []string{ "www", "web", "admin", @@ -168,10 +168,10 @@ var reservedDomains = []string{ "api", } -func IsReservedDomain(s string) bool { +func IsReservedTeamName(s string) bool { s = strings.ToLower(s) - for _, value := range reservedDomains { + for _, value := range reservedName { if strings.Index(s, value) == 0 { return true } @@ -180,7 +180,7 @@ func IsReservedDomain(s string) bool { return false } -func IsValidDomain(s string) bool { +func IsValidTeamName(s string) bool { if !IsValidAlphaNum(s) { return false |