Small fixes

nuxt.config.ts

@@ -136,6 +136,7 @@ export default defineNuxtConfig({
       tasks: true,
     },
     rollupConfig: {
+      external: ['bun'],
       plugins: [
         vuePlugin({ include: /\.vue$/, target: 'node' })
       ]

server/api/auth/register.post.ts

@@ -73,7 +73,7 @@ export default defineEventHandler(async (e): Promise<Return> => {
 
             logSession(e, await setUserSession(e, { user: { id: id.id, username: body.data.username, email: body.data.email, state: 0, signin: new Date(), permissions: [] } }) as UserSessionRequired);
 
-            runTask('mail', {
+            await runTask('mail', {
                 payload: {
                     type: 'mail',
                     to: [body.data.email],

server/api/users/[id]/revalidate.get.ts

@@ -46,7 +46,7 @@ export default defineEventHandler(async (e) => {
         return;
     }
 
-    runTask('mail', {
+    await runTask('mail', {
         payload: {
             type: 'mail',
             to: [session.user.email],

server/components/mail/revalidation.vue

@@ -1,20 +0,0 @@
-<template>
-    <div class="">
-        <img  />
-        <p>Bienvenue sur d[any], <span>{{ username }}</span>.</p>
-    </div>
-    <p class="">Nous vous invitons à valider votre compte en cliquant <a :href="`https://obsidian.peaceultime.com/user/mail-validation?u=${id}&t=${timestamp}&h=${hash(id.toString(), timestamp)}`"><Button>ici</Button></a> afin de profiter de toutes les fonctionnalités de d[any]</p>
-    <p class="">Vous pouvez egalement copier le lien suivant pour valider votre compte: {{ `https://obsidian.peaceultime.com/user/mail-validation?u=${id}&t=${timestamp}&h=${hash(id.toString(), timestamp)}` }}</p>
-    <span>Ce lien est valable 1 heure.</span>
-    <footer></footer>
-</template>
-
-<script setup lang="ts">
-import { hash } from 'bun';
-
-const { id, username, timestamp } = defineProps<{
-    id: number
-    username: string
-    timestamp: number
-}>();
-</script>

server/tasks/mail.ts

@@ -1,20 +1,17 @@
 import nodemailer from 'nodemailer';
 import { createSSRApp, h } from 'vue';
 import { renderToString } from 'vue/server-renderer';
-import postcss from 'postcss';
-import tailwindcss from 'tailwindcss';
-import { join } from 'node:path';
 
 import base from '../components/mail/base.vue';
 import registration from '../components/mail/registration.vue';
-import revalidation from '../components/mail/revalidation.vue';
+//import revalidation from '../components/mail/revalidation.vue';
 
 const config = useRuntimeConfig();
 const [domain, selector, dkim] = config.mail.dkim.split(":");
 
 export const templates: Record<string, { component: any, subject: string }> = {
     "registration": { component: registration, subject: 'Bienvenue sur d[any] 😎' },
-    "revalidate-mail": { component: revalidation, subject: 'd[any]: Valider votre email' },
+//    "revalidate-mail": { component: revalidation, subject: 'd[any]: Valider votre email' },
 };
 
 import 'nitropack/types';

server/tasks/pull.ts

@@ -1,6 +1,6 @@
 import useDatabase from "~/composables/useDatabase";
 import { extname, basename } from 'node:path';
-import type { File, FileType, Tag } from '~/types/api';
+import type { FileType } from '~/types/api';
 import type { CanvasColor, CanvasContent } from "~/types/canvas";
 import { explorerContentTable } from "~/db/schema";
 
@@ -25,9 +25,9 @@ export default defineTask({
                     recursive: true,
                     per_page: 1000,
                 }
-            }) as any;
+            }) as { tree: any[] } & Record<string, any>;
 
-            const files: typeof explorerContentTable.$inferInsert = await Promise.all(tree.tree.filter((e: any) => !e.path.startsWith(".")).map(async (e: any) => { 
+            const files: typeof explorerContentTable.$inferInsert = await Promise.all(tree.tree.filter((e: any) => !e.path.startsWith(".")).map(async (e, i) => { 
                 if(e.type === 'tree')
                 {
                     const title = basename(e.path);
@@ -35,7 +35,7 @@ export default defineTask({
                     const path = (e.path as string).split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/');
                     return { 
                         path: path.toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""), 
-                        order: order && order[1] ? order[1] : 0,
+                        order: i,
                         title: order && order[2] ? order[2] : title,
                         type: 'folder',
                         content: null,
@@ -53,7 +53,7 @@ export default defineTask({
 
                 return { 
                     path: (extension === '.md' ? path.replace(extension, '') : path).toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""), 
-                    order: order && order[1] ? order[1] : 0,
+                    order: i,
                     title: order && order[2] ? order[2] : title,
                     type: (typeMapping[extension] ?? 'file'), 
                     content: reshapeContent(content as string, typeMapping[extension] ?? 'File'),