ModAction details field for confirm spam and unspam.

DamonAnderson · Feb 2, 2012 · b14b73e · b14b73e
1 parent 42979d3
commit b14b73e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
@@ -1385,27 +1385,32 @@ def POST_searchfeedback(self, q, sort, t, approval):
     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'),
                 thing = VByName('id'))
     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')),

diff --git a/r2/r2/models/modaction.py b/r2/r2/models/modaction.py
@@ -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'),