diff options
| author | JoramWilander <jwawilander@gmail.com> | 2018-07-10 12:51:07 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2018-07-10 12:51:07 -0400 |
| commit | 1e1a5e5e85240f25c4faddcb24c5a29a915fe6e4 (patch) | |
| tree | d4c64bbd826259e494c05b829e228930f143489a /model | |
| parent | 6daf82073de808a9c7f22fe8f75be815835362cc (diff) | |
| parent | 9470564d355c201155f6fcb123152b8ac954f812 (diff) | |
| download | chat-1e1a5e5e85240f25c4faddcb24c5a29a915fe6e4.tar.gz chat-1e1a5e5e85240f25c4faddcb24c5a29a915fe6e4.tar.bz2 chat-1e1a5e5e85240f25c4faddcb24c5a29a915fe6e4.zip | |
Merge branch 'master' into plugins-2
Diffstat (limited to 'model')
| -rw-r--r-- | model/user.go | 1 | ||||
| -rw-r--r-- | model/user_test.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/model/user.go b/model/user.go index c5d6c13b6..e56f3aaed 100644 --- a/model/user.go +++ b/model/user.go @@ -565,6 +565,7 @@ var restrictedUsernames = []string{ "all", "channel", "matterbot", + "system", } func IsValidUsername(s string) bool { diff --git a/model/user_test.go b/model/user_test.go index 645eaadff..a1953a40d 100644 --- a/model/user_test.go +++ b/model/user_test.go @@ -272,6 +272,7 @@ var usernames = []struct { {"spin'punch", false}, {"spin*punch", false}, {"all", false}, + {"system", false}, } func TestValidUsername(t *testing.T) { |