Made check for PlayerObject more rigorous in create.create_msg, in response to issue 209.
This commit is contained in:
parent
641d829154
commit
ed00e42762
1 changed files with 6 additions and 3 deletions
|
|
@ -276,14 +276,17 @@ def create_message(senderobj, message, channels=None,
|
||||||
desired.
|
desired.
|
||||||
"""
|
"""
|
||||||
from src.comms.models import Msg
|
from src.comms.models import Msg
|
||||||
|
from src.players.models import PlayerDB
|
||||||
from src.comms.managers import to_object
|
from src.comms.managers import to_object
|
||||||
|
|
||||||
def to_player(obj):
|
def to_player(obj):
|
||||||
"Make sure the object is a player object"
|
"Make sure the object is a player object"
|
||||||
if hasattr(obj, 'user'):
|
if isinstance(obj, PlayerDB):
|
||||||
return obj
|
return obj
|
||||||
elif hasattr(obj, 'player'):
|
elif hasattr(obj, 'user'):
|
||||||
return obj.player
|
return obj.dbobj
|
||||||
|
elif hasattr(obj, 'db_player'):
|
||||||
|
return obj.db_player
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue