From 3dab78c514a4361c9d2ae47ac286a1402c847bf4 Mon Sep 17 00:00:00 2001
From: Chad Birch <chad.birch@gmail.com>
Date: Wed, 21 Aug 2013 15:43:40 -0600
Subject: [PATCH] Mod log: add support for sticky/unsticky

---
 r2/r2/controllers/api.py                    |   2 ++
 r2/r2/models/modaction.py                   |  13 ++++++++++---
 r2/r2/public/static/css/reddit.less         |  10 +++++++++-
 r2/r2/public/static/modactions_sticky.png   | Bin 0 -> 594 bytes
 r2/r2/public/static/modactions_unsticky.png | Bin 0 -> 598 bytes
 5 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 r2/r2/public/static/modactions_sticky.png
 create mode 100644 r2/r2/public/static/modactions_unsticky.png

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 71612cb0d..38c41dd2e 100755
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -1163,8 +1163,10 @@ class ApiController(RedditController, OAuth2ResourceController):
 
         if state:
             sr.sticky_fullname = thing._fullname
+            ModAction.create(sr, c.user, 'sticky', target=thing)
         elif not state:
             sr.sticky_fullname = None
+            ModAction.create(sr, c.user, 'unsticky', target=thing)
 
         sr._commit()
         jquery.refresh()
diff --git a/r2/r2/models/modaction.py b/r2/r2/models/modaction.py
index a945a5cfe..94463edec 100644
--- a/r2/r2/models/modaction.py
+++ b/r2/r2/models/modaction.py
@@ -57,7 +57,8 @@ class ModAction(tdb_cassandra.UuidThing, Printable):
                'editsettings', 'editflair', 'distinguish', 'marknsfw', 
                'wikibanned', 'wikicontributor', 'wikiunbanned',
                'removewikicontributor', 'wikirevise', 'wikipermlevel',
