Add Msg.db_receiver_external field. Resolve #2193.
This commit is contained in:
parent
e38604ab02
commit
ac459572f5
4 changed files with 35 additions and 23 deletions
|
|
@ -196,19 +196,21 @@ class Msg(SharedMemoryModel):
|
|||
list(self.db_sender_accounts.all())
|
||||
+ list(self.db_sender_objects.all())
|
||||
+ list(self.db_sender_scripts.all())
|
||||
+ [self.db_sender_external]
|
||||
+ ([self.db_sender_external] if self.db_sender_external else [])
|
||||
)
|
||||
|
||||
@senders.setter
|
||||
def senders(self, senders):
|
||||
"Setter. Allows for self.sender = value"
|
||||
|
||||
if isinstance(senders, str):
|
||||
self.db_sender_external = senders
|
||||
self.save(update_fields=["db_sender_external"])
|
||||
return
|
||||
|
||||
for sender in make_iter(senders):
|
||||
if not sender:
|
||||
continue
|
||||
if isinstance(sender, str):
|
||||
self.db_sender_external = sender
|
||||
self.save(update_fields=["db_sender_external"])
|
||||
continue
|
||||
if not hasattr(sender, "__dbclass__"):
|
||||
raise ValueError("This is a not a typeclassed object!")
|
||||
clsname = sender.__dbclass__.__name__
|
||||
|
|
@ -267,7 +269,7 @@ class Msg(SharedMemoryModel):
|
|||
list(self.db_receivers_accounts.all())
|
||||
+ list(self.db_receivers_objects.all())
|
||||
+ list(self.db_receivers_scripts.all())
|
||||
+ [self.db_receiver_external]
|
||||
+ ([self.db_receiver_external] if self.db_receiver_external else [])
|
||||
)
|
||||
|
||||
@receivers.setter
|
||||
|
|
|
|||
|
|
@ -139,10 +139,15 @@ class TestCreateMessage(EvenniaTest):
|
|||
"""
|
||||
|
||||
def test_create_msg__simple(self):
|
||||
# from evennia import set_trace;set_trace()
|
||||
msg = create.create_message(self.char1, self.msgtext, header="TestHeader")
|
||||
msg.senders = "ExternalSender"
|
||||
msg.receivers = self.char2
|
||||
msg.receivers = "ExternalReceiver"
|
||||
self.assertEqual(msg.message, self.msgtext)
|
||||
self.assertEqual(msg.header, "TestHeader")
|
||||
self.assertEqual(msg.senders, [self.char1])
|
||||
self.assertEqual(msg.senders, [self.char1, "ExternalSender"])
|
||||
self.assertEqual(msg.receivers, [self.char2, "ExternalReceiver"])
|
||||
|
||||
def test_create_msg__custom(self):
|
||||
locks = "foo:false();bar:true()"
|
||||
|
|
@ -151,11 +156,11 @@ class TestCreateMessage(EvenniaTest):
|
|||
self.char1,
|
||||
self.msgtext,
|
||||
header="TestHeader",
|
||||
receivers=[self.char1, self.char2],
|
||||
receivers=[self.char1, self.char2, "ExternalReceiver"],
|
||||
locks=locks,
|
||||
tags=tags,
|
||||
)
|
||||
self.assertEqual(set(msg.receivers), set([self.char1, self.char2]))
|
||||
self.assertEqual(set(msg.receivers), set([self.char1, self.char2, "ExternalReceiver"]))
|
||||
self.assertTrue(all(lock in msg.locks.all() for lock in locks.split(";")))
|
||||
self.assertEqual(msg.tags.all(), tags)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue