@@ -319,6 +319,27 @@ def test_admins_see_chat_and_whole_commands_and_it_is_audited(app, env, world, c
     assert "docks" not in rows[0]["detail_json"] and "private" not in rows[0]["detail_json"]
 
 
+def test_channel_commands_are_chat_for_admins_and_a_channel_name_for_mods(app, env, world, coreprotect):
+    hazel = world["hazel"]
+    coreprotect.command(hazel, 171, "/looc where is the beagle")
+    coreprotect.command(hazel, 172, "/RPCharacters:FOOC raid at dusk")
+    coreprotect.command(hazel, 173, "/me waves")
+    coreprotect.command(hazel, 174, "/home")
+    _, token = account(env, "boss", "admin")
+    feed = client(app, token).get(f"/admin/players/{HAZEL}/activity").json()
+    said = [(e["kind"], e["channel"], e["message"]) for e in feed["entries"] if e["kind"] == "chat"]
+    assert said == [("chat", "Emote", "waves"), ("chat", "FOOC", "raid at dusk"), ("chat", "LOOC", "where is the beagle")]
+    assert [e["target"] for e in feed["entries"] if e["kind"] == "command"] == ["/home", "/msg Bob a private thing"]
+    only_chat = client(app, token).get(f"/admin/players/{HAZEL}/activity", params={"kinds": "chat"}).json()
+    assert [e["channel"] for e in only_chat["entries"]] == ["Emote", "FOOC", "LOOC"]
+    assert json.loads(message_audits(env)[0]["detail_json"])["rows"] == 5
+
+    mod = client(app, staff(env, "mod")).get(f"/admin/players/{HAZEL}/activity").json()
+    commands = [(e["target"], e["channel"]) for e in mod["entries"] if e["kind"] == "command"]
+    assert commands == [("/home", None), ("/me", "Emote"), ("/RPCharacters:FOOC", "FOOC"), ("/looc", "LOOC"), ("/msg", None)]
+    assert "beagle" not in str(mod) and "dusk" not in str(mod) and "waves" not in str(mod)
+
+
 def test_pages_without_messages_are_not_audited(app, env, world):
     _, token = account(env, "boss", "admin")
     feed = client(app, token).get(f"/admin/players/{HAZEL}/activity", params={"kinds": "block,session"}).json()
 
@@ -96,6 +96,13 @@ Activity responses also return `server_label` and `map_world`, so the panel
 calls the map's world by its name (Vardera). The panel merges consecutive
 changes to the same block within a minute into one row; the API does not.
 
+RPCharacters chat sent by command (`/looc hi`, `/fooc`, `/me`, `/shout`…;
+the aliases are `CHANNELS` in `activity.py`, from Main's `chat.yml`) is chat:
+for admins it comes back as kind `chat` with its `channel` and the text after
+the command, under the Chat filter and audited like chat; moderators still get
+only the command word, with the `channel` named. Plain chat goes to the
+player's current channel, which CoreProtect does not record, so it has none.
+
 Sessions are rebuilt from login, logout and ping rows; see `sessions.py` for how crashed sessions end.
 
 Movement is a player's session rows in a window (up to 7 days for one
 
@@ -41,6 +41,25 @@
 )
 _FULL_COMMAND_TEXT = f"CASE WHEN {_SKILL} THEN substr({_CAST}, 1, 80) ELSE substr(message, 1, {MESSAGE_MAX}) END"
 
+# RPCharacters' chat channels, as sent by command (`/looc hi`): alias → label,
+# from Main's plugins/RPCharacters/chat.yml. Plain chat goes to the player's
+# current channel, which CoreProtect does not record.
+CHANNELS = {
+    "rp": "RP", "shout": "Shout", "yell": "Yell", "y": "Yell", "whisper": "Whisper", "wh": "Whisper",
+    "me": "Emote", "dm": "DM", "narrate": "DM", "scene": "Scene",
+    "ooc": "OOC", "looc": "LOOC", "gooc": "GOOC", "fooc": "FOOC", "pooc": "POOC", "rooc": "ROOC",
+    "admin": "Admin", "a": "Admin", "helper": "Helper", "h": "Helper",
+}
+_FIRST_WORD = "lower(CASE WHEN instr(message, ' ') > 0 THEN substr(message, 1, instr(message, ' ') - 1) ELSE message END)"
+_CHANNEL = "{} IN ({})".format(_FIRST_WORD, ", ".join(
+    f"'/{prefix}{alias}'" for alias in CHANNELS for prefix in ("", "rpcharacters:")))
+
+
+def channel_of(command: str | None) -> str | None:
+    """The chat channel a command speaks in (`/looc hi` → LOOC), or None."""
+    word = (command or "").split(" ", 1)[0].lower().removeprefix("/").removeprefix("rpcharacters:")
+    return CHANNELS.get(word)
+
 
 @dataclass(frozen=True)
 class Source:
@@ -53,6 +72,8 @@ class Source:
     full_columns: str | None = None
     # Read only when the caller may read messages.
     sensitive: bool = False
+    # Kinds used instead when the caller may read messages.
+    full_kinds: dict[str, str] | None = None
 
 
 SOURCES = (
@@ -71,10 +92,15 @@ class Source:
            f"{_SKILL} AS is_skill, {_TELEPORT} > 0 AS teleport, {_COMMAND_TEXT} AS text, 0 AS truncated",
            {"skill": _SKILL, "command": f"NOT {_SKILL}"},
            full_columns=(f"{_SKILL} AS is_skill, {_TELEPORT} > 0 AS teleport, {_FULL_COMMAND_TEXT} AS text, "
-                         f"NOT {_SKILL} AND length(message) > {MESSAGE_MAX} AS truncated")),
+                         f"NOT {_SKILL} AND length(message) > {MESSAGE_MAX} AS truncated"),
+           # Those who may read chat see channel commands as chat (source 10), not here.
+           full_kinds={"skill": _SKILL, "command": f"NOT {_SKILL} AND NOT {_CHANNEL}"}),
     Source(8, "session", "co_session", "action", {"session": "action IN (0, 1)"}),
     Source(9, "chat", "co_chat", f"substr(message, 1, {MESSAGE_MAX}) AS text, length(message) > {MESSAGE_MAX} AS truncated",
            {"chat": "1"}, sensitive=True),
