From c6acff8932aa7175982d51d7f7b722425d87b5b3 Mon Sep 17 00:00:00 2001 From: SX-9 <90962949+SX-9@users.noreply.github.com> Date: Sat, 16 Nov 2024 18:11:59 +0700 Subject: [PATCH] curl response update --- package-lock.json | 14 +------------- package.json | 3 +-- src/hooks.server.ts | 28 +++++++++++++++++++--------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index e88d31b..3a49764 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,7 @@ "name": "5th-site", "version": "0.0.1", "dependencies": { - "@sveltejs/adapter-cloudflare": "^4.7.4", - "figlet": "^1.8.0" + "@sveltejs/adapter-cloudflare": "^4.7.4" }, "devDependencies": { "@sveltejs/adapter-auto": "^3.0.0", @@ -1584,17 +1583,6 @@ } } }, - "node_modules/figlet": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.8.0.tgz", - "integrity": "sha512-chzvGjd+Sp7KUvPHZv6EXV5Ir3Q7kYNpCr4aHrRW79qFtTefmQZNny+W1pW9kf5zeE6dikku2W50W/wAH2xWgw==", - "bin": { - "figlet": "bin/index.js" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", diff --git a/package.json b/package.json index 5e6eb86..796706a 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ }, "type": "module", "dependencies": { - "@sveltejs/adapter-cloudflare": "^4.7.4", - "figlet": "^1.8.0" + "@sveltejs/adapter-cloudflare": "^4.7.4" } } diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 14345cd..2e161c3 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,17 +1,27 @@ import type { Handle } from '@sveltejs/kit'; -import figlet from 'figlet'; -import info from '$lib'; +import info, { daysUntilBirthday, getTimeIn } from '$lib'; export const handle: Handle = async ({ event, resolve }) => { + const days = daysUntilBirthday(info.birthday); + const time = getTimeIn(info.timezone); + if (!event.request.headers.get('user-agent')?.includes('curl')) return await resolve(event); else return new Response(`\ -${info.title} - curl version - -${await figlet.text(info.name.toUpperCase(), { - font: "Standard", - // @ts-expect-error -}).catch(() => info.name.toUpperCase())} - +\x1b[2J\x1b[3J\x1b[H +\x1b[1m${info.subtitle}\x1b[0m ${info.description} + +\x1b[1m${days || 'Today'}\x1b[0m ${ days ? 'day' + (days === 1 ? '' : 's') + ' until my birthday.' : 'is my birthday!' } \ +Its \x1b[1m${time}\x1b[0m in ${info.timezone}. + +\x1b[3m${info.skills.join('\x1b[0m, \x1b[3m')}\x1b[0m + +${Object.entries(info.links).map(([key, value]) => `\x1b[1m${key}\x1b[0m: \x1b[4m${value}\x1b[0m`).join('\n')} + +\x1b[1mgithub\x1b[0m: ${info.github} +\x1b[1mdiscord\x1b[0m: ${info.discord} +\x1b[1mblog\x1b[0m: ${info.blog.main} + +\x1b[37;3m${info.title} - curl version ;)\x1b[0m `); }; \ No newline at end of file