diff --git a/package.json b/package.json index 1bc24f7..863c500 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "canvas-confetti": "^1.9.2", "postcss": "^8.4.33", "svelte": "^4.2.8", - "svelte-check": "^3.6.2", + "svelte-check": "^3.6.3", "svelte-dnd-action": "^0.9.38", "tailwindcss": "^3.4.1", "tslib": "^2.6.2", @@ -41,7 +41,7 @@ "dependencies": { "@floating-ui/dom": "^1.5.4", "@napi-rs/canvas": "^0.1.44", - "@sveltejs/kit": "^2.3.0", + "@sveltejs/kit": "^2.3.2", "firebase": "^10.7.1", "firebase-admin": "^11.11.1", "firebase-frameworks": "^0.11.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab66db5..a0976a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ dependencies: specifier: ^0.1.44 version: 0.1.44 '@sveltejs/kit': - specifier: ^2.3.0 - version: 2.3.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11) + specifier: ^2.3.2 + version: 2.3.2(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11) firebase: specifier: ^10.7.1 version: 10.7.1 @@ -45,7 +45,7 @@ devDependencies: version: 0.3.1(tailwindcss@3.4.1) '@sveltejs/adapter-auto': specifier: ^3.1.0 - version: 3.1.0(@sveltejs/kit@2.3.0) + version: 3.1.0(@sveltejs/kit@2.3.2) '@sveltejs/vite-plugin-svelte': specifier: ^3.0.1 version: 3.0.1(svelte@4.2.8)(vite@5.0.11) @@ -80,8 +80,8 @@ devDependencies: specifier: ^4.2.8 version: 4.2.8 svelte-check: - specifier: ^3.6.2 - version: 3.6.2(postcss@8.4.33)(svelte@4.2.8) + specifier: ^3.6.3 + version: 3.6.3(postcss@8.4.33)(svelte@4.2.8) svelte-dnd-action: specifier: ^0.9.38 version: 0.9.38(svelte@4.2.8) @@ -1287,17 +1287,17 @@ packages: tailwindcss: 3.4.1 dev: true - /@sveltejs/adapter-auto@3.1.0(@sveltejs/kit@2.3.0): + /@sveltejs/adapter-auto@3.1.0(@sveltejs/kit@2.3.2): resolution: {integrity: sha512-igS5hqCwdiXWb8NoWzThKCVQQj9tKgUkbTtzfxBPgSLOyFjkiGNDX0SgCoY2QIUWBqOkfGTOqGlrW5Ynw9oUvw==} peerDependencies: '@sveltejs/kit': ^2.0.0 dependencies: - '@sveltejs/kit': 2.3.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11) + '@sveltejs/kit': 2.3.2(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11) import-meta-resolve: 4.0.0 dev: true - /@sveltejs/kit@2.3.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11): - resolution: {integrity: sha512-A6/aQTVFONDDv8nRLINNiXrERq6VeAdHT+/gHPBUSDt4+b6oBKTEF3oiGzNmxspcWDgHzBpypFO7NWtkoUK67g==} + /@sveltejs/kit@2.3.2(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.11): + resolution: {integrity: sha512-AzGWV1TyUSkBuciy06E5NegXndIEgTthDtllv80qynEJFh8bZD62ZxLajiQLOsKGqRDilEQyshDARQxjIqiaqg==} engines: {node: '>=18.13'} hasBin: true requiresBuild: true @@ -4167,8 +4167,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /svelte-check@3.6.2(postcss@8.4.33)(svelte@4.2.8): - resolution: {integrity: sha512-E6iFh4aUCGJLRz6QZXH3gcN/VFfkzwtruWSRmlKrLWQTiO6VzLsivR6q02WYLGNAGecV3EocqZuCDrC2uttZ0g==} + /svelte-check@3.6.3(postcss@8.4.33)(svelte@4.2.8): + resolution: {integrity: sha512-Q2nGnoysxUnB9KjnjpQLZwdjK62DHyW6nuH/gm2qteFnDk0lCehe/6z8TsIvYeKjC6luKaWxiNGyOcWiLLPSwA==} hasBin: true peerDependencies: svelte: ^3.55.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0 diff --git a/src/lib/server/FirebaseAdmin.ts b/src/lib/server/FirebaseAdmin.ts index 555964a..55fb0ee 100644 --- a/src/lib/server/FirebaseAdmin.ts +++ b/src/lib/server/FirebaseAdmin.ts @@ -67,7 +67,7 @@ export const saveWheel = async ( path, uid, visibility, - created: Date.now(), + created: new Date(), updated: null, title: wheel.config.title, views: 0 @@ -89,33 +89,31 @@ export const updateWheel = async ( uid: string, visibility?: WheelVisibility ) => { - const wheelMetaDoc = db.doc(`wheel-meta/${path}`) - const wheelMetaSnap = await wheelMetaDoc.get() - if (!wheelMetaSnap.exists) { + const metaDoc = db.doc(`wheel-meta/${path}`) + const metaSnap = await metaDoc.get() + if (!metaSnap.exists) { return null } - const wheelMeta = wheelMetaSnap.data() as ApiWheelMeta - if (wheelMeta.uid !== uid) { + const meta = metaSnap.data() as ApiWheelMeta + if (meta.uid !== uid) { return null } - const newWheelMeta: Partial = { - updated: Date.now() - } - if (wheel.config && wheel.config.title !== wheelMeta.title) { - newWheelMeta.title = wheel.config.title + const newMeta: Partial = { updated: new Date() } + if (wheel.config && wheel.config.title !== meta.title) { + newMeta.title = wheel.config.title } if (visibility) { - newWheelMeta.visibility = visibility + newMeta.visibility = visibility } - await wheelMetaDoc.update(newWheelMeta) + await metaDoc.update(newMeta) const wheelDoc = db.doc(`wheels/${path}`) await wheelDoc.update({ ...wheel } satisfies Partial) - return wheelMeta.path + return meta.path } const getNewWheelPath = async () => { let path: string - let snap: FirebaseFirestore.DocumentSnapshot + let snap: FirebaseFirestore.DocumentSnapshot do { path = getRandomPath() snap = await db.doc(`wheel-meta/${path}`).get() diff --git a/src/lib/utils/Api.ts b/src/lib/utils/Api.ts index 65842b9..3571175 100644 --- a/src/lib/utils/Api.ts +++ b/src/lib/utils/Api.ts @@ -111,8 +111,8 @@ export interface ApiWheelMeta { path: string uid: string visibility: WheelVisibility - created: number - updated: number | null + created: Date + updated: Date | null title: string views: number }