+    Source(10, "channel", "co_command",
+           f"substr(message, 1, {MESSAGE_MAX}) AS text, length(message) > {MESSAGE_MAX} AS truncated",
+           {"chat": _CHANNEL}, sensitive=True),
 )
 # Kinds anyone with view_players may ask for, and the extra ones for view_player_messages.
 KINDS = tuple(dict.fromkeys(kind for source in SOURCES if not source.sensitive for kind in source.kinds))
@@ -190,7 +216,8 @@ def fetch(reader: Reader, maps: Maps, ids: list[int], kinds: tuple[str, ...], cu
     for source in SOURCES:
         if source.table not in maps.tables or (source.sensitive and not full_text):
             continue
-        conditions = [cond for kind, cond in source.kinds.items() if kind in kinds]
+        source_kinds = (source.full_kinds if full_text else None) or source.kinds
+        conditions = [cond for kind, cond in source_kinds.items() if kind in kinds]
         if not conditions:
             continue
         upper = _upper(source, cursor)
@@ -332,6 +359,7 @@ def _entry(source: Source, row: dict, maps: Maps, victims: dict) -> dict:
         "truncated": False,
         "rolled_back": _rollback(row.get("rolled_back")),
         "target_info": None,
+        "channel": None,
     }
     if source.name == "block":
         if action == 3:
@@ -372,10 +400,15 @@ def _entry(source: Source, row: dict, maps: Maps, victims: dict) -> dict:
             entry.update(kind="skill", verb="teleported with" if row["teleport"] else "cast",
                          target=(row["text"] or "").strip() or "a skill")
         else:
