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

ModAction details field for confirm spam and unspam.

Browse Source
This commit is contained in:
bsimpson63
2011-12-23 10:37:13 -08:00
committed by Neil Williams
parent 42979d34f6
commit b14b73e109
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
r2/r2/controllers/api.py
View File

@@ -1385,12 +1385,15 @@ class ApiController(RedditController):
def POST_remove(self, why, thing):
if getattr(thing, "promoted", None) is None:
end_trial(thing, why + "-removed")
kw = {}
if thing._spam:
kw['details'] = 'confirm_spam'
admintools.spam(thing, False, not c.user_is_admin, c.user.name)
sr = thing.subreddit_slow
if isinstance(thing, Link):
ModAction.create(sr, c.user, 'removelink', target=thing)
ModAction.create(sr, c.user, 'removelink', target=thing, **kw)
elif isinstance(thing, Comment):
ModAction.create(sr, c.user, 'removecomment', target=thing)
ModAction.create(sr, c.user, 'removecomment', target=thing, **kw)
@noresponse(VUser(), VModhash(),
why = VSrCanBan('id'),
@@ -1398,14 +1401,16 @@ class ApiController(RedditController):
def POST_approve(self, why, thing):
if not thing: return
if thing._deleted: return
end_trial(thing, why + "-approved")
kw = {}
if thing._spam:
kw['details'] = 'unspam'
admintools.unspam(thing, c.user.name)
sr = thing.subreddit_slow
if isinstance(thing, Link):
ModAction.create(sr, c.user, 'approvelink', target=thing)
ModAction.create(sr, c.user, 'approvelink', target=thing, **kw)
elif isinstance(thing, Comment):
ModAction.create(sr, c.user, 'approvecomment', target=thing)
ModAction.create(sr, c.user, 'approvecomment', target=thing, **kw)
@validatedForm(VUser(), VModhash(),
VCanDistinguish(('id', 'how')),

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

@@ -54,7 +54,11 @@ class ModAction(tdb_cassandra.UuidThing, Printable):
'editsettings': _('edited settings'),
'editflair': _('edited user flair')}
_details_text = {# removemoderator
_details_text = {# approve comment/link
'unspam': _('unspam'),
# remove comment/link
'confirm_spam': _('confirmed spam'),
# removemoderator
'remove_self': _('removed self'),
# editsettings
'title': _('title'),