Reserved Usernames on Signup

pkg/config/config.go

@@ -59,7 +59,16 @@ const (
 )
 
 var (
-	UsernameRegexp = regexp.MustCompile(`^[a-z0-9_-]{3,32}$`)
+	UsernameRegexp    = regexp.MustCompile(`^[a-z0-9_-]{3,32}$`)
+	ReservedUsernames = []string{
+		"admin",
+		"admins",
+		"administrator",
+		"moderator",
+		"support",
+		"staff",
+		"nonshy",
+	}
 )
 
 // Photo Galleries

pkg/controller/account/signup.go

@@ -86,6 +86,15 @@ func Signup() http.HandlerFunc {
 				return
 			}
 
+			// Reserved username check.
+			for _, cmp := range config.ReservedUsernames {
+				if username == cmp {
+					session.FlashError(w, r, "That username is reserved, please choose a different username.")
+					templates.Redirect(w, r.URL.Path+"?token="+tokenStr)
+					return
+				}
+			}
+
 			// Cache username in case of passwd validation errors.
 			vars["Email"] = email
 			vars["Username"] = username

web/templates/account/settings.html

@@ -230,7 +230,8 @@
                                 </label>
                                 <p class="help">
                                     Check this box if you are OK seeing explicit content on this site, which may
-                                    include erections or sexually charged content.
+                                    include erections or sexually charged content. These may appear on the Site
+                                    Gallery as well as user profile pages.
                                 </p>
                             </div>