ABOCN/TelegramBot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

fix: yt: set cookies for check_size args #35

Merged
GiovaniFZ merged 2 commits from fix_ttk into main 2025-04-15 00:59:12 +00:00
Conversation 4 Commits 2 Files changed 1 +197 -192
1 changed files with 197 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8ec088796e - Show all commits

49
src/commands/youtube.js
View file

@ -41,7 +41,12 @@ const downloadFromYoutube = async (command, args) => {
}; };
const getApproxSize = async (command, videoUrl) => { const getApproxSize = async (command, videoUrl) => {
const args = [videoUrl, '--compat-opt', 'manifest-filesize-approx', '-O', 'filesize_approx']; let args = [];
if (fs.existsSync(path.resolve(__dirname, "../props/cookies.txt"))) {
args = [videoUrl, '--compat-opt', 'manifest-filesize-approx', '-O', 'filesize_approx', '--cookies', path.resolve(__dirname, "../props/cookies.txt")];
} else {
args = [videoUrl, '--compat-opt', 'manifest-filesize-approx', '-O', 'filesize_approx'];
}
try { try {
const { stdout } = await downloadFromYoutube(command, args); const { stdout } = await downloadFromYoutube(command, args);
const sizeInBytes = parseInt(stdout.trim(), 10); const sizeInBytes = parseInt(stdout.trim(), 10);
@ -99,9 +104,9 @@ module.exports = (bot) => {
downloadingMessage.message_id, downloadingMessage.message_id,
null, null,
Strings.ytDownload.downloadingVid, { Strings.ytDownload.downloadingVid, {
parse_mode: 'Markdown', parse_mode: 'Markdown',
reply_to_message_id: ctx.message.message_id, reply_to_message_id: ctx.message.message_id,
}, },
); );
const dlpArgs = [videoUrl, ...cmdArgs.split(' '), mp4File]; const dlpArgs = [videoUrl, ...cmdArgs.split(' '), mp4File];
@ -112,12 +117,12 @@ module.exports = (bot) => {
downloadingMessage.message_id, downloadingMessage.message_id,
null, null,
Strings.ytDownload.uploadingVid, { Strings.ytDownload.uploadingVid, {
parse_mode: 'Markdown', parse_mode: 'Markdown',
reply_to_message_id: ctx.message.message_id, reply_to_message_id: ctx.message.message_id,
}, },
); );
if(fs.existsSync(tempMp4File)){ if (fs.existsSync(tempMp4File)) {
await downloadFromYoutube(ffmpegPath, ffmpegArgs); await downloadFromYoutube(ffmpegPath, ffmpegArgs);
} }
@ -126,7 +131,8 @@ module.exports = (bot) => {
try { try {
await ctx.replyWithVideo({ await ctx.replyWithVideo({
source: mp4File }, { source: mp4File
}, {
caption: message, caption: message,
parse_mode: 'Markdown', parse_mode: 'Markdown',
reply_to_message_id: ctx.message.message_id, reply_to_message_id: ctx.message.message_id,
@ -140,9 +146,9 @@ module.exports = (bot) => {
downloadingMessage.message_id, downloadingMessage.message_id,
null, null,
Strings.ytDownload.uploadLimit, { Strings.ytDownload.uploadLimit, {
parse_mode: 'Markdown', parse_mode: 'Markdown',
reply_to_message_id: ctx.message.message_id, reply_to_message_id: ctx.message.message_id,
}, },
); );
} else { } else {
const errMsg = Strings.ytDownload.uploadErr.replace("{error}", error) const errMsg = Strings.ytDownload.uploadErr.replace("{error}", error)
@ -151,9 +157,9 @@ module.exports = (bot) => {
downloadingMessage.message_id, downloadingMessage.message_id,
null, null,
errMsg, { errMsg, {
parse_mode: 'Markdown', parse_mode: 'Markdown',
reply_to_message_id: ctx.message.message_id, reply_to_message_id: ctx.message.message_id,
}, },
); );
}; };
@ -171,22 +177,21 @@ module.exports = (bot) => {
downloadingMessage.message_id, downloadingMessage.message_id,
null, null,
Strings.ytDownload.libNotFound, { Strings.ytDownload.libNotFound, {
parse_mode: 'Markdown', parse_mode: 'Markdown',
reply_to_message_id: ctx.message.message_id, reply_to_message_id: ctx.message.message_id,
}, },
); );
} }
} catch (error) { } catch (error) {
console.error(error);
const errMsg = Strings.ytDownload.uploadErr.replace("{error}", error) const errMsg = Strings.ytDownload.uploadErr.replace("{error}", error)
await ctx.telegram.editMessageText( await ctx.telegram.editMessageText(
ctx.chat.id, ctx.chat.id,
downloadingMessage.message_id, downloadingMessage.message_id,
null, null,
errMsg, { errMsg, {
parse_mode: 'Markdown', parse_mode: 'Markdown',
reply_to_message_id: ctx.message.message_id, reply_to_message_id: ctx.message.message_id,
}, },
); );
} }
}); });