Option for public mods to display icon in forum/qa

app/templating/ForumHelper.scala

@@ -31,8 +31,9 @@ trait ForumHelper { self: UserHelper with StringHelper =>
   def authorLink(
     post: Post,
     cssClass: Option[String] = None,
-    withOnline: Boolean = true
+    withOnline: Boolean = true,
+    modIcon: Boolean = false
   ) = post.userId.fold(Html(lila.user.User.anonymous)) { userId =>
-    userIdLink(userId.some, cssClass = cssClass, withOnline = withOnline)
+    userIdLink(userId.some, cssClass = cssClass, withOnline = withOnline, modIcon = modIcon)
   }
 }

app/templating/UserHelper.scala

@@ -82,7 +82,8 @@ trait UserHelper { self: I18nHelper with StringHelper with NumberHelper =>
     withOnline: Boolean = true,
     withTitle: Boolean = true,
     truncate: Option[Int] = None,
-    params: String = ""
+    params: String = "",
+    modIcon: Boolean = false
   ): Html = Html {
     userIdOption.flatMap(lightUser).fold(User.anonymous) { user =>
       userIdNameLink(
@@ -94,7 +95,8 @@ trait UserHelper { self: I18nHelper with StringHelper with NumberHelper =>
         withOnline = withOnline,
         withTitle = withTitle,
         truncate = truncate,
-        params = params
+        params = params,
+        modIcon = modIcon
       )
     }
   }
@@ -116,7 +118,8 @@ trait UserHelper { self: I18nHelper with StringHelper with NumberHelper =>
       withOnline = withOnline,
       withTitle = withTitle,
       truncate = truncate,
-      params = params
+      params = params,
+      modIcon = false
     )
   }
 
@@ -139,13 +142,14 @@ trait UserHelper { self: I18nHelper with StringHelper with NumberHelper =>
     withTitle: Boolean,
     truncate: Option[Int],
     title: Option[String],
-    params: String
+    params: String,
+    modIcon: Boolean
   ): String = {
     val klass = userClass(userId, cssClass, withOnline)
     val href = userHref(username, params = params)
     val content = truncate.fold(username)(username.take)
     val titleS = if (withTitle) titleTag(title) else ""
-    val icon = withOnline ?? lineIcon(isPatron)
+    val icon = withOnline ?? (if (modIcon) moderatorIcon else lineIcon(isPatron))
     s"""<a $klass $href>$icon$titleS$content</a>"""
   }
 
