github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-05 03:00:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sent messages: don't hide removed messages

Browse Source
This commit is contained in:
Chad Birch
2013-12-30 03:01:14 -07:00
parent c806017af8
commit 0ac994bad9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/controllers/listingcontroller.py
View File

@@ -809,7 +809,11 @@ class MessageController(ListingController):
wouldkeep = item.keep_item(item)
# TODO: Consider a flag to disable this (and see above plus builder.py)
if (item._deleted or item._spam) and not c.user_is_admin:
if item._deleted and not c.user_is_admin:
return False
if (item._spam and
item.author_id != c.user._id and
not c.user_is_admin):
return False
if item.author_id in c.user.enemies:
return False