Add user deletion, ProseA hover cards, Canvas

server/api/file.get.ts

@@ -1,45 +1,41 @@
+import { and, eq, like, sql } from 'drizzle-orm';
 import useDatabase from '~/composables/useDatabase';
-import type { File } from '~/types/api';
+import { explorerContentTable } from '~/db/schema';
 
 export default defineEventHandler(async (e) => {
-    const project = getRouterParam(e, "projectId");
     const query = getQuery(e);
-
-    if(!project)
-    {
-        setResponseStatus(e, 404);
-        return;
-    }
-
     const where = [];
-    const criteria: Record<string, any> = {  };
 
     if(query && query.path !== undefined)
     {
-        where.push("path = $path");
-        criteria["$path"] = query.path;
+        where.push(eq(explorerContentTable.path, sql.placeholder('path')));
     }
     if(query && query.title !== undefined)
     {
-        where.push("title = $title");
-        criteria["$title"] = query.title;
+        where.push(eq(explorerContentTable.title, sql.placeholder('title')));
     }
     if(query && query.type !== undefined)
     {
-        where.push("type = $type");
-        criteria["$type"] = query.type;
+        where.push(eq(explorerContentTable.type, sql.placeholder('type')));
     }
     if (query && query.search !== undefined)
     {
-        where.push("path LIKE $search");
-        criteria["$search"] = query.search;
+        where.push(like(explorerContentTable.path, sql.placeholder('search')));
     }
 
-    if(where.length > 1)
+    if(where.length > 0)
     {
         const db = useDatabase();
 
-        const content = db.query(`SELECT * FROM explorer_files WHERE ${where.join(" and ")}`).all(criteria) as File[];
+        const content = db.select({ 
+            'path': explorerContentTable.path,
+            'owner': explorerContentTable.owner,
+            'title': explorerContentTable.title,
+            'type': explorerContentTable.type,
+            'content': sql<string>`cast(${explorerContentTable.content} as TEXT)`.as('content'),
+            'navigable': explorerContentTable.navigable,
+            'private': explorerContentTable.private,
+        }).from(explorerContentTable).where(and(...where)).prepare().all(query);
 
         if(content.length > 0)
         {

server/api/users/[id].delete.ts

@@ -0,0 +1,30 @@
+import { eq } from "drizzle-orm";
+import useDatabase from "~/composables/useDatabase";
+import { usersTable } from "~/db/schema";
+
+export default defineEventHandler(async (e) => {
+    const session = await getUserSession(e);
+
+    if(!session.user)
+    {
+        setResponseStatus(e, 404);
+        return;
+    }
+    const id = getRouterParam(e, 'id');
+
+    if(!id)
+    {
+        setResponseStatus(e, 400);
+        return;
+    }
+    if(session.user.id.toString() !== id)
+    {
+        setResponseStatus(e, 403);
+        return;
+    }
+
+    const db = useDatabase();
+    
+    clearUserSession(e);
+    db.delete(usersTable).where(eq(usersTable.id, session.user.id)).run();
+});

server/plugins/session.ts

@@ -1,6 +1,6 @@
 import useDatabase from "~/composables/useDatabase";
 import { userSessionsTable } from "~/db/schema";
-import { eq, and, sql } from "drizzle-orm";
+import { eq, and, sql, lte } from "drizzle-orm";
 import { refreshSessionFromDB } from "../utils/user";
 
 const monthAsMs = 60 * 60 * 24 * 30 * 1000;
@@ -9,6 +9,7 @@ export default defineNitroPlugin(() => {
     const db = useDatabase();
     
     sessionHooks.hook('fetch', async (session, event) => {
+        db.delete(userSessionsTable).where(and(eq(userSessionsTable.user_id, sql.placeholder('id')), lte(userSessionsTable.timestamp, sql.placeholder('timestamp')))).prepare().run({ id: session.user.id, timestamp: Math.round((Date.now() - monthAsMs) / 1000) });
         const result = db.select({ timestamp: userSessionsTable.timestamp }).from(userSessionsTable).where(and(eq(userSessionsTable.id, sql.placeholder('id')), eq(userSessionsTable.user_id, sql.placeholder('user_id')))).prepare().get({ id: session.id, user_id: session.user.id });
 
         if(!result)
@@ -16,11 +17,6 @@ export default defineNitroPlugin(() => {
             await clearUserSession(event);
             throw createError({ statusCode: 401, message: 'Unauthorized' });
         }
-        else if(result && result.timestamp && result.timestamp.getTime() < Date.now() - monthAsMs)
-        {
-            await clearUserSession(event);
-            throw createError({ statusCode: 401, message: 'Session has expired' });
-        }
         else
         {
             await db.update(userSessionsTable).set({