diff --git a/evennia/comms/migrations/0003_auto_20140917_0756.py b/evennia/comms/migrations/0003_auto_20140917_0756.py index 63cf9292f3..1ee5f874da 100644 --- a/evennia/comms/migrations/0003_auto_20140917_0756.py +++ b/evennia/comms/migrations/0003_auto_20140917_0756.py @@ -17,8 +17,8 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='msg', - name='db_hide_from_players', - field=models.ManyToManyField(related_name=b'hide_from_players_set', null=True, to=settings.AUTH_USER_MODEL), + name='db_hide_from_accounts', + field=models.ManyToManyField(related_name=b'hide_from_accounts_set', null=True, to=settings.AUTH_USER_MODEL), preserve_default=True, ), migrations.AddField( @@ -35,8 +35,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='msg', - name='db_receivers_players', - field=models.ManyToManyField(help_text=b'player receivers', related_name=b'receiver_player_set', null=True, to=settings.AUTH_USER_MODEL), + name='db_receivers_accounts', + field=models.ManyToManyField(help_text=b'account receivers', related_name=b'receiver_account_set', null=True, to=settings.AUTH_USER_MODEL), preserve_default=True, ), migrations.AddField( @@ -47,8 +47,8 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='msg', - name='db_sender_players', - field=models.ManyToManyField(related_name=b'sender_player_set', null=True, verbose_name=b'sender(player)', to=settings.AUTH_USER_MODEL, db_index=True), + name='db_sender_accounts', + field=models.ManyToManyField(related_name=b'sender_account_set', null=True, verbose_name=b'sender(account)', to=settings.AUTH_USER_MODEL, db_index=True), preserve_default=True, ), migrations.AddField( diff --git a/evennia/comms/migrations/0009_auto_20160921_1731.py b/evennia/comms/migrations/0009_auto_20160921_1731.py index 9415e233c2..3be041b88a 100644 --- a/evennia/comms/migrations/0009_auto_20160921_1731.py +++ b/evennia/comms/migrations/0009_auto_20160921_1731.py @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ), migrations.AlterField( model_name='msg', - name='db_hide_from_players', - field=models.ManyToManyField(blank=True, null=True, related_name='hide_from_players_set', to=settings.AUTH_USER_MODEL), + name='db_hide_from_accounts', + field=models.ManyToManyField(blank=True, null=True, related_name='hide_from_accounts_set', to=settings.AUTH_USER_MODEL), ), migrations.AlterField( model_name='msg', @@ -40,8 +40,8 @@ class Migration(migrations.Migration): ), migrations.AlterField( model_name='msg', - name='db_receivers_players', - field=models.ManyToManyField(blank=True, help_text=b'player receivers', null=True, related_name='receiver_player_set', to=settings.AUTH_USER_MODEL), + name='db_receivers_accounts', + field=models.ManyToManyField(blank=True, help_text=b'account receivers', null=True, related_name='receiver_account_set', to=settings.AUTH_USER_MODEL), ), migrations.AlterField( model_name='msg', @@ -55,8 +55,8 @@ class Migration(migrations.Migration): ), migrations.AlterField( model_name='msg', - name='db_sender_players', - field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='sender_player_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(player)'), + name='db_sender_accounts', + field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='sender_account_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(account)'), ), migrations.AlterField( model_name='msg', diff --git a/evennia/comms/migrations/0011_auto_20170606_1731.py b/evennia/comms/migrations/0011_auto_20170606_1731.py index 6d99ae85b3..f4df669e2d 100644 --- a/evennia/comms/migrations/0011_auto_20170606_1731.py +++ b/evennia/comms/migrations/0011_auto_20170606_1731.py @@ -45,8 +45,8 @@ class Migration(migrations.Migration): ), migrations.AlterField( model_name='msg', - name='db_hide_from_players', - field=models.ManyToManyField(blank=True, related_name='hide_from_players_set', to=settings.AUTH_USER_MODEL), + name='db_hide_from_accounts', + field=models.ManyToManyField(blank=True, related_name='hide_from_accounts_set', to=settings.AUTH_USER_MODEL), ), migrations.AlterField( model_name='msg', @@ -60,8 +60,8 @@ class Migration(migrations.Migration): ), migrations.AlterField( model_name='msg', - name='db_receivers_players', - field=models.ManyToManyField(blank=True, help_text=b'player receivers', related_name='receiver_player_set', to=settings.AUTH_USER_MODEL), + name='db_receivers_accounts', + field=models.ManyToManyField(blank=True, help_text=b'account receivers', related_name='receiver_account_set', to=settings.AUTH_USER_MODEL), ), migrations.AlterField( model_name='msg', @@ -70,8 +70,8 @@ class Migration(migrations.Migration): ), migrations.AlterField( model_name='msg', - name='db_sender_players', - field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_player_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(player)'), + name='db_sender_accounts', + field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_account_set', to=settings.AUTH_USER_MODEL, verbose_name=b'sender(account)'), ), migrations.AlterField( model_name='msg', diff --git a/evennia/comms/migrations/0014_auto_20170705_1736.py b/evennia/comms/migrations/0014_auto_20170705_1736.py index a8ece9e756..1550f6d10f 100644 --- a/evennia/comms/migrations/0014_auto_20170705_1736.py +++ b/evennia/comms/migrations/0014_auto_20170705_1736.py @@ -8,27 +8,27 @@ from django.db import migrations def forwards(apps, schema_editor): try: - apps.get_model('players', 'PlayerDB') + apps.get_model('accounts', 'AccountDB') except LookupError: return AccountDB = apps.get_model('accounts', 'AccountDB') Msg = apps.get_model('comms', 'Msg') for msg in Msg.objects.all(): - for player in msg.db_sender_players.all(): - account = AccountDB.objects.get(id=player.id) + for account in msg.db_sender_accounts.all(): + account = AccountDB.objects.get(id=account.id) msg.db_sender_accounts.add(account) - for player in msg.db_receivers_players.all(): - account = AccountDB.objects.get(id=player.id) + for account in msg.db_receivers_accounts.all(): + account = AccountDB.objects.get(id=account.id) msg.db_receivers_accounts.add(account) - for player in msg.db_hide_from_players.all(): - account = AccountDB.objects.get(id=player.id) + for account in msg.db_hide_from_accounts.all(): + account = AccountDB.objects.get(id=account.id) msg.db_hide_from_accounts.add(account) ChannelDB = apps.get_model('comms', 'ChannelDB') for channel in ChannelDB.objects.all(): - for player in channel.db_subscriptions.all(): - account = AccountDB.objects.get(id=player.id) + for account in channel.db_subscriptions.all(): + account = AccountDB.objects.get(id=account.id) channel.db_account_subscriptions.add(account) diff --git a/evennia/comms/migrations/0015_auto_20170706_2041.py b/evennia/comms/migrations/0015_auto_20170706_2041.py index ec5fc29201..0aa6dae002 100644 --- a/evennia/comms/migrations/0015_auto_20170706_2041.py +++ b/evennia/comms/migrations/0015_auto_20170706_2041.py @@ -18,10 +18,10 @@ class Migration(migrations.Migration): ), migrations.RemoveField( model_name='msg', - name='db_receivers_players', + name='db_receivers_accounts', ), migrations.RemoveField( model_name='msg', - name='db_sender_players', + name='db_sender_accounts', ), ] diff --git a/evennia/objects/migrations/0001_initial.py b/evennia/objects/migrations/0001_initial.py index 2ad6323226..bba205bffb 100644 --- a/evennia/objects/migrations/0001_initial.py +++ b/evennia/objects/migrations/0001_initial.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('db_typeclass_path', models.CharField(help_text=b"this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name=b'typeclass')), ('db_date_created', models.DateTimeField(auto_now_add=True, verbose_name=b'creation date')), ('db_lock_storage', models.TextField(help_text=b"locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name=b'locks', blank=True)), - ('db_sessid', models.CommaSeparatedIntegerField(help_text=b'csv list of session ids of connected Player, if any.', max_length=32, null=True, verbose_name=b'session id')), + ('db_sessid', models.CommaSeparatedIntegerField(help_text=b'csv list of session ids of connected Account, if any.', max_length=32, null=True, verbose_name=b'session id')), ('db_cmdset_storage', models.CharField(help_text=b'optional python path to a cmdset class.', max_length=255, null=True, verbose_name=b'cmdset', blank=True)), ('db_attributes', models.ManyToManyField(help_text=b'attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True)), ('db_destination', models.ForeignKey(related_name=b'destinations_set', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='objects.ObjectDB', help_text=b'a destination, used only by exit objects.', null=True, verbose_name=b'destination')), diff --git a/evennia/objects/migrations/0002_auto_20140917_0756.py b/evennia/objects/migrations/0002_auto_20140917_0756.py index cc7cf09ca7..7483c27268 100644 --- a/evennia/objects/migrations/0002_auto_20140917_0756.py +++ b/evennia/objects/migrations/0002_auto_20140917_0756.py @@ -17,8 +17,8 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( model_name='objectdb', - name='db_player', - field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name=b'player', to=settings.AUTH_USER_MODEL, help_text=b'a Player connected to this object, if any.', null=True), + name='db_account', + field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name=b'account', to=settings.AUTH_USER_MODEL, help_text=b'an Account connected to this object, if any.', null=True), preserve_default=True, ), migrations.AddField( diff --git a/evennia/objects/migrations/0006_auto_20170606_1731.py b/evennia/objects/migrations/0006_auto_20170606_1731.py index 74d48b29bb..df56b38745 100644 --- a/evennia/objects/migrations/0006_auto_20170606_1731.py +++ b/evennia/objects/migrations/0006_auto_20170606_1731.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='objectdb', name='db_sessid', - field=models.CharField(help_text=b'csv list of session ids of connected Player, if any.', max_length=32, null=True, validators=[django.core.validators.RegexValidator(re.compile('^\\d+(?:\\,\\d+)*\\Z'), code='invalid', message='Enter only digits separated by commas.')], verbose_name=b'session id'), + field=models.CharField(help_text=b'csv list of session ids of connected Account, if any.', max_length=32, null=True, validators=[django.core.validators.RegexValidator(re.compile('^\\d+(?:\\,\\d+)*\\Z'), code='invalid', message='Enter only digits separated by commas.')], verbose_name=b'session id'), ), migrations.AlterField( model_name='objectdb', diff --git a/evennia/objects/migrations/0008_auto_20170705_1736.py b/evennia/objects/migrations/0008_auto_20170705_1736.py index 02b2ca857c..4e1ba6429b 100644 --- a/evennia/objects/migrations/0008_auto_20170705_1736.py +++ b/evennia/objects/migrations/0008_auto_20170705_1736.py @@ -8,16 +8,16 @@ from django.db import migrations def forwards(apps, schema_editor): try: - apps.get_model('players', 'PlayerDB') + apps.get_model('accounts', 'AccountDB') except LookupError: return AccountDB = apps.get_model('accounts', 'AccountDB') ObjectDB = apps.get_model('objects', 'ObjectDB') for object in ObjectDB.objects.all(): - player = object.db_player - if player: - account = AccountDB.objects.get(id=player.id) + account = object.db_account + if account: + account = AccountDB.objects.get(id=account.id) object.db_account = account object.save(update_fields=['db_account']) diff --git a/evennia/objects/migrations/0009_remove_objectdb_db_player.py b/evennia/objects/migrations/0009_remove_objectdb_db_player.py index 80161a1f13..740d7eca66 100644 --- a/evennia/objects/migrations/0009_remove_objectdb_db_player.py +++ b/evennia/objects/migrations/0009_remove_objectdb_db_player.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): operations = [ migrations.RemoveField( model_name='objectdb', - name='db_player', + name='db_account', ), ] diff --git a/evennia/scripts/migrations/0001_initial.py b/evennia/scripts/migrations/0001_initial.py index 67ddafd077..751bd2928e 100644 --- a/evennia/scripts/migrations/0001_initial.py +++ b/evennia/scripts/migrations/0001_initial.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): ('db_is_active', models.BooleanField(default=False, verbose_name=b'script active')), ('db_attributes', models.ManyToManyField(help_text=b'attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True)), ('db_obj', models.ForeignKey(blank=True, to='objects.ObjectDB', help_text=b'the object to store this script on, if not a global script.', null=True, verbose_name=b'scripted object')), - ('db_player', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text=b'the player to store this script on (should not be set if obj is set)', null=True, verbose_name=b'scripted player')), + ('db_account', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text=b'the account to store this script on (should not be set if obj is set)', null=True, verbose_name=b'scripted account')), ('db_tags', models.ManyToManyField(help_text=b'tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag', null=True)), ], options={ diff --git a/evennia/scripts/migrations/0010_auto_20170705_1736.py b/evennia/scripts/migrations/0010_auto_20170705_1736.py index 6c9b427e74..61c9e929ae 100644 --- a/evennia/scripts/migrations/0010_auto_20170705_1736.py +++ b/evennia/scripts/migrations/0010_auto_20170705_1736.py @@ -8,16 +8,16 @@ from django.db import migrations def forwards(apps, schema_editor): try: - apps.get_model('players', 'PlayerDB') + apps.get_model('accounts', 'AccountDB') except LookupError: return AccountDB = apps.get_model('accounts', 'AccountDB') ScriptDB = apps.get_model('scripts', 'ScriptDB') for script in ScriptDB.objects.all(): - player = script.db_player - if player: - account = AccountDB.objects.get(id=player.id) + account = script.db_account + if account: + account = AccountDB.objects.get(id=account.id) script.db_account = account script.save(update_fields=['db_account']) diff --git a/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py b/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py index d3746a5bd9..66157f65f9 100644 --- a/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py +++ b/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): operations = [ migrations.RemoveField( model_name='scriptdb', - name='db_player', + name='db_account', ), ] diff --git a/evennia/settings_default.py b/evennia/settings_default.py index c604a67ec9..37da605ad5 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -497,7 +497,7 @@ PERMISSION_HIERARCHY = ["Guest", # note-only used if GUEST_ENABLED=True "Admin", "Developer"] # The default permission given to all new accounts -PERMISSION_PLAYER_DEFAULT = "Player" +PERMISSION_ACCOUNT_DEFAULT = "Player" # Default sizes for client window (in number of characters), if client # is not supplying this on its own CLIENT_DEFAULT_WIDTH = 78 diff --git a/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py b/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py index 8f432f034c..8b966bfb86 100644 --- a/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py +++ b/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import evennia.players.manager +import evennia.accounts.manager class Migration(migrations.Migration): @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ ('objects', '0005_auto_20150403_2339'), ('scripts', '0007_auto_20150403_2339'), - ('players', '0004_auto_20150403_2339'), + ('accounts', '0004_auto_20150403_2339'), ('typeclasses', '0002_auto_20150109_0913'), ] @@ -25,15 +25,15 @@ class Migration(migrations.Migration): bases=('objects.objectdb',), ), migrations.CreateModel( - name='DefaultPlayer', + name='DefaultAccount', fields=[ ], options={ 'proxy': True, }, - bases=('players.playerdb',), + bases=('accounts.accountdb',), managers=[ - (b'objects', evennia.players.manager.PlayerManager()), + (b'objects', evennia.accounts.manager.AccountManager()), ], ), migrations.CreateModel( @@ -70,9 +70,9 @@ class Migration(migrations.Migration): options={ 'proxy': True, }, - bases=('typeclasses.defaultplayer',), + bases=('typeclasses.defaultaccount',), managers=[ - (b'objects', evennia.players.manager.PlayerManager()), + (b'objects', evennia.accounts.manager.AccountManager()), ], ), migrations.CreateModel( diff --git a/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py b/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py index f68ac4cf84..1cf8be8160 100644 --- a/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py +++ b/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py @@ -11,10 +11,10 @@ def update_tags_with_dbmodel(apps, schema_editor): obj.db_attributes.all().update(db_model="objectdb") obj.db_tags.all().update(db_model="objectdb") - PlayerDB = apps.get_model('players', 'PlayerDB') - for obj in PlayerDB.objects.all(): - obj.db_attributes.all().update(db_model="playerdb") - obj.db_tags.all().update(db_model="playerdb") + AccountDB = apps.get_model('accounts', 'AccountDB') + for obj in AccountDB.objects.all(): + obj.db_attributes.all().update(db_model="accountdb") + obj.db_tags.all().update(db_model="accountdb") ScriptDB = apps.get_model('scripts', 'ScriptDB') for obj in ScriptDB.objects.all(): diff --git a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py index 5d47e5f481..eac208f6b7 100644 --- a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py +++ b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py @@ -17,12 +17,12 @@ def update_tags_with_dbmodel(apps, schema_editor): newtag.save() obj.db_tags.add(newtag) - PlayerDB = apps.get_model('players', 'PlayerDB') - for obj in PlayerDB.objects.all().exclude(db_tags__db_model="playerdb"): - for tag in obj.db_tags.all().exclude(db_model="playerdb"): + AccountDB = apps.get_model('accounts', 'AccountDB') + for obj in AccountDB.objects.all().exclude(db_tags__db_model="accountdb"): + for tag in obj.db_tags.all().exclude(db_model="accountdb"): obj.db_tags.remove(tag) newtag = Tag(db_key=tag.db_key, db_category=tag.db_category, - db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="playerdb") + db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="accountdb") newtag.save() obj.db_tags.add(newtag) diff --git a/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py b/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py index 048fc67a22..ef3633eb65 100644 --- a/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py +++ b/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py @@ -9,7 +9,7 @@ def update_perms_and_locks(apps, schema_editor): # update all permissions Tag = apps.get_model('typeclasses', 'Tag') - perm_map = {"guests": "guest", "players": "player", "playerhelpers":"helper", + perm_map = {"guests": "guest", "accounts": "account", "accounthelpers":"helper", "builders": "builder", "wizards":"admin", "immortals": "developer"} for perm in Tag.objects.filter(db_tagtype="permission"): @@ -18,7 +18,7 @@ def update_perms_and_locks(apps, schema_editor): perm.save(update_fields=("db_key",)) # update all locks on all entities - apps_models = [("objects", "ObjectDB"), ("players", "PlayerDB"), ("scripts", "ScriptDB"), + apps_models = [("objects", "ObjectDB"), ("accounts", "AccountDB"), ("scripts", "ScriptDB"), ("comms", "ChannelDB")] p_reg = re.compile(r"(?<=perm\()(\w+)(?=\))|(?<=perm_above\()(\w+)(?=\))", re.IGNORECASE + re.UNICODE)