Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ServerSession.get_display_name as alias to puppet/account versions. Resolve #2839

Browse source
This commit is contained in:
Griatch 2022-11-06 11:17:07 +01:00
parent c92d2a0c1e
commit b37ce26005
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/server/serversession.py
View file

@ -7,14 +7,15 @@ It is stored on the Server side (as opposed to protocol-specific sessions which
are stored on the Portal side) are stored on the Portal side)
""" """
import time import time
from django.utils import timezone
from django.conf import settings from django.conf import settings
from evennia.comms.models import ChannelDB from django.utils import timezone
from evennia.utils import logger
from evennia.utils.utils import make_iter, lazy_property, class_from_module
from evennia.commands.cmdsethandler import CmdSetHandler from evennia.commands.cmdsethandler import CmdSetHandler
from evennia.comms.models import ChannelDB
from evennia.scripts.monitorhandler import MONITOR_HANDLER from evennia.scripts.monitorhandler import MONITOR_HANDLER
from evennia.typeclasses.attributes import AttributeHandler, InMemoryAttributeBackend, DbHolder from evennia.typeclasses.attributes import AttributeHandler, DbHolder, InMemoryAttributeBackend
from evennia.utils import logger
from evennia.utils.utils import class_from_module, lazy_property, make_iter
_GA = object.__getattribute__ _GA = object.__getattribute__
_SA = object.__setattr__ _SA = object.__setattr__
@ -435,3 +436,11 @@ class ServerSession(_BASE_SESSION_CLASS):
""" """
return True return True
def get_display_name(self, *args, **kwargs):
if self.puppet:
return self.puppet.get_display_name(*args, **kwargs)
elif self.account:
return self.account.get_display_name(*args, **kwargs)
else:
return f"{self.protocol_key}({self.address})"