@@ -130,8 +131,8 @@ export function popupWithBottomButtons(obj) {
export function backdropLink(link, text) {
return `
@@ -151,12 +152,20 @@ export function footerButtons(obj) {
items += ``;
break;
case "popup":
- let context = obj[i]["context"] ? `, '${obj[i]["context"]}'` : ''
- let context2 = obj[i+1] && obj[i+1]["context"] ? `, '${obj[i+1]["context"]}'` : ''
+ let buttonName = obj[i]["context"] ? `${obj[i]["name"]}-${obj[i]["context"]}` : obj[i]["name"],
+ context = obj[i]["context"] ? `, '${obj[i]["context"]}'` : '',
+ buttonName2,
+ context2;
+
+ if (obj[i+1]) {
+ buttonName2 = obj[i+1]["context"] ? `${obj[i+1]["name"]}-${obj[i+1]["context"]}` : obj[i+1]["name"];
+ context2 = obj[i+1]["context"] ? `, '${obj[i+1]["context"]}'` : '';
+ }
+
items += `
`;
i++;
break;
@@ -169,7 +178,12 @@ export function explanation(text) {
return `
${text}
`
}
export function celebrationsEmoji() {
- let n = new Date().toISOString().split('T')[0].split('-');
- let dm = `${n[1]}-${n[2]}`;
- return Object.keys(celebrations).includes(dm) ? celebrations[dm] : "🐲";
+ try {
+ let n = new Date().toISOString().split('T')[0].split('-');
+ let dm = `${n[1]}-${n[2]}`;
+ let f = Object.keys(celebrations).includes(dm) ? celebrations[dm] : "🐲";
+ return f != "🐲" ? emoji(f, 22) : false;
+ } catch (e) {
+ return false
+ }
}
diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js
index e2df0af7..d506890a 100644
--- a/src/modules/pageRender/page.js
+++ b/src/modules/pageRender/page.js
@@ -1,4 +1,4 @@
-import { backdropLink, celebrationsEmoji, checkbox, collapsibleList, explanation, footerButtons, multiPagePopup, popup, popupWithBottomButtons, sep, settingsCategory, switcher, socialLink } from "./elements.js";
+import { backdropLink, checkbox, collapsibleList, explanation, footerButtons, multiPagePopup, popup, popupWithBottomButtons, sep, settingsCategory, switcher, socialLink } from "./elements.js";
import { services as s, appName, authorInfo, version, repo, donations, supportedAudio } from "../config.js";
import { getCommitInfo } from "../sub/currentCommit.js";
import loc from "../../localization/manager.js";
@@ -149,7 +149,7 @@ export default function(obj) {
})
}, {
name: "donate",
- title: `${emoji("💰")} ${t('DonationsTab')}`,
+ title: `${emoji("💖")} ${t('DonationsTab')}`,
content: popup({
name: "donate",
header: {
@@ -392,13 +392,13 @@ export default function(obj) {
footerButtons([{
name: "about",
type: "popup",
- text: `${emoji(celebrationsEmoji() , 22)} ${t('AboutTab')}`,
+ text: `${emoji("🐲" , 22)} ${t('AboutTab')}`,
aria: t('AccessibilityOpenAbout')
}, {
name: "about",
type: "popup",
context: "donate",
- text: `${emoji("💰", 22)} ${t('Donate')}`,
+ text: `${emoji("💖", 22)} ${t('Donate')}`,
aria: t('AccessibilityOpenDonate')
}, {
name: "settings",
diff --git a/src/modules/processing/services/soundcloud.js b/src/modules/processing/services/soundcloud.js
index 0c9434d9..f285f56c 100644
--- a/src/modules/processing/services/soundcloud.js
+++ b/src/modules/processing/services/soundcloud.js
@@ -36,8 +36,7 @@ async function findClientID() {
export default async function(obj) {
let html;
if (!obj.author && !obj.song && obj.shortLink) {
- html = await fetch(`https://soundcloud.app.goo.gl/${obj.shortLink}/`).then((r) => { return r.status === 404 ? false : r.text() }).catch(() => { return false });
- if (!html) html = await fetch(`https://on.soundcloud.com/${obj.shortLink}/`).then((r) => { return r.status === 404 ? false : r.text() }).catch(() => { return false })
+ html = await fetch(`https://on.soundcloud.com/${obj.shortLink}/`).then((r) => { return r.status === 404 ? false : r.text() }).catch(() => { return false });
}
if (obj.author && obj.song) {
html = await fetch(`https://soundcloud.com/${obj.author}/${obj.song}${obj.accessKey ? `/s-${obj.accessKey}` : ''}`).then((r) => { return r.text() }).catch(() => { return false });
diff --git a/src/modules/processing/services/vk.js b/src/modules/processing/services/vk.js
index 4be85342..dc1ad39d 100644
--- a/src/modules/processing/services/vk.js
+++ b/src/modules/processing/services/vk.js
@@ -44,7 +44,7 @@ export default async function(o) {
if (Number(bestQuality._attributes.id) > Number(quality)) bestQuality = repr[quality];
url = js.player.params[0][`url${resolutionMatch[bestQuality._attributes[resolutionPick]]}`];
- filename = `${bestQuality._attributes.width}x${bestQuality._attributes.height}.mp4`
+ filename += `${bestQuality._attributes.width}x${bestQuality._attributes.height}.mp4`
} else if (js.player.params[0]["url240"]) { // fallback for when video is too old
url = js.player.params[0]["url240"];
diff --git a/src/modules/setup.js b/src/modules/setup.js
index 4fca6c53..2740a770 100644
--- a/src/modules/setup.js
+++ b/src/modules/setup.js
@@ -1,6 +1,6 @@
import { existsSync, unlinkSync, appendFileSync } from "fs";
import { createInterface } from "readline";
-import { Cyan, Bright, Green } from "./sub/consoleText.js";
+import { Cyan, Bright } from "./sub/consoleText.js";
import { execSync } from "child_process";
let envPath = './.env';
@@ -42,7 +42,7 @@ rl.question(q, r1 => {
if (r2) ob['port'] = r2
if (!r1 && r2) ob['selfURL'] = `http://localhost:${r2}/`
- console.log(Bright("\nWould you like to enable CORS? It allows other websites and extensions to use your instance's API.\n y/n (n)"))
+ console.log(Bright("\nWould you like to enable CORS? It allows other websites and extensions to use your instance's API.\ny/n (n)"))
rl.question(q, r3 => {
if (r3.toLowerCase() !== 'y') ob['cors'] = '0'
diff --git a/src/modules/stream/types.js b/src/modules/stream/types.js
index 3aa259f6..e682fcd7 100644
--- a/src/modules/stream/types.js
+++ b/src/modules/stream/types.js
@@ -2,7 +2,7 @@ import { spawn } from "child_process";
import ffmpeg from "ffmpeg-static";
import got from "got";
import { ffmpegArgs, genericUserAgent } from "../config.js";
-import { metadataManager, msToTime } from "../sub/utils.js";
+import { getThreads, metadataManager, msToTime } from "../sub/utils.js";
export function streamDefault(streamInfo, res) {
try {
@@ -35,9 +35,9 @@ export function streamLiveRender(streamInfo, res) {
return;
}
let audio = got.get(streamInfo.urls[1], { isStream: true });
-
let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [
'-loglevel', '-8',
+ '-threads', `${getThreads()}`,
'-i', streamInfo.urls[0],
'-i', 'pipe:3',
'-map', '0:v',
@@ -95,6 +95,7 @@ export function streamAudioOnly(streamInfo, res) {
try {
let args = [
'-loglevel', '-8',
+ '-threads', `${getThreads()}`,
'-i', streamInfo.urls
]
if (streamInfo.metadata) {
@@ -141,6 +142,7 @@ export function streamVideoOnly(streamInfo, res) {
try {
let format = streamInfo.filename.split('.')[streamInfo.filename.split('.').length - 1], args = [
'-loglevel', '-8',
+ '-threads', `${getThreads()}`,
'-i', streamInfo.urls,
'-c', 'copy'
]
diff --git a/src/modules/sub/utils.js b/src/modules/sub/utils.js
index 4bcfc6d9..345a7540 100644
--- a/src/modules/sub/utils.js
+++ b/src/modules/sub/utils.js
@@ -142,3 +142,15 @@ export function checkJSONPost(obj) {
export function getIP(req) {
return req.header('cf-connecting-ip') ? req.header('cf-connecting-ip') : req.ip;
}
+export function getThreads() {
+ try {
+ if (process.env.ffmpegThreads && process.env.ffmpegThreads.length <= 3
+ && (Number(process.env.ffmpegThreads) >= 0 && Number(process.env.ffmpegThreads) <= 256)) {
+ return process.env.ffmpegThreads
+ } else {
+ return '0'
+ }
+ } catch (e) {
+ return '0'
+ }
+}
diff --git a/src/test/tests.json b/src/test/tests.json
index 57fbefdd..5e11f3b1 100644
--- a/src/test/tests.json
+++ b/src/test/tests.json
@@ -36,8 +36,8 @@
"status": "redirect"
}
}, {
- "name": "picker: mixed media (3 gifs + image)",
- "url": "https://twitter.com/emerald_pedrod/status/1582418163521581063?s=20",
+ "name": "picker: mixed media (2 videos)",
+ "url": "https://twitter.com/taehyungsflow/status/1583411488433516544",
"params": {
"aFormat": "mp3",
"isAudioOnly": false,
@@ -280,6 +280,22 @@
"code": 200,
"status": "stream"
}
+ }, {
+ "name": "on.soundcloud link",
+ "url": "https://on.soundcloud.com/wLZre",
+ "params": {},
+ "expected": {
+ "code": 200,
+ "status": "stream"
+ }
+ }, {
+ "name": "on.soundcloud link, different stream type",
+ "url": "https://on.soundcloud.com/AG4c",
+ "params": {},
+ "expected": {
+ "code": 200,
+ "status": "stream"
+ }
}],
"youtube": [{
"name": "4k video (h264, 1440)",
@@ -617,7 +633,7 @@
}
}, {
"name": "images",
- "url": "https://vt.tiktok.com/ZS8JP89eB/",
+ "url": "https://www.tiktok.com/@matryoshk4/video/7231234675476532526",
"params": {},
"expected": {
"code": 200,
@@ -804,6 +820,14 @@
"code": 200,
"status": "redirect"
}
+ }, {
+ "name": "regular video",
+ "url": "https://www.instagram.com/p/CmCVWoIr9OH/",
+ "params": {},
+ "expected": {
+ "code": 200,
+ "status": "redirect"
+ }
}, {
"name": "reel (isAudioOnly)",
"url": "https://www.instagram.com/reel/CoEBV3eM4QR/",
', j.text);
+ }
+ } catch (e) {
+ eid("about-footer").innerHTML = bac;
+ }
}
async function loadOnDemand(elementId, blockId) {
+ let j = {};
store.historyButton = eid(elementId).innerHTML;
- let j = {}
- eid(elementId).innerHTML = "..."
+ eid(elementId).innerHTML = "...";
+
try {
if (store.historyContent) {
j = store.historyContent;
} else {
- await fetch(`/api/onDemand?blockId=${blockId}`).then(async (r) => {
+ await fetch(`${apiURL}/api/onDemand?blockId=${blockId}`).then(async(r) => {
j = await r.json();
- if (j.status === "success") store.historyContent = j;
- })
- }
- if (j.status === "success" && j.status !== "rate-limit") {
- if (j.text) {
- eid(elementId).innerHTML = `${j.text}`;
- } else {
- throw new Error()
- }
- } else {
- throw new Error()
+ if (j && j.status === "success") {
+ store.historyContent = j;
+ } else throw new Error();
+ }).catch(() => { throw new Error() });
}
+ if (j.text) {
+ eid(elementId).innerHTML = `${j.text}`;
+ } else throw new Error()
} catch (e) {
eid(elementId).innerHTML = store.historyButton;
internetError()
@@ -431,6 +448,7 @@ window.onload = () => {
eid("footer").style.visibility = 'visible';
eid("url-input-area").value = "";
notificationCheck();
+ loadCelebrationsEmoji();
if (isIOS) sSet("downloadPopup", "true");
let urlQuery = new URLSearchParams(window.location.search).get("u");
if (urlQuery !== null && regex.test(urlQuery)) {
diff --git a/src/front/emoji/money_bag.svg b/src/front/emoji/money_bag.svg
deleted file mode 100644
index 561ee98a..00000000
--- a/src/front/emoji/money_bag.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/front/emoji/sparkling_heart.svg b/src/front/emoji/sparkling_heart.svg
new file mode 100644
index 00000000..b5dd6eb2
--- /dev/null
+++ b/src/front/emoji/sparkling_heart.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json
index a0c3febb..4f052578 100644
--- a/src/localization/languages/en.json
+++ b/src/localization/languages/en.json
@@ -47,7 +47,7 @@
"SettingsQualityDescription": "if selected quality isn't available, closest one is used instead.",
"LinkGitHubChanges": ">> see previous commits and contribute on github",
"NoScriptMessage": "{appName} uses javascript for api requests and interactive interface. you have to allow javascript to use this site. there are no pesty scripts, pinky promise.",
- "DownloadPopupDescriptionIOS": "press and hold the download button, hide the video preview, and then select \"download linked file\" to save.",
+ "DownloadPopupDescriptionIOS": "easiest way to save videos on ios:\n1. add this siri shortcut.\n2. press \"share\" above and select \"save to photos\" in appeared share sheet.\nif asked, review the permission request popup on top, and press \"always allow\".\n\nalternative method: press and hold the download button, hide the video preview, and select \"download linked file\" to download.\nthen, open safari downloads, select the file you downloaded, open share menu, and finally press \"save video\".",
"DownloadPopupDescription": "download button opens a new tab with requested file. you can disable this popup in settings.",
"DownloadPopupWayToSave": "pick a way to save",
"ClickToCopy": "press to copy",
@@ -94,7 +94,7 @@
"ChangelogPressToHide": "collapse",
"Donate": "donate",
"DonateSub": "help me keep it up",
- "DonateExplanation": "{appName} does not (and will never) serve ads or sell your data, therefore it's completely free to use. but turns out developing and keeping up a web service used by over 80 thousand people is not that easy.\n\nif you ever found {appName} useful and want to keep it online, or simply want to thank the developer, consider chipping in! every cent helps and is VERY appreciated :D",
+ "DonateExplanation": "{appName} does not (and will never) serve ads or sell your data, therefore it's completely free to use. but turns out developing and keeping up a web service used by over 150,000 people is not that easy.\n\nif you ever found {appName} useful and want to help continue its development and support, or simply want to thank the developer, consider chipping in! every cent helps and is VERY appreciated :D\n\ncurrently, i have big (scaling) plans, and i need your help. {appName}'s usage is growing daily, so i need to make up for it. donations are more appreciated than ever.\n\ni am yet to earn anything from {appName}, everything goes back to users, so you're essentially helping everyone.",
"DonateVia": "donate via",
"DonateHireMe": "...or you can hire me :)",
"SettingsVideoMute": "mute audio",
diff --git a/src/localization/languages/ru.json b/src/localization/languages/ru.json
index d971c261..7f59f356 100644
--- a/src/localization/languages/ru.json
+++ b/src/localization/languages/ru.json
@@ -47,7 +47,7 @@
"SettingsQualityDescription": "если выбранное качество недоступно, то выбирается ближайшее к нему.",
"LinkGitHubChanges": ">> смотри предыдущие изменения на github",
"NoScriptMessage": "{appName} использует javascript для обработки ссылок и интерактивного интерфейса. ты должен разрешить использование javascript, чтобы пользоваться сайтом. тут нет никаких зловредных скриптов, обещаю.",
- "DownloadPopupDescriptionIOS": "зажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.",
+ "DownloadPopupDescriptionIOS": "наиболее простой метод скачивания видео на ios:\n1. добавь этот сценарий siri.\n2. нажми \"поделиться\" выше и выбери \"save to photos\" в открывшемся окне.\nесли появляется окно с запросом разрешения, то прочитай его, потом нажми \"всегда разрешать\".\n\nальтернативный метод: зажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.\nпотом открой загрузки в safari, выбери скачанный файл, нажми иконку \"поделиться\", и, наконец, нажми \"сохранить видео\".",
"DownloadPopupDescription": "кнопка скачивания открывает новое окно с файлом. ты можешь отключить выбор метода скачивания файла в настройках.",
"DownloadPopupWayToSave": "выбери, как сохранить",
"ClickToCopy": "нажми, чтобы скопировать",
@@ -94,7 +94,7 @@
"ChangelogPressToHide": "скрыть",
"Donate": "задонатить",
"DonateSub": "ты можешь помочь!",
- "DonateExplanation": "{appName} не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает совершенно бесплатно. но оказывается, что разработка и поддержка сервиса, которым пользуются более 80 тысяч людей, обходится довольно трудно.\n\nесли {appName} тебе помог и ты хочешь поблагодарить разработчика, то это можно сделать через донаты! каждый рубль помогает мне, моим котам, и {appName}! спасибо :)",
+ "DonateExplanation": "{appName} не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает совершенно бесплатно. но оказывается, что разработка и поддержка сервиса, которым пользуются более 150 тысяч людей, обходится довольно затратно.\n\nесли {appName} тебе помог и ты хочешь поблагодарить разработчика, то это можно сделать через донаты! каждый рубль помогает мне, моим котам, и {appName}! спасибо :)",
"DonateVia": "открыть",
"DonateHireMe": "...или же ты можешь пригласить меня на работу :)",
"SettingsVideoMute": "убрать аудио",
diff --git a/src/localization/manager.js b/src/localization/manager.js
index 65c048c8..2f5a334a 100644
--- a/src/localization/manager.js
+++ b/src/localization/manager.js
@@ -1,8 +1,8 @@
import * as fs from "fs";
-import { appName, repo } from "../modules/config.js";
+import { appName, links, repo } from "../modules/config.js";
import loadJson from "../modules/sub/loadJSON.js";
-const locPath = './src/localization/languages'
+const locPath = './src/localization/languages';
let loc = {}
let languages = [];
@@ -19,7 +19,7 @@ export function loadLoc() {
loadLoc();
export function replaceBase(s) {
- return s.replace(/\n/g, '