show appeal status on user mod section

johndoknjas · Nov 14, 2024 · 32ed577 · 32ed577
1 parent 4fb6dd1
commit 32ed577
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 17 deletions.
diff --git a/app/controllers/User.scala b/app/controllers/User.scala
@@ -386,6 +386,9 @@ final class User(
             .map: prefs =>
               ui.prefs(user, prefs.hasKeyboardMove, prefs.botCompatible)
 
+        val appeal = isGranted(_.Appeals).so:
+          env.appeal.api.byId(user).mapz(views.appeal.ui.modSection(lila.mod.ui.mzSection("appeal")))
+
         val rageSit = isGranted(_.CheatHunter).so(
           env.playban.api
             .rageSitOf(user.id)
@@ -438,6 +441,7 @@ final class User(
             .merge(modZoneSegment(student, "student", user))
             .merge(modZoneSegment(teacher, "teacher", user))
             .merge(modZoneSegment(prefs, "prefs", user))
+            .merge(modZoneSegment(appeal, "appeal", user))
             .merge(modZoneSegment(rageSit, "rageSit", user))
             .merge(modZoneSegment(othersAndLogins.map(_._1), "others", user))
             .merge(modZoneSegment(identification, "identification", user))

diff --git a/modules/appeal/src/main/ui/AppealUi.scala b/modules/appeal/src/main/ui/AppealUi.scala
@@ -33,3 +33,9 @@ final class AppealUi(helpers: Helpers):
         userIdLink(UserId.lichess.some),
         Granter.opt(_.Appeals).option(frag(" (", userIdLink(userId.some), ")"))
       )
+
+  def modSection(section: Tag)(ap: Appeal): Frag =
+    section(
+      strong(cls := "text inline")("Appeal status"),
+      strong(cls := "fat")(a(href := routes.Appeal.show(ap.userId))(ap.status.toString))
+    )
diff --git a/modules/mod/src/main/ui/ModUserUi.scala b/modules/mod/src/main/ui/ModUserUi.scala
@@ -276,6 +276,18 @@ final class ModUserUi(helpers: Helpers, modUi: ModUi):
     Granter.opt(_.ChangePermission) || (Granter.opt(_.Admin) && user.roles.nonEmpty)
 
   def prefs(u: User, hasKeyboardMove: Boolean, botCompatible: Boolean)(using Context) =
+    val prefList = List(
+      hasKeyboardMove.option(li("keyboard moves")),
+      botCompatible.option:
+        li:
+          strong:
+            a(
+              cls      := "text",
+              dataIcon := Icon.CautionCircle,
+              href := lila.common.String.base64
+                .decode("aHR0cDovL2NoZXNzLWNoZWF0LmNvbS9ob3dfdG9fY2hlYXRfYXRfbGljaGVzcy5odG1s")
+            )("BOT-COMPATIBLE SETTINGS")
+    ).flatten
     frag(
       canViewRolesOf(u).option(
         mzSection("roles")(
@@ -285,24 +297,11 @@ final class ModUserUi(helpers: Helpers, modUi: ModUi):
           )
         )
       ),
-      mzSection("preferences")(
-        strong(cls := "text inline", dataIcon := Icon.Gear)("Notable preferences"),
-        ul(
-          hasKeyboardMove.option(li("keyboard moves")),
-          botCompatible.option(
-            li(
-              strong(
-                a(
-                  cls      := "text",
-                  dataIcon := Icon.CautionCircle,
-                  href := lila.common.String.base64
-                    .decode("aHR0cDovL2NoZXNzLWNoZWF0LmNvbS9ob3dfdG9fY2hlYXRfYXRfbGljaGVzcy5odG1s")
-                )("BOT-COMPATIBLE SETTINGS")
-              )
-            )
-          )
+      prefList.nonEmpty.option:
+        mzSection("preferences")(
+          strong(cls := "text inline", dataIcon := Icon.Gear)("Notable preferences"),
+          ul(prefList)
         )
-      )
     )
 
   def showRageSitAndPlaybans(rageSit: RageSit, playbans: Int): Frag =

diff --git a/ui/mod/css/_user.scss b/ui/mod/css/_user.scss
@@ -88,6 +88,11 @@
     flex: 1 1 auto;
   }
 
+  &--appeal {
+    order: 5;
+    flex: 1 1 auto;
+  }
+
   &--boardTokens {
     order: 6;
     flex: 1 1 auto;