Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-02 22:17:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a lacking implementation in the Msg API. You need to re-sync the database since Msg now relies on three fields that where commented out before.

Browse source
This commit is contained in:
Griatch 2010-09-04 12:18:00 +00:00
parent 72bb8ac667
commit d90c2909a2
6 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/comms/managers.py
View file

@ -66,8 +66,7 @@ class MsgManager(models.Manager):
sender = to_object(sender)
if not sender:
return None
return [msg for msg in sender.sender_set.all()
if sender not in msg.hide_from_senders.all()]
return self.filter(db_sender=sender).exclude(db_hide_from_sender=False)
def get_messages_by_receiver(self, receiver):
"""
@ -76,8 +75,9 @@ class MsgManager(models.Manager):
receiver = to_object(receiver)
if not receiver:
return None
return [msg for msg in receiver.receiver_set.all()
if receiver not in msg.hide_from_receivers.all()]
return [msg for msg in self.all()
if receiver in msg.recivers
and receiver not in msg.hide_from_receivers]
def get_messages_by_channel(self, channel):
"""
@ -86,9 +86,9 @@ class MsgManager(models.Manager):
channel = to_object(channel, objtype='channel')
if not channel:
return None
return [msg for msg in channel.channel_set.all()
if channel not in msg.hide_from_channels.all()]
return [msg for msg in self.all()
if channel in msg.channels
and channel not in msg.hide_from_channels]
#TODO add search limited by send_times
def text_search(self, searchstring, filterdict=None):

6
src/comms/models.py
View file

@ -107,9 +107,9 @@ class Msg(SharedMemoryModel):
# Stored as a comma-separated string of dbrefs. Can be used by the
# game to mask out messages from being visible in the archive (no
# messages are actually deleted)
#db_hide_from_sender = models.BooleanField(default=False)
#db_hide_from_receivers = models.CharField(max_length=255, null=True, blank=True)
#db_hide_from_channels = models.CharField(max_length=255, null=True, blank=True)
db_hide_from_sender = models.BooleanField(default=False)
db_hide_from_receivers = models.CharField(max_length=255, null=True, blank=True)
db_hide_from_channels = models.CharField(max_length=255, null=True, blank=True)
# permission strings, separated by commas
db_permissions = models.CharField(max_length=255, blank=True)