haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 19:08:21 +00:00
Code Issues Releases Wiki Activity

Replace use message post save signal

Browse Source
This commit is contained in:
zhengxie
2014-06-10 13:34:56 +08:00
parent dd9f5c04a7
commit 3eea0e3647
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/message/models.py
View File

@@ -5,6 +5,7 @@ from django.db import models
from django.db.models import Q from django.db.models import Q
from seahub.base.fields import LowerCaseCharField from seahub.base.fields import LowerCaseCharField
from seahub.message.signals import user_message_sent
class UserMessageManager(models.Manager): class UserMessageManager(models.Manager):
def get_messages_related_to_user(self, username): def get_messages_related_to_user(self, username):
@@ -34,6 +35,7 @@ class UserMessageManager(models.Manager):
new_msg = self.model(from_email=user1, to_email=user2, message=msg, new_msg = self.model(from_email=user1, to_email=user2, message=msg,
ifread=0) ifread=0)
new_msg.save(using=self._db) new_msg.save(using=self._db)
user_message_sent.send(sender=None, msg=new_msg)
return new_msg return new_msg
def update_unread_messages(self, user1, user2): def update_unread_messages(self, user1, user2):

21
seahub/notifications/models.py
View File

@@ -601,11 +601,11 @@ from seahub.signals import share_file_to_user_successful, upload_file_successful
from seahub.group.models import GroupMessage, MessageReply from seahub.group.models import GroupMessage, MessageReply
from seahub.group.signals import grpmsg_added, grpmsg_reply_added, \ from seahub.group.signals import grpmsg_added, grpmsg_reply_added, \
group_join_request group_join_request
from seahub.share.signals import share_repo_to_user_successful from seahub.share.signals import share_repo_to_user_successful
from seahub.message.models import UserMessage from seahub.message.models import UserMessage
from seahub.message.signals import user_message_sent
@receiver(upload_file_successful)
@receiver(upload_file_successful)
def add_upload_file_msg_cb(sender, **kwargs): def add_upload_file_msg_cb(sender, **kwargs):
"""Notify repo owner when others upload files to his/her folder from shared link. """Notify repo owner when others upload files to his/her folder from shared link.
""" """
@@ -646,13 +646,14 @@ def add_share_file_msg_cb(sender, **kwargs):
detail = priv_file_share_msg_to_json(priv_share.from_user, file_name, priv_share.token) detail = priv_file_share_msg_to_json(priv_share.from_user, file_name, priv_share.token)
UserNotification.objects.add_priv_file_share_msg(priv_share.to_user, detail) UserNotification.objects.add_priv_file_share_msg(priv_share.to_user, detail)
@receiver(post_save, sender=UserMessage) @receiver(user_message_sent)
def add_user_message_cb(sender, instance, **kwargs): def add_user_message_cb(sender, **kwargs):
"""Notify user when he/she got a new mesaage. """Notify user when he/she got a new mesaage.
""" """
msg_from = instance.from_email msg = kwargs.get('msg')
msg_to = instance.to_email msg_from = msg.from_email
msg_to = msg.to_email
UserNotification.objects.add_user_message(msg_to, detail=msg_from) UserNotification.objects.add_user_message(msg_to, detail=msg_from)
@@ -667,7 +668,7 @@ def grpmsg_added_cb(sender, **kwargs):
detail = group_msg_to_json(group_id, from_email) detail = group_msg_to_json(group_id, from_email)
UserNotification.objects.bulk_add_group_msg_notices(notify_members, detail) UserNotification.objects.bulk_add_group_msg_notices(notify_members, detail)
@receiver(grpmsg_reply_added) @receiver(grpmsg_reply_added)
def grpmsg_reply_added_cb(sender, **kwargs): def grpmsg_reply_added_cb(sender, **kwargs):
msg_id = kwargs['msg_id'] msg_id = kwargs['msg_id']
reply_from_email = kwargs['from_email'] reply_from_email = kwargs['from_email']
@@ -702,5 +703,3 @@ def group_join_request_cb(sender, **kwargs):
for staff in staffs: for staff in staffs:
UserNotification.objects.add_group_join_request_notice(to_user=staff, UserNotification.objects.add_group_join_request_notice(to_user=staff,
detail=detail) detail=detail)