Merge pull request #326 from omsimos/dev

feat(social): disable group chat behind a kill switch to cut polling

Author: joshxfi

CHANGELOG.md

@@ -18,6 +18,12 @@ any that are empty.
 - **Deprecated** — features marked for removal.
 - **Removed** — features removed.
 
+## [6.0.1] - 2026-07-10
+
+### Changed
+
+- Group chat is temporarily unavailable while we work on it. Groups, tags, members, and invites are unaffected — opening a group now shows a short notice in place of the chat.
+
 ## [6.0.0] - 2026-07-04
 
 ### Added
@@ -818,6 +824,7 @@ Turso query cost, and a set of audit-driven correctness and security fixes.
 - Stopped logging raw errors that could contain usernames or token internals.
 - Added a daily cron that prunes expired sessions.
 
+[6.0.1]: https://github.com/omsimos/umamin/compare/v6.0.0...v6.0.1
 [6.0.0]: https://github.com/omsimos/umamin/compare/v5.26.0...v6.0.0
 [5.26.0]: https://github.com/omsimos/umamin/compare/v5.25.0...v5.26.0
 [5.25.0]: https://github.com/omsimos/umamin/compare/v5.24.0...v5.25.0

apps/org/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev --turbopack",
+    "dev": "next dev --turbopack -p 3001",
     "ui:add": "pnpm dlx shadcn@canary add",
     "build": "next build --turbopack",
     "check-types": "tsc --noEmit",

apps/www/app/(private)/groups/groups-hub.tsx

@@ -19,6 +19,7 @@ import { respondToInviteAction } from "@/app/actions/group";
 import { CreateGroupDialog } from "@/components/create-group-dialog";
 import { useSingleFlightAction } from "@/hooks/use-single-flight-action";
 import {
+  GROUP_CHAT_ENABLED,
   type GroupAccent,
   type GroupIcon,
   OWNED_GROUPS_CAP,
@@ -71,10 +72,12 @@ export function GroupsHub() {
   });
 
   // Unread dots — refetched on focus so returning to the hub reflects new
-  // activity (and clears once a room is opened + marked read).
+  // activity (and clears once a room is opened + marked read). Skipped while
+  // group chat is off so the hub stops polling /api/groups/unread.
   const { data: unread } = useQuery({
     queryKey: queryKeys.groupUnread(),
     queryFn: fetchGroupUnread,
+    enabled: GROUP_CHAT_ENABLED,
     staleTime: PRIVATE_STALE_TIME,
     refetchOnWindowFocus: true,
   });