@@ -276,6 +280,7 @@ trait UserHelper { self: I18nHelper with StringHelper with NumberHelper =>
 
   val lineIcon: String = """<i class="line"></i>"""
   val patronIcon: String = """<i class="line patron" title="lichess Patron"></i>"""
+  val moderatorIcon: String = """<i class="line moderator" title="lichess Moderator"></i>"""
   private def lineIcon(patron: Boolean): String = if (patron) patronIcon else lineIcon
   private def lineIcon(user: Option[LightUser]): String = lineIcon(user.??(_.isPatron))
   def lineIcon(user: User): String = lineIcon(user.isPatron)

app/views/forum/topic/form.scala.html

@@ -26,6 +26,9 @@ <h1 data-icon="!"> Important</h1>
   @forum.post.formFields(form("post")("text"), form("post")("author"), None)
   @base.captcha(form("post")("move"), form("post")("gameId"), captcha)
   @errMsg(form("post"))
+  @if(isGranted(_.PublicMod)){
+    <div class="submit"><input type="checkbox" name="post.modIcon" value="true" /> Show moderator icon next to my name</div>
+  }
   <button class="submit button" type="submit" data-icon="E"> @trans.createTheTopic()</button>
   <a href="@routes.ForumCateg.show(categ.slug)" style="margin-left:20px">@trans.cancel()</a>
 </form>

app/views/forum/topic/show.scala.html

@@ -40,7 +40,7 @@
     @posts.currentPageResults.map { post =>
     <div class="post" id="@post.number">
       <div class="metas clearfix">
-        @authorLink(post, "author".some)
+        @authorLink(post=post, cssClass="author".some, modIcon=post.displayModIcon)
 
         @post.updatedAt.map { updatedAt =>
           <span class="post-edited">edited</span>
@@ -104,6 +104,9 @@ <h2 class="postNewTitle" id="reply">@trans.replyToThisTopic()</h2>
       @forum.post.formFields(form("text"), form("author"), topic.some)
       @base.captcha(form("move"), form("gameId"), captcha)
       @globalError(form)
+      @if(isGranted(_.PublicMod)){
+      <div class="submit"><input type="checkbox" name="modIcon" value="true" /> Show moderator icon next to my name</div>
+      }
       <button type="submit" class="submit button" data-icon="E"> @trans.reply()</button>
       <a href="@routes.ForumCateg.show(categ.slug)" style="margin-left:20px">@trans.cancel()</a>
     </form>

app/views/qa/answerList.scala.html

@@ -33,7 +33,7 @@
     <div class="content">
       <div class="answer">
         <div class="meta">
-          <span class="light">Answered @momentFromNow(a.createdAt) by @userIdLink(a.userId.some)</span>
+          <span class="light">Answered @momentFromNow(a.createdAt) by @userIdLink(userIdOption=a.userId.some, modIcon=a.displayModIcon)</span>
           @if(lila.qa.QaAuth canEdit a) {
           <a class="thin button toggle-edit-answer" data-icon="m"> Edit</a>
           }

app/views/qa/questionShow.scala.html

@@ -75,6 +75,9 @@ <h1 class="lichess_title">
         <textarea class="answer-body" name="@form("body").name">@form("body").value</textarea>
         @errMsg(form("body"))
         @base.captcha(form("move"), form("gameId"), captcha)
+        @if(isGranted(_.PublicMod)){
+          <div class="submit"><input type="checkbox" name="modIcon" value="true" /> Show moderator icon next to my name</div>
+        }
         <button class="pure submit button" type="submit">Post your answer</button>
       </form>
     </div>

modules/forum/src/main/CategApi.scala

@@ -54,7 +54,8 @@ private[forum] final class CategApi(env: Env) {
         troll = false,
         hidden = topic.hidden,
         lang = "en".some,
-        categId = categ.id
+        categId = categ.id,
+        modIcon = None
       )
       env.categColl.insert(categ).void >>
         env.postColl.insert(post).void >>

modules/forum/src/main/DataForm.scala

@@ -11,7 +11,8 @@ private[forum] final class DataForm(val captcher: akka.actor.ActorSelection) ext
     "text" -> text(minLength = 3),
     "author" -> optional(text),
     "gameId" -> text,
-    "move" -> text
+    "move" -> text,
+    "modIcon" -> optional(boolean)
   )(PostData.apply)(PostData.unapply)
     .verifying(captchaFailMessage, validateCaptcha _)
 
@@ -33,7 +34,8 @@ object DataForm {
     text: String,
     author: Option[String],
     gameId: String,
-    move: String
+    move: String,
+    modIcon: Option[Boolean]
   )
 
   case class TopicData(

modules/forum/src/main/Post.scala

@@ -21,7 +21,8 @@ case class Post(
     lang: Option[String],
     editHistory: Option[List[OldVersion]] = None,
     createdAt: DateTime,
-    updatedAt: Option[DateTime] = None
+    updatedAt: Option[DateTime] = None,
+    modIcon: Option[Boolean]
 ) {
 
   private val permitEditsFor = 4 hours
@@ -59,6 +60,8 @@ case class Post(
   }
 
   def hasEdits = editHistory.isDefined
+
+  def displayModIcon = ~modIcon
 }
 
 object Post {
@@ -77,7 +80,8 @@ object Post {
     number: Int,
     lang: Option[String],
     troll: Boolean,
-    hidden: Boolean
+    hidden: Boolean,
+    modIcon: Option[Boolean]
   ): Post = {
 
     Post(
@@ -92,7 +96,8 @@ object Post {
       troll = troll,
       hidden = hidden,
       createdAt = DateTime.now,
-      categId = categId
+      categId = categId,
+      modIcon = modIcon
     )
   }
 }

modules/forum/src/main/PostApi.scala

@@ -41,7 +41,8 @@ final class PostApi(
           lang = lang map (_.language),
           troll = ctx.troll,
           hidden = topic.hidden,
-          categId = categ.id
+          categId = categ.id,
+          modIcon = (data.modIcon.getOrElse(false) && ctx.me.map(MasterGranter(_.PublicMod)).getOrElse(false)).fold(Some(true), None)
         )
         PostRepo findDuplicate post flatMap {
           case Some(dup) => fuccess(dup)

modules/forum/src/main/TopicApi.scala

@@ -60,7 +60,8 @@ private[forum] final class TopicApi(
           text = lila.security.Spam.replace(data.post.text),
           lang = lang map (_.language),
           number = 1,
-          categId = categ.id
+          categId = categ.id,
+          modIcon = (data.post.modIcon.getOrElse(false) && ctx.me.map(MasterGranter(_.PublicMod)).getOrElse(false)).fold(Some(true), None)
         )
         env.postColl.insert(post) >>
           env.topicColl.insert(topic withPost post) >>

modules/qa/src/main/DataForm.scala

@@ -35,7 +35,8 @@ private[qa] final class DataForm(
       "body" -> nonEmptyText(minLength = 30)
         .verifying(languageMessage, validateLanguage _),
       "gameId" -> text,
-      "move" -> text
+      "move" -> text,
+      "modIcon" -> optional(boolean)
     )(AnswerData.apply)(AnswerData.unapply)
       .verifying(captchaFailMessage, validateCaptcha _)
   )
@@ -82,7 +83,8 @@ private[qa] case class QuestionData(
 private[qa] case class AnswerData(
   body: String,
   gameId: String,
-  move: String
+  move: String,
+  modIcon: Option[Boolean]
 )
 
 private[qa] case class CommentData(body: String)

modules/qa/src/main/QaApi.scala

@@ -9,7 +9,8 @@ import org.joda.time.DateTime
 import lila.common.paginator._
 import lila.db.dsl._
 import lila.db.paginator._
-import lila.user.User
+import lila.user.{ User, UserContext }
+import lila.security.Granter
 
 final class QaApi(
     questionColl: Coll,
@@ -161,7 +162,7 @@ final class QaApi(
     private implicit val voteBSONHandler = Macros.handler[Vote]
     private implicit val answerBSONHandler = Macros.handler[Answer]
 
-    def create(data: AnswerData, q: Question, user: User): Fu[Answer] =
+    def create(data: AnswerData, q: Question, user: User)(implicit ctx: UserContext): Fu[Answer] =
       lila.db.Util findNextId answerColl flatMap { id =>
         val a = Answer(
           _id = id,
@@ -172,7 +173,8 @@ final class QaApi(
           comments = Nil,
           acceptedAt = None,
           createdAt = DateTime.now,
-          editedAt = None
+          editedAt = None,
+          modIcon = (data.modIcon.getOrElse(false) && ctx.me.map(Granter(_.PublicMod)).getOrElse(false)).fold(Some(true), None)
         )
 
         (answerColl insert a) >>

modules/qa/src/main/model.scala

@@ -46,7 +46,8 @@ case class Answer(
     comments: List[Comment],
     acceptedAt: Option[DateTime],
     createdAt: DateTime,
-    editedAt: Option[DateTime]
+    editedAt: Option[DateTime],
+    modIcon: Option[Boolean]
 ) {
 
   def id = _id
@@ -60,6 +61,8 @@ case class Answer(
   def editNow = copy(editedAt = Some(DateTime.now))
 
   def userIds = userId :: comments.map(_.userId)
+
+  def displayModIcon = ~modIcon
 }
 
 case class AnswerWithQuestion(answer: Answer, question: Question)

public/stylesheets/common.css

@@ -127,6 +127,9 @@ time {
 .user_link .line.patron::before {
   content: '';
 }
+.user_link .line.moderator::before {
+  content: '';
+}
 
 body.blind_mode .is::before,
 body.blind_mode .is::after,