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

modaction: Allow querying by multiple moderators.

Browse Source
This commit is contained in:
Andre D
2013-06-28 12:39:49 -07:00
committed by Neil Williams
parent e4f7d4e1fe
commit 0202ad2036
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/models/modaction.py
View File

@@ -21,6 +21,7 @@
###############################################################################
from datetime import timedelta
import itertools
from r2.lib.db import tdb_cassandra
from r2.lib.utils import tup
@@ -247,7 +248,10 @@ class ModAction(tdb_cassandra.UuidThing, Printable):
rowkeys = [sr._id36 for sr in srs]
q = ModActionBySR.query(rowkeys, after=after, reverse=reverse, count=count)
elif mod and not action:
rowkeys = ['%s_%s' % (sr._id36, mod._id36) for sr in srs]
mods = tup(mod)
rowkeys = itertools.product([sr._id36 for sr in srs],
[mod._id36 for mod in mods])
rowkeys = ['%s_%s' % (sr, mod) for sr, mod in rowkeys]
q = ModActionBySRMod.query(rowkeys, after=after, reverse=reverse, count=count)
elif not mod and action:
rowkeys = ['%s_%s' % (sr._id36, action) for sr in srs]