Modify message reply notification

group/models.py

@@ -37,20 +37,23 @@ def msgreply_save_handler(sender, instance, **kwargs):
     m = re.match(at_pattern, reply_msg)
     if m:
         nickname_or_emailprefix = m.group()[1:]
-        p = get_first_object_or_none(\
+        for member in get_group_members(group_msg.group_id):
-            Profile.objects.filter(nickname=nickname_or_emailprefix))
+            # For every group member, get his username and nickname if
-        if p:
+            # it exists, check whether match.
-            to_user = p.user
+            username = member.user_name
-        else:
+            if username == from_email:
-            # Match email prefix in group members.
+                continue
-            group_members = get_group_members(group_msg.group_id)
+            
-            for m in group_members:
+            p = get_first_object_or_none(\
-                if m.user_name.startswith(nickname_or_emailprefix):
+                Profile.objects.filter(user=username))
-                    to_user = m.user_name
+            nickname = p.nickname if p else ''
-                    break
+            if nickname == nickname_or_emailprefix or \
-                
+                    username.split('@')[0] == nickname_or_emailprefix:
-        if to_user and to_user != from_email:
+                to_user = username
-            # Send notification to the user if user replies someone else'
+                break
+
+        if to_user:
+            # Send notification to the user if he replies someone else'
             # message.
             try:
                 UserNotification.objects.get(to_user=to_user,
@@ -61,6 +64,4 @@ def msgreply_save_handler(sender, instance, **kwargs):
                                      msg_type='grpmsg_reply',
                                      detail=group_msg.id)
                 n.save()
-
+                
-
-