Merged. Still need to update some migrations.

src/server/initial_setup.py

@@ -7,13 +7,15 @@ Everything starts at handle_setup()
 """
 
 import django
-from django.contrib.auth.models import User
 from django.core import management
 from django.conf import settings
+from django.core.management import call_command
+from django.contrib.auth import get_user_model
 from src.server.models import ServerConfig
 from src.help.models import HelpEntry
 from src.utils import create
 
+
 from django.utils.translation import ugettext as _
 
 def create_config_values():
@@ -23,11 +25,20 @@ def create_config_values():
     ServerConfig.objects.conf("site_name", settings.SERVERNAME)
     ServerConfig.objects.conf("idle_timeout", settings.IDLE_TIMEOUT)
 
-def get_god_user():
+def get_god_player():
     """
-    Returns the initially created 'god' User object.
+    Creates the god user.
     """
-    return User.objects.get(id=1)
+    PlayerDB = get_user_model()
+    try:
+        god_player = PlayerDB.objects.get(id=1)
+    except PlayerDB.DoesNotExist:
+        txt = "\n\nNo superuser exists yet. The superuser is the 'owner' account on the"
+        txt += "\nEvennia server. Create a new superuser using the command"
+        txt += "\n\n  python manage.py createsuperuser"
+        txt += "\n\nFollow the prompts, then restart the server."
+        raise Exception(txt)
+    return god_player
 
 def create_objects():
     """
@@ -38,22 +49,26 @@ def create_objects():
 
     # Set the initial User's account object's username on the #1 object.
     # This object is pure django and only holds name, email and password.
-    god_user = get_god_user()
+    god_player = get_god_player()
 
     # Create a Player 'user profile' object to hold eventual
     # mud-specific settings for the bog standard User object. This is
     # accessed by user.get_profile() and can also store attributes.
     # It also holds mud permissions, but for a superuser these
     # have no effect anyhow.
-    character_typeclass = settings.BASE_CHARACTER_TYPECLASS
+    player_typeclass = settings.BASE_PLAYER_TYPECLASS
 
-    # Create the Player object as well as the in-game god-character
-    # for user #1. We can't set location and home yet since nothing
+    # run all creation hooks on god_player (we must do so manually since the manage.py command does not)
+    god_player.typeclass_path = player_typeclass
+    god_player.basetype_setup()
+    god_player.at_player_creation()
+    god_player.locks.add("examine:perm(Immortals);edit:false();delete:false();boot:false();msg:all()")
+
+    # Create the in-game god-character for player #1. We can't set location and home yet since nothing
     # exists. Also, all properties (name, email, password, is_superuser)
     # is inherited from the user so we don't specify it again here.
-
-    god_player = create.create_player(god_user.username, None, None, user=god_user)
-    god_character = create.create_object(character_typeclass, key=god_user.username)
+    character_typeclass = settings.BASE_CHARACTER_TYPECLASS
+    god_character = create.create_object(character_typeclass, key=god_player.username)
 
     god_character.id = 1
     god_character.db.desc = _('This is User #1.')
@@ -121,7 +136,7 @@ def create_channels():
         return
 
     # connect the god user to all these channels by default.
-    goduser = get_god_user()
+    goduser = get_god_player()
     from src.comms.models import PlayerChannelConnection
     PlayerChannelConnection.objects.create_connection(goduser, pchan)
     PlayerChannelConnection.objects.create_connection(goduser, ichan)

src/server/serversession.py

@@ -77,17 +77,16 @@ class ServerSession(Session):
         player - the player associated with the session
         """
         self.player = player
-        self.user = player.user
-        self.uid = self.user.id
-        self.uname = self.user.username
+        self.uid = self.player.id
+        self.uname = self.player.username
         self.logged_in = True
         self.conn_time = time.time()
         self.puid = None
         self.puppet = None
 
         # Update account's last login time.
-        self.user.last_login = datetime.now()
-        self.user.save()
+        self.player.last_login = datetime.now()
+        self.player.save()
 
     def at_disconnect(self):
         """
@@ -97,7 +96,7 @@ class ServerSession(Session):
             sessid = self.sessid
             player = self.player
             _GA(player.dbobj, "unpuppet_object")(sessid)
-            uaccount = _GA(player.dbobj, "user")
+            uaccount = player.dbobj
             uaccount.last_login = datetime.now()
             uaccount.save()
             # calling player hook