diff options
Diffstat (limited to 'src')
66 files changed, 638 insertions, 630 deletions
diff --git a/src/lib/nostr.ts b/src/lib/nostr.ts index a00a28f9..f45dc811 100644 --- a/src/lib/nostr.ts +++ b/src/lib/nostr.ts @@ -35,15 +35,15 @@ type EncryptParams = { const { encode, decode, toWords, fromWords } = bech32m; -export let generate = async (user: any) => { - let p = get(pin); +export const generate = async (user: any) => { + const p = get(pin); if (p && p.length !== 6) return; - let salt = crypto.getRandomValues(new Uint8Array(16)); - let mnemonic = generateSeedWords(); - let sk = privateKeyFromSeedWords(mnemonic); + const salt = crypto.getRandomValues(new Uint8Array(16)); + const mnemonic = generateSeedWords(); + const sk = privateKeyFromSeedWords(mnemonic); - let bytes = new Uint8Array( + const bytes = new Uint8Array( await crypto.subtle.encrypt( { name: "AES-GCM", iv: new Uint8Array(16) }, await stretch(await getPassword(), salt), @@ -56,19 +56,19 @@ export let generate = async (user: any) => { user.salt = Buffer.from(salt).toString("hex"); }; -export let encrypt = async ({ message, recipient, user }: EncryptParams) => { - let sk = await getPrivateKey(user); +export const encrypt = async ({ message, recipient, user }: EncryptParams) => { + const sk = await getPrivateKey(user); return nip04.encrypt(sk, recipient, message); }; -export let decrypt = async ({ event, user }) => { - let cache = get(decrypted); +export const decrypt = async ({ event, user }) => { + const cache = get(decrypted); try { let { content, pubkey, id } = event; if (cache[id]) return cache[id]; if (pubkey === user.pubkey) pubkey = event.tags[0][1]; - let message = await nip04.decrypt( + const message = await nip04.decrypt( await getPrivateKey(user), pubkey, content, @@ -83,7 +83,7 @@ export let decrypt = async ({ event, user }) => { } }; -export let getPrivateKey = async (user: User): Promise<Uint8Array> => { +export const getPrivateKey = async (user: User): Promise<Uint8Array> => { let k; if (browser) { k = localStorage.getItem("nsec"); @@ -92,7 +92,7 @@ export let getPrivateKey = async (user: User): Promise<Uint8Array> => { } } - let { nsec } = user; + const { nsec } = user; if (nsec) { k = nip49decrypt(nsec, await getPassword()); @@ -102,8 +102,8 @@ export let getPrivateKey = async (user: User): Promise<Uint8Array> => { return k; }; -export let getMnemonic = async (user: User) => { - let { cipher, salt } = user; +export const getMnemonic = async (user: User) => { + const { cipher, salt } = user; let entropy; entropy = new Uint8Array( @@ -117,23 +117,23 @@ export let getMnemonic = async (user: User) => { return entropyToMnemonic(entropy, wordlist); }; -let decodeNsec = (nsec: string): Uint8Array => { - let { type, data } = nip19.decode(nsec); +const decodeNsec = (nsec: string): Uint8Array => { + const { type, data } = nip19.decode(nsec); if (type === "nsec" && data instanceof Uint8Array) return data; - else throw new Error("invalid nsec"); + throw new Error("invalid nsec"); }; -export let getNsec = async (user: User) => { +export const getNsec = async (user: User) => { return nip19.nsecEncode(await getPrivateKey(user)); }; -export let setNsec = async (user: User, nsec: string) => { +export const setNsec = async (user: User, nsec: string) => { user.pubkey = getPublicKey(decodeNsec(nsec)); user.nsec = await encryptNsec(nsec); }; -export let encryptNsec = async (nsec: string) => { - let d = decodeNsec(nsec); +export const encryptNsec = async (nsec: string) => { + const d = decodeNsec(nsec); return nip49encrypt(d, await getPassword()); }; @@ -142,30 +142,30 @@ type SignParams = { user: User; }; -export let sign = async ({ event, user }: SignParams) => { +export const sign = async ({ event, user }: SignParams) => { event = finalizeEvent(event, await getPrivateKey(user)); }; -export let send = (event: EventTemplate) => { +export const send = (event: EventTemplate) => { return post("/events", { event }); }; -let getPassword = async (): Promise<string> => { +const getPassword = async (): Promise<string> => { if (!get(pw)) passwordPrompt.set(true); await wait(() => !!get(pw)); return get(pw) || ""; }; -export let reEncryptEntropy = async (user: User, newPassword: string) => { - let { cipher, salt } = user; +export const reEncryptEntropy = async (user: User, newPassword: string) => { + const { cipher, salt } = user; - let entropy = await crypto.subtle.decrypt( + const entropy = await crypto.subtle.decrypt( { name: "AES-GCM", iv: new Uint8Array(16) }, await stretch(await getPassword(), hexToUint8Array(salt)), Uint8Array.from(fromWords(decode(cipher, 180).words)), ); - let bytes = new Uint8Array( + const bytes = new Uint8Array( await crypto.subtle.encrypt( { name: "AES-GCM", iv: new Uint8Array(16) }, await stretch(newPassword, hexToUint8Array(salt)), diff --git a/src/lib/parse.ts b/src/lib/parse.ts index 0ebbe003..6e38150c 100644 --- a/src/lib/parse.ts +++ b/src/lib/parse.ts @@ -10,7 +10,8 @@ export default async (t, host) => { if (t.startsWith("http")) redirect(307, t); if (t.startsWith(host)) redirect(307, `http://${t}`); - let amount, user; + let amount; + let user; t = t.trim(); t.toLowerCase().startsWith("bitcoin:") && @@ -54,7 +55,7 @@ export default async (t, host) => { // bitcoin if (validate(t) || isLiquid(t)) { let r = `/send/bitcoin/${t}`; - if (amount) r += "/" + amount; + if (amount) r += `/${amount}`; redirect(307, r); } diff --git a/src/lib/samples.ts b/src/lib/samples.ts index 1cd74409..469ddad9 100644 --- a/src/lib/samples.ts +++ b/src/lib/samples.ts @@ -1,6 +1,6 @@ import { PUBLIC_DOMAIN, PUBLIC_COINOS_URL } from "$env/static/public"; -let api = PUBLIC_DOMAIN.includes("localhost") +const api = PUBLIC_DOMAIN.includes("localhost") ? `${PUBLIC_COINOS_URL}` : `https://${PUBLIC_DOMAIN}/api`; diff --git a/src/lib/store.ts b/src/lib/store.ts index 1183f049..3156d0e2 100644 --- a/src/lib/store.ts +++ b/src/lib/store.ts @@ -1,8 +1,8 @@ import { writable } from "svelte/store"; import { browser } from "$app/environment"; -let persistSession = (key, defaultValue = undefined) => { - let s = writable( +const persistSession = (key, defaultValue = undefined) => { + const s = writable( browser && sessionStorage.getItem(key) && sessionStorage.getItem(key) !== "undefined" @@ -17,8 +17,8 @@ let persistSession = (key, defaultValue = undefined) => { return s; }; -let persistLocal = (key, defaultValue: any = undefined) => { - let s = writable( +const persistLocal = (key, defaultValue: any = undefined) => { + const s = writable( browser && localStorage.getItem(key) && localStorage.getItem(key) !== "undefined" @@ -38,25 +38,25 @@ let persistLocal = (key, defaultValue: any = undefined) => { return s; }; -export let account = writable(); -export let amountPrompt = persistLocal("amountPrompt"); -export let avatar = writable(); -export let banner = writable(); -export let event = writable(); -export let events = writable({}); -export let installPrompt = writable(); -export let invoice = writable(); -export let last = writable(); -export let loginRedirect = writable(); -export let decrypted = persistLocal("decrypted", {}); -export let mnemonic = persistSession("mnemonic"); -export let newPayment = persistLocal("newPayment"); -export let password = writable<string | undefined>(); -export let passwordPrompt = writable(); -export let pin = persistLocal("pin"); -export let rate = writable(); -export let request = writable(); -export let requestRedirect = writable(); -export let token = persistSession("token"); -export let ndef = writable(); -export let showQr = persistLocal("showQr", true); +export const account = writable(); +export const amountPrompt = persistLocal("amountPrompt"); +export const avatar = writable(); +export const banner = writable(); +export const event = writable(); +export const events = writable({}); +export const installPrompt = writable(); +export const invoice = writable(); +export const last = writable(); +export const loginRedirect = writable(); +export const decrypted = persistLocal("decrypted", {}); +export const mnemonic = persistSession("mnemonic"); +export const newPayment = persistLocal("newPayment"); +export const password = writable<string | undefined>(); +export const passwordPrompt = writable(); +export const pin = persistLocal("pin"); +export const rate = writable(); +export const request = writable(); +export const requestRedirect = writable(); +export const token = persistSession("token"); +export const ndef = writable(); +export const showQr = persistLocal("showQr", true); diff --git a/src/lib/ticket.ts b/src/lib/ticket.ts index 557b278f..0d93f390 100644 --- a/src/lib/ticket.ts +++ b/src/lib/ticket.ts @@ -3,15 +3,15 @@ import { env } from "$env/dynamic/private"; import tickets from "$lib/tickets"; export const createTicket = async (cookies, username) => { - let { ticket } = await get("/ticket"); + const { ticket } = await get("/ticket"); - let { address } = await post( + const { address } = await post( `/${username}/invoice`, { invoice: { network: "liquid" }, user: { username } }, auth(cookies), ); - let { asset } = await post( + const { asset } = await post( "/assets", { address, diff --git a/src/lib/upload.ts b/src/lib/upload.ts index 6bc5eaf3..6d9d4230 100644 --- a/src/lib/upload.ts +++ b/src/lib/upload.ts @@ -1,10 +1,10 @@ export const upload = async (file, type, progress) => { - let url = `/api/upload/${type}`; - let formData = new FormData(); + const url = `/api/upload/${type}`; + const formData = new FormData(); formData.append("file", file); return new Promise((resolve, reject) => { - let ajax = new XMLHttpRequest(); + const ajax = new XMLHttpRequest(); ajax.addEventListener("load", () => { if (ajax.readyState === ajax.DONE) { if (ajax.status === 200) resolve(ajax.response); diff --git a/src/lib/utils.ts b/src/lib/utils.ts index d246e3cf..b27ce5f1 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -13,7 +13,7 @@ export function scroll(section: any) { const base = browser ? "" : PUBLIC_COINOS_URL; export const punk = (k: string) => - Math.floor((parseInt(k.slice(-2), 16) / 256) * 64) + 1 + ".webp"; + `${Math.floor((parseInt(k.slice(-2), 16) / 256) * 64) + 1}.webp`; export const g = (url: string, fetch: any, headers: object) => fetch(base + url, { headers }) @@ -100,10 +100,10 @@ export const copyNoNewlines = (text: string) => { export function reverseFormat(val: string, locale: string): number { const parts = new Intl.NumberFormat(locale).formatToParts(1111.1); - const group = parts.find((part) => part.type === "group")!.value; - const decimal = parts.find((part) => part.type === "decimal")!.value; - let reversedVal = val.replace(new RegExp("\\" + group, "g"), ""); - reversedVal = reversedVal.replace(new RegExp("\\" + decimal, "g"), "."); + const group = parts.find((part) => part.type === "group")?.value; + const decimal = parts.find((part) => part.type === "decimal")?.value; + let reversedVal = val.replace(new RegExp(`\\${group}`, "g"), ""); + reversedVal = reversedVal.replace(new RegExp(`\\${decimal}`, "g"), "."); return Number.isNaN(reversedVal) ? 0 : +reversedVal; } @@ -156,7 +156,7 @@ export const login = async ( ) => { const maxAge = 380 * 24 * 60 * 60; - const res = await fetch(base + "/login", { + const res = await fetch(`${base}/login`, { method: "POST", body: JSON.stringify(user), headers: { @@ -216,14 +216,14 @@ export const f = (s: number, currency: string): string => { export const s = (s: number): string => new Intl.NumberFormat("en-US", { maximumFractionDigits: 0 }).format(s); -export const sat = (s: number): string => "⚡️" + si(Math.abs(s)).toString(); +export const sat = (s: number): string => `⚡️${si(Math.abs(s)).toString()}`; export const si = (s: number) => { if (s < 1000) return s.toString(); // Return the original number if it's less than 1000 const units = ["", "K", "M", "G", "T", "P", "E", "Z"]; const d = Math.floor(Math.log10(s) / 3); // Calculate the unit index - const scaled = s / Math.pow(1000, d); // Scale the number to the correct unit + const scaled = s / 1000 ** d; // Scale the number to the correct unit return ( new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 }).format( @@ -320,7 +320,7 @@ export const isLiquid = (text: string): boolean => text.startsWith("lq1qq"); export function getCookie(name: string): string | null { - const nameEQ = name + "="; + const nameEQ = `${name}=`; const ca = document.cookie.split(";"); for (let i = 0; i < ca.length; i++) { let c = ca[i]; @@ -333,8 +333,8 @@ export function getCookie(name: string): string | null { export function setCookie(name: string, value: string, seconds: number): void { const now = new Date(); now.setTime(now.getTime() + seconds * 1000); - const expires = "expires=" + now.toUTCString(); - document.cookie = name + "=" + value + ";" + expires + ";path=/"; + const expires = `expires=${now.toUTCString()}`; + document.cookie = `${name}=${value};${expires};path=/`; } export const network = { diff --git a/src/routes/(app)/[username]/(profile)/+layout.server.ts b/src/routes/(app)/[username]/(profile)/+layout.server.ts index 4592b81e..0ed3edb8 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.server.ts +++ b/src/routes/(app)/[username]/(profile)/+layout.server.ts @@ -1,16 +1,16 @@ import { get } from "$lib/utils"; export async function load({ depends, parent }) { - depends("app:user"); + depends("app:user"); - let { subject, user } = await parent(); + const { subject, user } = await parent(); - let { follows, followers } = await get(`/${subject.pubkey}/count`); - let followList = new Promise((r) => r([])); - if (user) - followList = get(`/${user.pubkey}/follows?pubkeysOnly=true`).catch( - () => [], - ); + const { follows, followers } = await get(`/${subject.pubkey}/count`); + let followList = new Promise((r) => r([])); + if (user) + followList = get(`/${user.pubkey}/follows?pubkeysOnly=true`).catch( + () => [], + ); - return { follows, followers, followList }; + return { follows, followers, followList }; } diff --git a/src/routes/(app)/[username]/(profile)/+page.server.ts b/src/routes/(app)/[username]/(profile)/+page.server.ts index e3d3bed1..7d54592b 100644 --- a/src/routes/(app)/[username]/(profile)/+page.server.ts +++ b/src/routes/(app)/[username]/(profile)/+page.server.ts @@ -1,16 +1,16 @@ import { auth, get } from "$lib/utils"; export async function load({ cookies, depends, parent }) { - depends("app:payments"); - depends("app:items"); + depends("app:payments"); + depends("app:items"); - let { subject } = await parent(); + const { subject } = await parent(); - let accounts = []; - if (cookies.get("token")) accounts = await get("/accounts", auth(cookies)); + let accounts = []; + if (cookies.get("token")) accounts = await get("/accounts", auth(cookies)); - let items = await get(`/${subject.id}/items`, auth(cookies)); - items.map((i) => (i.quantity = 0)); + const items = await get(`/${subject.id}/items`, auth(cookies)); + items.map((i) => (i.quantity = 0)); - return { accounts, items }; + return { accounts, items }; } diff --git a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.ts b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.ts index baeab3d7..2c0050cf 100644 --- a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.ts +++ b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.ts @@ -2,11 +2,11 @@ import { get } from "$lib/utils"; import { error } from "@sveltejs/kit"; export async function load({ params: { id } }) { - try { - let event = await get(`/event/${id}`); - if (!event) error(500, "Event not found"); - return { event }; - } catch (e: any) { - error(500, e.message); - } + try { + const event = await get(`/event/${id}`); + if (!event) error(500, "Event not found"); + return { event }; + } catch (e: any) { + error(500, e.message); + } } diff --git a/src/routes/(app)/[username]/+layout.server.ts b/src/routes/(app)/[username]/+layout.server.ts index c7a5c44b..1dd163e9 100644 --- a/src/routes/(app)/[username]/+layout.server.ts +++ b/src/routes/(app)/[username]/+layout.server.ts @@ -1,24 +1,24 @@ import { get } from "$lib/utils"; import { error } from "@sveltejs/kit"; -export let load = async ({ - cookies, - depends, - params: { username }, - parent, +export const load = async ({ + cookies, + depends, + params: { username }, + parent, }) => { - depends("app:user"); + depends("app:user"); - try { - let subject = await get(`/users/${username}`); - let { user } = await parent(); + try { + const subject = await get(`/users/${username}`); + const { user } = await parent(); - let expires = new Date(); - expires.setSeconds(expires.getSeconds() + 380 * 24 * 60 * 60); - cookies.set("username", username, { path: "/", expires }); + const expires = new Date(); + expires.setSeconds(expires.getSeconds() + 380 * 24 * 60 * 60); + cookies.set("username", username, { path: "/", expires }); - return { subject, user }; - } catch (e) { - error(500, "Unable to retrieve user account data"); - } + return { subject, user }; + } catch (e) { + error(500, "Unable to retrieve user account data"); + } }; diff --git a/src/routes/(app)/[username]/shopify.js/+server.ts b/src/routes/(app)/[username]/shopify.js/+server.ts index 43a2ef2d..f76d6998 100644 --- a/src/routes/(app)/[username]/shopify.js/+server.ts +++ b/src/routes/(app)/[username]/shopify.js/+server.ts @@ -1,7 +1,7 @@ export async function GET({ params, url }) { - let { username } = params; + const { username } = params; - let js = ` + const js = ` var qrcode=function(r,_){var t=r,e=QRErrorCorrectLevel[_],n=null,$=0,o=null,a=[],f={},i=function(r,_){n=function(r){for(var _=Array(r),t=0;t<r;t+=1){_[t]=Array(r);for(var e=0;e<r;e+=1)_[t][e]=null}return _}($=4*t+17),u(0,0),u($-7,0),u(0,$-7),l(),g(),v(r,_),t>=7&&h(r),null==o&&(o=x(t,e,a)),s(o,_)},u=function(r,_){for(var t=-1;t<=7;t+=1)if(!(r+t<=-1)&&!($<=r+t))for(var e=-1;e<=7;e+=1)_+e<=-1||$<=_+e||(0<=t&&t<=6&&(0==e||6==e)||0<=e&&e<=6&&(0==t||6==t)||2<=t&&t<=4&&2<=e&&e<=4?n[r+t][_+e]=!0:n[r+t][_+e]=!1)},c=function(){for(var r=0,_=0,t=0;t<8;t+=1){i(!0,t);var e=QRUtil.getLostPoint(f);(0==t||r>e)&&(r=e,_=t)}return _},g=function(){for(var r=8;r<$-8;r+=1)null==n[r][6]&&(n[r][6]=r%2==0);for(var _=8;_<$-8;_+=1)null==n[6][_]&&(n[6][_]=_%2==0)},l=function(){for(var r=QRUtil.getPatternPosition(t),_=0;_<r.length;_+=1)for(var e=0;e<r.length;e+=1){var $=r[_],o=r[e];if(null==n[$][o])for(var a=-2;a<=2;a+=1)for(var f=-2;f<=2;f+=1)-2==a||2==a||-2==f||2==f||0==a&&0==f?n[$+a][o+f]=!0:n[$+a][o+f]=!1}},h=function(r){for(var _=QRUtil.getBCHTypeNumber(t),e=0;e<18;e+=1){var o=!r&&(_>>e&1)==1;n[Math.floor(e/3)][e%3+$-8-3]=o}for(var e=0;e<18;e+=1){var o=!r&&(_>>e&1)==1;n[e%3+$-8-3][Math.floor(e/3)]=o}},v=function(r,_){for(var t=QRUtil.getBCHTypeInfo(e<<3|_),o=0;o<15;o+=1){var a=!r&&(t>>o&1)==1;o<6?n[o][8]=a:o<8?n[o+1][8]=a:n[$-15+o][8]=a}for(var o=0;o<15;o+=1){var a=!r&&(t>>o&1)==1;o<8?n[8][$-o-1]=a:o<9?n[8][15-o-1+1]=a:n[8][15-o-1]=a}n[$-8][8]=!r},s=function(r,_){for(var t=-1,e=$-1,o=7,a=0,f=QRUtil.getMaskFunction(_),i=$-1;i>0;i-=2)for(6==i&&(i-=1);;){for(var u=0;u<2;u+=1)if(null==n[e][i-u]){var c=!1;a<r.length&&(c=(r[a]>>>o&1)==1),f(e,i-u)&&(c=!c),n[e][i-u]=c,-1==(o-=1)&&(a+=1,o=7)}if((e+=t)<0||$<=e){e-=t,t=-t;break}}},d=function(r,_){for(var t=0,e=0,n=0,$=Array(_.length),o=Array(_.length),a=0;a<_.length;a+=1){var f=_[a].dataCount,i=_[a].totalCount-f;e=Math.max(e,f),n=Math.max(n,i),$[a]=Array(f);for(var u=0;u<$[a].length;u+=1)$[a][u]=255&r.getBuffer()[u+t];t+=f;var c=QRUtil.getErrorCorrectPolynomial(i),g=qrPolynomial($[a],c.getLength()-1).mod(c);o[a]=Array(c.getLength()-1);for(var u=0;u<o[a].length;u+=1){var l=u+g.getLength()-o[a].length;o[a][u]=l>=0?g.getAt(l):0}}for(var h=0,u=0;u<_.length;u+=1)h+=_[u].totalCount;for(var v=Array(h),s=0,u=0;u<e;u+=1)for(var a=0;a<_.length;a+=1)u<$[a].length&&(v[s]=$[a][u],s+=1);for(var u=0;u<n;u+=1)for(var a=0;a<_.length;a+=1)u<o[a].length&&(v[s]=o[a][u],s+=1);return v},x=function(r,_,t){for(var e=QRRSBlock.getRSBlocks(r,_),n=qrBitBuffer(),$=0;$<t.length;$+=1){var o=t[$];n.put(o.getMode(),4),n.put(o.getLength(),QRUtil.getLengthInBits(o.getMode(),r)),o.write(n)}for(var a=0,$=0;$<e.length;$+=1)a+=e[$].dataCount;if(n.getLengthInBits()>8*a)throw Error("code length overflow. ("+n.getLengthInBits()+">"+8*a+")");for(n.getLengthInBits()+4<=8*a&&n.put(0,4);n.getLengthInBits()%8!=0;)n.putBit(!1);for(;!(n.getLengthInBits()>=8*a)&&(n.put(236,8),!(n.getLengthInBits()>=8*a));){;n.put(17,8)}return d(n,e)};return f.addData=function(r){var _=qr8BitByte(r);a.push(_),o=null},f.isDark=function(r,_){if(r<0||$<=r||_<0||$<=_)throw Error(r+","+_);return n[r][_]},f.getModuleCount=function(){return $},f.make=function(){i(!1,c())},f.createTableTag=function(r,_){r=r||2;var t="";t+='<table style="',t+=" border-width: 0px; border-style: none;",t+=" border-collapse: collapse;",t+=" padding: 0px; margin: "+(_=void 0===_?4*r:_)+"px;",t+='">',t+="<tbody>";for(var e=0;e<f.getModuleCount();e+=1){t+="<tr>";for(var n=0;n<f.getModuleCount();n+=1)t+='<td style="',t+=" border-width: 0px; border-style: none;",t+=" border-collapse: collapse;",t+=" padding: 0px; margin: 0px;",t+=" width: "+r+"px;",t+=" height: "+r+"px;",t+=" background-color: ",t+=f.isDark(e,n)?"#000000":"#ffffff",t+=";",t+='"/>';t+="</tr>"}return t+="</tbody>",t+="</table>"},f.createImgTag=function(r,_,t){r=r||2;var e=_=void 0===_?4*r:_,n=f.getModuleCount()*r+_;return createImgTag(t,t,function(_,t){if(!(e<=_)||!(_<n)||!(e<=t)||!(t<n))return 1;var $=Math.floor((_-e)/r),o=Math.floor((t-e)/r);return f.isDark(o,$)?0:1})},f};qrcode.stringToBytes=function(r){for(var _=[],t=0;t<r.length;t+=1){var e=r.charCodeAt(t);_.push(255&e)}return _},qrcode.createStringToBytes=function(r,_){var t=function(){for(var t=base64DecodeInputStream(r),e=function(){var r=t.read();if(-1==r)throw Error();return r},n=0,$={};;){var o=t.read();if(-1==o)break;var a=e(),f=e(),i=e(),u=String.fromCharCode(o<<8|a),c=f<<8|i;$[u]=c,n+=1}if(n!=_)throw Error(n+" != "+_);return $}();return function(r){for(var _=[],e=0;e<r.length;e+=1){var n=r.charCodeAt(e);if(n<128)_.push(n);else{var $=t[r.charAt(e)];"number"==typeof $?(255&$)==$?_.push($):(_.push($>>>8),_.push(255&$)):_.push(63)}}return _}};var QRMode={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},QRErrorCorrectLevel={L:1,M:0,Q:3,H:2},QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},QRUtil=function(){var r=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],_={},t=function(r){for(var _=0;0!=r;)_+=1,r>>>=1;return _};return _.getBCHTypeInfo=function(r){for(var _=r<<10;t(_)-t(1335)>=0;)_^=1335<<t(_)-t(1335);return(r<<10|_)^21522},_.getBCHTypeNumber=function(r){for(var _=r<<12;t(_)-t(7973)>=0;)_^=7973<<t(_)-t(7973);return r<<12|_},_.getPatternPosition=function(_){return r[_-1]},_.getMaskFunction=function(r){switch(r){case QRMaskPattern.PATTERN000:return function(r,_){return(r+_)%2==0};case QRMaskPattern.PATTERN001:return function(r,_){return r%2==0};case QRMaskPattern.PATTERN010:return function(r,_){return _%3==0};case QRMaskPattern.PATTERN011:return function(r,_){return(r+_)%3==0};case QRMaskPattern.PATTERN100:return function(r,_){return(Math.floor(r/2)+Math.floor(_/3))%2==0};case QRMaskPattern.PATTERN101:return function(r,_){return r*_%2+r*_%3==0};case QRMaskPattern.PATTERN110:return function(r,_){return(r*_%2+r*_%3)%2==0};case QRMaskPattern.PATTERN111:return function(r,_){return(r*_%3+(r+_)%2)%2==0};default:throw Error("bad maskPattern:"+r)}},_.getErrorCorrectPolynomial=function(r){for(var _=qrPolynomial([1],0),t=0;t<r;t+=1)_=_.multiply(qrPolynomial([1,QRMath.gexp(t)],0));return _},_.getLengthInBits=function(r,_){if(1<=_&&_<10)switch(r){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:case QRMode.MODE_KANJI:return 8;default:throw Error("mode:"+r)}else if(_<27)switch(r){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw Error("mode:"+r)}else if(_<41)switch(r){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw Error("mode:"+r)}else throw Error("type:"+_)},_.getLostPoint=function(r){for(var _=r.getModuleCount(),t=0,e=0;e<_;e+=1)for(var n=0;n<_;n+=1){for(var $=0,o=r.isDark(e,n),a=-1;a<=1;a+=1)if(!(e+a<0)&&!(_<=e+a))for(var f=-1;f<=1;f+=1)!(n+f<0)&&!(_<=n+f)&&(0!=a||0!=f)&&o==r.isDark(e+a,n+f)&&($+=1);$>5&&(t+=3+$-5)}for(var e=0;e<_-1;e+=1)for(var n=0;n<_-1;n+=1){var i=0;r.isDark(e,n)&&(i+=1),r.isDark(e+1,n)&&(i+=1),r.isDark(e,n+1)&&(i+=1),r.isDark(e+1,n+1)&&(i+=1),(0==i||4==i)&&(t+=3)}for(var e=0;e<_;e+=1)for(var n=0;n<_-6;n+=1)r.isDark(e,n)&&!r.isDark(e,n+1)&&r.isDark(e,n+2)&&r.isDark(e,n+3)&&r.isDark(e,n+4)&&!r.isDark(e,n+5)&&r.isDark(e,n+6)&&(t+=40);for(var n=0;n<_;n+=1)for(var e=0;e<_-6;e+=1)r.isDark(e,n)&&!r.isDark(e+1,n)&&r.isDark(e+2,n)&&r.isDark(e+3,n)&&r.isDark(e+4,n)&&!r.isDark(e+5,n)&&r.isDark(e+6,n)&&(t+=40);for(var u=0,n=0;n<_;n+=1)for(var e=0;e<_;e+=1)r.isDark(e,n)&&(u+=1);return t+10*(Math.abs(100*u/_/_-50)/5)},_}(),QRMath=function(){for(var r=Array(256),_=Array(256),t=0;t<8;t+=1)r[t]=1<<t;for(var t=8;t<256;t+=1)r[t]=r[t-4]^r[t-5]^r[t-6]^r[t-8];for(var t=0;t<255;t+=1)_[r[t]]=t;var e={};return e.glog=function(r){if(r<1)throw Error("glog("+r+")");return _[r]},e.gexp=function(_){for(;_<0;)_+=255;for(;_>=256;)_-=255;return r[_]},e}();function qrPolynomial(r,_){if(void 0===r.length)throw Error(r.length+"/"+_);var t=function(){for(var t=0;t<r.length&&0==r[t];)t+=1;for(var e=Array(r.length-t+_),n=0;n<r.length-t;n+=1)e[n]=r[n+t];return e}(),e={};return e.getAt=function(r){return t[r]},e.getLength=function(){return t.length},e.multiply=function(r){for(var _=Array(e.getLength()+r.getLength()-1),t=0;t<e.getLength();t+=1)for(var n=0;n<r.getLength();n+=1)_[t+n]^=QRMath.gexp(QRMath.glog(e.getAt(t))+QRMath.glog(r.getAt(n)));return qrPolynomial(_,0)},e.mod=function(r){if(e.getLength()-r.getLength()<0)return e;for(var _=QRMath.glog(e.getAt(0))-QRMath.glog(r.getAt(0)),t=Array(e.getLength()),n=0;n<e.getLength();n+=1)t[n]=e.getAt(n);for(var n=0;n<r.getLength();n+=1)t[n]^=QRMath.gexp(QRMath.glog(r.getAt(n))+_);return qrPolynomial(t,0).mod(r)},e}var QRRSBlock=function(){var r=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],_=function(r,_){var t={};return t.totalCount=r,t.dataCount=_,t},t={},e=function(_,t){switch(t){case QRErrorCorrectLevel.L:return r[(_-1)*4+0];case QRErrorCorrectLevel.M:return r[(_-1)*4+1];case QRErrorCorrectLevel.Q:return r[(_-1)*4+2];case QRErrorCorrectLevel.H:return r[(_-1)*4+3];default:return}};return t.getRSBlocks=function(r,t){var n=e(r,t);if(void 0===n)throw Error("bad rs block @ typeNumber:"+r+"/errorCorrectLevel:"+t);for(var $=n.length/3,o=[],a=0;a<$;a+=1)for(var f=n[3*a+0],i=n[3*a+1],u=n[3*a+2],c=0;c<f;c+=1)o.push(_(i,u));return o},t}(),qrBitBuffer=function(){var r=[],_=0,t={};return t.getBuffer=function(){return r},t.getAt=function(_){return(r[Math.floor(_/8)]>>>7-_%8&1)==1},t.put=function(r,_){for(var e=0;e<_;e+=1)t.putBit((r>>>_-e-1&1)==1)},t.getLengthInBits=function(){return _},t.putBit=function(t){var e=Math.floor(_/8);r.length<=e&&r.push(0),t&&(r[e]|=128>>>_%8),_+=1},t},qr8BitByte=function(r){for(var _=QRMode.MODE_8BIT_BYTE,t=r,e=[],n={},$=0,o=t.length;$<o;$++){var a=[],f=t.charCodeAt($);f>65536?(a[0]=240|(1835008&f)>>>18,a[1]=128|(258048&f)>>>12,a[2]=128|(4032&f)>>>6,a[3]=128|63&f):f>2048?(a[0]=224|(61440&f)>>>12,a[1]=128|(4032&f)>>>6,a[2]=128|63&f):f>128?(a[0]=192|(1984&f)>>>6,a[1]=128|63&f):a[0]=f,e.push(a)}(e=Array.prototype.concat.apply([],e)).length!=t.length&&(e.unshift(191),e.unshift(187),e.unshift(239));var i=e;return n.getMode=function(){return _},n.getLength=function(r){return i.length},n.write=function(r){for(var _=0;_<i.length;_+=1)r.put(i[_],8)},n},byteArrayOutputStream=function(){var r=[],_={};return _.writeByte=function(_){r.push(255&_)},_.writeShort=function(r){_.writeByte(r),_.writeByte(r>>>8)},_.writeBytes=function(r,t,e){t=t||0,e=e||r.length;for(var n=0;n<e;n+=1)_.writeByte(r[n+t])},_.writeString=function(r){for(var t=0;t<r.length;t+=1)_.writeByte(r.charCodeAt(t))},_.toByteArray=function(){return r},_.toString=function(){var _="";_+="[";for(var t=0;t<r.length;t+=1)t>0&&(_+=","),_+=r[t];return _+"]"},_},base64EncodeOutputStream=function(){var r=0,_=0,t=0,e="",n={},$=function(r){e+=String.fromCharCode(o(63&r))},o=function(r){if(r<0);else if(r<26)return 65+r;else if(r<52)return 97+(r-26);else if(r<62)return 48+(r-52);else if(62==r)return 43;else if(63==r)return 47;throw Error("n:"+r)};return n.writeByte=function(e){for(r=r<<8|255&e,_+=8,t+=1;_>=6;)$(r>>>_-6),_-=6},n.flush=function(){if(_>0&&($(r<<6-_),r=0,_=0),t%3!=0)for(var n=3-t%3,o=0;o<n;o+=1)e+="="},n.toString=function(){return e},n},base64DecodeInputStream=function(r){var _=r,t=0,e=0,n=0,$={};$.read=function(){for(;n<8;){if(t>=_.length){if(0==n)return -1;throw Error("unexpected end of file./"+n)}var r=_.charAt(t);if(t+=1,"="==r)return n=0,-1;!r.match(/^\s$/)&&(e=e<<6|o(r.charCodeAt(0)),n+=6)}var $=e>>>n-8&255;return n-=8,$};var o=function(r){if(65<=r&&r<=90)return r-65;if(97<=r&&r<=122)return r-97+26;if(48<=r&&r<=57)return r-48+52;if(43==r)return 62;if(47==r)return 63;else throw Error("c:"+r)};return $},gifImage=function(r,_){var t=r,e=_,n=Array(r*_),$={};$.setPixel=function(r,_,e){n[_*t+r]=e},$.write=function(r){r.writeString("GIF87a"),r.writeShort(t),r.writeShort(e),r.writeByte(128),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(255),r.writeByte(255),r.writeByte(255),r.writeString(","),r.writeShort(0),r.writeShort(0),r.writeShort(t),r.writeShort(e),r.writeByte(0);var _=a(2);r.writeByte(2);for(var n=0;_.length-n>255;)r.writeByte(255),r.writeBytes(_,n,255),n+=255;r.writeByte(_.length-n),r.writeBytes(_,n,_.length-n),r.writeByte(0),r.writeString(";")};var o=function(r){var _=r,t=0,e=0,n={};return n.write=function(r,n){if(r>>>n!=0)throw Error("length over");for(;t+n>=8;)_.writeByte(255&(r<<t|e)),n-=8-t,r>>>=8-t,e=0,t=0;e=r<<t|e,t+=n},n.flush=function(){t>0&&_.writeByte(e)},n},a=function(r){for(var _=1<<r,t=(1<<r)+1,e=r+1,$=f(),a=0;a<_;a+=1)$.add(String.fromCharCode(a));$.add(String.fromCharCode(_)),$.add(String.fromCharCode(t));var i=byteArrayOutputStream(),u=o(i);u.write(_,e);var c=0,g=String.fromCharCode(n[c]);for(c+=1;c<n.length;){var l=String.fromCharCode(n[c]);c+=1,$.contains(g+l)?g+=l:(u.write($.indexOf(g),e),4095>$.size()&&($.size()==1<<e&&(e+=1),$.add(g+l)),g=l)}return u.write($.indexOf(g),e),u.write(t,e),u.flush(),i.toByteArray()},f=function(){var r={},_=0,t={};return t.add=function(e){if(t.contains(e))throw Error("dup key:"+e);r[e]=_,_+=1},t.size=function(){return _},t.indexOf=function(_){return r[_]},t.contains=function(_){return void 0!==r[_]},t};return $},createImgTag=function(r,_,t,e){for(var n=gifImage(r,_),$=0;$<_;$+=1)for(var o=0;o<r;o+=1)n.setPixel(o,$,t(o,$));var a=byteArrayOutputStream();n.write(a);for(var f=base64EncodeOutputStream(),i=a.toByteArray(),u=0;u<i.length;u+=1)f.writeByte(i[u]);f.flush();var c="";return c+="data:image/gif;base64,",c+=f},drawImg=function(r,_){var t,e=(_=_||{}).typeNumber||4,n=_.errorCorrectLevel||"M",$=_.size||500;try{(t=qrcode(e,n||"M")).addData(r),t.make()}catch(o){if(!(e>=40))return drawImg(r,{size:$,errorCorrectLevel:n,typeNumber:e+1});throw Error("Text too long to encode")}var a=parseInt($/t.getModuleCount()),f=parseInt(($-t.getModuleCount()*a)/2);return t.createImgTag(a,f,$)}; @@ -183,9 +183,9 @@ window.addEventListener('load', async () => { }); `; - return new Response(js, { - headers: { - "Content-Type": "application/javascript", - }, - }); + return new Response(js, { + headers: { + "Content-Type": "application/javascript", + }, + }); } diff --git a/src/routes/(app)/account/+server.ts b/src/routes/(app)/account/+server.ts index bcf73ac8..e6dc7e0c 100644 --- a/src/routes/(app)/account/+server.ts +++ b/src/routes/(app)/account/+server.ts @@ -2,11 +2,11 @@ import { auth, post } from "$lib/utils"; import { error, json } from "@sveltejs/kit"; export async function POST({ cookies, request }) { - try { - let body = await request.json(); - return json(await post(`/accounts`, body, auth(cookies))); - } catch (e: any) { - console.log(e); - error(500, e.message); - } + try { + const body = await request.json(); + return json(await post("/accounts", body, auth(cookies))); + } catch (e: any) { + console.log(e); + error(500, e.message); + } } diff --git a/src/routes/(app)/account/[id]/+page.server.ts b/src/routes/(app)/account/[id]/+page.server.ts index e521f15b..b91a0788 100644 --- a/src/routes/(app)/account/[id]/+page.server.ts +++ b/src/routes/(app)/account/[id]/+page.server.ts @@ -1,24 +1,24 @@ import { error, redirect } from "@sveltejs/kit"; import { auth, get, post, fd } from "$lib/utils"; -export let load = async ({ cookies, params }) => { - let account = await get(`/account/${params.id}`, auth(cookies)); - return { account }; +export const load = async ({ cookies, params }) => { + const account = await get(`/account/${params.id}`, auth(cookies)); + return { account }; }; export const actions = { - default: async ({ cookies, params, request }) => { - let { id } = params; - let body = await fd(request); - let username = cookies.get("username"); + default: async ({ cookies, params, request }) => { + const { id } = params; + const body = await fd(request); + const username = cookies.get("username"); - try { - await post(`/account/${id}`, body, auth(cookies)); - } catch (e: any) { - console.log(e); - error(400, { message: e.message }); - } + try { + await post(`/account/${id}`, body, auth(cookies)); + } catch (e: any) { + console.log(e); + error(400, { message: e.message }); + } - redirect(303, `/${username}`); - }, + redirect(303, `/${username}`); + }, }; diff --git a/src/routes/(app)/admin/+layout.server.ts b/src/routes/(app)/admin/+layout.server.ts index 58f8df09..d4aa181d 100644 --- a/src/routes/(app)/admin/+layout.server.ts +++ b/src/routes/(app)/admin/+layout.server.ts @@ -2,10 +2,10 @@ import { auth, get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function load({ cookies }) { - let token = cookies.get("token"); - if (!token) redirect(307, "/login"); - let user = await get("/me", auth(cookies)); - if (!user) redirect(307, "/login"); + const token = cookies.get("token"); + if (!token) redirect(307, "/login"); + const user = await get("/me", auth(cookies)); + if (!user) redirect(307, "/login"); - return { user }; + return { user }; } diff --git a/src/routes/(app)/admin/+page.server.ts b/src/routes/(app)/admin/+page.server.ts index 40c56c77..8c250026 100644 --- a/src/routes/(app)/admin/+page.server.ts +++ b/src/routes/(app)/admin/+page.server.ts @@ -2,11 +2,11 @@ import { auth, get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function load({ cookies, parent }) { - let { user } = await parent(); - if (!user) redirect(307, "/login"); + const { user } = await parent(); + if (!user) redirect(307, "/login"); - let users = (await get("/users", auth(cookies))).sort( - (a, b) => b.balance - a.balance, - ); - return { users }; + const users = (await get("/users", auth(cookies))).sort( + (a, b) => b.balance - a.balance, + ); + return { users }; } diff --git a/src/routes/(app)/disable2fa/+server.ts b/src/routes/(app)/disable2fa/+server.ts index 0afda3b9..81ee2ff2 100644 --- a/src/routes/(app)/disable2fa/+server.ts +++ b/src/routes/(app)/disable2fa/+server.ts @@ -2,12 +2,12 @@ import { error, json } from "@sveltejs/kit"; import { auth, post } from "$lib/utils"; export async function POST({ cookies, request }) { - try { - let body = await request.json(); - let res = await post("/disable2fa", body, auth(cookies)); + try { + const body = await request.json(); + const res = await post("/disable2fa", body, auth(cookies)); - return json(res); - } catch (e) { - error(500, "Problem disabling 2fa"); - } + return json(res); + } catch (e) { + error(500, "Problem disabling 2fa"); + } } diff --git a/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts b/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts index df8a6f83..e7ac3787 100644 --- a/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts +++ b/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts @@ -1,11 +1,11 @@ import { get } from "$lib/utils"; export async function load({ params }) { - let { id, version } = params; - version ||= 4; - version = parseInt(version); + let { id, version } = params; + version ||= 4; + version = parseInt(version); - let { token, status } = await get(`/cash/${id}/${version}`); - let { spent, total, mint, external } = status; - return { id, token, spent, total, mint, external, version }; + const { token, status } = await get(`/cash/${id}/${version}`); + const { spent, total, mint, external } = status; + return { id, token, spent, total, mint, external, version }; } diff --git a/src/routes/(app)/ecash/[id]/[...version]/+page.server.ts b/src/routes/(app)/ecash/[id]/[...version]/+page.server.ts index a866c4ac..68ccfda6 100644 --- a/src/routes/(app)/ecash/[id]/[...version]/+page.server.ts +++ b/src/routes/(app)/ecash/[id]/[...version]/+page.server.ts @@ -2,20 +2,20 @@ import { fail, redirect } from "@sveltejs/kit"; import { auth, fd, post } from "$lib/utils"; export const actions = { - default: async ({ cookies, request, url }) => { - if (!cookies.get("username")) - redirect(307, `/register?redirect=${url.pathname}`); + default: async ({ cookies, request, url }) => { + if (!cookies.get("username")) + redirect(307, `/register?redirect=${url.pathname}`); - let { token } = await fd(request); - let claimed; - try { - claimed = await post(`/claim`, { token }, auth(cookies)); - claimed = { ok: true }; - } catch (e: any) { - return fail(400, { error: e.message }); - } - if (claimed?.ok) { - redirect(307, `/payments`); - } - }, + const { token } = await fd(request); + let claimed; + try { + claimed = await post("/claim", { token }, auth(cookies)); + claimed = { ok: true }; + } catch (e: any) { + return fail(400, { error: e.message }); + } + if (claimed?.ok) { + redirect(307, "/payments"); + } + }, }; diff --git a/src/routes/(app)/ecash/[id]/[...version]/swap/+page.server.ts b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.server.ts index 14e4767d..f82bdbb1 100644 --- a/src/routes/(app)/ecash/[id]/[...version]/swap/+page.server.ts +++ b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.server.ts @@ -1,3 +1,3 @@ export async function load() { - return { test: 123 }; + return { test: 123 }; } diff --git a/src/routes/(app)/enable2fa/+server.ts b/src/routes/(app)/enable2fa/+server.ts index 6917ae21..988dd0ed 100644 --- a/src/routes/(app)/enable2fa/+server.ts +++ b/src/routes/(app)/enable2fa/+server.ts @@ -1,8 +1,8 @@ import { auth, post } from "$lib/utils"; export async function POST({ cookies, request }) { - let body = await request.json(); - let res = await post("/2fa", body, auth(cookies)); + const body = await request.json(); + const res = await post("/2fa", body, auth(cookies)); - return new Response(JSON.stringify(res)); + return new Response(JSON.stringify(res)); } diff --git a/src/routes/(app)/events/+server.ts b/src/routes/(app)/events/+server.ts index 746f2caf..42b9f3dd 100644 --- a/src/routes/(app)/events/+server.ts +++ b/src/routes/(app)/events/+server.ts @@ -2,11 +2,11 @@ import { auth, post } from "$lib/utils"; import { json, error } from "@sveltejs/kit"; export async function POST({ cookies, request }) { - let body = await request.json(); - try { - let result = await post("/event", body, auth(cookies)); - return json(result); - } catch (e: any) { - error(500, e.message); - } + const body = await request.json(); + try { + const result = await post("/event", body, auth(cookies)); + return json(result); + } catch (e: any) { + error(500, e.message); + } } diff --git a/src/routes/(app)/forgot/+page.server.ts b/src/routes/(app)/forgot/+page.server.ts index de440f02..55169a5e 100644 --- a/src/routes/(app)/forgot/+page.server.ts +++ b/src/routes/(app)/forgot/+page.server.ts @@ -2,13 +2,13 @@ import { fail } from "@sveltejs/kit"; import { fd, post } from "$lib/utils"; export const actions = { - default: async ({ request }) => { - try { - let { email } = await fd(request); - await post("/forgot", { email }); - return { success: true }; - } catch (e: any) { - return fail(400, { error: e.message }); - } - }, + default: async ({ request }) => { + try { + const { email } = await fd(request); + await post("/forgot", { email }); + return { success: true }; + } catch (e: any) { + return fail(400, { error: e.message }); + } + }, }; diff --git a/src/routes/(app)/fund/[id]/+page.server.ts b/src/routes/(app)/fund/[id]/+page.server.ts index 6fd3af68..4f189133 100644 --- a/src/routes/(app)/fund/[id]/+page.server.ts +++ b/src/routes/(app)/fund/[id]/+page.server.ts @@ -2,22 +2,22 @@ import { redirect } from "@sveltejs/kit"; import { auth, get, post } from "$lib/utils"; import Qr from "qrcode-base64"; -export let load = async ({ params: { id }, url }) => { - let { amount, payments } = await get(`/fund/${id}`); +export const load = async ({ params: { id }, url }) => { + const { amount, payments } = await get(`/fund/${id}`); - let src = Qr.drawImg(url.href, { size: 300 }); - return { amount, payments, src }; + const src = Qr.drawImg(url.href, { size: 300 }); + return { amount, payments, src }; }; export const actions = { - default: async ({ cookies, locals, params }) => { - let { user } = locals; + default: async ({ cookies, locals, params }) => { + const { user } = locals; - if (user) { - await post("/redeem", params, auth(cookies)); - redirect(307, `/payments`); - } + if (user) { + await post("/redeem", params, auth(cookies)); + redirect(307, "/payments"); + } - redirect(307, "/register"); - }, + redirect(307, "/register"); + }, }; diff --git a/src/routes/(app)/fund/[id]/sweep/+page.server.ts b/src/routes/(app)/fund/[id]/sweep/+page.server.ts index 613cf8e2..5bb42fa4 100644 --- a/src/routes/(app)/fund/[id]/sweep/+page.server.ts +++ b/src/routes/(app)/fund/[id]/sweep/+page.server.ts @@ -2,12 +2,12 @@ import { get, auth, post } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function load({ cookies, params, parent }) { - let { user } = await parent(); - let { id } = params; - let { amount } = await get(`/fund/${id}`); + const { user } = await parent(); + const { id } = params; + const { amount } = await get(`/fund/${id}`); - if (!amount) redirect(307, `/fund/${id}`); - if (!user) redirect(307, `/register?redirect=/fund/${id}/sweep`); - await post("/take", { amount, id }, auth(cookies)); - return { amount, id }; + if (!amount) redirect(307, `/fund/${id}`); + if (!user) redirect(307, `/register?redirect=/fund/${id}/sweep`); + await post("/take", { amount, id }, auth(cookies)); + return { amount, id }; } diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.server.ts b/src/routes/(app)/fund/[id]/withdraw/+page.server.ts index f0379153..1e477918 100644 --- a/src/routes/(app)/fund/[id]/withdraw/+page.server.ts +++ b/src/routes/(app)/fund/[id]/withdraw/+page.server.ts @@ -2,19 +2,19 @@ import { fail, redirect } from "@sveltejs/kit"; import { fd, auth, post } from "$lib/utils"; export async function load({ parent }) { - let { user } = await parent(); - if (!user) redirect(307, "/register"); + const { user } = await parent(); + if (!user) redirect(307, "/register"); } export const actions = { - default: async ({ cookies, request }) => { - let body = await fd(request); - try { - await post("/take", body, auth(cookies)); - } catch (e: any) { - return fail(400, { message: e.message }); - } + default: async ({ cookies, request }) => { + const body = await fd(request); + try { + await post("/take", body, auth(cookies)); + } catch (e: any) { + return fail(400, { message: e.message }); + } - redirect(307, `/fund/${body.id}`); - }, + redirect(307, `/fund/${body.id}`); + }, }; diff --git a/src/routes/(app)/fund/[id]/withdraw/+server.ts b/src/routes/(app)/fund/[id]/withdraw/+server.ts index 96d66413..dabef6f8 100644 --- a/src/routes/(app)/fund/[id]/withdraw/+server.ts +++ b/src/routes/(app)/fund/[id]/withdraw/+server.ts @@ -2,5 +2,5 @@ import { json } from "@sveltejs/kit"; import { auth, post } from "$lib/utils"; export async function POST({ cookies, request }) { - return json(await post("/take", await request.json(), auth(cookies))); + return json(await post("/take", await request.json(), auth(cookies))); } diff --git a/src/routes/(app)/generate/+server.ts b/src/routes/(app)/generate/+server.ts index 5a442982..b16d0b37 100644 --- a/src/routes/(app)/generate/+server.ts +++ b/src/routes/(app)/generate/+server.ts @@ -2,11 +2,11 @@ import { auth, post } from "$lib/utils"; import { error, json } from "@sveltejs/kit"; export async function POST({ cookies, request }) { - try { - let body = await request.json(); - return json(await post(`/user`, body, auth(cookies))); - } catch (e: any) { - console.log(e); - error(500, e.message); - } + try { + const body = await request.json(); + return json(await post("/user", body, auth(cookies))); + } catch (e: any) { + console.log(e); + error(500, e.message); + } } diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts index bad43c97..a844b928 100644 --- a/src/routes/(app)/invoice/[id]/+layout.server.ts +++ b/src/routes/(app)/invoice/[id]/+layout.server.ts @@ -3,38 +3,38 @@ import { get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function load({ cookies, depends, params, url, parent }) { - depends("app:invoice"); + depends("app:invoice"); - let token = cookies.get("token"); - let { subject, user } = await parent(); - let { id } = params; - let invoice; + const token = cookies.get("token"); + let { subject, user } = await parent(); + const { id } = params; + let invoice; - if (id) { - invoice = await get(`/invoice/${id}`); - let options = !!url.searchParams.get("options"); + if (id) { + invoice = await get(`/invoice/${id}`); + const options = !!url.searchParams.get("options"); - if ( - user && - invoice.uid !== user.id && - !(url.pathname.includes("tip") || url.pathname.includes("memo")) && - !options - ) { - redirect(307, `/send/invoice/${id}`); - } + if ( + user && + invoice.uid !== user.id && + !(url.pathname.includes("tip") || url.pathname.includes("memo")) && + !options + ) { + redirect(307, `/send/invoice/${id}`); + } - let { amount, pending, received } = invoice; - amount = parseInt(amount); - subject = user || invoice.user; + let { amount, pending, received } = invoice; + amount = parseInt(amount); + subject = user || invoice.user; - let paid = - (!amount && (pending || received)) || - (amount > 0 && (pending >= amount || received >= amount)); - if (paid && !url.pathname.endsWith("paid")) { - redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : "")); - } - } + const paid = + (!amount && (pending || received)) || + (amount > 0 && (pending >= amount || received >= amount)); + if (paid && !url.pathname.endsWith("paid")) { + redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : "")); + } + } - let src = Qr.drawImg(invoice?.text || "", { size: 500 }); - return { id, invoice, subject, src, user, token }; + const src = Qr.drawImg(invoice?.text || "", { size: 500 }); + return { id, invoice, subject, src, user, token }; } diff --git a/src/routes/(app)/invoice/[id]/+page.server.ts b/src/routes/(app)/invoice/[id]/+page.server.ts index a57efa64..d54ff30d 100644 --- a/src/routes/(app)/invoice/[id]/+page.server.ts +++ b/src/routes/(app)/invoice/[id]/+page.server.ts @@ -1,5 +1,5 @@ import invoice from "$lib/invoice"; export const actions = { - default: invoice, + default: invoice, }; diff --git a/src/routes/(app)/invoice/[id]/memo/+page.server.ts b/src/routes/(app)/invoice/[id]/memo/+page.server.ts index 24dec1af..a2609658 100644 --- a/src/routes/(app)/invoice/[id]/memo/+page.server.ts +++ b/src/routes/(app)/invoice/[id]/memo/+page.server.ts @@ -2,12 +2,12 @@ import invoice from "$lib/invoice"; import { redirect } from "@sveltejs/kit"; export async function load({ parent, params }) { - let { invoice } = await parent(); - if (!invoice.amount) { - redirect(307, `/invoice/${invoice.id}`); - } + const { invoice } = await parent(); + if (!invoice.amount) { + redirect(307, `/invoice/${invoice.id}`); + } } export const actions = { - default: invoice, + default: invoice, }; diff --git a/src/routes/(app)/invoice/[id]/tip/+page.server.ts b/src/routes/(app)/invoice/[id]/tip/+page.server.ts index f5a1b220..a1ba8924 100644 --- a/src/routes/(app)/invoice/[id]/tip/+page.server.ts +++ b/src/routes/(app)/invoice/[id]/tip/+page.server.ts @@ -3,13 +3,13 @@ import invoice from "$lib/invoice"; import { redirect } from "@sveltejs/kit"; export async function load({ parent }) { - let rates = await get("/rates"); - let { invoice } = await parent(); - if (!invoice.amount) redirect(307, `/invoice/${invoice.id}`); + const rates = await get("/rates"); + const { invoice } = await parent(); + if (!invoice.amount) redirect(307, `/invoice/${invoice.id}`); - return { rates }; + return { rates }; } export const actions = { - default: invoice, + default: invoice, }; diff --git a/src/routes/(app)/items/[id]/+page.server.ts b/src/routes/(app)/items/[id]/+page.server.ts index 67cebd93..32924d03 100644 --- a/src/routes/(app)/items/[id]/+page.server.ts +++ b/src/routes/(app)/items/[id]/+page.server.ts @@ -1,21 +1,21 @@ import { fd, auth, get, post } from "$lib/utils"; import { fail, redirect } from "@sveltejs/kit"; -export let load = async ({ params: { id } }) => { - let item = await get(`/items/${id}`); - return { item }; +export const load = async ({ params: { id } }) => { + const item = await get(`/items/${id}`); + return { item }; }; export const actions = { - default: async ({ cookies, request, url }) => { - let form = await fd(request); - try { - await post(`/items`, form, auth(cookies)); - } catch (e: any) { - return fail(400, { message: e.message }); - } + default: async ({ cookies, request, url }) => { + const form = await fd(request); + try { + await post("/items", form, auth(cookies)); + } catch (e: any) { + return fail(400, { message: e.message }); + } - let success = `/${url.pathname.split("/")[1]}`; - redirect(307, success); - }, + const success = `/${url.pathname.split("/")[1]}`; + redirect(307, success); + }, }; diff --git a/src/routes/(app)/items/create/+page.server.ts b/src/routes/(app)/items/create/+page.server.ts index 2e006a3e..e125e047 100644 --- a/src/routes/(app)/items/create/+page.server.ts +++ b/src/routes/(app)/items/create/+page.server.ts @@ -2,15 +2,15 @@ import { fail, redirect } from "@sveltejs/kit"; import { fd, auth, post } from "$lib/utils"; export const actions = { - default: async ({ cookies, request, url }) => { - let form = await fd(request); - try { - await post("/items", form, auth(cookies)); - } catch (e: any) { - return fail(400, { message: e.message }); - } + default: async ({ cookies, request, url }) => { + const form = await fd(request); + try { + await post("/items", form, auth(cookies)); + } catch (e: any) { + return fail(400, { message: e.message }); + } - let success = `/${url.pathname.split("/")[1]}`; - redirect(307, success); - }, + const success = `/${url.pathname.split("/")[1]}`; + redirect(307, success); + }, }; diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.ts b/src/routes/(app)/ln/[lnurl]/+page.server.ts index 4ac55e44..b405f427 100644 --- a/src/routes/(app)/ln/[lnurl]/+page.server.ts +++ b/src/routes/(app)/ln/[lnurl]/+page.server.ts @@ -2,76 +2,80 @@ import { fd, auth, get, post } from "$lib/utils"; import { error, fail, redirect } from "@sveltejs/kit"; export async function load({ params, parent }) { - let { user } = await parent(); - if (!user) redirect(307, "/register"); + const { user } = await parent(); + if (!user) redirect(307, "/register"); - let data; + let data; - try { - let { lnurl } = params; - data = await get(`/decode?text=${lnurl}`); - } catch (e: any) { - error(500, e.message); - } + try { + const { lnurl } = params; + data = await get(`/decode?text=${lnurl}`); + } catch (e: any) { + error(500, e.message); + } - if (!["payRequest", "withdrawRequest"].includes(data.tag)) - error(500, "We only support LNURLp and LNURLw at this time"); + if (!["payRequest", "withdrawRequest"].includes(data.tag)) + error(500, "We only support LNURLp and LNURLw at this time"); - return data; + return data; } export const actions = { - pay: async ({ fetch, request }) => { - let error; + pay: async ({ fetch, request }) => { + let error; - let { callback, amount, minSendable, maxSendable, comment } = - await fd(request); - minSendable = Math.round(minSendable / 1000); - maxSendable = Math.round(maxSendable / 1000); + let { callback, amount, minSendable, maxSendable, comment } = + await fd(request); + minSendable = Math.round(minSendable / 1000); + maxSendable = Math.round(maxSendable / 1000); - if (amount < minSendable) - error = `Amount must be at least ${minSendable} sats`; - if (amount > maxSendable) - error = `Amount must be at most ${maxSendable} sats`; - if (error) return fail(400, { error }); + if (amount < minSendable) + error = `Amount must be at least ${minSendable} sats`; + if (amount > maxSendable) + error = `Amount must be at most ${maxSendable} sats`; + if (error) return fail(400, { error }); - let url = `${callback}?amount=${amount * 1000}`; - if (comment) url += `&comment=${comment}`; + let url = `${callback}?amount=${amount * 1000}`; + if (comment) url += `&comment=${comment}`; - let { pr } = await fetch(url).then((r) => r.json()); - redirect(307, `/send/lightning/${pr}`); - }, + const { pr } = await fetch(url).then((r) => r.json()); + redirect(307, `/send/lightning/${pr}`); + }, - withdraw: async ({ cookies, fetch, request }) => { - let error; + withdraw: async ({ cookies, fetch, request }) => { + let error; - let { - callback, - amount, - username, - currency, - minWithdrawable, - maxWithdrawable, - k1, - } = await fd(request); + let { + callback, + amount, + username, + currency, + minWithdrawable, + maxWithdrawable, + k1, + } = await fd(request); - minWithdrawable = Math.round(minWithdrawable / 1000); - maxWithdrawable = Math.round(maxWithdrawable / 1000); + minWithdrawable = Math.round(minWithdrawable / 1000); + maxWithdrawable = Math.round(maxWithdrawable / 1000); - if (amount < minWithdrawable) - error = `Amount must be at least ${minWithdrawable} sats`; - if (amount > maxWithdrawable) - error = `Amount must be at most ${maxWithdrawable} sats`; - if (error) return fail(400, { error }); + if (amount < minWithdrawable) + error = `Amount must be at least ${minWithdrawable} sats`; + if (amount > maxWithdrawable) + error = `Amount must be at most ${maxWithdrawable} sats`; + if (error) return fail(400, { error }); - let invoice = { amount, type: "lightning" }; - let user = { username, currency }; + const invoice = { amount, type: "lightning" }; + const user = { username, currency }; - let { text: pr } = await post("/invoice", { invoice, user }, auth(cookies)); + const { text: pr } = await post( + "/invoice", + { invoice, user }, + auth(cookies), + ); - let c = callback.includes("?") ? "&" : "?"; - await fetch(`${callback}${c}k1=${k1}&pr=${pr}`).then((r) => r.json()); + const c = callback.includes("?") ? "&" : "?"; + await fetch(`${callback}${c}k1=${k1}&pr=${pr}`).then((r) => r.json()); - redirect(307, `/payments`); - }, + redirect(307, "/payments"); + }, }; diff --git a/src/routes/(app)/logout/+page.server.ts b/src/routes/(app)/logout/+page.server.ts index 374f244a..2a6fc71f 100644 --- a/src/routes/(app)/logout/+page.server.ts +++ b/src/routes/(app)/logout/+page.server.ts @@ -1,15 +1,15 @@ import { redirect } from "@sveltejs/kit"; const opts = { - expires: new Date(0), - path: "/", + expires: new Date(0), + path: "/", }; export async function load({ cookies }) { - let lang = cookies.get("lang"); - cookies.set("aid", "", opts); - cookies.set("lang", "", opts); - cookies.set("username", "", opts); - cookies.set("token", "", opts); - redirect(307, `/login?lang=${lang}`); + const lang = cookies.get("lang"); + cookies.set("aid", "", opts); + cookies.set("lang", "", opts); + cookies.set("username", "", opts); + cookies.set("token", "", opts); + redirect(307, `/login?lang=${lang}`); } diff --git a/src/routes/(app)/messages/+page.server.ts b/src/routes/(app)/messages/+page.server.ts index a7195b18..b64dfb42 100644 --- a/src/routes/(app)/messages/+page.server.ts +++ b/src/routes/(app)/messages/+page.server.ts @@ -2,43 +2,43 @@ import { get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; interface Message { - created_at: number; + created_at: number; } interface Note { - created_at: number; - seen: number; + created_at: number; + seen: number; } export async function load({ params, parent }) { - let { user } = await parent(); - if (user.username !== params.username) redirect(307, `/${params.username}`); - let { since = 0 } = params; + const { user } = await parent(); + if (user.username !== params.username) redirect(307, `/${params.username}`); + const { since = 0 } = params; - let messages = [], - notes = []; + let messages = []; + let notes = []; - if (user?.pubkey) { - let { pubkey } = user; - try { - messages = await get(`/${pubkey}/${since}/messages`); - messages = messages.sort( - (a: Message, b: Message) => b.created_at - a.created_at, - ); - } catch (e) { - console.log(`failed to fetch nostr messages`, e); - } + if (user?.pubkey) { + const { pubkey } = user; + try { + messages = await get(`/${pubkey}/${since}/messages`); + messages = messages.sort( + (a: Message, b: Message) => b.created_at - a.created_at, + ); + } catch (e) { + console.log("failed to fetch nostr messages", e); + } - try { - notes = await get(`/${pubkey}/notes`); - } catch (e) { - console.log(`failed to fetch nostr notes for ${pubkey}`, e); - } + try { + notes = await get(`/${pubkey}/notes`); + } catch (e) { + console.log(`failed to fetch nostr notes for ${pubkey}`, e); + } - notes.map((e: Note) => { - e.seen = e.created_at; - }); - } + notes.map((e: Note) => { + e.seen = e.created_at; + }); + } - return { messages, notes }; + return { messages, notes }; } diff --git a/src/routes/(app)/messages/[recipient]/+page.server.ts b/src/routes/(app)/messages/[recipient]/+page.server.ts index 0ff2885e..6e61e1b4 100644 --- a/src/routes/(app)/messages/[recipient]/+page.server.ts +++ b/src/routes/(app)/messages/[recipient]/+page.server.ts @@ -2,24 +2,24 @@ import { get } from "$lib/utils"; import type { Message } from "$lib/types"; export async function load({ params, parent }) { - let { user } = await parent(); - let { since = 0 } = params; + const { user } = await parent(); + const { since = 0 } = params; - let messages: Message[] = []; - let recipient = await get(`/users/${params.recipient}`); + let messages: Message[] = []; + const recipient = await get(`/users/${params.recipient}`); - try { - messages = await get(`/${user.pubkey}/${since}/messages`); + try { + messages = await get(`/${user.pubkey}/${since}/messages`); - messages = messages - .filter( - (m: Message) => - m.recipient?.id === recipient.id || m.author?.id === recipient.id, - ) - .sort((a, b) => a.created_at - b.created_at); - } catch (e) { - console.log(`failed to fetch nostr messages`, e); - } + messages = messages + .filter( + (m: Message) => + m.recipient?.id === recipient.id || m.author?.id === recipient.id, + ) + .sort((a, b) => a.created_at - b.created_at); + } catch (e) { + console.log("failed to fetch nostr messages", e); + } - return { messages, recipient, user }; + return { messages, recipient, user }; } diff --git a/src/routes/(app)/otpsecret/+server.ts b/src/routes/(app)/otpsecret/+server.ts index 9102dd51..7226a7c9 100644 --- a/src/routes/(app)/otpsecret/+server.ts +++ b/src/routes/(app)/otpsecret/+server.ts @@ -3,15 +3,15 @@ import Qr from "qrcode-base64"; import { error } from "@sveltejs/kit"; export async function POST({ cookies, request }) { - try { - let body = await request.json(); - let { username, secret } = await post("/otpsecret", body, auth(cookies)); - let uri = `otpauth://totp/coinos:${username}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`; - return new Response( - JSON.stringify({ secret, uri, qr: Qr.drawImg(uri, { size: 600 }) }), - ); - } catch (e: any) { - if (e.message.includes("pin")) throw e; - error(500, "Problem saving secret"); - } + try { + const body = await request.json(); + const { username, secret } = await post("/otpsecret", body, auth(cookies)); + const uri = `otpauth://totp/coinos:${username}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`; + return new Response( + JSON.stringify({ secret, uri, qr: Qr.drawImg(uri, { size: 600 }) }), + ); + } catch (e: any) { + if (e.message.includes("pin")) throw e; + error(500, "Problem saving secret"); + } } diff --git a/src/routes/(app)/password/+server.ts b/src/routes/(app)/password/+server.ts index 26ed3858..8e41b9c9 100644 --- a/src/routes/(app)/password/+server.ts +++ b/src/routes/(app)/password/+server.ts @@ -2,6 +2,6 @@ import { json } from "@sveltejs/kit"; import { auth, post } from "$lib/utils"; export async function POST({ cookies, request }) { - let result = await post("/password", await request.json(), auth(cookies)); - return json(result); + const result = await post("/password", await request.json(), auth(cookies)); + return json(result); } diff --git a/src/routes/(app)/payment/[id]/+page.server.ts b/src/routes/(app)/payment/[id]/+page.server.ts index 1dfc0c09..fffdb451 100644 --- a/src/routes/(app)/payment/[id]/+page.server.ts +++ b/src/routes/(app)/payment/[id]/+page.server.ts @@ -1,7 +1,7 @@ import { auth, get } from "$lib/utils"; export async function load({ cookies, depends, params }) { - depends("app:payments"); - let payment = await get(`/payments/${params.id}`, auth(cookies)); - return { payment }; + depends("app:payments"); + const payment = await get(`/payments/${params.id}`, auth(cookies)); + return { payment }; } diff --git a/src/routes/(app)/payment/[id]/bump/+server.ts b/src/routes/(app)/payment/[id]/bump/+server.ts index 336284ba..ae25999c 100644 --- a/src/routes/(app)/payment/[id]/bump/+server.ts +++ b/src/routes/(app)/payment/[id]/bump/+server.ts @@ -2,11 +2,11 @@ import { auth, post } from "$lib/utils"; import { json, error } from "@sveltejs/kit"; export async function POST({ cookies, request }) { - let body = await request.json(); - try { - let res = await post("/replace", body, auth(cookies)); - return json(res); - } catch (e: any) { - error(400, e.message); - } + const body = await request.json(); + try { + const res = await post("/replace", body, auth(cookies)); + return json(res); + } catch (e: any) { + error(400, e.message); + } } diff --git a/src/routes/(app)/payment/[id]/plain/+page.server.ts b/src/routes/(app)/payment/[id]/plain/+page.server.ts index 5a364c65..49d9b98b 100644 --- a/src/routes/(app)/payment/[id]/plain/+page.server.ts +++ b/src/routes/(app)/payment/[id]/plain/+page.server.ts @@ -1,6 +1,6 @@ import { auth, get } from "$lib/utils"; export async function load({ cookies, params }) { - let payment = await get(`/payments/${params.id}`, auth(cookies)); - return { payment }; + const payment = await get(`/payments/${params.id}`, auth(cookies)); + return { payment }; } diff --git a/src/routes/(app)/payment/[id]/print/+server.ts b/src/routes/(app)/payment/[id]/print/+server.ts index 2fdfc8c1..aab6d3f4 100644 --- a/src/routes/(app)/payment/[id]/print/+server.ts +++ b/src/routes/(app)/payment/[id]/print/+server.ts @@ -2,6 +2,6 @@ import { auth, post } from "$lib/utils"; import { json } from "@sveltejs/kit"; export async function POST({ cookies, request }) { - let body = await request.json(); - return json(post("/print", body, auth(cookies))); + const body = await request.json(); + return json(post("/print", body, auth(cookies))); } diff --git a/src/routes/(app)/payments/[...page]/+page.server.ts b/src/routes/(app)/payments/[...page]/+page.server.ts index f1818955..268fd32b 100644 --- a/src/routes/(app)/payments/[...page]/+page.server.ts +++ b/src/routes/(app)/payments/[...page]/+page.server.ts @@ -1,29 +1,31 @@ import { get, auth } from "$lib/utils"; -let limit = 25; +const limit = 25; export async function load({ cookies, depends, params }) { - depends("app:payments"); + depends("app:payments"); - let aid = cookies.get("aid"); - let parts = params.page.split("/"); + const aid = cookies.get("aid"); + const parts = params.page.split("/"); - let start, end, page; - if (parts.length === 1) [page] = parts; - if (parts.length === 2) [start, page] = parts; - if (parts.length === 3) [start, end, page] = parts; - if (!parseInt(page)) page = 1; + let start; + let end; + let page; + if (parts.length === 1) [page] = parts; + if (parts.length === 2) [start, page] = parts; + if (parts.length === 3) [start, end, page] = parts; + if (!parseInt(page)) page = 1; - let offset = (page - 1) * limit; - if (!start) start = Date.now() / 1000 - 24 * 60 * 60; + const offset = (page - 1) * limit; + if (!start) start = Date.now() / 1000 - 24 * 60 * 60; - let url = `/payments?aid=${aid}&start=${ - start * 1000 - }&limit=${limit}&offset=${offset}`; - if (end) url += `&end=${end * 1000}`; + let url = `/payments?aid=${aid}&start=${ + start * 1000 + }&limit=${limit}&offset=${offset}`; + if (end) url += `&end=${end * 1000}`; - let { count, payments, incoming, outgoing } = await get(url, auth(cookies)); - let pages = new Array(Math.ceil(count / limit)); + const { count, payments, incoming, outgoing } = await get(url, auth(cookies)); + const pages = new Array(Math.ceil(count / limit)); - return { payments, page, pages, start, end, incoming, outgoing }; + return { payments, page, pages, start, end, incoming, outgoing }; } diff --git a/src/routes/(app)/payments/[...page]/+server.ts b/src/routes/(app)/payments/[...page]/+server.ts index a81faaf3..20315da4 100644 --- a/src/routes/(app)/payments/[...page]/+server.ts +++ b/src/routes/(app)/payments/[...page]/+server.ts @@ -2,17 +2,18 @@ import { get, auth } from "$lib/utils"; import { json } from "@sveltejs/kit"; export async function GET({ cookies, params }) { - let parts = params.page.split("/"); + const parts = params.page.split("/"); - let start, end; - if (parts.length === 1) [start] = parts; - if (parts.length === 2) [start, end] = parts; + let start; + let end; + if (parts.length === 1) [start] = parts; + if (parts.length === 2) [start, end] = parts; - if (!start) start = Date.now() / 1000 - 24 * 60 * 60; + if (!start) start = Date.now() / 1000 - 24 * 60 * 60; - let url = `/payments?start=${start * 1000}`; - if (end) url += `&end=${end * 1000}`; + let url = `/payments?start=${start * 1000}`; + if (end) url += `&end=${end * 1000}`; - let { payments } = await get(url, auth(cookies)); - return json({ payments }); + const { payments } = await get(url, auth(cookies)); + return json({ payments }); } diff --git a/src/routes/(app)/pin/+server.ts b/src/routes/(app)/pin/+server.ts index 76d407bf..d819ee5f 100644 --- a/src/routes/(app)/pin/+server.ts +++ b/src/routes/(app)/pin/+server.ts @@ -2,6 +2,6 @@ import { json } from "@sveltejs/kit"; import { auth, post } from "$lib/utils"; export async function POST({ cookies, request }) { - let result = await post("/pin", await request.json(), auth(cookies)); - return json(result); + const result = await post("/pin", await request.json(), auth(cookies)); + return json(result); } diff --git a/src/routes/(app)/qr/[text]/+page.server.ts b/src/routes/(app)/qr/[text]/+page.server.ts index 5eaafe57..09e7593f 100644 --- a/src/routes/(app)/qr/[text]/+page.server.ts +++ b/src/routes/(app)/qr/[text]/+page.server.ts @@ -1,8 +1,8 @@ import Qr from "qrcode-base64"; export async function load({ params }) { - let { text } = params; - let src = Qr.drawImg(text, { size: 600 }); + const { text } = params; + const src = Qr.drawImg(text, { size: 600 }); - return { src, text }; + return { src, text }; } diff --git a/src/routes/(app)/receive/[...token]/+page.server.ts b/src/routes/(app)/receive/[...token]/+page.server.ts index 65888ff4..05b2dad8 100644 --- a/src/routes/(app)/receive/[...token]/+page.server.ts +++ b/src/routes/(app)/receive/[...token]/+page.server.ts @@ -3,15 +3,15 @@ import { fail, redirect } from "@sveltejs/kit"; import parse from "$lib/parse"; export async function load({ params, parent, url }) { - let { user } = await parent(); - if (!user) redirect(307, `/register?redirect=${url.pathname}`); - await parse(params.token, url.host); + const { user } = await parent(); + if (!user) redirect(307, `/register?redirect=${url.pathname}`); + await parse(params.token, url.host); } export const actions = { - default: async ({ request, url }) => { - let { text } = await fd(request); - await parse(text, url.host); - return fail(400, { error: "default" }); - }, + default: async ({ request, url }) => { + const { text } = await fd(request); + await parse(text, url.host); + return fail(400, { error: "default" }); + }, }; diff --git a/src/routes/(app)/reset/+server.ts b/src/routes/(app)/reset/+server.ts index 544c4e0a..4e8deeaa 100644 --- a/src/routes/(app)/reset/+server.ts +++ b/src/routes/(app)/reset/+server.ts @@ -2,6 +2,6 @@ import { json } from "@sveltejs/kit"; import { auth, post } from "$lib/utils"; export async function POST({ cookies, request }) { - let result = await post("/reset", await request.json(), auth(cookies)); - return json(result); + const result = await post("/reset", await request.json(), auth(cookies)); + return json(result); } diff --git a/src/routes/(app)/reset/[code]/+page.server.ts b/src/routes/(app)/reset/[code]/+page.server.ts index 375fd588..533e21f5 100644 --- a/src/routes/(app)/reset/[code]/+page.server.ts +++ b/src/routes/(app)/reset/[code]/+page.server.ts @@ -2,29 +2,29 @@ import { fail, redirect } from "@sveltejs/kit"; import { fd, post, login } from "$lib/utils"; export const actions = { - default: async ({ cookies, params, request }) => { - let ip = request.headers.get("cf-connecting-ip"); - let error; + default: async ({ cookies, params, request }) => { + const ip = request.headers.get("cf-connecting-ip"); + let error; - let { code } = params; - let { password } = await fd(request); + const { code } = params; + const { password } = await fd(request); - try { - let user = await post("/reset", { code, password }); - user.password = password; + try { + const user = await post("/reset", { code, password }); + user.password = password; - try { - await login(user, cookies, ip); - error = null; - } catch (e: any) { - error ||= e.message; - } + try { + await login(user, cookies, ip); + error = null; + } catch (e: any) { + error ||= e.message; + } - if (error) return fail(400, { error }); - redirect(307, `/${user.username}`); - } catch (e: any) { - console.log(e.message); - return fail(400, { error: e.message }); - } - }, + if (error) return fail(400, { error }); + redirect(307, `/${user.username}`); + } catch (e: any) { + console.log(e.message); + return fail(400, { error: e.message }); + } + }, }; diff --git a/src/routes/(app)/send/[...text]/+page.server.ts b/src/routes/(app)/send/[...text]/+page.server.ts index 906d6563..b0baa2d5 100644 --- a/src/routes/(app)/send/[...text]/+page.server.ts +++ b/src/routes/(app)/send/[...text]/+page.server.ts @@ -3,17 +3,17 @@ import { fail } from "@sveltejs/kit"; import parse from "$lib/parse"; export async function load({ cookies, params, url }) { - let { text } = params; + const { text } = params; - await parse(text, url.host); - let contacts = await get("/contacts", auth(cookies)); - return { contacts }; + await parse(text, url.host); + const contacts = await get("/contacts", auth(cookies)); + return { contacts }; } export const actions = { - default: async ({ request, url }) => { - let { text } = await fd(request); - await parse(text, url.host); - return fail(400, { error: "default" }); - }, + default: async ({ request, url }) => { + const { text } = await fd(request); + await parse(text, url.host); + return fail(400, { error: "default" }); + }, }; diff --git a/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts b/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts index a6edf8b0..68191311 100644 --- a/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts +++ b/src/routes/(app)/send/bitcoin/[address]/+layout.server.ts @@ -2,22 +2,22 @@ import { auth, get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function load({ cookies, params, parent }) { - let { user } = await parent(); - let aid = cookies.get("aid"); - let { address } = params; - let { balance } = await get(`/account/${aid}`, auth(cookies)); + const { user } = await parent(); + const aid = cookies.get("aid"); + const { address } = params; + const { balance } = await get(`/account/${aid}`, auth(cookies)); - try { - let invoice = await get(`/invoice/${address}`); + try { + const invoice = await get(`/invoice/${address}`); - if (invoice) { - let recipient = await get(`/users/${invoice.uid}`); - if (recipient?.id !== user.id) - redirect(307, `/pay/${recipient.username}`); - } - } catch (e) { - // invoice not found - } + if (invoice) { + const recipient = await get(`/users/${invoice.uid}`); + if (recipient?.id !== user.id) + redirect(307, `/pay/${recipient.username}`); + } + } catch (e) { + // invoice not found + } - return { balance }; + return { balance }; } diff --git a/src/routes/(app)/send/ecash/+page.server.ts b/src/routes/(app)/send/ecash/+page.server.ts index 64de18c7..6a535524 100644 --- a/src/routes/(app)/send/ecash/+page.server.ts +++ b/src/routes/(app)/send/ecash/+page.server.ts @@ -2,17 +2,17 @@ import { error, redirect } from "@sveltejs/kit"; import { auth, post, fd } from "$lib/utils"; export const actions = { - default: async ({ cookies, request }) => { - let id; - let body = await fd(request); + default: async ({ cookies, request }) => { + let id; + const body = await fd(request); - try { - ({ id } = await post("/mint", body, auth(cookies))); - } catch (e: any) { - console.log("problem creating ecash", e); - error(400, { message: e.message }); - } + try { + ({ id } = await post("/mint", body, auth(cookies))); + } catch (e: any) { + console.log("problem creating ecash", e); + error(400, { message: e.message }); + } - redirect(307, `/ecash/${id}`); - }, + redirect(307, `/ecash/${id}`); + }, }; diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts index 2897b159..ed39f96b 100644 --- a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts +++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts @@ -2,16 +2,16 @@ import { fail, redirect } from "@sveltejs/kit"; import { auth, fd, post } from "$lib/utils"; export const actions = { - default: async ({ cookies, request }) => { - let body = await fd(request); - let p; + default: async ({ cookies, request }) => { + const body = await fd(request); + let p; - try { - p = await post("/payments", body, auth(cookies)); - } catch (e: any) { - return fail(400, { message: e.message }); - } + try { + p = await post("/payments", body, auth(cookies)); + } catch (e: any) { + return fail(400, { message: e.message }); + } - if (p) redirect(307, `/fund/${body.name}`); - }, + if (p) redirect(307, `/fund/${body.name}`); + }, }; diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts index f1c00c0f..c65a6c7b 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.server.ts +++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts @@ -14,7 +14,7 @@ export async function load({ cookies, params: { id }, parent }) { redirect(307, `/invoice/${id}/memo`); if (invoice.aid === aid) error(500, { message: "Cannot send to self" }); - else if (user) redirect(307, `/send/${invoice.type}/${invoice.hash}`); + else if (user) redirect(307, `/send/${invoice.type}/${invoice.hash}`); if (!user) redirect(307, `/invoice/${id}`); diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts index 89493539..0df87255 100644 --- a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts +++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts @@ -2,24 +2,24 @@ import { fail, redirect } from "@sveltejs/kit"; import { fd, auth, post } from "$lib/utils"; export async function load({ cookies, params }) { - return post("/parse", params, auth(cookies)); + return post("/parse", params, auth(cookies)); } export const actions = { - setAmount: async ({ request }) => fd(request), + setAmount: async ({ request }) => fd(request), - send: async ({ cookies, request }) => { - let p; - try { - let body = await fd(request); + send: async ({ cookies, request }) => { + let p; + try { + const body = await fd(request); - p = await post("/payments", body, auth(cookies)); - } catch (e: any) { - if (e.message.includes("unusable") || e.message.includes("routes")) - e.message = "payments.failedToRoute"; - return fail(400, { message: e.message }); - } + p = await post("/payments", body, auth(cookies)); + } catch (e: any) { + if (e.message.includes("unusable") || e.message.includes("routes")) + e.message = "payments.failedToRoute"; + return fail(400, { message: e.message }); + } - redirect(307, `/sent/${p.id}`); - }, + redirect(307, `/sent/${p.id}`); + }, }; diff --git a/src/routes/(app)/sent/[id]/+page.server.ts b/src/routes/(app)/sent/[id]/+page.server.ts index 80b1d428..d3d98ea5 100644 --- a/src/routes/(app)/sent/[id]/+page.server.ts +++ b/src/routes/(app)/sent/[id]/+page.server.ts @@ -1,7 +1,7 @@ import { get, auth } from "$lib/utils"; -export let load = async ({ cookies, params }) => { - let { id } = params; - let p = await get(`/payments/${id}`, auth(cookies)); - return p; +export const load = async ({ cookies, params }) => { + const { id } = params; + const p = await get(`/payments/${id}`, auth(cookies)); + return p; }; diff --git a/src/routes/(app)/verify/[code]/+page.server.ts b/src/routes/(app)/verify/[code]/+page.server.ts index 66ef39ad..a7edede6 100644 --- a/src/routes/(app)/verify/[code]/+page.server.ts +++ b/src/routes/(app)/verify/[code]/+page.server.ts @@ -1,14 +1,14 @@ import { get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; -export let load = async ({ params: { code } }) => { - let user; - try { - user = await get(`/verify/${code}`); - } catch (e) { - console.log(e); - return { error: "Verification failed" }; - } +export const load = async ({ params: { code } }) => { + let user; + try { + user = await get(`/verify/${code}`); + } catch (e) { + console.log(e); + return { error: "Verification failed" }; + } - redirect(307, `/settings/account?verified=true`); + redirect(307, "/settings/account?verified=true"); }; diff --git a/src/routes/(app)/withdraw/+server.ts b/src/routes/(app)/withdraw/+server.ts index a75a72f8..51f6e3d0 100644 --- a/src/routes/(app)/withdraw/+server.ts +++ b/src/routes/(app)/withdraw/+server.ts @@ -1,10 +1,10 @@ import { auth, post } from "$lib/utils"; export async function POST({ cookies, request }) { - let body = await request.json(); - await post("/payments", body, auth(cookies)); + const body = await request.json(); + await post("/payments", body, auth(cookies)); - return new Response(JSON.stringify("ok"), { - headers: { "content-type": "application/json" }, - }); + return new Response(JSON.stringify("ok"), { + headers: { "content-type": "application/json" }, + }); } diff --git a/src/routes/(static)/+layout.server.ts b/src/routes/(static)/+layout.server.ts index 56b8efa1..c780b5e0 100644 --- a/src/routes/(static)/+layout.server.ts +++ b/src/routes/(static)/+layout.server.ts @@ -1,14 +1,14 @@ import { get, auth } from "$lib/utils"; export async function load({ cookies }) { - let token = cookies.get("token"); + const token = cookies.get("token"); - let user; - if (token) { - try { - user = await get("/me", auth(cookies)); - } catch (e) {} - } + let user; + if (token) { + try { + user = await get("/me", auth(cookies)); + } catch (e) {} + } - return { user }; + return { user }; } diff --git a/src/routes/(static)/docs/+page.server.ts b/src/routes/(static)/docs/+page.server.ts index 41176b14..86f95824 100644 --- a/src/routes/(static)/docs/+page.server.ts +++ b/src/routes/(static)/docs/+page.server.ts @@ -1,4 +1,4 @@ -export let load = async ({ cookies }) => { - let token = cookies.get("token"); - return { token }; +export const load = async ({ cookies }) => { + const token = cookies.get("token"); + return { token }; }; diff --git a/src/routes/(static)/login/+page.server.ts b/src/routes/(static)/login/+page.server.ts index 6ba7e033..268f95b7 100644 --- a/src/routes/(static)/login/+page.server.ts +++ b/src/routes/(static)/login/+page.server.ts @@ -2,24 +2,24 @@ import { fail, redirect } from "@sveltejs/kit"; import { login, fd } from "$lib/utils"; export const load = async ({ parent }) => { - let { user } = await parent(); - if (user?.pubkey) redirect(307, `/${user.username}`); + const { user } = await parent(); + if (user?.pubkey) redirect(307, `/${user.username}`); }; export const actions = { - default: async ({ cookies, request }) => { - let form = await fd(request); - let { username, password, token, loginRedirect } = form; - let user = { username, password, token }; + default: async ({ cookies, request }) => { + const form = await fd(request); + let { username, password, token, loginRedirect } = form; + const user = { username, password, token }; - if (loginRedirect === "undefined") loginRedirect = undefined; + if (loginRedirect === "undefined") loginRedirect = undefined; - try { - await login(user, cookies, request.headers.get("cf-connecting-ip")); - } catch (e: any) { - return fail(400, { error: "Login failed", message: e.message, ...form }); - } + try { + await login(user, cookies, request.headers.get("cf-connecting-ip")); + } catch (e: any) { + return fail(400, { error: "Login failed", message: e.message, ...form }); + } - redirect(307, loginRedirect || `/${user.username}`); - }, + redirect(307, loginRedirect || `/${user.username}`); + }, }; diff --git a/src/routes/(static)/register/+page.server.ts b/src/routes/(static)/register/+page.server.ts index 0b965507..2dffef01 100644 --- a/src/routes/(static)/register/+page.server.ts +++ b/src/routes/(static)/register/+page.server.ts @@ -2,40 +2,40 @@ import { fail, redirect } from "@sveltejs/kit"; import { fd, post, login } from "$lib/utils"; export const load = async ({ parent }) => { - let { user } = await parent(); - if (user) redirect(307, `/${user.username}`); + const { user } = await parent(); + if (user) redirect(307, `/${user.username}`); - let index = Math.floor(Math.random() * 64) + 1; + const index = Math.floor(Math.random() * 64) + 1; - return { index }; + return { index }; }; export const actions = { - default: async ({ cookies, request }) => { - let ip = request.headers.get("cf-connecting-ip"); + default: async ({ cookies, request }) => { + const ip = request.headers.get("cf-connecting-ip"); - let form = await fd(request); - let { profile, username, password, cipher, salt, pubkey, loginRedirect } = - form; - let user = { profile, username, password, cipher, salt, pubkey }; - let error; + const form = await fd(request); + let { profile, username, password, cipher, salt, pubkey, loginRedirect } = + form; + const user = { profile, username, password, cipher, salt, pubkey }; + let error; - if (loginRedirect === "undefined") loginRedirect = undefined; + if (loginRedirect === "undefined") loginRedirect = undefined; - try { - await post("/register", { user }, { "cf-connecting-ip": ip }); - } catch (e: any) { - error = e.message; - } + try { + await post("/register", { user }, { "cf-connecting-ip": ip }); + } catch (e: any) { + error = e.message; + } - try { - await login(user, cookies, ip); - error = null; - } catch (e: any) { - error ||= e.message; - } + try { + await login(user, cookies, ip); + error = null; + } catch (e: any) { + error ||= e.message; + } - if (error) return fail(400, { error }); - redirect(307, loginRedirect || `/${user.username}`); - }, + if (error) return fail(400, { error }); + redirect(307, loginRedirect || `/${user.username}`); + }, }; diff --git a/src/routes/(static)/support/+server.ts b/src/routes/(static)/support/+server.ts index e9a16cfc..4b179fe2 100644 --- a/src/routes/(static)/support/+server.ts +++ b/src/routes/(static)/support/+server.ts @@ -4,6 +4,6 @@ import { auth, post } from "$lib/utils"; export const prerender = false; export async function POST({ cookies, request }) { - let result = await post("/email", await request.json(), auth(cookies)); - return json(result); + const result = await post("/email", await request.json(), auth(cookies)); + return json(result); } diff --git a/src/routes/about/+server.ts b/src/routes/about/+server.ts index eb3d9729..7cc1b7e8 100644 --- a/src/routes/about/+server.ts +++ b/src/routes/about/+server.ts @@ -1,5 +1,5 @@ import { redirect } from "@sveltejs/kit"; export async function GET() { - redirect(307, "/#about"); + redirect(307, "/#about"); } |