-               'ignorereports', 'unignorereports', 'setpermissions')
+               'ignorereports', 'unignorereports', 'setpermissions', 'sticky',
+               'unsticky')
 
     _menu = {'banuser': _('ban user'),
              'unbanuser': _('unban user'),
@@ -84,7 +85,10 @@ class ModAction(tdb_cassandra.UuidThing, Printable):
              'wikipermlevel': _('wiki page permissions'),
              'ignorereports': _('ignore reports'),
              'unignorereports': _('unignore reports'),
-             'setpermissions': _('permissions')}
+             'setpermissions': _('permissions'),
+             'sticky': _('sticky post'),
+             'unsticky': _('unsticky post'),
+            }
 
     _text = {'banuser': _('banned'),
              'wikibanned': _('wiki banned'),
@@ -111,7 +115,10 @@ class ModAction(tdb_cassandra.UuidThing, Printable):
              'marknsfw': _('marked nsfw'),
              'ignorereports': _('ignored reports'),
              'unignorereports': _('unignored reports'),
-             'setpermissions': _('changed permissions on')}
+             'setpermissions': _('changed permissions on'),
+             'sticky': _('stickied'),
+             'unsticky': _('unstickied'),
+            }
 
     _details_text = {# approve comment/link
                      'unspam': _('unspam'),
diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less
index f41bec09a..c443465e4 100755
--- a/r2/r2/public/static/css/reddit.less
+++ b/r2/r2/public/static/css/reddit.less
@@ -6345,7 +6345,9 @@ body:not(.gold) .allminus-link {
 .modactions.wikicontributor,
 .modactions.removewikicontributor,
 .modactions.ignorereports,
-.modactions.unignorereports {
+.modactions.unignorereports,
+.modactions.sticky,
+.modactions.unsticky {
     height: 16px;
     width: 16px;
     display: block;
@@ -6422,6 +6424,12 @@ body:not(.gold) .allminus-link {
 .modactions.unignorereports {
     background-image: url(../modactions_unmute.png); /* SPRITE */
 }
+.modactions.sticky {
+    background-image: url(../modactions_sticky.png); /* SPRITE */
+}
+.modactions.unsticky {
+    background-image: url(../modactions_unsticky.png); /* SPRITE */
+}
 
 .adminpasswordform {
     display: block;
diff --git a/r2/r2/public/static/modactions_sticky.png b/r2/r2/public/static/modactions_sticky.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee012d8b7f969dabd0cba343f9ee3c18e0b6790e
GIT binary patch
literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3S#H4+Ywqe!l<!0pCeP
zK~y-)rIKAplVKFcf7{eF9GKB+ATjy?E!03`QQk$jb(=vK_FW?ijp(9_z%E92L3I&y
z8Ff==5JClE>Qoxh#9>*3GAS6t-Z{5D@B4hbU0ATB*`fmv=RBPM`91s}4*X|$N-xI;
z55KNt=-#1+yMNVHE1O+A!=0b<AJImmjQN?DPjkZ#-pnTArTX6hVo~y9d^BF}<rwjQ
z^Vb(UJ$dof$<d1cpfq~NP9*}>o7%L|e6i-<rsp$fAD<YS_$%Pj_?a4`O>#p`U|Xnu
z3&t4UWoG!CnVXf4Y<+NKz$w*xR|2%sPnA?nN@<i)C|6PETZ<!{&5m%MRBYkcV7I$3
z)P**h;pt)SAAR&kZB;pdC<uhKF|Nk4zH{ML_f;47vT%z2Tp^pYmKJUdMW?Qp1r(Qx
zNG;K>rcU^14Au5`v~<$cxSf~D0sqAGNPjpIZ19!^<ZWziV=J3A(y*(!9qrY$2M?e<
zl0B_^0V1ma1h$emT9VB#Q0=MbV9WXC{n&q(t${XxTJLHWjK^TShK!Xa`87uLc@F^5
zXFa6SQvkwO4zRvs-L=$*6f?>92wNajn$X4&nZi8Te44Su2#c0|(^KhMha<r#a1QVT
gIpEIZ?Qd6p01y4>UcEh!lmGw#07*qoM6N<$g6WnI)c^nh

literal 0
HcmV?d00001

diff --git a/r2/r2/public/static/modactions_unsticky.png b/r2/r2/public/static/modactions_unsticky.png
new file mode 100644
index 0000000000000000000000000000000000000000..5001f90dc19851207a45c71528b6647bd50a2494
GIT binary patch
literal 598
zcmV-c0;&CpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3S#H4=LzE5?lZP0pm$T
zK~y-)rIO7{lu;DMpF4MaQ!5B2#Xd$~!=jSfRJ6#Io1#stNP{+gnQba-;j$p2zra>4
zT10L77*PVJMcU*P4WUsPLyDP+*<geE&iiriIk!bcll0n12QK#>?sI<kJckSXXNcnD
zM55(oDMdFA-QDx+99?|b)VO!|xbp$T1kL<&|FO2N*^XD);Y_jq4}dqP@Hm~yguOh7
z%<}wQ9Bg}We&AH9<QWu4$FtMJ)nzq1i3y+b6GJnTx%T@fA3gsk;8OaG#l&x`tm+1P
z)g~}A-seW}F*lJ_f!cBB=)<5`A6X0_O}$#_jam~lYiOfUAuADhL2cj#-6dN%o@h1u
z>?RNs`rq{9_OW|^)kebrUcrN>e6S(p^WTtasqNHGzFj+oI7u@Jplg4Uu7?8L1s94G
z$Pjjo&0zJ0^;fnupR-ofH^P107k~FOd9{y6oJc6Z@!^vXU;EgW9mVG6!&dp|6Np=_
zs2qC$yDlb;Fc-o*a6I^0fem4;t59B34;<|H?fvpPNEY^z7FaM?FlMa?3PZhE*?kti
zJB<Q>`8f%am|9|pK6(;8(3-FitAd>#(D7JBG%Cw5|5aoBiy#BjB})C)sUz`DXLhPh
klBgqTJ{#c1fh1k~4rJZ#Rc;_ZLjV8(07*qoM6N<$f*`RCS^xk5

literal 0
HcmV?d00001