-            entry.update(kind="command", verb="ran", target=row["text"] or "/", truncated=bool(row["truncated"]))
+            # Without full text this is just `/looc`: which channel, never what was said.
+            entry.update(kind="command", verb="ran", target=row["text"] or "/", truncated=bool(row["truncated"]),
+                         channel=channel_of(row["text"]))
     elif source.name == "chat":
         entry.update(kind="chat", verb="said", target=None, message=row["text"] or "",
                      truncated=bool(row["truncated"]))
+    elif source.name == "channel":
+        entry.update(kind="chat", verb="said", target=None, channel=channel_of(row["text"]),
+                     message=(row["text"] or "").partition(" ")[2].strip(), truncated=bool(row["truncated"]))
     else:
         entry.update(kind="session", verb="logged in" if action == 1 else "logged out", target=None)
     return entry
 
@@ -39,6 +39,24 @@ export const KIND_LABELS: Record<string, string> = {
 
 const SOURCE_LABELS: Record<string, string> = { mmoitems: "MMOItems", mythicmobs: "MythicMobs" };
 
+// Each channel in the colour its in-game tag uses (RPCharacters' chat.yml).
+const CHANNEL_COLOURS: Record<string, string> = {
+  LOOC: "#55c455", OOC: "#7f8cff", GOOC: "#ffaa00", FOOC: "#55e0e0", POOC: "#ff77ff", ROOC: "#ff77ff",
+  Admin: "#ff6b6b", Helper: "#ff77ff", Shout: "#ffaa00", Yell: "#ff6b6b", Whisper: "#55aaff", Emote: "#ff77ff",
+};
+
+function ChannelTag({ channel }: { channel: string }) {
+  const colour = CHANNEL_COLOURS[channel] ?? "var(--tfmc-mist)";
+  return (
+    <span
+      className="mr-1.5 inline-block rounded-full border px-1.5 align-[1px] text-[10px] font-semibold uppercase tracking-wide"
+      style={{ color: colour, borderColor: `color-mix(in srgb, ${colour} 45%, transparent)` }}
+    >
+      {channel}
+    </span>
+  );
+}
+
 const strongClass = "font-semibold text-[var(--tfmc-cream)]";
 const badgeClass =
   "ml-1.5 inline-block rounded-full border border-[color-mix(in_srgb,var(--tfmc-cream)_22%,transparent)] px-1.5 align-[1px] text-[10px] font-medium uppercase tracking-wide text-[var(--tfmc-stone)]";
@@ -92,7 +110,14 @@ function Thing({ entry, count }: { entry: ActivityEntry; count: number }) {
 
 function Sentence({ entry, count }: { entry: ActivityEntry; count: number }) {
   const verb = capital(entry.verb);
-  if (entry.kind === "chat") return <>{verb}</>;
+  if (entry.kind === "command" && entry.channel) {
+    // A moderator's view of channel chat: where they spoke, not what.
+    return (
+      <>
+        Spoke in <ChannelTag channel={entry.channel} />
+      </>
+    );
+  }
   if (entry.kind === "command") {
     return (
       <>
@@ -153,16 +178,20 @@ function Row({ row, names }: { row: ActivityRow; names: WorldNames }) {
     <li className="grid grid-cols-[3rem_minmax(0,1fr)] gap-x-3 py-2.5">
       <Clock at={entry.time} />
       <div className="min-w-0">
-        <p className="break-words text-[var(--tfmc-mist)]">
-          <Sentence entry={entry} count={count} />
-          {entry.truncated ? <span className="text-[var(--tfmc-stone)]"> (cut short)</span> : null}
-          {entry.rolled_back ? <Rollback text={entry.rolled_back} /> : null}
-        </p>
         {entry.kind === "chat" ? (
-          <blockquote className="mt-1 break-words rounded-sm border-l-2 border-[color-mix(in_srgb,var(--tfmc-accent)_55%,transparent)] bg-[color-mix(in_srgb,var(--tfmc-cream)_5%,transparent)] px-2.5 py-1 text-[var(--tfmc-cream)]">
-            {entry.message}
-          </blockquote>
-        ) : null}
+          <p className="break-words border-l-2 border-[color-mix(in_srgb,var(--tfmc-cream)_22%,transparent)] pl-2.5 text-[var(--tfmc-cream)]">
+            <span className="sr-only">Said </span>
+            {entry.channel ? <ChannelTag channel={entry.channel} /> : null}
+            <span>{entry.message}</span>
+            {entry.truncated ? <span className="text-[var(--tfmc-stone)]"> (cut short)</span> : null}
+          </p>
+        ) : (
+          <p className="break-words text-[var(--tfmc-mist)]">
+            <Sentence entry={entry} count={count} />
+            {entry.truncated ? <span className="text-[var(--tfmc-stone)]"> (cut short)</span> : null}
+            {entry.rolled_back ? <Rollback text={entry.rolled_back} /> : null}
+          </p>
+        )}
         <p className="mt-0.5 flex flex-wrap items-baseline gap-x-1 text-xs text-[var(--tfmc-stone)]">
           {where ? (
             <span>
@@ -291,7 +320,7 @@ export default function PlayerActivity({ uuid }: { uuid: string }) {
       <div
         role="group"
         aria-label="Show"
-        className="-mx-5 mt-3 flex gap-1.5 overflow-x-auto px-5 py-1 [scrollbar-width:none] sm:mx-0 sm:flex-wrap sm:overflow-visible sm:px-0 [&::-webkit-scrollbar]:hidden"
+        className="scroll-strip mt-3 flex gap-1.5 overflow-x-auto overscroll-x-contain py-1 sm:flex-wrap sm:overflow-visible"
       >
         <button type="button" aria-pressed={!kinds.length} className={chip(!kinds.length)} onClick={() => choose([])}>
           All
 
@@ -249,6 +249,24 @@ it("shows chat and whole commands to admins, and says views are logged", async (
   expect(within(feed).getByText(/Your views of these are logged/)).toBeTruthy();
 });
 
+it("tags chat with its channel, and tells moderators only the channel", async () => {
+  vi.mocked(getPlayerActivity).mockResolvedValue({
+    entries: [
+      entry("channel:1", { kind: "chat", verb: "said", target: null, message: "where is the beagle", channel: "LOOC" }),
+      entry("chat:2", { kind: "chat", verb: "said", target: null, message: "hello" }),
+      entry("command:3", { kind: "command", verb: "ran", target: "/fooc", channel: "FOOC" }),
+    ],
+    next: null, searched_to: null, kinds: [...KINDS, "chat"], shows_messages: true, coreprotect: { status: "available" },
+  });
+  render(<PlayerProfile uuid={UUID} />);
+  const feed = await screen.findByRole("region", { name: "Recent activity" });
+  const looc = await within(feed).findByText("where is the beagle");
+  expect(looc.parentElement!.textContent).toBe("Said LOOCwhere is the beagle");
+  expect(within(feed).getByText("hello").parentElement!.textContent).toBe("Said hello");
+  expect(within(feed).getByText(/Spoke in/).textContent).toBe("Spoke in FOOC");
+  expect(within(feed).queryByText("/fooc")).toBeNull();
+});
+
 it("keeps moderators' note when messages are not included", async () => {
   render(<PlayerProfile uuid={UUID} />);
   const feed = await screen.findByRole("region", { name: "Recent activity" });
 
@@ -72,6 +72,15 @@ html.map-fullscreen textarea {
   height: 8px;
 }
 
+/* A sideways strip (the activity filters) that scrolls without a bar. Unlayered
+   like the rules above, which a Tailwind utility could not override. */
+.scroll-strip {
+  scrollbar-width: none;
+}
+.scroll-strip::-webkit-scrollbar {
+  display: none;
+}
+
 *::-webkit-scrollbar-track {
   background: color-mix(in srgb, var(--tfmc-forest) 70%, transparent);
   border-radius: 4px;
 
@@ -272,6 +272,8 @@ export type ActivityEntry = {
   victim: { minecraft_name: string; uuid: string | null } | null;
   /** Chat text, for admins only. */
   message: string | null;
+  /** The RPCharacters channel (`LOOC`, `Emote`) of chat sent by command; plain chat's channel is not recorded. */
+  channel?: string | null;
   truncated: boolean;
   world: string | null;
   x: number;