From 7136de666566afc61d5e79183d22d05568f2ee3d Mon Sep 17 00:00:00 2001 From: SrIzan10 <66965250+SrIzan10@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:16:30 +0100 Subject: [PATCH] feat: remove askjavi command until the next event --- Dockerfile | 2 +- commands/misc/askjavi.ts | 199 +------ commands/misc/askjavi_disabled.ts | 192 ++++++ package-lock.json | 554 ++++++------------ package.json | 1 - ...ayingradio.ts => nowplayingradio.disabled} | 0 6 files changed, 375 insertions(+), 573 deletions(-) create mode 100644 commands/misc/askjavi_disabled.ts rename util/{nowplayingradio.ts => nowplayingradio.disabled} (100%) diff --git a/Dockerfile b/Dockerfile index 1e88ec9..d6e8ffb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN npm i EXPOSE 7272 -RUN apk update && apk add bash +RUN apk update && apk add bash ffmpeg COPY . . diff --git a/commands/misc/askjavi.ts b/commands/misc/askjavi.ts index 3f01151..7a8a4f3 100644 --- a/commands/misc/askjavi.ts +++ b/commands/misc/askjavi.ts @@ -1,192 +1,19 @@ -import { commandModule, CommandType } from '@sern/handler'; -import { - ActionRowBuilder, - ModalBuilder, - TextInputBuilder, - TextInputStyle, - ModalActionRowComponentBuilder, - ButtonBuilder, - ButtonStyle, - ComponentType, - ModalSubmitInteraction, - ApplicationCommandOptionType, -} from 'discord.js'; -import { publish } from '../../src/plugins/publish.js'; -import { ownerOnly } from '../../src/plugins/ownerOnly.js'; -import padyama from '../../schemas/padyama.js'; -import { randomnumbergen } from '../../util/randomnumbergen.js'; +import { commandModule, CommandType } from '@sern/handler' +import { publish } from "../../src/plugins/publish.js"; +import { ownerOnly } from "../../src/plugins/ownerOnly.js" +import { ApplicationCommandOptionType } from "discord.js"; +/* +import { publish } from "../../src/plugins/publish.js"; +import { ownerOnly } from "../../src/plugins/ownerOnly.js" +*/ export default commandModule({ name: 'askjavi', - type: CommandType.Slash, - plugins: [ - publish({ guildIds: ['1000400148289036298', '928018226330337280'] }), - ], - description: 'TEMP: Pregunta a Javi LO QUE SEA!', + type: CommandType.Slash, + plugins: [publish({ guildIds: ['1000400148289036298', '928018226330337280'] })], + description: 'DESACTIVADO: Pregunta a Javi LO QUE SEA!', //alias : [], - options: [ - { - name: 'new', - description: 'Haz una nueva pregunta', - type: ApplicationCommandOptionType.Subcommand, - }, - { - name: 'get', - description: 'Mira una pregunta teniendo su ID.', - type: ApplicationCommandOptionType.Subcommand, - options: [ - { - name: 'id', - description: 'El ID de la pregunta', - type: ApplicationCommandOptionType.String, - required: true, - }, - ], - }, - { - name: 'you', - description: 'Todos los IDs de las preguntas que hayas hecho', - type: ApplicationCommandOptionType.Subcommand, - }, - { - name: 'answered', - description: - 'ORGANIZADOR: Todos los IDs de las preguntas que hayas hecho', - type: ApplicationCommandOptionType.Subcommand, - options: [ - { - name: 'id', - description: 'El ID de la pregunta', - type: ApplicationCommandOptionType.String, - required: true, - }, - ], - }, - ], execute: async (ctx, options) => { - switch (ctx.interaction.options.getSubcommand()) { - case 'new': { - const modal = new ModalBuilder() - .setCustomId('askjavi') - .setTitle('Sugerencias'); - const input = new TextInputBuilder() - .setCustomId('askjavi-prompt') - .setLabel('Qué quieres preguntarle?') - .setStyle(TextInputStyle.Paragraph); - const suggestionsActionRow = - new ActionRowBuilder().addComponents( - input - ); - modal.addComponents(suggestionsActionRow); - const buttons = new ActionRowBuilder().addComponents( - new ButtonBuilder() - .setCustomId('askjavi-buttons-yes') - .setLabel('Sí!') - .setStyle(ButtonStyle.Success), - new ButtonBuilder() - .setCustomId('askjavi-buttons-no') - .setLabel('Ok mejor no') - .setStyle(ButtonStyle.Danger) - ); - const message = await ctx.reply({ - content: `No puedes enviar sugerencias inútiles o spam.\nSi haces esto, serás descalificado.\nContinuas?`, - components: [buttons], - ephemeral: true, - }); - const collector = message.createMessageComponentCollector({ - max: 1, - componentType: ComponentType.Button, - time: 60_000, - }); - collector.on('collect', async (i) => { - if (i.customId === 'askjavi-buttons-yes') { - const suggestionid = randomnumbergen(5); - await i.showModal(modal); - await ctx.interaction.editReply({ - components: [], - }); - const submitted = (await ctx.interaction - .awaitModalSubmit({ - time: 180000, - filter: (i) => i.user.id === ctx.user.id, - }) - .catch((error) => {})) as ModalSubmitInteraction; - const db = new padyama({ - id: i.user.id, - user: i.user.username, - suggestionid: suggestionid, - suggestion: submitted.fields.getTextInputValue('askjavi-prompt'), - }); - await db.save(); - await submitted.reply({ - content: `Tu pregunta ha sido registrada en la base de datos correctamente.\nEl ID de esta pregunta es: \`${suggestionid}\`. Se te contactará por DMs cuando se responda la pregunta.\nPuedes ver tus IDs de preguntas con el comando .`, - ephemeral: true, - }); - } - if (i.customId === 'askjavi-buttons-no') { - await ctx.interaction.editReply({ - content: 'Ok pues...', - components: [], - }); - } - }); - } - case 'get': { - const option = options[1].getString('id'); - const db = await padyama.findOne({ suggestionid: option }); - if (db?.suggestion !== undefined) - return await ctx.reply({ - content: `La sugerencia es:\n${db?.suggestion}`, - ephemeral: true, - }); - else - return await ctx.reply({ - content: `Parece que ese ID no se ha encontrado...`, - ephemeral: true, - }); - } - case 'you': { - const db = await padyama.find({ id: ctx.user.id }); - await ctx.reply({ - content: `Los IDs de las preguntas que has hecho:\n${db.map( - (doc) => `\`${doc.suggestionid}\`` - )}`, - ephemeral: true, - }); - } - case 'answered': { - if (ctx.user.id !== '703974042700611634') - return await ctx.reply({ - content: `No puedes usar este comando.`, - ephemeral: true, - }); - const option = options[1].getString('id'); - const db = await padyama.findOne({ suggestionid: option }); - if (db?.user !== undefined) { - try { - await (await ctx.user.fetch(db?.id)) - .send({ - content: `Hola!\nRespecto al AMA del sevidor de Mara:\nTu pregunta con ID \`${option}\` ha sido respondida correctamente!`, - }) - .then(async () => { - await ctx.reply({ - content: `DM enviado correctamente!`, - ephemeral: true, - }); - }); - } catch (err) { - await ctx.reply({ - content: `Parece que no se ha podido enviar el DM...`, - ephemeral: true, - }); - } - } else { - await ctx.reply({ - content: `No se ha encontrado el usuario enlazado con el ID en cuestión...`, - ephemeral: true, - }); - } - } - } + await ctx.reply({content: `Este comando ha sido desactivado ya que era para un evento que ya ha ocurrido.\nGracias por haber participado!`, ephemeral: true}) }, -}); +}); \ No newline at end of file diff --git a/commands/misc/askjavi_disabled.ts b/commands/misc/askjavi_disabled.ts new file mode 100644 index 0000000..9756f5b --- /dev/null +++ b/commands/misc/askjavi_disabled.ts @@ -0,0 +1,192 @@ +import { commandModule, CommandType } from '@sern/handler'; +import { + ActionRowBuilder, + ModalBuilder, + TextInputBuilder, + TextInputStyle, + ModalActionRowComponentBuilder, + ButtonBuilder, + ButtonStyle, + ComponentType, + ModalSubmitInteraction, + ApplicationCommandOptionType, +} from 'discord.js'; +import { publish } from '../../src/plugins/publish.js'; +import { ownerOnly } from '../../src/plugins/ownerOnly.js'; +import padyama from '../../schemas/padyama.js'; +import { randomnumbergen } from '../../util/randomnumbergen.js'; + +export default commandModule({ + name: 'askjavi', + type: CommandType.Slash, + plugins: [ + // publish({ guildIds: ['1000400148289036298', '928018226330337280'] }), + ], + description: 'TEMP: Pregunta a Javi LO QUE SEA!', + //alias : [], + options: [ + { + name: 'new', + description: 'Haz una nueva pregunta', + type: ApplicationCommandOptionType.Subcommand, + }, + { + name: 'get', + description: 'Mira una pregunta teniendo su ID.', + type: ApplicationCommandOptionType.Subcommand, + options: [ + { + name: 'id', + description: 'El ID de la pregunta', + type: ApplicationCommandOptionType.String, + required: true, + }, + ], + }, + { + name: 'you', + description: 'Todos los IDs de las preguntas que hayas hecho', + type: ApplicationCommandOptionType.Subcommand, + }, + { + name: 'answered', + description: + 'ORGANIZADOR: Todos los IDs de las preguntas que hayas hecho', + type: ApplicationCommandOptionType.Subcommand, + options: [ + { + name: 'id', + description: 'El ID de la pregunta', + type: ApplicationCommandOptionType.String, + required: true, + }, + ], + }, + ], + execute: async (ctx, options) => { + switch (ctx.interaction.options.getSubcommand()) { + case 'new': { + const modal = new ModalBuilder() + .setCustomId('askjavi') + .setTitle('Sugerencias'); + const input = new TextInputBuilder() + .setCustomId('askjavi-prompt') + .setLabel('Qué quieres preguntarle?') + .setStyle(TextInputStyle.Paragraph); + const suggestionsActionRow = + new ActionRowBuilder().addComponents( + input + ); + modal.addComponents(suggestionsActionRow); + const buttons = new ActionRowBuilder().addComponents( + new ButtonBuilder() + .setCustomId('askjavi-buttons-yes') + .setLabel('Sí!') + .setStyle(ButtonStyle.Success), + new ButtonBuilder() + .setCustomId('askjavi-buttons-no') + .setLabel('Ok mejor no') + .setStyle(ButtonStyle.Danger) + ); + const message = await ctx.reply({ + content: `No puedes enviar sugerencias inútiles o spam.\nSi haces esto, serás descalificado.\nContinuas?`, + components: [buttons], + ephemeral: true, + }); + const collector = message.createMessageComponentCollector({ + max: 1, + componentType: ComponentType.Button, + time: 60_000, + }); + collector.on('collect', async (i) => { + if (i.customId === 'askjavi-buttons-yes') { + const suggestionid = randomnumbergen(5); + await i.showModal(modal); + await ctx.interaction.editReply({ + components: [], + }); + const submitted = (await ctx.interaction + .awaitModalSubmit({ + time: 180000, + filter: (i) => i.user.id === ctx.user.id, + }) + .catch((error) => {})) as ModalSubmitInteraction; + const db = new padyama({ + id: i.user.id, + user: i.user.username, + suggestionid: suggestionid, + suggestion: submitted.fields.getTextInputValue('askjavi-prompt'), + }); + await db.save(); + await submitted.reply({ + content: `Tu pregunta ha sido registrada en la base de datos correctamente.\nEl ID de esta pregunta es: \`${suggestionid}\`. Se te contactará por DMs cuando se responda la pregunta.\nPuedes ver tus IDs de preguntas con el comando .`, + ephemeral: true, + }); + } + if (i.customId === 'askjavi-buttons-no') { + await ctx.interaction.editReply({ + content: 'Ok pues...', + components: [], + }); + } + }); + } + case 'get': { + const option = options[1].getString('id'); + const db = await padyama.findOne({ suggestionid: option }); + if (db?.suggestion !== undefined) + return await ctx.reply({ + content: `La sugerencia es:\n${db?.suggestion}`, + ephemeral: true, + }); + else + return await ctx.reply({ + content: `Parece que ese ID no se ha encontrado...`, + ephemeral: true, + }); + } + case 'you': { + const db = await padyama.find({ id: ctx.user.id }); + await ctx.reply({ + content: `Los IDs de las preguntas que has hecho:\n${db.map( + (doc) => `\`${doc.suggestionid}\`` + )}`, + ephemeral: true, + }); + } + case 'answered': { + if (ctx.user.id !== '703974042700611634') + return await ctx.reply({ + content: `No puedes usar este comando.`, + ephemeral: true, + }); + const option = options[1].getString('id'); + const db = await padyama.findOne({ suggestionid: option }); + if (db?.user !== undefined) { + try { + await (await ctx.user.fetch(db?.id)) + .send({ + content: `Hola!\nRespecto al AMA del sevidor de Mara:\nTu pregunta con ID \`${option}\` ha sido respondida correctamente!`, + }) + .then(async () => { + await ctx.reply({ + content: `DM enviado correctamente!`, + ephemeral: true, + }); + }); + } catch (err) { + await ctx.reply({ + content: `Parece que no se ha podido enviar el DM...`, + ephemeral: true, + }); + } + } else { + await ctx.reply({ + content: `No se ha encontrado el usuario enlazado con el ID en cuestión...`, + ephemeral: true, + }); + } + } + } + }, +}); diff --git a/package-lock.json b/package-lock.json index 27c766c..b4fa6c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,38 +45,6 @@ "node": ">=12" } }, - "node_modules/@derhuerst/http-basic": { - "version": "8.2.4", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "caseless": "^0.12.0", - "concat-stream": "^2.0.0", - "http-response-object": "^3.0.1", - "parse-cache-control": "^1.0.1" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@derhuerst/http-basic/node_modules/@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==", - "optional": true, - "peer": true - }, - "node_modules/@derhuerst/http-basic/node_modules/http-response-object": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz", - "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==", - "optional": true, - "peer": true, - "dependencies": { - "@types/node": "^10.0.3" - } - }, "node_modules/@discordjs/builders": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.2.0.tgz", @@ -123,45 +91,6 @@ "node-pre-gyp": "bin/node-pre-gyp" } }, - "node_modules/@discordjs/node-pre-gyp/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/@discordjs/node-pre-gyp/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@discordjs/node-pre-gyp/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/@discordjs/node-pre-gyp/node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -184,11 +113,6 @@ "semver": "bin/semver.js" } }, - "node_modules/@discordjs/node-pre-gyp/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/@discordjs/node-pre-gyp/node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -277,11 +201,51 @@ "node": ">=16.9.0" } }, + "node_modules/@discordjs/voice/node_modules/@discordjs/opus": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.8.0.tgz", + "integrity": "sha512-uHE7OmHEmP8YM0yvsH3iSdacdeghO0qTkF0CIkV07Tg0qdyOLUVkoZHj5Zcpge9rC4qb/JvTS2xRgttSZLM43Q==", + "hasInstallScript": true, + "optional": true, + "peer": true, + "dependencies": { + "@discordjs/node-pre-gyp": "^0.4.4", + "node-addon-api": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/@discordjs/voice/node_modules/discord-api-types": { "version": "0.37.12", "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.12.tgz", "integrity": "sha512-SMBP4V6/A9mE7shBQAiTxNWnQlYTdiKMGvc7G23neayxaTJeFYh5FviJSWUa0BTdXcph1h/jT03Nbyv5XgZkzw==" }, + "node_modules/@discordjs/voice/node_modules/prism-media": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.3.4.tgz", + "integrity": "sha512-eW7LXORkTCQznZs+eqe9VjGOrLBxcBPXgNyHXMTSRVhphvd/RrxgIR7WaWt4fkLuhshcdT5KHL88LAfcvS3f5g==", + "peerDependencies": { + "@discordjs/opus": "^0.8.0", + "ffmpeg-static": "^5.0.2 || ^4.2.7 || ^3.0.0 || ^2.4.0", + "node-opus": "^0.3.3", + "opusscript": "^0.0.8" + }, + "peerDependenciesMeta": { + "@discordjs/opus": { + "optional": true + }, + "ffmpeg-static": { + "optional": true + }, + "node-opus": { + "optional": true + }, + "opusscript": { + "optional": true + } + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.0", "dev": true, @@ -447,6 +411,38 @@ "node": ">=10.0.0" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -558,12 +554,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/caseless": { - "version": "0.12.0", - "license": "Apache-2.0", - "optional": true, - "peer": true - }, "node_modules/chownr": { "version": "2.0.0", "license": "ISC", @@ -602,28 +592,6 @@ "version": "0.0.1", "license": "MIT" }, - "node_modules/concat-stream": { - "version": "2.0.0", - "engines": [ - "node >= 6.0" - ], - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - } - }, - "node_modules/concat-stream/node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "optional": true, - "peer": true - }, "node_modules/console-control-strings": { "version": "1.1.0", "license": "ISC" @@ -991,15 +959,6 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/env-paths": { - "version": "2.2.1", - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/escape-html": { "version": "1.0.3", "license": "MIT" @@ -1154,74 +1113,6 @@ "version": "3.1.3", "license": "MIT" }, - "node_modules/ffmpeg-static": { - "version": "5.1.0", - "hasInstallScript": true, - "license": "GPL-3.0-or-later", - "optional": true, - "peer": true, - "dependencies": { - "@derhuerst/http-basic": "^8.2.0", - "env-paths": "^2.2.0", - "https-proxy-agent": "^5.0.0", - "progress": "^2.0.3" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/ffmpeg-static/node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "optional": true, - "peer": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/ffmpeg-static/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "optional": true, - "peer": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/ffmpeg-static/node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "optional": true, - "peer": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/ffmpeg-static/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "optional": true, - "peer": true - }, "node_modules/file-type": { "version": "18.0.0", "license": "MIT", @@ -1486,6 +1377,39 @@ "node": ">=10.19.0" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/iconv-lite": { "version": "0.4.24", "license": "MIT", @@ -1968,11 +1892,6 @@ "node": ">=8" } }, - "node_modules/parse-cache-control": { - "version": "1.0.1", - "optional": true, - "peer": true - }, "node_modules/parseurl": { "version": "1.3.3", "license": "MIT", @@ -2053,39 +1972,6 @@ "npm": "^8.1.2" } }, - "node_modules/prism-media": { - "version": "1.3.4", - "license": "Apache-2.0", - "peerDependencies": { - "@discordjs/opus": "^0.8.0", - "ffmpeg-static": "^5.0.2 || ^4.2.7 || ^3.0.0 || ^2.4.0", - "node-opus": "^0.3.3", - "opusscript": "^0.0.8" - }, - "peerDependenciesMeta": { - "@discordjs/opus": { - "optional": true - }, - "ffmpeg-static": { - "optional": true - }, - "node-opus": { - "optional": true - }, - "opusscript": { - "optional": true - } - } - }, - "node_modules/progress": { - "version": "2.0.3", - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/proxy-addr": { "version": "2.0.7", "license": "MIT", @@ -2851,12 +2737,6 @@ "node": ">= 0.6" } }, - "node_modules/typedarray": { - "version": "0.0.6", - "license": "MIT", - "optional": true, - "peer": true - }, "node_modules/typescript": { "version": "4.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", @@ -3012,36 +2892,6 @@ "@jridgewell/trace-mapping": "0.3.9" } }, - "@derhuerst/http-basic": { - "version": "8.2.4", - "optional": true, - "peer": true, - "requires": { - "caseless": "^0.12.0", - "concat-stream": "^2.0.0", - "http-response-object": "^3.0.1", - "parse-cache-control": "^1.0.1" - }, - "dependencies": { - "@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==", - "optional": true, - "peer": true - }, - "http-response-object": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz", - "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==", - "optional": true, - "peer": true, - "requires": { - "@types/node": "^10.0.3" - } - } - } - }, "@discordjs/builders": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.2.0.tgz", @@ -3080,31 +2930,6 @@ "tar": "^6.1.11" }, "dependencies": { - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "requires": { - "debug": "4" - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "requires": { - "agent-base": "6", - "debug": "4" - } - }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -3120,11 +2945,6 @@ } } }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -3196,10 +3016,27 @@ "ws": "^8.9.0" }, "dependencies": { + "@discordjs/opus": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@discordjs/opus/-/opus-0.8.0.tgz", + "integrity": "sha512-uHE7OmHEmP8YM0yvsH3iSdacdeghO0qTkF0CIkV07Tg0qdyOLUVkoZHj5Zcpge9rC4qb/JvTS2xRgttSZLM43Q==", + "optional": true, + "peer": true, + "requires": { + "@discordjs/node-pre-gyp": "^0.4.4", + "node-addon-api": "^5.0.0" + } + }, "discord-api-types": { "version": "0.37.12", "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.12.tgz", "integrity": "sha512-SMBP4V6/A9mE7shBQAiTxNWnQlYTdiKMGvc7G23neayxaTJeFYh5FviJSWUa0BTdXcph1h/jT03Nbyv5XgZkzw==" + }, + "prism-media": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.3.4.tgz", + "integrity": "sha512-eW7LXORkTCQznZs+eqe9VjGOrLBxcBPXgNyHXMTSRVhphvd/RrxgIR7WaWt4fkLuhshcdT5KHL88LAfcvS3f5g==", + "requires": {} } } }, @@ -3316,6 +3153,29 @@ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.5.tgz", "integrity": "sha512-0dpjDLeCXYThL2YhqZcd/spuwoH+dmnFoND9ZxZkAYxp1IJUB2GP16ow2MJRsjVxy8j1Qv8BJRmN5GKnbDKCmQ==" }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -3388,11 +3248,6 @@ "get-intrinsic": "^1.0.2" } }, - "caseless": { - "version": "0.12.0", - "optional": true, - "peer": true - }, "chownr": { "version": "2.0.0" }, @@ -3414,26 +3269,6 @@ "concat-map": { "version": "0.0.1" }, - "concat-stream": { - "version": "2.0.0", - "optional": true, - "peer": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.0.2", - "typedarray": "^0.0.6" - }, - "dependencies": { - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "optional": true, - "peer": true - } - } - }, "console-control-strings": { "version": "1.1.0" }, @@ -3688,11 +3523,6 @@ "entities": { "version": "2.2.0" }, - "env-paths": { - "version": "2.2.1", - "optional": true, - "peer": true - }, "escape-html": { "version": "1.0.3" }, @@ -3823,57 +3653,6 @@ "fast-deep-equal": { "version": "3.1.3" }, - "ffmpeg-static": { - "version": "5.1.0", - "optional": true, - "peer": true, - "requires": { - "@derhuerst/http-basic": "^8.2.0", - "env-paths": "^2.2.0", - "https-proxy-agent": "^5.0.0", - "progress": "^2.0.3" - }, - "dependencies": { - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "optional": true, - "peer": true, - "requires": { - "debug": "4" - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "optional": true, - "peer": true, - "requires": { - "ms": "2.1.2" - } - }, - "https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "optional": true, - "peer": true, - "requires": { - "agent-base": "6", - "debug": "4" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "optional": true, - "peer": true - } - } - }, "file-type": { "version": "18.0.0", "requires": { @@ -4045,6 +3824,30 @@ "resolve-alpn": "^1.0.0" } }, + "https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "iconv-lite": { "version": "0.4.24", "requires": { @@ -4367,11 +4170,6 @@ "p-cancelable": { "version": "2.1.1" }, - "parse-cache-control": { - "version": "1.0.1", - "optional": true, - "peer": true - }, "parseurl": { "version": "1.3.3" }, @@ -4421,15 +4219,6 @@ "pretty-seconds-spanish": { "version": "2.1.0" }, - "prism-media": { - "version": "1.3.4", - "requires": {} - }, - "progress": { - "version": "2.0.3", - "optional": true, - "peer": true - }, "proxy-addr": { "version": "2.0.7", "requires": { @@ -4912,11 +4701,6 @@ "mime-types": "~2.1.24" } }, - "typedarray": { - "version": "0.0.6", - "optional": true, - "peer": true - }, "typescript": { "version": "4.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz", diff --git a/package.json b/package.json index 5c78a93..1faa009 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "@discordjs/opus": "^0.9.0", "@discordjs/voice": "^0.13.0", "@sern/handler": "^1.2.1", - "@xmldom/xmldom": "^0.8.5", "axios": "^1.0.0", "dayjs": "^1.11.6", "discord-bot-youtube-notifications": "^1.1.4", diff --git a/util/nowplayingradio.ts b/util/nowplayingradio.disabled similarity index 100% rename from util/nowplayingradio.ts rename to util/nowplayingradio.disabled