Merge pull request #16769 from yafred/issue-16715-notes-in-kid-mode-t…

…ake2 Allow private notes on games in kid mode
lichess-org · Jan 21, 2025 · f528bb9 · f528bb9
2 parents c6d7b20 + 35c1e91
commit f528bb9
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 69 deletions.
diff --git a/app/controllers/Round.scala b/app/controllers/Round.scala
@@ -200,7 +200,7 @@ final class Round(
   private[controllers] def getWatcherChat(
       game: GameModel
   )(using ctx: Context): Fu[Option[lila.chat.UserChat.Mine]] = {
-    ctx.kid.no && (ctx.noBot || ctx.userId.exists(game.userIds.has)) && ctx.me.fold(
+    (ctx.noBot || ctx.userId.exists(game.userIds.has)) && ctx.me.fold(
       HTTPRequest.isHuman(ctx.req)
     )(env.chat.panic.allowed(_)) && {
       game.finishedOrAborted || !ctx.userId.exists(game.userIds.has)
@@ -211,41 +211,40 @@ final class Round(
   private[controllers] def getPlayerChat(game: GameModel, tour: Option[Tour])(using
       ctx: Context
   ): Fu[Option[Chat.GameOrEvent]] =
-    ctx.kid.no.so:
-      def toEventChat(resource: String)(c: lila.chat.UserChat.Mine) =
-        Chat
-          .GameOrEvent:
-            Right:
-              (c.truncate(100), lila.chat.Chat.ResourceId(resource))
-          .some
-      (game.tournamentId, game.simulId, game.swissId) match
-        case (Some(tid), _, _) =>
-          val hasChat = ctx.isAuth && tour.forall(tournamentC.canHaveChat(_, none))
-          hasChat.so(
+    def toEventChat(resource: String)(c: lila.chat.UserChat.Mine) =
+      Chat
+        .GameOrEvent:
+          Right:
+            (c.truncate(100), lila.chat.Chat.ResourceId(resource))
+        .some
+    (game.tournamentId, game.simulId, game.swissId) match
+      case (Some(tid), _, _) =>
+        val hasChat = ctx.isAuth && tour.forall(tournamentC.canHaveChat(_, none))
+        hasChat.so(
+          env.chat.api.userChat.cached
+            .findMine(tid.into(ChatId))
+            .dmap(toEventChat(s"tournament/$tid"))
+        )
+      case (_, Some(sid), _) =>
+        env.chat.api.userChat.cached.findMine(sid.into(ChatId)).dmap(toEventChat(s"simul/$sid"))
+      case (_, _, Some(sid)) =>
+        env.swiss.api
+          .roundInfo(sid)
+          .flatMapz(swissC.canHaveChat)
+          .flatMapz:
             env.chat.api.userChat.cached
-              .findMine(tid.into(ChatId))
-              .dmap(toEventChat(s"tournament/$tid"))
-          )
-        case (_, Some(sid), _) =>
-          env.chat.api.userChat.cached.findMine(sid.into(ChatId)).dmap(toEventChat(s"simul/$sid"))
-        case (_, _, Some(sid)) =>
-          env.swiss.api
-            .roundInfo(sid)
-            .flatMapz(swissC.canHaveChat)
-            .flatMapz:
-              env.chat.api.userChat.cached
-                .findMine(sid.into(ChatId))
-                .dmap(toEventChat(s"swiss/$sid"))
-        case _ =>
-          game.hasChat.so:
-            for
-              chat  <- env.chat.api.playerChat.findIf(game.id.into(ChatId), !game.justCreated)
-              lines <- lila.chat.JsonView.asyncLines(chat)
-            yield Chat
-              .GameOrEvent:
-                Left:
-                  Chat.Restricted(chat, lines, restricted = game.sourceIs(_.Lobby) && ctx.isAnon)
-              .some
+              .findMine(sid.into(ChatId))
+              .dmap(toEventChat(s"swiss/$sid"))
+      case _ =>
+        game.hasChat.so:
+          for
+            chat  <- env.chat.api.playerChat.findIf(game.id.into(ChatId), !game.justCreated)
+            lines <- lila.chat.JsonView.asyncLines(chat)
+          yield Chat
+            .GameOrEvent:
+              Left:
+                Chat.Restricted(chat, lines, restricted = game.sourceIs(_.Lobby) && ctx.isAnon)
+            .some
 
   def sides(gameId: GameId, color: Color) = Open:
     FoundSnip(env.round.proxyRepo.pov(gameId, color)): pov =>

diff --git a/modules/chat/src/main/ChatUi.scala b/modules/chat/src/main/ChatUi.scala
@@ -64,34 +64,41 @@ final class ChatUi(helpers: Helpers):
       palantir: Boolean = false,
       hostIds: List[UserId] = Nil
   )(using ctx: Context): JsObject =
-    Json
-      .obj(
-        "data" -> Json
-          .obj(
-            "id"         -> chat.id,
-            "name"       -> name,
-            "lines"      -> lines,
-            "resourceId" -> resourceId.value
-          )
-          .add("hostIds" -> hostIds.some.filter(_.nonEmpty))
-          .add("userId" -> ctx.userId)
-          .add("loginRequired" -> chat.loginRequired)
-          .add("restricted" -> restricted)
-          .add("palantir" -> (palantir && ctx.isAuth)),
-        "writeable" -> writeable,
-        "public"    -> public,
-        "permissions" -> Json
-          .obj("local" -> (public && localMod))
-          .add("broadcast" -> (public && broadcastMod))
-          .add("timeout" -> (public && Granter.opt(_.ChatTimeout)))
-          .add("shadowban" -> (public && Granter.opt(_.Shadowban)))
-      )
-      .add("kobold" -> ctx.troll)
-      .add("blind" -> ctx.blind)
-      .add("timeout" -> timeout)
-      .add("noteId" -> (withNoteAge.isDefined && ctx.noBlind).option(chat.id.value.take(8)))
-      .add("noteAge" -> withNoteAge)
-      .add(
-        "timeoutReasons" -> (!localMod && (Granter.opt(_.ChatTimeout) || Granter.opt(_.BroadcastTimeout)))
-          .option(JsonView.timeoutReasons)
-      )
+    val noteId = (withNoteAge.isDefined && ctx.noBlind).option(chat.id.value.take(8))
+    if ctx.kid.yes then
+      Json
+        .obj("kidMode" -> true)
+        .add("noteId" -> noteId)
+        .add("noteAge" -> withNoteAge)
+    else
+      Json
+        .obj(
+          "data" -> Json
+            .obj(
+              "id"         -> chat.id,
+              "name"       -> name,
+              "lines"      -> lines,
+              "resourceId" -> resourceId.value
+            )
+            .add("hostIds" -> hostIds.some.filter(_.nonEmpty))
+            .add("userId" -> ctx.userId)
+            .add("loginRequired" -> chat.loginRequired)
+            .add("restricted" -> restricted)
+            .add("palantir" -> (palantir && ctx.isAuth)),
+          "writeable" -> writeable,
+          "public"    -> public,
+          "permissions" -> Json
+            .obj("local" -> (public && localMod))
+            .add("broadcast" -> (public && broadcastMod))
+            .add("timeout" -> (public && Granter.opt(_.ChatTimeout)))
+            .add("shadowban" -> (public && Granter.opt(_.Shadowban)))
+        )
+        .add("kobold" -> ctx.troll)
+        .add("blind" -> ctx.blind)
+        .add("timeout" -> timeout)
+        .add("noteId" -> noteId)
+        .add("noteAge" -> withNoteAge)
+        .add(
+          "timeoutReasons" -> (!localMod && (Granter.opt(_.ChatTimeout) || Granter.opt(_.BroadcastTimeout)))
+            .option(JsonView.timeoutReasons)
+        )
diff --git a/ui/chat/src/ctrl.ts b/ui/chat/src/ctrl.ts
@@ -25,7 +25,7 @@ export default class ChatCtrl {
   private maxLinesDrop = 50; // how many lines to drop at once
   private subs: [PubsubEvent, PubsubCallback][];
 
-  allTabs: Tab[] = ['discussion'];
+  allTabs: Tab[] = [];
   palantir: ChatPalantir;
   tabStorage: LichessStorage = storage.make('chat.tab');
   storedTab: string | null = this.tabStorage.get();
@@ -39,12 +39,13 @@ export default class ChatCtrl {
     readonly redraw: Redraw,
   ) {
     this.data = opts.data;
+    if (!opts.kidMode) this.allTabs.push('discussion');
     if (opts.noteId) this.allTabs.push('note');
-    if (opts.plugin) this.allTabs.push(opts.plugin.tab.key);
+    if (!opts.kidMode && opts.plugin) this.allTabs.push(opts.plugin.tab.key);
     this.palantir = {
       instance: undefined,
       loaded: false,
-      enabled: prop(!!this.data.palantir),
+      enabled: prop(!opts.kidMode && !!this.data.palantir),
     };
     const noChat = storage.get('nochat');
     this.vm = {
@@ -71,6 +72,8 @@ export default class ChatCtrl {
       redraw: this.redraw,
     });
 
+    if (opts.kidMode) return;
+
     /* If discussion is disabled, and we have another chat tab,
      * then select that tab over discussion */
     if (this.allTabs.length > 1 && this.vm.tab === 'discussion' && noChat) this.vm.tab = this.allTabs[1];

diff --git a/ui/chat/src/interfaces.ts b/ui/chat/src/interfaces.ts
@@ -20,6 +20,7 @@ export interface ChatOpts {
   noteText?: string;
   plugin?: ChatPlugin;
   alwaysEnabled: boolean;
+  kidMode: boolean;
 }
 
 export interface ChatPlugin {