@@ -237,16 +240,18 @@ export function GroupsHub() {
                   <div>
                     {/* Row → info page (unchanged); this icon jumps straight to
                       chat. The unread dot lives on the glyph above. */}
-                    <Button
-                      asChild
-                      size="icon"
-                      variant="ghost"
-                      aria-label={`Open ${group.name} chat`}
-                    >
-                      <Link href={`/groups/${group.tag}/chat`}>
-                        <MessageCircleIcon />
-                      </Link>
-                    </Button>
+                    {GROUP_CHAT_ENABLED && (
+                      <Button
+                        asChild
+                        size="icon"
+                        variant="ghost"
+                        aria-label={`Open ${group.name} chat`}
+                      >
+                        <Link href={`/groups/${group.tag}/chat`}>
+                          <MessageCircleIcon />
+                        </Link>
+                      </Button>
+                    )}
 
                     {role === "owner" && (
                       <Button

apps/www/app/(public)/groups/[tag]/chat/page.tsx

@@ -1,7 +1,11 @@
+import { Button } from "@umamin/ui/components/button";
+import { MessageCircleOffIcon } from "lucide-react";
 import type { Metadata } from "next";
+import Link from "next/link";
 import { notFound, redirect } from "next/navigation";
 import { Suspense } from "react";
 import { getSession } from "@/lib/auth";
+import { GROUP_CHAT_ENABLED } from "@/lib/group";
 import {
   getGroupPageData,
   getGroupViewerRelationship,
@@ -27,8 +31,32 @@ export default function GroupChatPage({
   );
 }
 
+function ChatDisabled({ tag }: { tag: string }) {
+  return (
+    <div className="mx-auto flex min-h-[60vh] max-w-md flex-col items-center justify-center px-6 text-center">
+      <div className="flex size-14 items-center justify-center rounded-full bg-muted">
+        <MessageCircleOffIcon className="size-7 text-muted-foreground" />
+      </div>
+      <h1 className="mt-4 text-lg font-semibold">Group chat is unavailable</h1>
+      <p className="mt-2 text-sm text-muted-foreground">
+        We've temporarily turned off group chat while we work on it. Your group
+        and its members are unchanged — check back soon.
+      </p>
+      <Button asChild variant="outline" className="mt-6">
+        <Link href={`/groups/${tag}`}>Back to group</Link>
+      </Button>
+    </div>
+  );
+}
+
 async function ChatLoader({ params }: { params: Promise<{ tag: string }> }) {
   const { tag } = await params;
+
+  // Feature is off — bail before any session/DB work and show a disabled state.
+  if (!GROUP_CHAT_ENABLED) {
+    return <ChatDisabled tag={tag} />;
+  }
+
   const [group, { session }] = await Promise.all([
     getGroupPageData(tag),
     getSession(),

apps/www/app/(public)/groups/[tag]/group-page-client.tsx

@@ -47,6 +47,7 @@ import {
   EllipsisIcon,
   Loader2Icon,
   MessageCircleIcon,
+  MessageCircleOffIcon,
   ScanFaceIcon,
   SquarePenIcon,
   TagIcon,
@@ -73,7 +74,11 @@ import {
 } from "@/app/actions/group";
 import { GroupEditDialog } from "@/components/group-edit-dialog";
 import { useSingleFlightAction } from "@/hooks/use-single-flight-action";
-import type { GroupAccent, GroupIcon } from "@/lib/group";
+import {
+  GROUP_CHAT_ENABLED,
+  type GroupAccent,
+  type GroupIcon,
+} from "@/lib/group";
 import { GROUP_ACCENT_CLASSES, GROUP_ICON_MAP } from "@/lib/group-icons";
 import { vibrate } from "@/lib/haptics";
 import {
@@ -402,12 +407,20 @@ export function GroupPageClient({
       {isMember && (
         <div className="space-y-2">
           {/* Open chat is the sole primary action; the tag toggle stays
-              secondary so two filled CTAs never compete. */}
-          <Button asChild className="w-full">
-            <Link href={`/groups/${tag}/chat`}>
-              <MessageCircleIcon /> Open chat
-            </Link>
-          </Button>
+              secondary so two filled CTAs never compete. While chat is off it's
+              a quiet notice (not a CTA), leaving the tag toggle as the action. */}
+          {GROUP_CHAT_ENABLED ? (
+            <Button asChild className="w-full">
+              <Link href={`/groups/${tag}/chat`}>
+                <MessageCircleIcon /> Open chat
+              </Link>
+            </Button>
+          ) : (
+            <div className="flex items-center gap-2.5 rounded-lg border bg-muted/40 px-4 py-3 text-sm text-muted-foreground">
+              <MessageCircleOffIcon className="size-4 shrink-0" />
+              <span>Group chat is temporarily unavailable.</span>
+            </div>
+          )}
 
           <div className="flex items-center gap-2">
             <Button

apps/www/app/actions/group-chat.test.ts

@@ -82,6 +82,14 @@ vi.mock("@umamin/encryption", () => ({
   aesEncrypt: vi.fn(async (s: string) => `enc:${s}`),
 }));
 
+// Group chat ships OFF behind a kill switch; force it on here so these tests
+// verify the underlying send/react/delete logic (which must still work when the
+// flag is flipped back on).
+vi.mock("@/lib/group", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@/lib/group")>()),
+  GROUP_CHAT_ENABLED: true,
+}));
+
 import {
   deleteGroupMessageAction,
   reactToGroupMessageAction,

apps/www/app/actions/group-chat.ts

@@ -12,7 +12,11 @@ import { aesEncrypt } from "@umamin/encryption";
 import { and, desc, eq, inArray, sql } from "drizzle-orm";
 import { updateTag } from "next/cache";
 import * as z from "zod";
-import { GROUP_CHAT_REACTION_EMOJIS } from "@/lib/group";
+import {
+  GROUP_CHAT_DISABLED_ERROR,
+  GROUP_CHAT_ENABLED,
+  GROUP_CHAT_REACTION_EMOJIS,
+} from "@/lib/group";
 import { redis } from "@/lib/redis";
 import { idSchema } from "@/lib/schema";
 import { UNAUTHORIZED_ERROR } from "@/lib/server/errors";
@@ -74,6 +78,9 @@ export const sendGroupMessageAction = withAction(
     },
   },
   async ({ groupId, content, replyToMessageId }, { session }) => {
+    if (!GROUP_CHAT_ENABLED) {
+      return { error: GROUP_CHAT_DISABLED_ERROR };
+    }
     if (!(await isGroupMember(groupId, session.userId))) {
       return { error: UNAUTHORIZED_ERROR };
     }
@@ -185,6 +192,9 @@ export const markGroupChatReadAction = withAction(
     },
   },
   async ({ groupId, lastReadMessageId }, { session }) => {
+    if (!GROUP_CHAT_ENABLED) {
+      return { error: GROUP_CHAT_DISABLED_ERROR };
+    }
     if (!(await isGroupMember(groupId, session.userId))) {
       return { error: UNAUTHORIZED_ERROR };
     }
@@ -220,6 +230,9 @@ export const deleteGroupMessageAction = withAction(
     },
   },
   async ({ groupId, messageId }, { session }) => {
+    if (!GROUP_CHAT_ENABLED) {
+      return { error: GROUP_CHAT_DISABLED_ERROR };
+    }
     const [message] = await db
       .select({ senderId: groupMessageTable.senderId })
       .from(groupMessageTable)
@@ -298,6 +311,9 @@ export const reactToGroupMessageAction = withAction(
     },
   },
   async ({ groupId, messageId, emoji }, { session }) => {
+    if (!GROUP_CHAT_ENABLED) {
+      return { error: GROUP_CHAT_DISABLED_ERROR };
+    }
     if (!(GROUP_CHAT_REACTION_EMOJIS as readonly string[]).includes(emoji)) {
       return { error: "Invalid reaction" };
     }

apps/www/app/api/groups/[tag]/chat/head/route.ts

@@ -1,4 +1,5 @@
 import type { NextRequest } from "next/server";
+import { GROUP_CHAT_ENABLED } from "@/lib/group";
 import { publicJson } from "@/lib/public-json";
 import { redis } from "@/lib/redis";
 import {
@@ -19,6 +20,12 @@ import {
 const HEAD_CACHE_SECONDS = 8;
 
 export async function GET(req: NextRequest) {
+  // Chat is off — keep the response cacheable so stale clients' polls collapse
+  // at the CDN and never touch Redis.
+  if (!GROUP_CHAT_ENABLED) {
+    return publicJson({ tail: null, rxn: null }, HEAD_CACHE_SECONDS);
+  }
+
   const groupId = new URL(req.url).searchParams.get("id");
 
   if (!redis || !groupId) {

apps/www/app/api/groups/[tag]/chat/reactions/[messageId]/route.ts

@@ -1,5 +1,6 @@
 import type { NextRequest } from "next/server";
 import { getSession } from "@/lib/auth";
+import { GROUP_CHAT_DISABLED_ERROR, GROUP_CHAT_ENABLED } from "@/lib/group";
 import { privateJson } from "@/lib/private-json";
 import { checkRateLimit, RATE_LIMIT_ERROR } from "@/lib/ratelimit";
 import {
@@ -16,6 +17,10 @@ export async function GET(
   ctx: { params: Promise<{ tag: string; messageId: string }> },
 ) {
   try {
+    if (!GROUP_CHAT_ENABLED) {
+      return privateJson({ error: GROUP_CHAT_DISABLED_ERROR }, { status: 403 });
+    }
+
     const { session } = await getSession();
     if (!session) {
       return privateJson({ error: "Unauthorized" }, { status: 401 });

apps/www/app/api/groups/[tag]/chat/reactions/route.ts

@@ -1,5 +1,6 @@
 import type { NextRequest } from "next/server";
 import { getSession } from "@/lib/auth";
+import { GROUP_CHAT_DISABLED_ERROR, GROUP_CHAT_ENABLED } from "@/lib/group";
 import { privateJson } from "@/lib/private-json";
 import { checkRateLimit, RATE_LIMIT_ERROR } from "@/lib/ratelimit";
 import {
@@ -16,6 +17,10 @@ export async function GET(
   ctx: { params: Promise<{ tag: string }> },
 ) {
   try {
+    if (!GROUP_CHAT_ENABLED) {
+      return privateJson({ error: GROUP_CHAT_DISABLED_ERROR }, { status: 403 });
+    }
+
     const { session } = await getSession();
     if (!session) {
       return privateJson({ error: "Unauthorized" }, { status: 401 });