diff --git a/app/src/events/interactionCreate.ts b/app/src/events/interactionCreate.ts index fdf6990f..40002aab 100644 --- a/app/src/events/interactionCreate.ts +++ b/app/src/events/interactionCreate.ts @@ -14,29 +14,13 @@ module.exports = { if (!interaction.isChatInputCommand() || !interaction.isCommand() || !clientInteractions.has(interaction.commandName)) return; + await interaction.deferReply(); + const args = interaction.options.data.filter((data) => data.type !== Discord.ApplicationCommandOptionType.Subcommand).map((opt) => opt.value.toString()); const command = interaction.commandName; const commandInteraction = clientInteractions.get(command); const interactionMember = interaction.member as Discord.GuildMember; - const cachedIds = []; - - if (!(interaction.user.id in cachedIds)) { - const fetchDBAccount = await supabase.from("users").select("user_id").eq("user_id", interaction.user.id).single(); - - if (!fetchDBAccount.data) { - await supabase.from("users").insert({ - user_id: interaction.user.id, - money: 500, - guilds: await fetchMutualServers(), - inventory: [], - }); - } else { - await supabase.from("users").update({ guilds: await fetchMutualServers() }).like("user_id", interaction.user.id); - } - - cachedIds.push(interaction.user.id); - } if (commandInteraction.memberPermissions && !interactionMember.permissions.has(commandInteraction.memberPermissions as Discord.PermissionResolvable)) { return interaction.reply({ @@ -50,8 +34,6 @@ module.exports = { }); } - await interaction.deferReply(); - try { await commandInteraction.execute(Client, interaction, args, supabase); } catch (err) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a00a156c..09ca1b19 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,6 @@ importers: '@supabase/supabase-js': ^2.0.5 '@swc/cli': 0.1.57 '@swc/core': 1.2.220 - '@types/async': ^3.2.15 '@types/cookie-parser': 1.4.3 '@types/cors': 2.8.12 '@types/express': 4.17.13 @@ -24,8 +23,6 @@ importers: '@types/node-schedule': 2.1.0 '@typescript-eslint/eslint-plugin': 5.31.0 '@typescript-eslint/parser': 5.31.0 - async: ^3.2.4 - async-each: ^1.0.3 canvas: ^2.9.1 chalk: 4.1.2 connect-session-sequelize: ^7.1.3 @@ -63,11 +60,8 @@ importers: '@discordjs/rest': 1.3.0 '@sapphire/snowflake': 3.2.2 '@supabase/supabase-js': 2.0.5 - '@types/async': 3.2.15 '@types/inquirer': 8.2.1 '@types/luxon': 3.1.0 - async: 3.2.4 - async-each: 1.0.3 canvas: 2.9.3 chalk: 4.1.2 connect-session-sequelize: 7.1.4_sequelize@6.21.2 @@ -138,7 +132,7 @@ importers: '@supabase/supabase-js': 2.0.5 feather-icons: 4.28.0 pinia: 2.0.22_typescript@4.8.4+vue@3.2.39 - vite-tsconfig-paths: 3.5.0_vite@3.1.0 + vite-tsconfig-paths: 3.5.0_vite@3.2.4 vue: 3.2.39 vue-feather: 2.0.0_feather-icons@4.28.0+vue@3.2.39 vue-router: 4.1.5_vue@3.2.39 @@ -233,6 +227,7 @@ packages: cpu: [arm] os: [android] requiresBuild: true + dev: true optional: true /@esbuild/linux-loong64/0.15.14: @@ -633,10 +628,6 @@ packages: resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==} dev: false - /@types/async/3.2.15: - resolution: {integrity: sha512-PAmPfzvFA31mRoqZyTVsgJMsvbynR429UTTxhmfsUCrWGh3/fxOrzqBtaTPJsn4UtzTv4Vb0+/O7CARWb69N4g==} - dev: false - /@types/body-parser/1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: @@ -1002,7 +993,7 @@ packages: '@vue/shared': 3.2.39 estree-walker: 2.0.2 magic-string: 0.25.9 - postcss: 8.4.16 + postcss: 8.4.19 source-map: 0.6.1 dev: false @@ -1017,7 +1008,7 @@ packages: '@vue/shared': 3.2.41 estree-walker: 2.0.2 magic-string: 0.25.9 - postcss: 8.4.16 + postcss: 8.4.19 source-map: 0.6.1 dev: false @@ -1260,14 +1251,6 @@ packages: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - /async-each/1.0.3: - resolution: {integrity: sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==} - dev: false - - /async/3.2.4: - resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==} - dev: false - /asynckit/0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: false @@ -1673,13 +1656,6 @@ packages: type: 1.2.0 dev: false - /d/1.0.1: - resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==} - dependencies: - es5-ext: 0.10.62 - type: 1.2.0 - dev: false - /dayjs/1.11.3: resolution: {integrity: sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==} dev: false @@ -1915,8 +1891,8 @@ packages: ext: 1.7.0 dev: false - /esbuild-android-64/0.15.7: - resolution: {integrity: sha512-p7rCvdsldhxQr3YHxptf1Jcd86dlhvc3EQmQJaZzzuAxefO9PvcI0GLOa5nCWem1AJ8iMRu9w0r5TG8pHmbi9w==} + /esbuild-android-64/0.15.14: + resolution: {integrity: sha512-HuilVIb4rk9abT4U6bcFdU35UHOzcWVGLSjEmC58OVr96q5UiRqzDtWjPlCMugjhgUGKEs8Zf4ueIvYbOStbIg==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -2101,27 +2077,28 @@ packages: hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/linux-loong64': 0.15.7 - esbuild-android-64: 0.15.7 - esbuild-android-arm64: 0.15.7 - esbuild-darwin-64: 0.15.7 - esbuild-darwin-arm64: 0.15.7 - esbuild-freebsd-64: 0.15.7 - esbuild-freebsd-arm64: 0.15.7 - esbuild-linux-32: 0.15.7 - esbuild-linux-64: 0.15.7 - esbuild-linux-arm: 0.15.7 - esbuild-linux-arm64: 0.15.7 - esbuild-linux-mips64le: 0.15.7 - esbuild-linux-ppc64le: 0.15.7 - esbuild-linux-riscv64: 0.15.7 - esbuild-linux-s390x: 0.15.7 - esbuild-netbsd-64: 0.15.7 - esbuild-openbsd-64: 0.15.7 - esbuild-sunos-64: 0.15.7 - esbuild-windows-32: 0.15.7 - esbuild-windows-64: 0.15.7 - esbuild-windows-arm64: 0.15.7 + '@esbuild/android-arm': 0.15.14 + '@esbuild/linux-loong64': 0.15.14 + esbuild-android-64: 0.15.14 + esbuild-android-arm64: 0.15.14 + esbuild-darwin-64: 0.15.14 + esbuild-darwin-arm64: 0.15.14 + esbuild-freebsd-64: 0.15.14 + esbuild-freebsd-arm64: 0.15.14 + esbuild-linux-32: 0.15.14 + esbuild-linux-64: 0.15.14 + esbuild-linux-arm: 0.15.14 + esbuild-linux-arm64: 0.15.14 + esbuild-linux-mips64le: 0.15.14 + esbuild-linux-ppc64le: 0.15.14 + esbuild-linux-riscv64: 0.15.14 + esbuild-linux-s390x: 0.15.14 + esbuild-netbsd-64: 0.15.14 + esbuild-openbsd-64: 0.15.14 + esbuild-sunos-64: 0.15.14 + esbuild-windows-32: 0.15.14 + esbuild-windows-64: 0.15.14 + esbuild-windows-arm64: 0.15.14 dev: true /escalade/3.1.1: @@ -2334,12 +2311,6 @@ packages: type: 2.7.2 dev: false - /ext/1.7.0: - resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==} - dependencies: - type: 2.7.2 - dev: false - /external-editor/3.1.0: resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} engines: {node: '>=4'} @@ -3622,6 +3593,7 @@ packages: nanoid: 3.3.4 picocolors: 1.0.0 source-map-js: 1.0.2 + dev: true /postcss/8.4.19: resolution: {integrity: sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==} @@ -4502,14 +4474,6 @@ packages: node-gyp-build: 4.5.0 dev: false - /utf-8-validate/5.0.10: - resolution: {integrity: sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==} - engines: {node: '>=6.14.2'} - requiresBuild: true - dependencies: - node-gyp-build: 4.5.0 - dev: false - /util-deprecate/1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -4671,8 +4635,6 @@ packages: typedarray-to-buffer: 3.1.5 utf-8-validate: 5.0.10 yaeti: 0.0.6 - transitivePeerDependencies: - - supports-color dev: false /whatwg-url/11.0.0: diff --git a/website/.gitignore b/website/.gitignore index 3ec544c7..b3eb616a 100644 --- a/website/.gitignore +++ b/website/.gitignore @@ -1,2 +1,3 @@ node_modules/ -.env \ No newline at end of file +.env +dist/ \ No newline at end of file