Message: Don't crash if Inbox exists.

reddit-archive · Oct 1, 2014 · 0063ea6 · 0063ea6
1 parent ff878cc
commit 0063ea6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
@@ -1449,14 +1449,18 @@ def _new(cls, author, to, subject, body, ip, parent=None, sr=None,
             first_sender_modmail = sr.is_moderator_with_perms(
                 first_sender, 'mail')
 
-            if first_sender != author and not first_sender_modmail:
+            if (first_sender != author and
+                    first_sender != to and
+                    not first_sender_modmail):
                 inbox_rel.append(Inbox._add(first_sender, m, 'inbox'))
 
             if first_message.to_id:
                 first_recipient = Account._byID(first_message.to_id, data=True)
                 first_recipient_modmail = sr.is_moderator_with_perms(
                     first_recipient, 'mail')
-                if first_recipient != author and not first_recipient_modmail:
+                if (first_recipient != author and
+                        first_recipient != to and
+                        not first_recipient_modmail):
                     inbox_rel.append(Inbox._add(first_recipient, m, 'inbox'))
 
         hooks.get_hook('message.new').call(message=m)