From d67db47044edaafbaed65e32046fda865a47c07d Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Thu, 5 Apr 2018 15:44:44 +0200
Subject: [PATCH] show mod log on streamer edit page

---
 app/controllers/Mod.scala                  |  2 +-
 app/controllers/Streamer.scala             |  9 +++++++--
 app/views/streamer/edit.scala.html         | 14 +++++++++++++-
 app/views/streamer/rules.scala.html        |  2 +-
 modules/security/src/main/Permission.scala |  3 ++-
 public/stylesheets/streamer.form.css       |  8 ++++----
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/controllers/Mod.scala b/app/controllers/Mod.scala
index 76c16a2b6e..6e57b1ec47 100644
--- a/app/controllers/Mod.scala
+++ b/app/controllers/Mod.scala
@@ -150,7 +150,7 @@ object Mod extends LilaController {
     }
   }
 
-  def log = Secure(_.SeeReport) { implicit ctx => me =>
+  def log = Secure(_.ModLog) { implicit ctx => me =>
     modLogApi.recent map { html.mod.log(_) }
   }
 
diff --git a/app/controllers/Streamer.scala b/app/controllers/Streamer.scala
index ddd6abbba0..af3cc0e77f 100644
--- a/app/controllers/Streamer.scala
+++ b/app/controllers/Streamer.scala
@@ -47,7 +47,9 @@ object Streamer extends LilaController {
   def edit = Auth { implicit ctx => me =>
     AsStreamer { s =>
       Env.streamer.liveStreamApi of s flatMap { sws =>
-        NoCache(Ok(html.streamer.edit(sws, StreamerForm userForm sws.streamer))).fuccess
+        isGranted(_.ModLog).??(Env.mod.logApi.userHistory(s.user.id) map some) map { modLog =>
+          NoCache(Ok(html.streamer.edit(sws, StreamerForm userForm sws.streamer, modLog)))
+        }
       }
     }
   }
@@ -57,7 +59,10 @@ object Streamer extends LilaController {
       Env.streamer.liveStreamApi of s flatMap { sws =>
         implicit val req = ctx.body
         StreamerForm.userForm(sws.streamer).bindFromRequest.fold(
-          error => BadRequest(html.streamer.edit(sws, error)).fuccess,
+          error =>
+            isGranted(_.ModLog).??(Env.mod.logApi.userHistory(s.user.id) map some) map { modLog =>
+              BadRequest(html.streamer.edit(sws, error, modLog))
+            },
           data => api.update(sws.streamer, data, isGranted(_.Streamers)) map { change =>
             change.list foreach { Env.mod.logApi.streamerList(lila.report.Mod(me), s.user.id, _) }
             change.feature foreach { Env.mod.logApi.streamerFeature(lila.report.Mod(me), s.user.id, _) }
diff --git a/app/views/streamer/edit.scala.html b/app/views/streamer/edit.scala.html
index e35813ed18..56e3a7c1c6 100644
--- a/app/views/streamer/edit.scala.html
+++ b/app/views/streamer/edit.scala.html
@@ -1,4 +1,4 @@
-@(s: lila.streamer.Streamer.WithUserAndStream, form: Form[_])(implicit ctx: Context)
+@(s: lila.streamer.Streamer.WithUserAndStream, form: Form[_], modLog: Option[List[lila.mod.Modlog]])(implicit ctx: Context)
 
 @import play.api.data.Field
 
@@ -71,6 +71,18 @@ menu = menu("edit", s.withoutStream.some).some) {
     <strong>If your stream is in another language than English</strong>, include the correct language tag (<a class="blue" href="https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes">2-letter ISO 639-1 code</a> enclosed in square brackets) in your stream title. As examples, include "[RU]" for Russian, "[TR]" for Turkish, "[FR]" for French, etc. If your stream is in English, there is no need to include a language tag.
   </div>
   }
+  @modLog.map { log =>
+  <div class="mod_log status">
+    <strong class="text" data-icon="!">Moderation history@if(log.isEmpty){: nothing to show.}</strong>
+    @if(log.nonEmpty) {
+    <ul>
+      @log.map { e =>
+      <li>@userIdLink(e.mod.some, withTitle=false) <b>@e.showAction</b> @e.details @momentFromNow(e.date)</li>
+      }
+    </ul>
+    }
+  </div>
+  }
   <form class="content_box_content material form" action="@routes.Streamer.edit@if(!ctx.is(s.user)){?u=@s.user.id}" method="POST">
     @errMsgMaterial(form.errors)
     @if(isGranted(_.Streamers)) {
diff --git a/app/views/streamer/rules.scala.html b/app/views/streamer/rules.scala.html
index 396aa85ad2..7dc8005368 100644
--- a/app/views/streamer/rules.scala.html
+++ b/app/views/streamer/rules.scala.html
@@ -1,5 +1,5 @@
 @()
-<ul>
+<ul class="rules">
   <li>Be listed as a lichess streamer.</li>
   <li title="For example: Blitz battle on lichess.org">Get bumped up the top of the list when you stream with the keyword "lichess.org" in the stream title.</li>
   <li>Notify your lichess followers when you start streaming.</li>
diff --git a/modules/security/src/main/Permission.scala b/modules/security/src/main/Permission.scala
index b75272b098..2fbc6cd0d3 100644
--- a/modules/security/src/main/Permission.scala
+++ b/modules/security/src/main/Permission.scala
@@ -26,6 +26,7 @@ object Permission {
   case object SetTitle extends Permission("ROLE_SET_TITLE", List(UserSpy))
   case object SetEmail extends Permission("ROLE_SET_EMAIL", List(UserSpy))
   case object SeeReport extends Permission("ROLE_SEE_REPORT")
+  case object ModLog extends Permission("ROLE_MOD_LOG")
   case object SeeInsight extends Permission("ROLE_SEE_INSIGHT")
   case object StreamConfig extends Permission("ROLE_STREAM_CONFIG")
   case object PracticeConfig extends Permission("ROLE_PRACTICE_CONFIG")
@@ -54,7 +55,7 @@ object Permission {
 
   case object Hunter extends Permission("ROLE_HUNTER", List(
     ViewBlurs, MarkEngine, MarkBooster, StaffForum,
-    UserSpy, UserEvaluate, SeeReport, SeeInsight,
+    UserSpy, UserEvaluate, SeeReport, ModLog, SeeInsight,
     UserSearch, ModNote, RemoveRanking, ModMessage
   ))
 
diff --git a/public/stylesheets/streamer.form.css b/public/stylesheets/streamer.form.css
index 575eb59760..4ca1765055 100644
--- a/public/stylesheets/streamer.form.css
+++ b/public/stylesheets/streamer.form.css
@@ -58,15 +58,15 @@
   font-size: 1.4em;
   margin-bottom: 1em;
 }
-.streamer-new ul li,
-.streamer.edit ul li {
+.streamer-new .rules li,
+.streamer.edit .rules li {
   font-size: 1.2em;
   margin: 1em 0 1em 2.2em;
   line-height: 1.6em;
   text-indent: -2.2em;
 }
-.streamer-new ul li::before,
-.streamer.edit ul li::before {
+.streamer-new .rules li::before,
+.streamer.edit .rules li::before {
   font-family: 'lichess';
   content: 'E';
   font-size: 1.5em;