Compare commits

...

2 Commits

Author SHA1 Message Date
a65542aa88
komand "coje" vypisuje i funkce 2024-08-21 00:45:02 +02:00
8ba97b397d
Upgrade na speciální fork play-dl 2024-08-20 22:24:16 +02:00
4 changed files with 29 additions and 60 deletions

59
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "denim_3001", "name": "denim_3001",
"version": "3001.59.0", "version": "3001.60.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "denim_3001", "name": "denim_3001",
"version": "3001.59.0", "version": "3001.60.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@discordjs/voice": "^0.17.0", "@discordjs/voice": "^0.17.0",
@ -14,11 +14,10 @@
"js-levenshtein": "^1.1.6", "js-levenshtein": "^1.1.6",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"opusscript": "^0.1.1", "opusscript": "^0.1.1",
"play-dl": "^1.9.7", "play-dl": "https://gitea.deadfish.cz/Histmy/play-dl-fix/archive/main.tar.gz",
"tiny-typed-emitter": "^2.1.0", "tiny-typed-emitter": "^2.1.0",
"tweetnacl": "^1.0.3", "tweetnacl": "^1.0.3",
"valibot": "^0.35.0", "valibot": "^0.35.0"
"ytdl-core": "^4.11.5"
}, },
"devDependencies": { "devDependencies": {
"@types/js-levenshtein": "^1.1.3", "@types/js-levenshtein": "^1.1.3",
@ -355,34 +354,12 @@
"resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
"integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==" "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="
}, },
"node_modules/m3u8stream": {
"version": "0.8.6",
"resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.8.6.tgz",
"integrity": "sha512-LZj8kIVf9KCphiHmH7sbFQTVe4tOemb202fWwvJwR9W5ENW/1hxJN6ksAWGhQgSBSa3jyWhnjKU1Fw1GaOdbyA==",
"license": "MIT",
"dependencies": {
"miniget": "^4.2.2",
"sax": "^1.2.4"
},
"engines": {
"node": ">=12"
}
},
"node_modules/magic-bytes.js": { "node_modules/magic-bytes.js": {
"version": "1.10.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.10.0.tgz", "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.10.0.tgz",
"integrity": "sha512-/k20Lg2q8LE5xiaaSkMXk4sfvI+9EGEykFS4b0CHHGWqDYU0bGUFSwchNOMA56D7TCs9GwVTkqe9als1/ns8UQ==", "integrity": "sha512-/k20Lg2q8LE5xiaaSkMXk4sfvI+9EGEykFS4b0CHHGWqDYU0bGUFSwchNOMA56D7TCs9GwVTkqe9als1/ns8UQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/miniget": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/miniget/-/miniget-4.2.3.tgz",
"integrity": "sha512-SjbDPDICJ1zT+ZvQwK0hUcRY4wxlhhNpHL9nJOB2MEAXRGagTljsO8MEDzQMTFf0Q8g4QNi8P9lEm/g7e+qgzA==",
"license": "MIT",
"engines": {
"node": ">=12"
}
},
"node_modules/mysql": { "node_modules/mysql": {
"version": "2.18.1", "version": "2.18.1",
"resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz", "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz",
@ -405,12 +382,14 @@
"node_modules/play-audio": { "node_modules/play-audio": {
"version": "0.5.2", "version": "0.5.2",
"resolved": "https://registry.npmjs.org/play-audio/-/play-audio-0.5.2.tgz", "resolved": "https://registry.npmjs.org/play-audio/-/play-audio-0.5.2.tgz",
"integrity": "sha512-ZAqHUKkQLix2Iga7pPbsf1LpUoBjcpwU93F1l3qBIfxYddQLhxS6GKmS0d3jV8kSVaUbr6NnOEcEMFvuX93SWQ==" "integrity": "sha512-ZAqHUKkQLix2Iga7pPbsf1LpUoBjcpwU93F1l3qBIfxYddQLhxS6GKmS0d3jV8kSVaUbr6NnOEcEMFvuX93SWQ==",
"license": "GPL-3.0"
}, },
"node_modules/play-dl": { "node_modules/play-dl": {
"version": "1.9.7", "version": "1.9.7",
"resolved": "https://registry.npmjs.org/play-dl/-/play-dl-1.9.7.tgz", "resolved": "https://gitea.deadfish.cz/Histmy/play-dl-fix/archive/main.tar.gz",
"integrity": "sha512-KpgerWxUCY4s9Mhze2qdqPhiqd8Ve6HufpH9mBH3FN+vux55qSh6WJKDabfie8IBHN7lnrAlYcT/UdGax58c2A==", "integrity": "sha512-YK62RESrfcOXJAE7orKb+D+vs7lJvRur7hq1vPeT4pFH2aJSjI4sGgoefRYDPoM/BCp8VCsC5i11YDpWbW2dMA==",
"license": "GPL-3.0",
"dependencies": { "dependencies": {
"play-audio": "^0.5.2" "play-audio": "^0.5.2"
}, },
@ -442,12 +421,6 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
}, },
"node_modules/sax": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
"integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
"license": "ISC"
},
"node_modules/sqlstring": { "node_modules/sqlstring": {
"version": "2.3.1", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz", "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz",
@ -525,20 +498,6 @@
"optional": true "optional": true
} }
} }
},
"node_modules/ytdl-core": {
"version": "4.11.5",
"resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-4.11.5.tgz",
"integrity": "sha512-27LwsW4n4nyNviRCO1hmr8Wr5J1wLLMawHCQvH8Fk0hiRqrxuIu028WzbJetiYH28K8XDbeinYW4/wcHQD1EXA==",
"license": "MIT",
"dependencies": {
"m3u8stream": "^0.8.6",
"miniget": "^4.2.2",
"sax": "^1.1.3"
},
"engines": {
"node": ">=12"
}
} }
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "denim_3001", "name": "denim_3001",
"version": "3001.59.0", "version": "3001.60.0",
"description": "Toto je velmi kvalitní bot.", "description": "Toto je velmi kvalitní bot.",
"repository": { "repository": {
"url": "https://github.com/Histmy/Denim-Bot/" "url": "https://github.com/Histmy/Denim-Bot/"
@ -18,11 +18,10 @@
"js-levenshtein": "^1.1.6", "js-levenshtein": "^1.1.6",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"opusscript": "^0.1.1", "opusscript": "^0.1.1",
"play-dl": "^1.9.7", "play-dl": "https://gitea.deadfish.cz/Histmy/play-dl-fix/archive/main.tar.gz",
"tiny-typed-emitter": "^2.1.0", "tiny-typed-emitter": "^2.1.0",
"tweetnacl": "^1.0.3", "tweetnacl": "^1.0.3",
"valibot": "^0.35.0", "valibot": "^0.35.0"
"ytdl-core": "^4.11.5"
}, },
"devDependencies": { "devDependencies": {
"@types/js-levenshtein": "^1.1.3", "@types/js-levenshtein": "^1.1.3",

View File

@ -269,8 +269,20 @@ const exp: Modul = {
// Vestavěnej komand // Vestavěnej komand
const vZakladni = zakladniKomandy[nazev]?.run; const vZakladni = zakladniKomandy[nazev]?.run;
if (typeof vZakladni == "function") if (typeof vZakladni == "function") {
return "tuto je slozitej kmenovej koamnd"; let telo = vZakladni.toString();
const odsazeni = /^( +)/m.exec(telo);
if (odsazeni)
telo = telo.replace(new RegExp(`^ \{${odsazeni[1].length - 4}\}`, "gm"), "");
telo = telo.replace(/```/g, "`\u200b``");
if (telo.length > 2000 - 42) {
telo = telo.slice(0, 2000 - 43) + "…";
}
return "tuto je kmenovej koamnd a dela:\n```js\n" + telo + "\u200b```";
}
if (typeof vZakladni == "string") if (typeof vZakladni == "string")
return `tuto je kmenovej koamnd a povida "${vZakladni}"`; return `tuto je kmenovej koamnd a povida "${vZakladni}"`;

View File

@ -2,8 +2,7 @@
import { AudioPlayerStatus, VoiceConnectionStatus } from "@discordjs/voice"; import { AudioPlayerStatus, VoiceConnectionStatus } from "@discordjs/voice";
import { Client } from "discord.js"; import { Client } from "discord.js";
import { search, validate, video_basic_info } from "play-dl"; import { search, stream, validate, video_basic_info } from "play-dl";
import ytdlko from "ytdl-core";
import { emouty } from "../utils/emotes"; import { emouty } from "../utils/emotes";
import { Modul } from "../utils/types"; import { Modul } from "../utils/types";
import { adminLog, log, send } from "../utils/utils"; import { adminLog, log, send } from "../utils/utils";
@ -28,8 +27,8 @@ async function playNext(guildId: string) {
let coZahrat: Hratelny; let coZahrat: Hratelny;
if (!item.special) { if (!item.special) {
const src = ytdlko(item.url, { filter: "audioonly", highWaterMark: 1 << 25 }); const src = await stream(item.url);
coZahrat = { src: src, volume: 1 }; coZahrat = { src: src.stream, volume: 1, type: src.type };
} else { } else {
coZahrat = item.url; coZahrat = item.url;
} }