fix

untitled/rules.py

@@ -3,22 +3,24 @@ import string
 from untitled import content, model
 
 
-def validate_cat_name(name, auto_gen=False):
+def validate_cat_name(name):
     ALLOWED = set(string.ascii_letters + string.digits)
-    if not auto_gen:
-        if len(name) < 4 or len(name) > 24:
-            return "Your cat's name must be 4-24 characters long."
-    else:
-        if len(name) < 4 or len(name) > 9:
-            return "Your cat's name must be greater than 3 characters and below 9 characters long."
-        if not any(c in "aeiou" for c in name.lower()):
-            return "Your cat's name must contain a vowel."
+    if len(name) < 4 or len(name) > 24:
+        return "Your cat's name must be 4-24 characters long."
+
     if not all(c in ALLOWED for c in name):
         return "Your cat's name can only have letters and numbers."
     if not any(c in string.ascii_letters for c in name):
         return "Your cat's name needs at least 1 letter."
 
 
+def validate_auto_gen_cat_name(name):
+    if len(name) < 4 or len(name) > 9:
+        return "Your cat's name must be greater than 3 characters and below 9 characters long."
+    if not any(c in "aeiou" for c in name.lower()):
+        return "Your cat's name must contain a vowel."
+
+
 def _clamp(value, low=0, high=100):
     if value < low:
         return low