bug fixes, and performance improvements, and drawer

2026-09-27 18:44:51 -05:00
parent d48d8163a7
commit 2b9f8d64d7
52 changed files with 4913 additions and 778 deletions
@@ -1,44 +1,39 @@
-import { and, eq } from 'drizzle-orm';
-import { topics } from '~~/drizzle/schema';
-import { db } from '~~/server/lib/db';
-import { cancelPendingRename } from '~~/server/utils/renames';
-import { userEvents } from '~~/server/utils/events';
+import { and, eq, isNull } from "drizzle-orm";
+import { topics } from "~~/drizzle/schema";
+import { db } from "~~/server/lib/db";
+import { cancelPendingRename } from "~~/server/utils/renames";
+import { topicEvents, userEvents } from "~~/server/utils/events";

 export default defineEventHandler(async (event) => {
    await protectRoute(event);
-
-    const topicId = getRouterParam(event, 'topicId')!;
-
-    const success = cancelPendingRename(topicId);
-    if (success) {
-        const res = await db.update(topics).set({
-            renaming: false,
-        }).where(and(eq(topics.id, topicId), eq(topics.userId, event.context.user!.id)));
-        if (res.rowCount === 0) {
-            throw createError({
-                statusCode: 400,
-                statusMessage: 'Invalid topic',
-                data: {
-                    code: 'INVALID_TOPIC',
-                    ok: false,
-                }
-            });
-        }
-
-        userEvents.emit(topicId, 'topics', {
-            op: 'update',
-            payload: {
-                topicId,
-                renaming: false,
-            },
-        });
-
-        return {
-            ok: true,
-        };
+    const topicId = getRouterParam(event, "topicId");
+    const userId = event.context.user?.id;
+    if (!topicId || !userId) {
+        setResponseStatus(event, 400);
+        return { ok: false };
    }

-    return {
-        ok: false,
-    };
-});
+    const topic = await db.query.topics.findFirst({ where: { id: topicId, userId } });
+    if (!topic) {
+        setResponseStatus(event, 404);
+        return { ok: false };
+    }
+    const cleared = await db.update(topics).set({
+        renaming: false,
+        renameAttemptId: null,
+        renameExpiresAt: null,
+    }).where(and(
+        eq(topics.id, topicId),
+        eq(topics.userId, userId),
+        topic.renameAttemptId ? eq(topics.renameAttemptId, topic.renameAttemptId) : isNull(topics.renameAttemptId),
+    )).returning({ id: topics.id });
+    if (cleared.length === 0) {
+        return { ok: false };
+    }
+    cancelPendingRename(topicId, topic.renameAttemptId);
+
+    const payload = { topicId, renaming: false };
+    userEvents.emit(userId, "topics", { op: "update", payload });
+    topicEvents.emit(topicId, { type: "topic_updated", payload });
+    return { ok: true };
+});