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

comment_tree: CachedQuery never has prewrap_fn.

Browse Source 
The special handling provided by _process_message_query() is not
needed.
This commit is contained in:
Brian Simpson
2015-07-06 19:00:47 -04:00
parent 9c94d2aca8
commit 748aa32ca4
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
r2/r2/lib/comment_tree.py
View File

@@ -392,11 +392,6 @@ def user_messages(user, update = False):
g.permacache.set(key, trees)
return trees
def _process_message_query(inbox):
if hasattr(inbox, 'prewrap_fn'):
return [inbox.prewrap_fn(i) for i in inbox]
return list(inbox)
def _load_messages(mlist):
from r2.models import Message
@@ -412,8 +407,8 @@ def user_messages_nocache(user):
Just like user_messages, but avoiding the cache
"""
from r2.lib.db import queries
inbox = _process_message_query(queries.get_inbox_messages(user))
sent = _process_message_query(queries.get_sent(user))
inbox = queries.get_inbox_messages(user)
sent = queries.get_sent(user)
messages = _load_messages(list(chain(inbox, sent)))
return compute_message_trees(messages)
@@ -457,7 +452,7 @@ def subreddit_messages_nocache(sr):
Just like user_messages, but avoiding the cache
"""
from r2.lib.db import queries
inbox = _process_message_query(queries.get_subreddit_messages(sr))
inbox = queries.get_subreddit_messages(sr)
messages = _load_messages(inbox)
return compute_message_trees(messages)