From e9fc3463cb5b5ee4bb3c4053d4544c7093916777 Mon Sep 17 00:00:00 2001
From: trhr <sage@limitlessinteractive.com>
Date: Thu, 9 Apr 2020 18:30:54 -0500
Subject: [PATCH] With recommended changes

---
 evennia/objects/objects.py | 34 +++++++++++++++++++++++++++-------
 evennia/objects/tests.py   |  6 ++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 9d9d2eb41e..9a04ba6969 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -2063,9 +2063,15 @@ class DefaultCharacter(DefaultObject):
         # If no typeclass supplied, use this class
         kwargs["typeclass"] = kwargs.pop("typeclass", cls)
 
+        # Normalize to latin characters and validate, if necessary, the supplied key
+        key = cls.normalize_name(key)
+
+        if not cls.validate_name(key):
+            errors.append("Invalid character name.")
+            return obj, errors
+
         # Set the supplied key as the name of the intended object
         kwargs["key"] = key
-        key = cls._validate(key)
 
         # Get home for character
         kwargs["home"] = ObjectDB.objects.get_id(kwargs.get("home", settings.DEFAULT_HOME))
@@ -2117,21 +2123,35 @@ class DefaultCharacter(DefaultObject):
         return obj, errors
 
     @classmethod
-    def _validate(cls, key):
+    def normalize_name(cls, name):
         """
-        Validate that character name is acceptable prior to creating. Note that this should be refactored
+        Normalize the character name prior to creating. Note that this should be refactored
         to support i18n for non-latin scripts, but as we (currently) have no bug reports requesting better
         support of non-latin character sets, requiring character names to be latinified is an acceptable option.
 
         Args:
-            key (str) : The name of the character
+            name (str) : The name of the character
 
         Returns:
-            key (str) : A valid name.
+            latin_name (str) : A valid name.
         """
+
         from evennia.utils.utils import latinify
-        key = latinify(key, default="X")
-        return key
+        latin_name = latinify(name, default="X")
+        return latin_name
+
+    @classmethod
+    def validate_name(cls, name):
+        """ Validate the character name prior to creating. Overload this function to add custom validators
+
+        Args:
+            name (str) : The name of the character
+        Returns:
+            valid (bool) : True if character creation should continue; False if it should fail
+
+        """
+
+        return True # Default validator does not perform any operations
 
     def basetype_setup(self):
         """
diff --git a/evennia/objects/tests.py b/evennia/objects/tests.py
index 75f91cba36..5944ee5aad 100644
--- a/evennia/objects/tests.py
+++ b/evennia/objects/tests.py
@@ -39,6 +39,12 @@ class DefaultObjectTest(EvenniaTest):
         self.assertFalse(errors, errors)
         self.assertEqual(obj.db_home, self.room1)
 
+    def test_character_create_weirdname(self):
+        obj, errors = DefaultCharacter.create("SigurðurÞórarinsson", self.account, home=self.room1.dbref)
+        self.assertTrue(obj, errors)
+        self.assertFalse(errors, errors)
+        self.assertEqual(obj.name, "SigurXurXorarinsson")
+
     def test_room_create(self):
         description = "A dimly-lit alley behind the local Chinese restaurant."
         obj, errors = DefaultRoom.create("alley", self.account, description=description, ip=self.ip)