summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--model/user.go1
-rw-r--r--webapp/utils/constants.jsx3
2 files changed, 3 insertions, 1 deletions
diff --git a/model/user.go b/model/user.go
index 2a7427748..bad616d73 100644
--- a/model/user.go
+++ b/model/user.go
@@ -413,6 +413,7 @@ var validUsernameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`)
var restrictedUsernames = []string{
"all",
"channel",
+ "matterbot",
}
func IsValidUsername(s string) bool {
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index 207ec5811..2b7a1564e 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -310,7 +310,8 @@ export const Constants = {
'valet',
'all',
'channel',
- 'here'
+ 'here',
+ 'matterbot'
],
MONTHS: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
MAX_DMS: 20,