diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 1c08f723..89951fe0 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -custom: https://boosty.to/wukko +custom: https://boosty.to/wukko/donate diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 00000000..d70b1821 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,55 @@ +name: Build Docker image + +on: + workflow_dispatch: + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Get version from package.json + id: package-version + uses: martinbeentjes/npm-get-version-action@v1.3.1 + - name: Get short commit hash + id: commit-hash + run: echo "commit_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + tags: | + type=raw,value=latest + type=raw,value=${{ steps.package-version.outputs.current-version }} + type=raw,value=${{ steps.package-version.outputs.current-version }}-${{ steps.commit-hash.outputs.commit_short }} + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.gitignore b/.gitignore index 305746b2..887344cc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,11 +5,18 @@ package-lock.json # secrets .env -# esbuild -min - # page build +min build # stuff i already made but delayed future + +# docker +docker-compose.yml + +# vscode +.vscode + +# cookie file +cookies.json diff --git a/README.md b/README.md index baa7da2a..ec91b41e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # cobalt Best way to save what you love. -Main instance: [co.wukko.me](https://co.wukko.me/) +Live web app: [cobalt.tools](https://cobalt.tools/) ![cobalt logo with repeated logo pattern background](https://raw.githubusercontent.com/wukko/cobalt/current/src/front/icons/pattern.png "cobalt logo with repeated logo pattern background") -[![Crowdin](https://badges.crowdin.net/cobalt/localized.svg)](https://crowdin.com/project/cobalt) [![DeepSource](https://deepsource.io/gh/wukko/cobalt.svg/?label=active+issues&token=MsmsJ9zUOKwcQor0yaiFot84)](https://deepsource.io/gh/wukko/cobalt/?ref=repository-badge) [![DeepSource](https://deepsource.io/gh/wukko/cobalt.svg/?label=resolved+issues&token=MsmsJ9zUOKwcQor0yaiFot84)](https://deepsource.io/gh/wukko/cobalt/?ref=repository-badge) +[![DeepSource](https://deepsource.io/gh/wukko/cobalt.svg/?label=active+issues&token=MsmsJ9zUOKwcQor0yaiFot84)](https://deepsource.io/gh/wukko/cobalt/?ref=repository-badge) ## What's cobalt? -cobalt is a social and media platform downloader that doesn't piss you off. +cobalt is social and media platform downloader that doesn't piss you off. It's fast, friendly, and doesn't have any bullshit that modern web is filled with: no ads, trackers, or analytics. Paste the link, get the video, move on. It's that simple. Just how it should be. @@ -16,40 +16,31 @@ Paste the link, get the video, move on. It's that simple. Just how it should be. | Service | Video + Audio | Only audio | Only video | Additional notes or features | | -------- | :---: | :---: | :---: | :----- | | bilibili.com | ✅ | ✅ | ✅ | | -| Instagram | ✅ | ✅ | ✅ | Ability to pick what to save from multi-media posts. | +| Instagram | ✅ | ✅ | ✅ | Supports photos and videos, lets you pick what to save from multi-media posts. | | Instagram Reels | ✅ | ✅ | ✅ | | +| Pinterest | ✅ | ✅ | ✅ | Support for videos and stories. | | Reddit | ✅ | ✅ | ✅ | Support for GIFs and videos. | | SoundCloud | ➖ | ✅ | ➖ | Audio metadata, downloads from private links. | +| Streamable | ✅ | ✅ | ✅ | | | TikTok | ✅ | ✅ | ✅ | Supports downloads of: videos with or without watermark, images from slideshow without watermark, full (original) audios. | -| Tumblr | ✅ | ✅ | ✅ | | -| Twitter | ✅ | ✅ | ✅ | Ability to pick what to save from multi-media tweets. | -| Twitter Spaces | ➖ | ✅ | ➖ | Audio metadata with all participants and other info. | -| Twitch | ✅ | ✅ | ✅ | | +| Tumblr | ✅ | ✅ | ✅ | Support for audio file downloads. | +| Twitch Clips/VODs | ✅ | ✅ | ✅ | | +| Twitter/X * | ✅ | ✅ | ✅ | Ability to pick what to save from multi-media tweets. | | Vimeo | ✅ | ✅ | ✅ | Audio downloads are only available for dash files. | | Vine Archive | ✅ | ✅ | ✅ | | | VK Videos | ✅ | ❌ | ❌ | | | VK Clips | ✅ | ❌ | ❌ | | -| YouTube Videos & Shorts | ✅ | ✅ | ✅ | Support for 8K, 4K, HDR, and high FPS videos. Audio metadata & dubs. h264/av1/vp9 codecs. | +| YouTube Videos & Shorts | ✅ | ✅ | ✅ | Support for 8K, 4K, HDR, VR, and high FPS videos. Audio metadata & dubs. h264/av1/vp9 codecs. | | YouTube Music | ➖ | ✅ | ➖ | Audio metadata. | This list is not final and keeps expanding over time, make sure to check it once in a while! + +*Reliability of downloads from Twitter is questionable due to its current management. ## cobalt API cobalt has an open API that you can use in your projects for **free**. -It's easy and straightforward to use, [check out the docs](https://github.com/wukko/cobalt/blob/current/docs/API.md) and see for yourself. - -## How to contribute translations -You can translate cobalt to any language you want on [cobalt's Crowdin](https://crowdin-co.wukko.me/). Feel free to ignore QA errors if you think you know better. If you don't see a language you want to translate cobalt to, open an issue, and I'll add it to Crowdin. - -### Translation guidelines: -- Text is **ALWAYS** stylized as **lowercase** unless it's STRESSED LIKE THIS or is an internal value like `{ContactLink}` or `{appName}`. - - Example: "`this is a live video, i am yet to learn how to look into future. wait for the stream to finish and try again!`". - *Notice how **everything is lowercase**, no matter the punctuation marks? Yes, that's cobalt's style and you have to follow it.* -- Avoid extremely formal language, leave it for big and classy tech companies. Use informal language wherever possible. -- You can (and should) rephrase sentences as long as they keep the same sense and send the same message as original. -- Do **NOT** use offensive or explicit vocabulary. -- Check if there are issues in UI with your localization and optimize it accordingly. If impossible, open an issue. -- Be nice. +It's easy and straightforward to use, [check out the docs](https://github.com/wukko/cobalt/blob/current/docs/API.md) and see for yourself. +Feel free to use the main API instance ([co.wuk.sh](https://co.wuk.sh/)) in your projects. ## Host an instance yourself ### Requirements @@ -63,6 +54,8 @@ Setup script installs all needed `npm` dependencies, but you have to install `No 3. Run cobalt via `npm start` 4. Done. +You need to host API and web app separately since v.6.0. Setup script will help you with that! + ### Ubuntu 22.04+ workaround `nscd` needs to be installed and running so that the `ffmpeg-static` binary can resolve DNS ([#101](https://github.com/wukko/cobalt/issues/101#issuecomment-1494822258)): @@ -72,13 +65,8 @@ sudo service nscd start ``` ### Docker -It's also possible to run cobalt via Docker, but you **need** to set all environment variables yourself: - -| Variable | Description | Example | -| -------- | :--- | :--- | -| `selfURL` | Instance URL | `http://localhost:9000/` or `https://co.wukko.me/` or etc | -| `port` | Instance port | `9000` | -| `cors` | CORS toggle | `0` | +It's also possible to run cobalt via Docker. I *highly* recommend using Docker compose. +Check out the [example compose file](https://github.com/wukko/cobalt/blob/current/docker-compose.example.yml) and alter it for your needs. ## Disclaimer cobalt is my passion project, so update schedule depends solely on my free time, motivation, and mood. diff --git a/docker-compose.example.yml b/docker-compose.example.yml new file mode 100644 index 00000000..a74a89af --- /dev/null +++ b/docker-compose.example.yml @@ -0,0 +1,66 @@ +version: '3.5' + +services: + cobalt-api: + image: ghcr.io/wukko/cobalt:latest + restart: unless-stopped + container_name: cobalt-api + + init: true + + # if container doesn't run detached on your machine, uncomment the next line: + #tty: true + + ports: + - 9000:9000/tcp + # if you're using a reverse proxy, uncomment the next line: + #- 127.0.0.1:9000:9000 + + environment: + - apiPort=9000 + # replace apiURL with your instance's target url in same format + - apiURL=https://co.wuk.sh/ + # replace apiName with your instance's distinctive name + - apiName=eu-nl + # if you want to use cookies when fetching data from services, uncomment the next line + #- cookiePath=/cookies.json + # see src/modules/processing/cookie/cookies_example.json for example file. + labels: + - com.centurylinklabs.watchtower.scope=cobalt + + # if you want to use cookies when fetching data from services, uncomment volumes and next line + #volumes: + #- ./cookies.json:/cookies.json + + cobalt-web: + image: ghcr.io/wukko/cobalt:latest + restart: unless-stopped + container_name: cobalt-web + + init: true + + # if container doesn't run detached on your machine, uncomment the next line: + #tty: true + + ports: + - 9001:9001/tcp + # if you're using a reverse proxy, uncomment the next line: + #- 127.0.0.1:9001:9001 + + environment: + - webPort=9001 + # replace webURL with your instance's target url in same format + - webURL=https://cobalt.tools/ + # replace apiURL with preferred api instance url + - apiURL=https://co.wuk.sh/ + + labels: + - com.centurylinklabs.watchtower.scope=cobalt + + # update the cobalt image automatically with watchtower + watchtower: + image: ghcr.io/containrrr/watchtower + restart: unless-stopped + command: --cleanup --scope cobalt --interval 900 + volumes: + - /var/run/docker.sock:/var/run/docker.sock \ No newline at end of file diff --git a/docs/API.md b/docs/API.md index f45e2c0e..9957d517 100644 --- a/docs/API.md +++ b/docs/API.md @@ -1,5 +1,12 @@ # cobalt API Documentation This document provides info about methods and acceptable variables for all cobalt API requests.
+ +``` +⚠️ Main API instance has moved to https://co.wuk.sh/ + +Make sure your projects use the correct API domain. +``` + ## POST: ``/api/json`` Main processing endpoint.
@@ -7,17 +14,18 @@ Request Body Type: ``application/json``
Response Body Type: ``application/json`` ### Request Body Variables -| key | type | variables | default | description | -|:----------------|:--------|:----------------------------------|:----------|:-------------------------------------------------------------------------------| -| url | string | Sharable URL encoded as URI | ``null`` | **Must** be included in every request. | -| vCodec | string | ``h264 / av1 / vp9`` | ``h264`` | Applies only to YouTube downloads. ``h264`` is recommended for phones. | -| vQuality | string | ``144 / ... / 2160 / max`` | ``720`` | ``720`` quality is recommended for phones. | -| aFormat | string | ``best / mp3 / ogg / wav / opus`` | ``mp3`` | | -| isAudioOnly | boolean | ``true / false`` | ``false`` | | -| isNoTTWatermark | boolean | ``true / false`` | ``false`` | Changes whether downloaded TikTok & Douyin videos have watermarks. | -| isTTFullAudio | boolean | ``true / false`` | ``false`` | Enables download of original sound used in a TikTok video. | -| isAudioMuted | boolean | ``true / false`` | ``false`` | Disables audio track in video downloads. | -| dubLang | boolean | ``true / false`` | ``false`` | Backend uses Accept-Language for YouTube video audio tracks when ``true``. | +| key | type | variables | default | description | +|:--------------------|:--------|:----------------------------------|:----------|:-------------------------------------------------------------------------------| +| ``url`` | string | Sharable URL encoded as URI | ``null`` | **Must** be included in every request. | +| ``vCodec`` | string | ``h264 / av1 / vp9`` | ``h264`` | Applies only to YouTube downloads. ``h264`` is recommended for phones. | +| ``vQuality`` | string | ``144 / ... / 2160 / max`` | ``720`` | ``720`` quality is recommended for phones. | +| ``aFormat`` | string | ``best / mp3 / ogg / wav / opus`` | ``mp3`` | | +| ``isAudioOnly`` | boolean | ``true / false`` | ``false`` | | +| ``isNoTTWatermark`` | boolean | ``true / false`` | ``false`` | Changes whether downloaded TikTok videos have watermarks. | +| ``isTTFullAudio`` | boolean | ``true / false`` | ``false`` | Enables download of original sound used in a TikTok video. | +| ``isAudioMuted`` | boolean | ``true / false`` | ``false`` | Disables audio track in video downloads. | +| ``dubLang`` | boolean | ``true / false`` | ``false`` | Backend uses Accept-Language for YouTube video audio tracks when ``true``. | +| ``disableMetadata`` | boolean | ``true / false`` | ``false`` | Disables file metadata when set to ``true``. | ### Response Body Variables | key | type | variables | @@ -57,7 +65,22 @@ On-demand website element loading. Currently used only for older changelogs.
| blockId | ``0`` | Block ID to be rendered on the server. | ### Response Body Variables -| key | type | variables | -|:-----------|:-------|:-----------------------------| -| status | string | ``error / success`` | -| text | string | Error text or rendered block | \ No newline at end of file +| key | type | variables | +|:-------|:-------|:-----------------------------| +| status | string | ``error / success`` | +| text | string | Error text or rendered block | + +## GET: ``/api/serverInfo`` +Returns current basic server info.
+Response Body Type: ``application/json`` + +### Response Body Variables +| key | type | variables | +|:----------|:-------|:------------------| +| version | string | cobalt version | +| commit | string | Git commit | +| branch | string | Git branch | +| name | string | Server name | +| url | string | Server url | +| cors | string | CORS status | +| startTime | string | Server start time | diff --git a/package.json b/package.json index 1382b1f5..304fa9eb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cobalt", "description": "save what you love", - "version": "5.7", + "version": "7.4", "author": "wukko", "exports": "./src/cobalt.js", "type": "module", @@ -11,7 +11,8 @@ "scripts": { "start": "node src/cobalt", "setup": "node src/modules/setup", - "test": "node src/test/test" + "test": "node src/test/test", + "build": "node src/modules/buildStatic" }, "repository": { "type": "git", @@ -29,11 +30,11 @@ "express": "^4.18.1", "express-rate-limit": "^6.3.0", "ffmpeg-static": "^5.1.0", - "got": "^12.1.0", "nanoid": "^4.0.2", "node-cache": "^5.1.2", + "set-cookie-parser": "2.6.0", + "undici": "^5.19.1", "url-pattern": "1.0.3", - "xml-js": "^1.6.11", - "youtubei.js": "^5.1.0" + "youtubei.js": "^5.4.0" } } diff --git a/src/cobalt.js b/src/cobalt.js index 990f5d31..949cccba 100644 --- a/src/cobalt.js +++ b/src/cobalt.js @@ -1,199 +1,35 @@ import "dotenv/config"; import express from "express"; -import cors from "cors"; -import rateLimit from "express-rate-limit"; -import { randomBytes } from "crypto"; -const ipSalt = randomBytes(64).toString('hex'); +import { Bright, Green, Red } from "./modules/sub/consoleText.js"; +import { getCurrentBranch, shortCommit } from "./modules/sub/currentCommit.js"; +import { loadLoc } from "./localization/manager.js"; import path from 'path'; import { fileURLToPath } from 'url'; + +const app = express(); + +const gitCommit = shortCommit(); +const gitBranch = getCurrentBranch(); + const __filename = fileURLToPath(import.meta.url); -const __dirname = path.dirname(__filename).slice(0, -4); // go up another level (get rid of src/) +const __dirname = path.dirname(__filename).slice(0, -4); -import { getCurrentBranch, shortCommit } from "./modules/sub/currentCommit.js"; -import { appName, genericUserAgent, version } from "./modules/config.js"; -import { getJSON } from "./modules/api.js"; -import { apiJSON, checkJSONPost, getIP, languageCode } from "./modules/sub/utils.js"; -import { Bright, Cyan, Green, Red } from "./modules/sub/consoleText.js"; -import stream from "./modules/stream/stream.js"; -import loc from "./localization/manager.js"; -import { buildFront } from "./modules/build.js"; -import { changelogHistory } from "./modules/pageRender/onDemand.js"; -import { sha256 } from "./modules/sub/crypto.js"; -import findRendered from "./modules/pageRender/findRendered.js"; -import { celebrationsEmoji } from "./modules/pageRender/elements.js"; +app.disable('x-powered-by'); -if (process.env.selfURL && process.env.port) { - const commitHash = shortCommit(); - const branch = getCurrentBranch(); - const app = express(); +await loadLoc(); - app.disable('x-powered-by'); +const apiMode = process.env.apiURL && process.env.apiPort && !((process.env.webURL && process.env.webPort) || (process.env.selfURL && process.env.port)); +const webMode = process.env.webURL && process.env.webPort && !((process.env.apiURL && process.env.apiPort) || (process.env.selfURL && process.env.port)); - const corsConfig = process.env.cors === '0' ? { origin: process.env.selfURL, optionsSuccessStatus: 200 } : {}; - - const apiLimiter = rateLimit({ - windowMs: 60000, - max: 25, - standardHeaders: false, - legacyHeaders: false, - keyGenerator: (req, res) => sha256(getIP(req), ipSalt), - handler: (req, res, next, opt) => { - res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') }); - return; - } - }); - const apiLimiterStream = rateLimit({ - windowMs: 60000, - max: 28, - standardHeaders: false, - legacyHeaders: false, - keyGenerator: (req, res) => sha256(getIP(req), ipSalt), - handler: (req, res, next, opt) => { - res.status(429).json({ "status": "error", "text": loc(languageCode(req), 'ErrorRateLimit') }); - return; - } - }); - - await buildFront(commitHash, branch); - - app.use('/api/:type', cors(corsConfig)); - app.use('/api/json', apiLimiter); - app.use('/api/stream', apiLimiterStream); - app.use('/api/onDemand', apiLimiter); - - app.use('/', express.static('./min')); - app.use('/', express.static('./src/front')); - - app.use((req, res, next) => { - try { decodeURIComponent(req.path) } catch (e) { return res.redirect('/') } - next(); - }); - app.use((req, res, next) => { - if (req.header("user-agent") && req.header("user-agent").includes("Trident")) res.destroy(); - next(); - }); - app.use('/api/json', express.json({ - verify: (req, res, buf) => { - try { - JSON.parse(buf); - if (buf.length > 720) throw new Error(); - if (String(req.header('Content-Type')) !== "application/json") { - res.status(400).json({ 'status': 'error', 'text': 'invalid content type header' }); - return; - } - if (String(req.header('Accept')) !== "application/json") { - res.status(400).json({ 'status': 'error', 'text': 'invalid accept header' }); - return; - } - } catch(e) { - res.status(400).json({ 'status': 'error', 'text': 'invalid json body.' }); - return; - } - } - })); - - app.post('/api/json', async (req, res) => { - try { - let ip = sha256(getIP(req), ipSalt); - let lang = languageCode(req); - let j = apiJSON(0, { t: "Bad request" }); - try { - let request = req.body; - if (request.url) { - request.dubLang = request.dubLang ? lang : false; - let chck = checkJSONPost(request); - if (chck) chck["ip"] = ip; - j = chck ? await getJSON(chck["url"], lang, chck) : apiJSON(0, { t: loc(lang, 'ErrorCouldntFetch') }); - } else { - j = apiJSON(0, { t: loc(lang, 'ErrorNoLink') }); - } - } catch (e) { - j = apiJSON(0, { t: loc(lang, 'ErrorCantProcess') }); - } - res.status(j.status).json(j.body); - return; - } catch (e) { - res.destroy(); - return - } - }); - - app.get('/api/:type', (req, res) => { - try { - let ip = sha256(getIP(req), ipSalt); - switch (req.params.type) { - case 'stream': - if (req.query.p) { - res.status(200).json({ "status": "continue" }); - return; - } else if (req.query.t && req.query.h && req.query.e) { - stream(res, ip, req.query.t, req.query.h, req.query.e); - } else { - let j = apiJSON(0, { t: "no stream id" }) - res.status(j.status).json(j.body); - return; - } - break; - case 'onDemand': - if (req.query.blockId) { - let blockId = req.query.blockId.slice(0, 3); - let r, j; - switch(blockId) { - case "0": // changelog history - r = changelogHistory(); - j = r ? apiJSON(3, { t: r }) : apiJSON(0, { t: "couldn't render this block" }) - break; - case "1": // celebrations emoji - r = celebrationsEmoji(); - j = r ? apiJSON(3, { t: r }) : false - break; - default: - j = apiJSON(0, { t: "couldn't find a block with this id" }) - break; - } - if (j.body) { - res.status(j.status).json(j.body) - } else { - res.status(204).end() - } - } else { - let j = apiJSON(0, { t: "no block id" }); - res.status(j.status).json(j.body) - } - break; - default: - let j = apiJSON(0, { t: "unknown response type" }) - res.status(j.status).json(j.body); - break; - } - } catch (e) { - res.status(500).json({ 'status': 'error', 'text': loc(languageCode(req), 'ErrorCantProcess') }); - return; - } - }); - app.get("/api", (req, res) => { - res.redirect('/api/json') - }); - app.get("/status", (req, res) => { - res.status(200).end() - }); - app.get("/", (req, res) => { - res.sendFile(`${__dirname}/${findRendered(languageCode(req), req.header('user-agent') ? req.header('user-agent') : genericUserAgent)}`); - }); - app.get("/favicon.ico", (req, res) => { - res.redirect('/icons/favicon.ico'); - }); - app.get("/*", (req, res) => { - res.redirect('/') - }); - - app.listen(process.env.port, () => { - let startTime = new Date(); - console.log(`\n${Cyan(appName)} ${Bright(`v.${version}-${commitHash} (${branch})`)}\nStart time: ${Bright(`${startTime.toUTCString()} (${Math.floor(new Date().getTime())})`)}\n\nURL: ${Cyan(`${process.env.selfURL}`)}\nPort: ${process.env.port}\n`) - }) +if (apiMode) { + const { runAPI } = await import('./core/api.js'); + runAPI(express, app, gitCommit, gitBranch, __dirname) +} else if (webMode) { + const { runWeb } = await import('./core/web.js'); + await runWeb(express, app, gitCommit, gitBranch, __dirname) } else { - console.log(Red(`cobalt hasn't been configured yet or configuration is invalid.\n`) + Bright(`please run the setup script to fix this: `) + Green(`npm run setup`)); + console.log(Red(`cobalt wasn't configured yet or configuration is invalid.\n`) + Bright(`please run the setup script to fix this: `) + Green(`npm run setup`)) } diff --git a/src/config.json b/src/config.json index 2871c3ea..1537223b 100644 --- a/src/config.json +++ b/src/config.json @@ -1,7 +1,7 @@ { - "streamLifespan": 120000, - "maxVideoDuration": 10800000, - "genericUserAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36", + "streamLifespan": 20000, + "maxVideoDuration": 18000000, + "genericUserAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36", "authorInfo": { "name": "wukko", "link": "https://wukko.me/", @@ -14,6 +14,10 @@ "mastodon": { "url": "https://wetdry.world/@cobalt", "handle": "@cobalt@wetdry.world" + }, + "discord": { + "url": "https://discord.gg/pQPt8HBUPu", + "handle": "cobalt community server" } } }, @@ -21,14 +25,15 @@ "crypto": { "bitcoin": "bc1q59jyyjvrzj4c22rkk3ljeecq6jmpyscgz9spnd", "ethereum": "0x4B4cF23051c78c7A7E0eA09d39099621c46bc302", - "litecoin": "ltc1qvp0xhrk2m7pa6p6z844qcslfyxv4p3vf95rhna" + "litecoin": "ltc1qvp0xhrk2m7pa6p6z844qcslfyxv4p3vf95rhna", + "monero": "4B1SNB6s8Pq1hxjNeKPEe8Qa8EP3zdL16Sqsa7QDoJcUecKQzEj9BMxWnEnTGu12doKLJBKRDUqnn6V9qfSdXpXi3Nw5Uod" }, "links": { - "boosty": "https://boosty.to/wukko" + "boosty": "https://boosty.to/wukko/donate" } }, "links": { - "saveToGalleryShortcut": "https://www.icloud.com/shortcuts/6d4fe6e5bade4150b8759ce20720c7a3" + "saveToGalleryShortcut": "https://www.icloud.com/shortcuts/b401917928fd407daf1db0fd07eb7e78" }, "celebrations": { "01-01": "🎄", diff --git a/src/core/api.js b/src/core/api.js new file mode 100644 index 00000000..84464b56 --- /dev/null +++ b/src/core/api.js @@ -0,0 +1,178 @@ +import cors from "cors"; +import rateLimit from "express-rate-limit"; +import { randomBytes } from "crypto"; + +const ipSalt = randomBytes(64).toString('hex'); + +import { version } from "../modules/config.js"; +import { getJSON } from "../modules/api.js"; +import { apiJSON, checkJSONPost, getIP, languageCode } from "../modules/sub/utils.js"; +import { Bright, Cyan } from "../modules/sub/consoleText.js"; +import stream from "../modules/stream/stream.js"; +import loc from "../localization/manager.js"; +import { sha256 } from "../modules/sub/crypto.js"; +import { verifyStream } from "../modules/stream/manage.js"; + +export function runAPI(express, app, gitCommit, gitBranch, __dirname) { + const corsConfig = process.env.cors === '0' ? { + origin: process.env.webURL, + optionsSuccessStatus: 200 + } : {}; + + const apiLimiter = rateLimit({ + windowMs: 60000, + max: 20, + standardHeaders: true, + legacyHeaders: false, + keyGenerator: (req, res) => sha256(getIP(req), ipSalt), + handler: (req, res, next, opt) => { + return res.status(429).json({ + "status": "rate-limit", + "text": loc(languageCode(req), 'ErrorRateLimit') + }); + } + }); + const apiLimiterStream = rateLimit({ + windowMs: 60000, + max: 25, + standardHeaders: true, + legacyHeaders: false, + keyGenerator: (req, res) => sha256(getIP(req), ipSalt), + handler: (req, res, next, opt) => { + return res.status(429).json({ + "status": "rate-limit", + "text": loc(languageCode(req), 'ErrorRateLimit') + }); + } + }); + + const startTime = new Date(); + const startTimestamp = Math.floor(startTime.getTime()); + + app.use('/api/:type', cors(corsConfig)); + app.use('/api/json', apiLimiter); + app.use('/api/stream', apiLimiterStream); + app.use('/api/onDemand', apiLimiter); + + app.use((req, res, next) => { + try { decodeURIComponent(req.path) } catch (e) { return res.redirect('/') } + next(); + }); + app.use('/api/json', express.json({ + verify: (req, res, buf) => { + let acceptCon = String(req.header('Accept')) === "application/json"; + if (acceptCon) { + if (buf.length > 720) throw new Error(); + JSON.parse(buf); + } else { + throw new Error(); + } + } + })); + // handle express.json errors properly (https://github.com/expressjs/express/issues/4065) + app.use('/api/json', (err, req, res, next) => { + let errorText = "invalid json body"; + let acceptCon = String(req.header('Accept')) !== "application/json"; + + if (err || acceptCon) { + if (acceptCon) errorText = "invalid accept header"; + return res.status(400).json({ + status: "error", + text: errorText + }); + } else { + next(); + } + }); + app.post('/api/json', async (req, res) => { + try { + let lang = languageCode(req); + let j = apiJSON(0, { t: "bad request" }); + try { + let contentCon = String(req.header('Content-Type')) === "application/json"; + let request = req.body; + if (contentCon && request.url) { + request.dubLang = request.dubLang ? lang : false; + + let chck = checkJSONPost(request); + if (!chck) throw new Error(); + + j = await getJSON(chck["url"], lang, chck); + } else { + j = apiJSON(0, { + t: !contentCon ? "invalid content type header" : loc(lang, 'ErrorNoLink') + }); + } + } catch (e) { + j = apiJSON(0, { t: loc(lang, 'ErrorCantProcess') }); + } + return res.status(j.status).json(j.body); + } catch (e) { + return res.destroy(); + } + }); + + app.get('/api/:type', (req, res) => { + try { + switch (req.params.type) { + case 'stream': + if (req.query.t && req.query.h && req.query.e && req.query.t.toString().length === 21 + && req.query.h.toString().length === 64 && req.query.e.toString().length === 13) { + let streamInfo = verifyStream(req.query.t, req.query.h, req.query.e); + if (streamInfo.error) { + return res.status(streamInfo.status).json(apiJSON(0, { t: streamInfo.error }).body); + } + if (req.query.p) { + return res.status(200).json({ + status: "continue" + }); + } + return stream(res, streamInfo); + } else { + let j = apiJSON(0, { + t: "stream token, hmac, or expiry timestamp is missing" + }) + return res.status(j.status).json(j.body); + } + case 'serverInfo': + return res.status(200).json({ + version: version, + commit: gitCommit, + branch: gitBranch, + name: process.env.apiName ? process.env.apiName : "unknown", + url: process.env.apiURL, + cors: process.env.cors && process.env.cors === "0" ? 0 : 1, + startTime: `${startTimestamp}` + }); + default: + let j = apiJSON(0, { + t: "unknown response type" + }) + return res.status(j.status).json(j.body); + } + } catch (e) { + return res.status(500).json({ + status: "error", + text: loc(languageCode(req), 'ErrorCantProcess') + }); + } + }); + app.get('/api/status', (req, res) => { + res.status(200).end() + }); + app.get('/favicon.ico', (req, res) => { + res.sendFile(`${__dirname}/src/front/icons/favicon.ico`) + }); + app.get('/*', (req, res) => { + res.redirect('/api/json') + }); + + app.listen(process.env.apiPort, () => { + console.log(`\n` + + `${Cyan("cobalt")} API ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\n` + + `Start time: ${Bright(`${startTime.toUTCString()} (${startTimestamp})`)}\n\n` + + `URL: ${Cyan(`${process.env.apiURL}`)}\n` + + `Port: ${process.env.apiPort}\n` + ) + }); +} diff --git a/src/core/web.js b/src/core/web.js new file mode 100644 index 00000000..c2512c1f --- /dev/null +++ b/src/core/web.js @@ -0,0 +1,87 @@ +import { genericUserAgent, version } from "../modules/config.js"; +import { apiJSON, languageCode } from "../modules/sub/utils.js"; +import { Bright, Cyan } from "../modules/sub/consoleText.js"; + +import { buildFront } from "../modules/build.js"; +import findRendered from "../modules/pageRender/findRendered.js"; + +import { celebrationsEmoji } from "../modules/pageRender/elements.js"; +import { changelogHistory } from "../modules/pageRender/onDemand.js"; + +export async function runWeb(express, app, gitCommit, gitBranch, __dirname) { + const startTime = new Date(); + const startTimestamp = Math.floor(startTime.getTime()); + + await buildFront(gitCommit, gitBranch); + + app.use('/', express.static('./build/min')); + app.use('/', express.static('./src/front')); + + app.use((req, res, next) => { + try { decodeURIComponent(req.path) } catch (e) { return res.redirect('/') } + next(); + }); + app.get('/onDemand', (req, res) => { + try { + if (req.query.blockId) { + let blockId = req.query.blockId.slice(0, 3); + let r, j; + switch(blockId) { + // changelog history + case "0": + r = changelogHistory(); + j = r ? apiJSON(3, { t: r }) : apiJSON(0, { + t: "couldn't render this block, please try again!" + }) + break; + // celebrations emoji + case "1": + r = celebrationsEmoji(); + j = r ? apiJSON(3, { t: r }) : false + break; + default: + j = apiJSON(0, { + t: "couldn't find a block with this id" + }) + break; + } + if (j.body) { + return res.status(j.status).json(j.body); + } else { + return res.status(204).end(); + } + } else { + return res.status(400).json({ + status: "error", + text: "couldn't render this block, please try again!" + }); + } + } catch (e) { + return res.status(400).json({ + status: "error", + text: "couldn't render this block, please try again!" + }) + } + }); + app.get("/status", (req, res) => { + return res.status(200).end() + }); + app.get("/", (req, res) => { + return res.sendFile(`${__dirname}/${findRendered(languageCode(req), req.header('user-agent') ? req.header('user-agent') : genericUserAgent)}`) + }); + app.get("/favicon.ico", (req, res) => { + return res.sendFile(`${__dirname}/src/front/icons/favicon.ico`) + }); + app.get("/*", (req, res) => { + return res.redirect('/') + }); + + app.listen(process.env.webPort, () => { + console.log(`\n` + + `${Cyan("cobalt")} WEB ${Bright(`v.${version}-${gitCommit} (${gitBranch})`)}\n` + + `Start time: ${Bright(`${startTime.toUTCString()} (${startTimestamp})`)}\n\n` + + `URL: ${Cyan(`${process.env.webURL}`)}\n` + + `Port: ${process.env.webPort}\n` + ) + }) +} diff --git a/src/front/cobalt.css b/src/front/cobalt.css index 9f9c8a9c..3c838ef2 100644 --- a/src/front/cobalt.css +++ b/src/front/cobalt.css @@ -3,57 +3,78 @@ --without-padding: calc(100% - 4rem); --border-15: 0.15rem solid var(--accent); --border-10: 0.1rem solid var(--accent); + --inset-focus: 0 0 0 0.1rem var(--accent) inset; + --inset-focus-inv: 0 0 0 0.15rem var(--background) inset; --font-mono: 'Noto Sans Mono', 'Consolas', 'SF Mono', monospace; --padding-1: 0.75rem; --line-height: 1.65rem; - --red: rgb(255, 0, 61); + --red: rgb(249, 47, 96); --gap: 0.5rem; --gap-no-icon: 0.6rem; - --rainbow-gradient: linear-gradient(161deg,#ffe454,#ff6964,#fe85e5,#bd26fe,#587ae9,#8ded95); } @media (prefers-color-scheme: dark) { :root { --accent: rgb(225, 225, 225); - --accent-hover: rgb(25, 25, 25); - --accent-button-bg: rgb(20, 20, 20); - --accent-press: rgb(10, 10, 10); - --accent-unhover: rgb(100, 100, 100); - --accent-unhover-2: rgb(110, 110, 110); + --accent-highlight: rgb(225, 225, 225, 4%); + --accent-subtext: rgb(110, 110, 110); + --accent-hover: rgb(30, 30, 30); + --accent-hover-elevated: rgb(48, 48, 48); + --accent-hover-transparent: rgba(48, 48, 48, 0.5); + --accent-button: rgb(25, 25, 25); + --accent-button-elevated: rgb(42, 42, 42); + --glass: rgba(25, 25, 25, 0.85); + --glass-lite: rgba(25, 25, 25, 0.98); + --subbackground: rgb(10, 10, 10); --background: rgb(0, 0, 0); - --glow-transparency: 0.45; + --background-backdrop: rgba(0, 0, 0, 0.5); } } @media (prefers-color-scheme: light) { :root { --accent: rgb(25, 25, 25); - --accent-hover: rgb(225, 225, 225); - --accent-button-bg: rgb(230, 230, 230); - --accent-press: rgb(240, 240, 240); - --accent-unhover: rgb(190, 190, 190); - --accent-unhover-2: rgb(110, 110, 110); + --accent-highlight: rgb(25, 25, 25, 4%); + --accent-subtext: rgb(110, 110, 110); + --accent-hover: rgb(230, 230, 230); + --accent-hover-elevated: rgb(215, 215, 215); + --accent-hover-transparent: rgba(215, 215, 215, 0.5); + --accent-button: rgb(225, 225, 225); + --accent-button-elevated: rgb(210, 210, 210); + --glass: rgba(230, 230, 230, 0.85); + --glass-lite: rgba(230, 230, 230, 0.98); + --subbackground: rgb(240, 240, 240); --background: rgb(255, 255, 255); - --glow-transparency: 0.6; + --background-backdrop: rgba(255, 255, 255, 0.5); } } [data-theme="dark"] { --accent: rgb(225, 225, 225); - --accent-hover: rgb(25, 25, 25); - --accent-button-bg: rgb(20, 20, 20); - --accent-press: rgb(10, 10, 10); - --accent-unhover: rgb(100, 100, 100); - --accent-unhover-2: rgb(110, 110, 110); + --accent-highlight: rgb(225, 225, 225, 4%); + --accent-subtext: rgb(110, 110, 110); + --accent-hover: rgb(30, 30, 30); + --accent-hover-elevated: rgb(48, 48, 48); + --accent-hover-transparent: rgba(48, 48, 48, 0.5); + --accent-button: rgb(25, 25, 25); + --accent-button-elevated: rgb(42, 42, 42); + --glass: rgba(25, 25, 25, 0.85); + --glass-lite: rgba(25, 25, 25, 0.98); + --subbackground: rgb(10, 10, 10); --background: rgb(0, 0, 0); - --glow-transparency: 0.45; + --background-backdrop: rgba(0, 0, 0, 0.5); } [data-theme="light"] { --accent: rgb(25, 25, 25); - --accent-hover: rgb(225, 225, 225); - --accent-button-bg: rgb(230, 230, 230); - --accent-press: rgb(240, 240, 240); - --accent-unhover: rgb(190, 190, 190); - --accent-unhover-2: rgb(110, 110, 110); + --accent-highlight: rgb(25, 25, 25, 4%); + --accent-subtext: rgb(110, 110, 110); + --accent-hover: rgb(230, 230, 230); + --accent-hover-elevated: rgb(215, 215, 215); + --accent-hover-transparent: rgba(219, 219, 219, 0.5); + --accent-button: rgb(225, 225, 225); + --accent-button-elevated: rgb(210, 210, 210); + --glass: rgba(230, 230, 230, 0.85); + --glass-lite: rgba(230, 230, 230, 0.98); + --subbackground: rgb(240, 240, 240); --background: rgb(255, 255, 255); - --glow-transparency: 0.6; + --background-backdrop: rgba(255, 255, 255, 0.5); } html, body { @@ -67,6 +88,12 @@ body { overflow: hidden; -ms-overflow-style: none; scrollbar-width: none; + height: calc(100% + env(safe-area-inset-top)/2); +} +#home { + position: fixed; + width: 100%; + height: 100%; } a { color: var(--accent); @@ -74,10 +101,12 @@ a { user-select: none; -webkit-user-select: none; } -::placeholder { - color: var(--accent-unhover-2); +::placeholder, +::moz-placeholder { + color: var(--accent-subtext); } -.switches::-webkit-scrollbar, #popup-content::-webkit-scrollbar { +.switches::-webkit-scrollbar, +#popup-content::-webkit-scrollbar { display: none; } :focus-visible { @@ -92,7 +121,7 @@ a { width: auto; margin-right: var(--padding-1); margin-bottom: var(--padding-1); - background: var(--accent-button-bg); + background: var(--accent-button); } .checkbox-label { line-height: 1.3rem; @@ -141,39 +170,71 @@ input[type="text"], [type="text"] { border-radius: 0; } +.glass-bkg { + background: var(--glass); + backdrop-filter: blur(7px); + -webkit-backdrop-filter: blur(7px); +} +.glass-bkg.alone { + z-index: -1; + top: 0; + left: 0; + bottom: 0; + right: 0; + position: absolute; +} +.glass-bkg.small { + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: -1; + position: absolute; + border: var(--accent-highlight) solid 0.15rem; + border-radius: 8px/9px; +} .desktop button:hover, .desktop .switch:hover, .desktop .checkbox:hover, .desktop .text-to-copy:hover, -.desktop .collapse-header:hover, -.desktop #close-button:hover { +.desktop .collapse-header:hover { background: var(--accent-hover); + box-shadow: 0 0 0 0.1rem var(--accent-highlight) inset; cursor: pointer; } button:active, .switch:active, .checkbox:active, .text-to-copy:active { - background: var(--accent-press); + box-shadow: 0 0 0 0.1rem var(--accent-highlight) inset; cursor: pointer; - transform: scale(0.95) + transform: scale(0.95); } .collapse-header:active { - background: var(--accent-press); - cursor: pointer; + box-shadow: 0 0 0 0.1rem var(--accent-highlight) inset; +} +.popup.small .switch { + background: var(--accent-button-elevated); +} +.desktop .popup.small .switch:hover { + background: var(--accent-hover-elevated); } .switch.text-backdrop, .switch.text-backdrop:hover, .switch.text-backdrop:active, .text-to-copy.text-backdrop, .text-to-copy.text-backdrop:hover, -.text-to-copy.text-backdrop:active { +.text-to-copy.text-backdrop:active, +.popup.small .switch.text-backdrop, +.popup.small .switch.text-backdrop:hover, +.popup.small .switch.text-backdrop:active { background: var(--accent); color: var(--background); + box-shadow: 0 0 0 0.1rem var(--accent-highlight) inset; } .picker-image:active { cursor: pointer; - transform: scale(0.95) + transform: scale(0.95); } .button { background: none; @@ -224,7 +285,6 @@ button:active, } .box { background: var(--background); - border: var(--border-15); color: var(--accent); } #url-input-area { @@ -234,7 +294,7 @@ button:active, color: var(--accent); border: 0; float: right; - border-bottom: 0.1rem solid var(--accent-unhover); + border-bottom: 0.1rem solid var(--accent-subtext); outline: none; font-size: 0.8rem; } @@ -244,6 +304,7 @@ button:active, padding: 0 1rem 0.2rem; transform: none; font-size: 1rem; + box-shadow: none!important; } #url-input-area:focus { outline: none; @@ -260,17 +321,18 @@ button:active, letter-spacing: -0.36rem; } #download-button:disabled { - color: var(--accent-unhover); + color: var(--accent-subtext); cursor: not-allowed; } #footer { - bottom: 0.8rem; + bottom: 0; + width: 100%; position: absolute; - left: 50%; - transform: translate(-50%, -50%); + display: flex; + justify-content: center; + padding-bottom: calc(env(safe-area-inset-bottom)/2 + 2rem); font-size: 0.9rem; text-align: center; - width: auto; } #cobalt-main-box #bottom, #footer-buttons, @@ -284,7 +346,7 @@ button:active, } .footer-button { width: auto!important; - color: var(--accent-unhover-2); + color: var(--accent-subtext); padding: var(--gap) 1.2rem!important; align-content: center; } @@ -298,9 +360,10 @@ button:active, .text-backdrop { background: var(--accent); color: var(--background); + padding: 0 0.3rem; } -.italic { - font-style: italic; +.text-backdrop.link { + text-decoration: underline; } .cobalt-support-link { display: flex; @@ -323,40 +386,87 @@ button:active, visibility: hidden; position: fixed; height: auto; - width: 32%; + width: 36%; z-index: 999; - padding: 2rem; font-size: 0.9rem; - max-height: 85%; + max-height: 95%; + opacity: 0; + transform: translate(-50%,-48%)scale(.95); + box-shadow: 0 0 0 0.2rem var(--glass) inset, + 0 0 20px 0 var(--accent-hover-transparent); } -.popup.small { - width: 20% +.popup.visible { + visibility: visible; + opacity: 1; + transform: translate(-50%, -50%); + transition: transform 100ms ease-out, opacity 100ms ease-in-out; } #popup-backdrop { - opacity: 0.5; - background-color: var(--background); + visibility: hidden; position: fixed; top: 0; left: 0; width: 100%; height: 100%; z-index: 998; + opacity: 0; + background: var(--background-backdrop); +} +#popup-backdrop.visible { + visibility: visible; + opacity: 1; + transition: opacity .13s ease-in-out; + backdrop-filter: blur(7px); + -webkit-backdrop-filter: blur(7px); +} +.popup.small { + width: 20%; + box-shadow: 0px 0px 60px 0px var(--accent-hover); + padding: 1.7rem; + transform: translate(-50%,-50%)scale(.95); + pointer-events: all; +} +.popup.small.visible { + transform: translate(-50%, -50%); +} +.popup.small #popup-header-contents, +.popup.small .popup-content-inner, +.popup.small #popup-header { + padding: 0; +} +.popup.small #popup-header { + position: relative; + border: none; +} +.popup.small #popup-title { + margin-bottom: 0.6rem; +} +.popup.small .explanation { + margin-bottom: 0.9rem; +} +#close-error { + background: var(--accent); + color: var(--background); } .popup.scrollable { - height: 85%; + height: 95%; } .scrollable .bottom-link { padding-bottom: 2rem; } .changelog-subtitle { - font-size: 1.1rem; + font-size: 1.3rem; padding-bottom: var(--gap-no-icon); } .changelog-banner { + position: relative; width: 100%; max-height: 300px; - margin-bottom: 1.65rem; + min-height: 210px; + margin-bottom: 0.7rem; float: left; + background: var(--accent-hover); + display: flex; } .changelog-img { object-fit: cover; @@ -364,6 +474,21 @@ button:active, height: inherit; max-height: inherit; } +.changelog-tags { + display: inline-flex; + align-items: center; + gap: 0.7rem; + padding-bottom: 0.7rem; + flex-wrap: wrap; +} +.changelog-tag-version { + font-size: 1rem; + padding: 0.15rem 0.7rem; +} +.changelog-tag-date { + color: var(--accent-subtext); + font-size: 0.8rem; +} .nowrap { white-space: nowrap; } @@ -371,14 +496,14 @@ button:active, padding-top: 0!important; } .desc-padding { - padding-bottom: 1.5rem; + padding-bottom: 0.7rem; } #popup-subtitle { font-size: 1.1rem; padding-bottom: var(--padding-1); } #popup-desc, -#desc-error, +.desc-error, #popup-info-desc { width: 100%; text-align: left; @@ -387,51 +512,48 @@ button:active, user-select: text; -webkit-user-select: text; } +.desc-error { + padding-bottom: 1.5rem; +} #popup-title { font-size: 1.5rem; - margin-bottom: 0.5rem; - line-height: 1.85em; + line-height: 1.2em; display: flex; align-items: center; -} -#popup-footer { - bottom: 0; - position: fixed; - margin-bottom: 1.5rem; - background: var(--background); - width: var(--without-padding); -} -.popup-footer-content { - font-size: 0.8rem; - line-height: var(--line-height); - color: var(--accent-unhover-2); - border-top: 0.05rem solid var(--accent-unhover-2); - padding-top: 0.4rem; + margin-bottom: 0.4rem; + margin-top: 0.4rem; } #popup-above-title { - color: var(--accent-unhover-2); + color: var(--accent-subtext); font-size: 0.8rem; } #popup-content { - overflow-x: hidden; + overflow-x: scroll; overflow-y: auto; - height: var(--without-padding); + height: 100%; scrollbar-width: none; } +.popup-content-inner, +.tab-content-settings, +#picker-holder { + padding-top: calc(env(safe-area-inset-top)/2 + 4.7rem); + padding-bottom: calc(env(safe-area-inset-bottom)/2 + 4.8rem); +} +.tab-content-settings, +#tab-about-about .popup-content-inner { + padding-top: calc(env(safe-area-inset-top)/2 + 6rem);; +} .bullpadding { padding-left: 0.58rem; } #popup-header { - position: relative; - background: var(--background); + position: absolute; z-index: 999; - padding-top: 0.8rem; -} -#popup-content.with-footer { - margin-bottom: 3rem; + padding-top: calc(env(safe-area-inset-top)/2 + 1.7rem); + width: 100%; } .settings-category { - padding-bottom: 1rem; + padding-bottom: 0.7rem; } .separator { float: left; @@ -439,8 +561,8 @@ button:active, .separator, .category-title { width: 100%; - color: var(--accent-unhover-2); - border-bottom: 0.05rem solid var(--accent-unhover-2); + color: var(--accent-subtext); + border-bottom: 0.05rem solid var(--accent-subtext); padding-bottom: 0.25rem; margin-bottom: calc(var(--gap-no-icon)*1.5); } @@ -480,17 +602,17 @@ button:active, font-size: 0.8rem; text-align: left; line-height: 1.3rem!important; - color: var(--accent-unhover-2); + color: var(--accent-subtext); } .subtext { - color: var(--accent-unhover-2); + color: var(--accent-subtext); } .switch { padding: var(--gap-no-icon); width: 100%; text-align: left; color: var(--accent); - background: var(--accent-button-bg); + background: var(--accent-button); display: flex; justify-content: center; align-items: center; @@ -499,21 +621,34 @@ button:active, .switch.space-right { margin-right: var(--padding-1); } -.switch[data-enabled="true"] { +.switch:focus { + box-shadow: var(--inset-focus) inset; +} +#popup-tabs .switch { + background: none; +} +.desktop #popup-tabs .switch:hover, +#popup-tabs .switch:active { + background: var(--accent-hover-transparent); + box-shadow: 0 0 0 0.1rem var(--accent-highlight) inset; +} +.switch[data-enabled="true"], +#popup-tabs .switch[data-enabled="true"] { color: var(--background); - background: var(--accent); + background: var(--accent)!important; cursor: default; - z-index: 999 } .switch[data-enabled="true"]:hover { background: var(--accent); } +.switch[data-enabled="true"]:focus { + box-shadow: var(--inset-focus-inv) inset; +} .switches { display: flex; width: auto; flex-direction: row; flex-wrap: nowrap; - overflow-x: scroll; scrollbar-width: none; } .switches .switch { @@ -532,59 +667,56 @@ button:active, .text-to-copy { user-select: text; -webkit-user-select: text; - background: var(--accent-button-bg); - padding: var(--padding-1); - overflow: auto; + background: var(--accent-button); + padding: var(--gap-no-icon); + overflow: clip; } -#close-button { - max-width: 2.6rem; - margin-left: var(--padding-1); - background: var(--background); - border: var(--border-15); - color: var(--accent); - padding: 0.3rem 0.75rem 0.5rem; +#back-button { + padding: 0; + background: none; + max-width: 4rem; + font-size: 1rem; } -#close-button.up { - float: right; - position: absolute; - right: 0; - height: 2.6rem; +#back-button svg path, +.collapse-indicator svg path { + fill: var(--accent); } -.popup-tab-content { +.popup-tab-content[data-enabled="false"] { display: none; } #popup-tabs { z-index: 999; bottom: 0; - position: relative; + position: absolute; width: 100%; + padding-top: 0.2rem; + padding-bottom: 1.7rem; } -.popup-tabs { - margin-top: 0.9rem; +.popup-tabs-child { + width: 100%; + padding: 0 0.2rem; } -.emoji { - margin-right: 0.4rem; +.emoji, svg { user-select: none; -webkit-user-select: none; pointer-events: none; } +.emoji { + margin-right: 0.4rem; +} .picker-image { object-fit: cover; - width: inherit; - height: inherit; + width: 100%; + height: 100%; + cursor: pointer; + user-select: all; + -webkit-user-select: all; } .picker-image-container { - width: 8rem; - height: 8rem; - margin-bottom: var(--padding-1); - background-color: var(--accent-button-bg); -} -.picker-various-container { - height: 20rem; - width: 25rem; - margin-bottom: var(--padding-1); - background-color: var(--accent-button-bg); - border: var(--accent-button-bg) 0.18rem solid; + width: calc(100% / 3); + height: 12rem; + background-color: var(--accent-button); + cursor: pointer; position: relative; } #picker-holder { @@ -592,18 +724,14 @@ button:active, justify-content: space-between; flex-wrap: wrap; align-content: space-around; -} -#picker-holder.various { - justify-content: left; - flex-wrap: unset; - overflow-x: scroll; - gap: 2rem; + padding-top: calc(env(safe-area-inset-top)/2 + 7.6rem); + padding-bottom: calc(env(safe-area-inset-bottom)/2 + 4.8rem); } .imageBlock { - height: 100%; width: 100%; + height: 100%; position: absolute; - z-index: 9999; + z-index: 99; } .picker-element-name { position: absolute; @@ -623,31 +751,40 @@ button:active, padding: var(--gap) 1.2rem; } .collapse-list { - background: var(--accent-press); + background: var(--subbackground); user-select: none; -webkit-user-select: none; } +.collapse-list.last { + margin-bottom: 1rem; +} .collapse-header { - padding: var(--padding-1); - font-size: 1rem; + padding: 0.5rem var(--padding-1); + font-size: 0.95rem; display: flex; flex-direction: row; align-items: center; cursor: pointer; - background: var(--accent-button-bg); + background: var(--accent-button); +} +.collapse-header .emoji { + margin-right: var(--padding-1); } .collapse-indicator { - transform: rotate(180deg); -} -.expanded .collapse-indicator { + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; transform: none; } +.collapse-list.expanded .collapse-indicator { + transform: rotate(180deg); +} .collapse-title { width: 100%; display: flex; flex-direction: row; align-items: center; - gap: 0.8rem; } .collapse-body { display: none; @@ -664,45 +801,162 @@ button:active, #pd-share { display: none; } -#hop-attribution { - display: block; - text-align: right; +#about-donate-footer { + box-shadow: 0 0 0 0.1rem var(--red) inset, 0 0 0.6rem 0 var(--red); + z-index: 1; } -#about-donate-footer::before { - content: ""; +.popup-content-inner, +.tab-content-settings, +#popup-header-contents { + padding-left: 1rem; + padding-right: 1rem; +} +.urgent-notice { + width: 100%; + text-align: center; position: absolute; - height: 110%; - width: 32%; - background: var(--rainbow-gradient); - z-index: -2; - filter: blur(5px); - opacity: var(--glow-transparency); + display: flex; + justify-content: center; + align-items: center; + padding-top: calc(env(safe-area-inset-top) + 1rem); } -#about-donate-footer:active::before { +.urgent-text { + display: flex; + align-items: center; + cursor: pointer; +} +.no-transparency .glass-bkg, +.no-transparency #popup-backdrop { + backdrop-filter: none; + -webkit-backdrop-filter: none; +} +.no-transparency .glass-bkg { + background: var(--glass-lite); +} +.no-animation .popup, +.no-animation #popup-backdrop { + transition: none; +} +.popup-from-bottom { + position: fixed; + width: 100%; + height: 100%; + bottom: 0; + z-index: 999; + visibility: hidden; + pointer-events: none; +} +.popup-from-bottom.visible { + visibility: visible; +} +#keyboard-collapse { + display: none; +} +.desktop #keyboard-collapse { + display: block; +} +.text-backdrop.key { + color: var(--accent-hover-elevated); +} +#keyboard-shortcuts { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + align-items: flex-start; + gap: 1.5rem; + user-select: none; + color: var(--accent); +} +.loader { + text-align: center; +} +#picker-download { + visibility: hidden; +} +#picker-download.visible { + visibility: visible; +} +#home { opacity: 0; } +#home.visible { + opacity: 1; + transition: opacity 0.2s ease-out; +} +/* rounded corners */ +#bottom #paste, +#footer .switch, +#audioMode, +#popup-content .switches, +.checkbox, +.changelog-img, +.changelog-banner, +#close-error, +.changelog-tag-version, +#download-switcher .switch, +#popup-about .switch, +#popup-tabs .switch, +.text-to-copy, +.text-to-copy.text-backdrop { + border-radius: 5px / 6px; +} +[type=checkbox] { + border-radius: 3px / 4px; +} +.popup, +.scrollable #popup-content { + border-radius: 8px / 9px; +} +#popup-header .glass-bkg { + border-top-left-radius: 8px 9px; + border-top-right-radius: 8px 9px; + border-bottom: var(--accent-highlight) solid 0.1rem; + top: -1px; +} +#popup-tabs .glass-bkg { + border-bottom-left-radius: 8px 9px; + border-bottom-right-radius: 8px 9px; + border-top: var(--accent-highlight) solid 0.1rem; + bottom: -1px; +} +.switches .first { + border-top-left-radius: 5px 6px; + border-bottom-left-radius: 5px 6px; +} +.switches .last { + border-top-right-radius: 5px 6px; + border-bottom-right-radius: 5px 6px; +} +.text-backdrop { + border-radius: 3px / 4px; +} +.collapse-list.first, +.collapse-list.first .collapse-header { + border-top-left-radius: 6px 7px; + border-top-right-radius: 6px 7px; +} +.collapse-list.last, +.collapse-list.last .collapse-header { + border-bottom-left-radius: 6px 7px; + border-bottom-right-radius: 6px 7px; +} +.collapse-list.last.expanded .collapse-header { + border-radius: 0; +} +/* prevent resizing fliecker on ios if web app is installed as standalone */ +@media all and (display-mode: standalone) { + #home.visible { + transition-delay: 0.1s; + } +} /* adapt the page according to screen size */ -@media screen and (min-width: 2300px) { - html { - zoom: 130%; - } -} -@media screen and (min-width: 3840px) { - html { - zoom: 180%; - } -} -@media screen and (min-width: 5000px) { - html { - zoom: 300%; - } -} @media screen and (max-width: 1550px) { .popup.small { width: 25% } .popup { - width: 35%; + width: 40%; } } @media screen and (max-width: 1440px) { @@ -713,12 +967,12 @@ button:active, width: 30% } .popup { - width: 40%; + width: 45%; } } @media screen and (max-width: 1300px) { .popup { - width: 46%; + width: 50%; } } @media screen and (max-width: 1200px) { @@ -729,7 +983,7 @@ button:active, width: 35% } .popup { - width: 50%; + width: 55%; } } @media screen and (max-width: 1025px) { @@ -743,23 +997,12 @@ button:active, width: 60%; } } -@media screen and (max-height: 605px) { +@media screen and (max-width: 850px) { .popup { - height: 80% - } - .popup.small { - height: auto; - } - .bottom-link { - padding-bottom: 2rem; + width: 75%; } } /* mobile page */ -@media screen and (max-width: 720px) { - #cobalt-main-box, #footer { - width: 90%; - } -} @media screen and (max-width: 499px) { .tab { font-size: 0!important; @@ -767,92 +1010,14 @@ button:active, .tab .emoji { margin-right: 0; } - #cobalt-main-box, #footer { - width: 90%; - } .checkbox { - width: 100%; - } -} -@media screen and (max-width: 320px) { - :root { - --gap: 0.38rem; - --gap-no-icon: 0.38rem; - --line-height: 1.2rem; - } - #popup-title { - font-size: 1.07rem; - line-height: 1.5rem; - } - .footer-button, - #audioMode-false, - #audioMode-true, - #paste { - font-size: 0!important; - } - .footer-button .emoji, - #audioMode-false .emoji, - #audioMode-true .emoji, - #paste .emoji { - margin-right: 0; - } - .switch, - .checkbox, - .category-title, - .subtitle, - #popup-desc, - .collapse-title { - font-size: .7rem; - } - .collapse-header { - padding: 0.5rem; - } - #popup-above-title, - #url-input-area { - font-size: 0.6rem; - } - .explanation { - font-size: .6rem; - margin-top: 0.5rem; - line-height: 1rem!important; - } - #popup-desc { - line-height: 1.2rem; - font-size: .64rem; - } - .changelog-subtitle, #popup-subtitle { - font-size: 0.8rem!important; - } - .category-title { - margin-bottom: 0.8rem; - } - .emoji { - height: 18px; - width: 18px; - } - .desc-padding { - padding-bottom: 0.8rem; - } - #logo { - font-size: 0.8rem; - } - .popup, - .popup.scrollable, - .popup.small { - height: 98%; - } - [type=checkbox] { - width: 15px; - height: 15px; - border: 0.12rem solid var(--accent); - } - [type=checkbox]:before { - transform: scaleY(.8)scaleX(.7)rotate(45deg); - left: 3.4px; - top: -2px; + width: calc(100% - 1.3rem); } } @media screen and (max-width: 720px) { + #cobalt-main-box { + width: calc(100% - (0.7rem * 2)); + } #cobalt-main-box #bottom { flex-direction: column-reverse; } @@ -860,16 +1025,13 @@ button:active, width: 100%; } #footer { - bottom: 4.9%; - transform: translate(-50%, 0%); + padding-bottom: calc(env(safe-area-inset-bottom)/2 + 1.5rem); } #footer-buttons { flex-direction: column; align-items: stretch; - } - #about-donate-footer::before { - height: 50%; - width: 50%; + width: 100%; + padding: 0 0.7rem; } .footer-pair .footer-button { width: 100%!important; @@ -886,59 +1048,89 @@ button:active, flex-direction: column; gap: var(--gap); } -} -@media screen and (max-width: 949px) { + .urgent-notice { + padding-top: calc(env(safe-area-inset-bottom)/2 + 1rem); + } + .popup, + #popup-header .glass-bkg, + #popup-tabs .glass-bkg, + .glass-bkg.small { + border-radius: 0; + } + #popup-tabs .glass-bkg { + bottom: 0; + } + .switches { + overflow-x: scroll; + } + .checkbox { + margin-right: 0; + } + .popup.center { + top: unset; + left: unset; + transform: unset; + } + .popup.small { + width: calc(100% - 1.7rem * 2); + height: auto; + top: unset; + bottom: 0; + left: 0; + transform: none; + position: absolute; + padding-bottom: calc(env(safe-area-inset-bottom)/2 + 1.7rem); + transform: translateY(30rem); + } + .glass-bkg.small { + border: none; + border-top: var(--accent-highlight) solid 0.15rem; + } + .popup.small.visible { + transform: none; + transition: transform 200ms cubic-bezier(0.075, 0.82, 0.165, 1), opacity 130ms ease-in-out; + } + .popup.small #popup-header { + background: none; + } + .no-animation .popup.small { + transition: none; + } + #close-error { + bottom: 3rem; + } #picker-holder::-webkit-scrollbar { display: none; } #picker-holder.various { flex-wrap: wrap; - align-content: left; gap: 0; overflow-x: hidden; overflow-y: scroll; } - .picker-various-container { - width: 100%; - height: 20rem; - max-width: 100%; - } - #popup-header { - padding-top: 1.2rem; - } - #popup-settings #popup-header { - padding-top: 0.8rem; - } - .picker-image-container { - height: 7rem; - width: 7rem; - line-height: 7rem; - } - #close-error { - bottom: 3rem; - position: absolute; - width: var(--without-padding); - } - .popup, .popup.scrollable, .popup.small { + .popup, .popup.scrollable { border: none; - width: 90%; - height: 95%; + width: 100%; + height: 100%; max-height: 100%; + box-shadow: none; + } + #popup-tabs { + padding-bottom: calc(env(safe-area-inset-bottom)/2 + 1.5rem); } .bottom-link { padding-bottom: 2rem; } - .popup-tabs { - margin-top: .3rem; + .popup-content-inner, + .tab-content-settings, + .popup-tabs-child, + #popup-header-contents { + padding-left: 0.7rem; + padding-right: 0.7rem; } } @media screen and (max-width: 400px) { .popup-title { line-height: inherit; } - .picker-image-container { - line-height: 6rem; - height: 6rem; - width: 6rem; - } } \ No newline at end of file diff --git a/src/front/cobalt.js b/src/front/cobalt.js index cd77b2d2..f58d5554 100644 --- a/src/front/cobalt.js +++ b/src/front/cobalt.js @@ -1,7 +1,12 @@ +const version = 36; + const ua = navigator.userAgent.toLowerCase(); const isIOS = ua.match("iphone os"); const isMobile = ua.match("android") || ua.match("iphone os"); -const version = 26; +const isSafari = ua.match("safari/"); +const isFirefox = ua.match("firefox/"); +const isOldFirefox = ua.match("firefox/") && ua.split("firefox/")[1].split('.')[0] < 103; + const regex = new RegExp(/https:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/); const notification = `
`; @@ -14,15 +19,30 @@ const switchers = { "vimeoDash": ["false", "true"], "audioMode": ["false", "true"] }; -const checkboxes = ["disableTikTokWatermark", "fullTikTokAudio", "muteAudio"]; +const checkboxes = [ + "alwaysVisibleButton", + "disableChangelog", + "downloadPopup", + "disableTikTokWatermark", + "fullTikTokAudio", + "muteAudio", + "reduceTransparency", + "disableAnimations", + "disableMetadata", +]; const exceptions = { // used for mobile devices "vQuality": "720" }; +const bottomPopups = ["error", "download"] -const apiURL = ''; +const pageQuery = new URLSearchParams(window.location.search); let store = {}; +function changeAPI(url) { + apiURL = url; + return true +} function eid(id) { return document.getElementById(id) } @@ -109,14 +129,18 @@ function detectColorScheme() { function changeTab(evnt, tabId, tabClass) { let tabcontent = document.getElementsByClassName(`tab-content-${tabClass}`); let tablinks = document.getElementsByClassName(`tab-${tabClass}`); + for (let i = 0; i < tabcontent.length; i++) { - tabcontent[i].style.display = "none"; + tabcontent[i].dataset.enabled = "false"; } for (let i = 0; i < tablinks.length; i++) { tablinks[i].dataset.enabled = "false"; } - eid(tabId).style.display = "block"; + evnt.currentTarget.dataset.enabled = "true"; + eid(tabId).dataset.enabled = "true"; + eid(tabId).parentElement.scrollTop = 0; + if (tabId === "tab-about-changelog" && sGet("changelogStatus") !== `${version}`) notificationCheck("changelog"); if (tabId === "tab-about-about" && !sGet("seenAbout")) notificationCheck("about"); } @@ -154,16 +178,20 @@ function notificationCheck(type) { function hideAllPopups() { let filter = document.getElementsByClassName('popup'); for (let i = 0; i < filter.length; i++) { - filter[i].style.visibility = "hidden"; + filter[i].classList.remove("visible"); } + eid("popup-backdrop").classList.remove("visible"); + store.isPopupOpen = false; + + // clear the picker eid("picker-holder").innerHTML = ''; eid("picker-download").href = '/'; - eid("picker-download").style.visibility = "hidden"; - eid("popup-backdrop").style.visibility = "hidden"; + eid("picker-download").classList.remove("visible"); } function popup(type, action, text) { if (action === 1) { hideAllPopups(); // hide the previous popup before showing a new one + store.isPopupOpen = true; switch (type) { case "about": let tabId = sGet("seenAbout") ? "changelog" : "about"; @@ -185,31 +213,40 @@ function popup(type, action, text) { case "picker": switch (text.type) { case "images": - eid("picker-title").innerHTML = loc.pickerImages; - eid("picker-subtitle").innerHTML = loc.pickerImagesExpl; - if (!eid("popup-picker").classList.contains("scrollable")) eid("popup-picker").classList.add("scrollable"); - if (eid("picker-holder").classList.contains("various")) eid("picker-holder").classList.remove("various"); + eid("picker-title").innerHTML = loc.ImagePickerTitle; + eid("picker-subtitle").innerHTML = isMobile ? loc.ImagePickerExplanationPhone : loc.ImagePickerExplanationPC; + + eid("picker-holder").classList.remove("various"); + eid("picker-download").href = text.audio; - eid("picker-download").style.visibility = "visible" + eid("picker-download").classList.add("visible"); + for (let i in text.arr) { - eid("picker-holder").innerHTML += `` + eid("picker-holder").innerHTML += + `` + + `` + + `` } break; default: - eid("picker-title").innerHTML = loc.pickerDefault; - eid("picker-subtitle").innerHTML = loc.pickerDefaultExpl; - if (eid("popup-picker").classList.contains("scrollable")) eid("popup-picker").classList.remove("scrollable"); - if (!eid("picker-holder").classList.contains("various")) eid("picker-holder").classList.add("various"); + eid("picker-title").innerHTML = loc.MediaPickerTitle; + eid("picker-subtitle").innerHTML = isMobile ? loc.MediaPickerExplanationPhone : loc.MediaPickerExplanationPC; + + eid("picker-holder").classList.add("various"); + for (let i in text.arr) { - let s = text.arr[i], item; - switch (s.type) { - case "video": - item = `
VIDEO ${Number(i)+1}
` - break; - } - eid("picker-holder").innerHTML += item + eid("picker-holder").innerHTML += + `` + + `
${text.arr[i].type}
` + + `
` + + `` + + `` } - eid("picker-download").style.visibility = "hidden"; + eid("picker-download").classList.remove("visible"); break; } break; @@ -217,14 +254,17 @@ function popup(type, action, text) { break; } } else { + store.isPopupOpen = false; if (type === "picker") { eid("picker-download").href = '/'; - eid("picker-download").style.visibility = "hidden" + eid("picker-download").classList.remove("visible"); eid("picker-holder").innerHTML = '' } } - eid("popup-backdrop").style.visibility = vis(action); - eid(`popup-${type}`).style.visibility = vis(action); + if (bottomPopups.includes(type)) eid(`popup-${type}-container`).classList.toggle("visible"); + eid("popup-backdrop").classList.toggle("visible"); + eid(`popup-${type}`).classList.toggle("visible"); + eid(`popup-${type}`).focus(); } function changeSwitcher(li, b) { if (b) { @@ -243,24 +283,16 @@ function changeSwitcher(li, b) { } } } -function internetError() { - eid("url-input-area").disabled = false - changeDownloadButton(2, '!!'); - popup("error", 1, loc.noInternet); -} function checkbox(action) { sSet(action, !!eid(action).checked); switch(action) { case "alwaysVisibleButton": button(); break; + case "reduceTransparency": eid("cobalt-body").classList.toggle('no-transparency'); break; + case "disableAnimations": eid("cobalt-body").classList.toggle('no-animation'); break; } action === "disableChangelog" && sGet(action) === "true" ? notificationCheck("disable") : notificationCheck(); } function loadSettings() { - try { - if (typeof(navigator.clipboard.readText) == "undefined") throw new Error(); - } catch (err) { - eid("paste").style.display = "none"; - } if (sGet("alwaysVisibleButton") === "true") { eid("alwaysVisibleButton").checked = true; eid("download-button").value = '>>' @@ -269,6 +301,12 @@ function loadSettings() { if (sGet("downloadPopup") === "true" && !isIOS) { eid("downloadPopup").checked = true; } + if (sGet("reduceTransparency") === "true" || isOldFirefox) { + eid("cobalt-body").classList.add('no-transparency'); + } + if (sGet("disableAnimations") === "true") { + eid("cobalt-body").classList.add('no-animation'); + } for (let i = 0; i < checkboxes.length; i++) { if (sGet(checkboxes[i]) === "true") eid(checkboxes[i]).checked = true; } @@ -281,8 +319,9 @@ function changeButton(type, text) { case 0: //error eid("url-input-area").disabled = false eid("url-clear").style.display = "block"; - changeDownloadButton(2, '!!') + changeDownloadButton(2, '!!'); popup("error", 1, text); + setTimeout(() => { changeButton(1); }, 2500); break; case 1: //enable back changeDownloadButton(1, '>>'); @@ -297,6 +336,12 @@ function changeButton(type, text) { break; } } +function internetError() { + eid("url-input-area").disabled = false + changeDownloadButton(2, '!!'); + setTimeout(() => { changeButton(1); }, 2500); + popup("error", 1, loc.ErrorNoInternet); +} function resetSettings() { localStorage.clear(); window.location.reload(); @@ -308,7 +353,17 @@ async function pasteClipboard() { eid("url-input-area").value = t; download(eid("url-input-area").value); } - } catch (e) {} + } catch (e) { + let errorMessage = loc.FeatureErrorGeneric; + let doError = true; + let error = String(e).toLowerCase(); + + if (error.includes("denied")) errorMessage = loc.ClipboardErrorNoPermission; + if (error.includes("dismissed") || isIOS) doError = false; + if (error.includes("function") && isFirefox) errorMessage = loc.ClipboardErrorFirefox; + + if (doError) popup("error", 1, errorMessage); + } } async function download(url) { changeDownloadButton(2, '...'); @@ -336,6 +391,8 @@ async function download(url) { if ((url.includes("tiktok.com/") || url.includes("douyin.com/")) && sGet("disableTikTokWatermark") === "true") req.isNoTTWatermark = true; } + if (sGet("disableMetadata") === "true") req.disableMetadata = true; + let j = await fetch(`${apiURL}/api/json`, { method: "POST", body: JSON.stringify(req), @@ -350,7 +407,7 @@ async function download(url) { if (j.text && (!j.url || !j.picker)) { if (j.status === "success") { changeButton(2, j.text) - } else changeButton(0, loc.noURLReturned); + } else changeButton(0, loc.ErrorNoUrlReturned); } switch (j.status) { case "redirect": @@ -360,23 +417,15 @@ async function download(url) { break; case "picker": if (j.audio && j.picker) { - changeDownloadButton(2, '?..') - fetch(`${j.audio}&p=1`).then(async (res) => { - let jp = await res.json(); - if (jp.status === "continue") { - changeDownloadButton(2, '>>>'); - popup('picker', 1, { audio: j.audio, arr: j.picker, type: j.pickerType }); - setTimeout(() => { changeButton(1) }, 2500); - } else { - changeButton(0, jp.text); - } - }).catch((error) => internetError()); + changeDownloadButton(2, '>>>'); + popup('picker', 1, { audio: j.audio, arr: j.picker, type: j.pickerType }); + setTimeout(() => { changeButton(1) }, 2500); } else if (j.picker) { changeDownloadButton(2, '>>>'); popup('picker', 1, { arr: j.picker, type: j.pickerType }); setTimeout(() => { changeButton(1) }, 2500); } else { - changeButton(0, loc.noURLReturned); + changeButton(0, loc.ErrorNoUrlReturned); } break; case "stream": @@ -384,7 +433,10 @@ async function download(url) { fetch(`${j.url}&p=1`).then(async (res) => { let jp = await res.json(); if (jp.status === "continue") { - changeDownloadButton(2, '>>>'); window.location.href = j.url; + changeDownloadButton(2, '>>>'); + if (isMobile || isSafari) { + window.location.href = j.url; + } else window.open(j.url, '_blank'); setTimeout(() => { changeButton(1) }, 2500); } else { changeButton(0, jp.text); @@ -395,7 +447,7 @@ async function download(url) { changeButton(2, j.text); break; default: - changeButton(0, loc.unknownStatus); + changeButton(0, loc.ErrorUnknownStatus); break; } } else if (j && j.text) { @@ -405,9 +457,9 @@ async function download(url) { async function loadCelebrationsEmoji() { let bac = eid("about-footer").innerHTML; try { - let j = await fetch(`${apiURL}/api/onDemand?blockId=1`).then((r) => { if (r.status === 200) { return r.json() } else { return false } }).catch(() => { return false }); + let j = await fetch(`/onDemand?blockId=1`).then((r) => { if (r.status === 200) { return r.json() } else { return false } }).catch(() => { return false }); if (j && j.status === "success" && j.text) { - eid("about-footer").innerHTML = eid("about-footer").innerHTML.replace('🐲', j.text); + eid("about-footer").innerHTML = eid("about-footer").innerHTML.replace('🐲', j.text); } } catch (e) { eid("about-footer").innerHTML = bac; @@ -416,13 +468,13 @@ async function loadCelebrationsEmoji() { async function loadOnDemand(elementId, blockId) { let j = {}; store.historyButton = eid(elementId).innerHTML; - eid(elementId).innerHTML = "..."; + eid(elementId).innerHTML = `
...
`; try { if (store.historyContent) { j = store.historyContent; } else { - await fetch(`${apiURL}/api/onDemand?blockId=${blockId}`).then(async(r) => { + await fetch(`/onDemand?blockId=${blockId}`).then(async(r) => { j = await r.json(); if (j && j.status === "success") { store.historyContent = j; @@ -430,7 +482,7 @@ async function loadOnDemand(elementId, blockId) { }).catch(() => { throw new Error() }); } if (j.text) { - eid(elementId).innerHTML = `${j.text}`; + eid(elementId).innerHTML = `${j.text}`; } else throw new Error() } catch (e) { eid(elementId).innerHTML = store.historyButton; @@ -440,30 +492,91 @@ async function loadOnDemand(elementId, blockId) { function restoreUpdateHistory() { eid("changelog-history").innerHTML = store.historyButton; } +function unpackSettings(b64) { + let changed = null; + try { + let settingsToImport = JSON.parse(atob(b64)); + let currentSettings = JSON.parse(JSON.stringify(localStorage)); + for (let s in settingsToImport) { + if (checkboxes.includes(s) && (settingsToImport[s] === "true" || settingsToImport[s] === "false") + && currentSettings[s] !== settingsToImport[s]) { + sSet(s, settingsToImport[s]); + changed = true + } + if (switchers[s] && switchers[s].includes(settingsToImport[s]) + && currentSettings[s] !== settingsToImport[s]) { + sSet(s, settingsToImport[s]); + changed = true + } + } + } catch (e) { + changed = false; + } + return changed +} window.onload = () => { + loadCelebrationsEmoji(); + loadSettings(); detectColorScheme(); + changeDownloadButton(0, '>>'); - eid("cobalt-main-box").style.visibility = 'visible'; - 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)) { - eid("url-input-area").value = urlQuery; - button(); + + if (isIOS) { + sSet("downloadPopup", "true"); + eid("downloadPopup-chkbx").style.display = "none"; } + + eid("home").style.visibility = 'visible'; + eid("home").classList.toggle("visible"); + + if (pageQuery.has("u") && regex.test(pageQuery.get("u"))) { + eid("url-input-area").value = pageQuery.get("u"); + button() + } + if (pageQuery.has("migration")) { + if (pageQuery.has("settingsData") && !sGet("migrated")) { + let setUn = unpackSettings(pageQuery.get("settingsData")); + if (setUn !== null) { + if (setUn) { + sSet("migrated", "true") + eid("desc-migration").innerHTML += `

${loc.DataTransferSuccess}` + } else { + eid("desc-migration").innerHTML += `

${loc.DataTransferError}` + } + } + } + loadSettings(); + detectColorScheme(); + popup("migration", 1); + } + window.history.replaceState(null, '', window.location.pathname); + + notificationCheck(); } -eid("url-input-area").addEventListener("keydown", (event) => { - if (event.key === 'Escape') eid("url-input-area").value = ''; +eid("url-input-area").addEventListener("keydown", (e) => { button(); }) -eid("url-input-area").addEventListener("keyup", (event) => { - if (event.key === 'Enter') eid("download-button").click(); +eid("url-input-area").addEventListener("keyup", (e) => { + if (e.key === 'Enter') eid("download-button").click(); }) -document.onkeydown = (event) => { - if (event.key === "Tab" || event.ctrlKey) eid("url-input-area").focus(); - if (event.key === 'Escape') hideAllPopups(); +document.onkeydown = (e) => { + if (!store.isPopupOpen) { + if (e.ctrlKey || e.key === "/") eid("url-input-area").focus(); + if (e.key === "Escape" || e.key === "Clear") clearInput(); + + // top buttons + if (e.key === "D") pasteClipboard(); + if (e.key === "K") changeSwitcher('audioMode', 'false'); + if (e.key === "L") changeSwitcher('audioMode', 'true'); + + // popups + if (e.key === "B") popup('about', 1, 'about'); // open about + if (e.key === "N") popup('about', 1, 'changelog'); // open changelog + if (e.key === "M") popup('settings', 1); + + } else { + if (e.key === "Escape") hideAllPopups(); + } } diff --git a/src/front/emoji/3d/cat_crying.svg b/src/front/emoji/3d/cat_crying.svg new file mode 100644 index 00000000..afa45138 --- /dev/null +++ b/src/front/emoji/3d/cat_crying.svg @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/3d/cat_flabbergasted.svg b/src/front/emoji/3d/cat_flabbergasted.svg new file mode 100644 index 00000000..84c9feda --- /dev/null +++ b/src/front/emoji/3d/cat_flabbergasted.svg @@ -0,0 +1,507 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/3d/cat_grin.svg b/src/front/emoji/3d/cat_grin.svg new file mode 100644 index 00000000..be6e29d0 --- /dev/null +++ b/src/front/emoji/3d/cat_grin.svg @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/3d/cat_smile.svg b/src/front/emoji/3d/cat_smile.svg new file mode 100644 index 00000000..e50cbfa0 --- /dev/null +++ b/src/front/emoji/3d/cat_smile.svg @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/abacus.svg b/src/front/emoji/abacus.svg new file mode 100644 index 00000000..6f9587c4 --- /dev/null +++ b/src/front/emoji/abacus.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/alien_monster.svg b/src/front/emoji/alien_monster.svg new file mode 100644 index 00000000..66be00bd --- /dev/null +++ b/src/front/emoji/alien_monster.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/boring_document.svg b/src/front/emoji/boring_document.svg new file mode 100644 index 00000000..ec3e642f --- /dev/null +++ b/src/front/emoji/boring_document.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/cat_crying.svg b/src/front/emoji/cat_crying.svg new file mode 100644 index 00000000..896ae898 --- /dev/null +++ b/src/front/emoji/cat_crying.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/cat_flabbergasted.svg b/src/front/emoji/cat_flabbergasted.svg new file mode 100644 index 00000000..92f72427 --- /dev/null +++ b/src/front/emoji/cat_flabbergasted.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/cat_grin.svg b/src/front/emoji/cat_grin.svg new file mode 100644 index 00000000..4b7cbb06 --- /dev/null +++ b/src/front/emoji/cat_grin.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/cat_smile.svg b/src/front/emoji/cat_smile.svg new file mode 100644 index 00000000..06ff249c --- /dev/null +++ b/src/front/emoji/cat_smile.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/front/emoji/frowning_face.svg b/src/front/emoji/frowning_face.svg deleted file mode 100644 index 04106077..00000000 --- a/src/front/emoji/frowning_face.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/front/emoji/keyboard.svg b/src/front/emoji/keyboard.svg new file mode 100644 index 00000000..f6cb218b --- /dev/null +++ b/src/front/emoji/keyboard.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/front/emoji/link.svg b/src/front/emoji/link.svg new file mode 100644 index 00000000..c3d86605 --- /dev/null +++ b/src/front/emoji/link.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/front/emoji/locked.svg b/src/front/emoji/locked.svg new file mode 100644 index 00000000..98e9e0e7 --- /dev/null +++ b/src/front/emoji/locked.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/front/emoji/magnifying_glass.svg b/src/front/emoji/magnifying_glass.svg new file mode 100644 index 00000000..905da556 --- /dev/null +++ b/src/front/emoji/magnifying_glass.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/front/emoji/mending_heart.svg b/src/front/emoji/mending_heart.svg new file mode 100644 index 00000000..3b647fa7 --- /dev/null +++ b/src/front/emoji/mending_heart.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/front/updateBanners/catswitchboxes.webp b/src/front/updateBanners/catswitchboxes.webp new file mode 100644 index 00000000..d4ae2bc3 Binary files /dev/null and b/src/front/updateBanners/catswitchboxes.webp differ diff --git a/src/front/updateBanners/developersdevelopersdevelopers.webp b/src/front/updateBanners/developers.webp similarity index 100% rename from src/front/updateBanners/developersdevelopersdevelopers.webp rename to src/front/updateBanners/developers.webp diff --git a/src/front/updateBanners/meowthcooking.webp b/src/front/updateBanners/meowthcooking.webp new file mode 100644 index 00000000..a0bea02a Binary files /dev/null and b/src/front/updateBanners/meowthcooking.webp differ diff --git a/src/front/updateBanners/meowthhammer.webp b/src/front/updateBanners/meowthhammer.webp new file mode 100644 index 00000000..ed3c97bb Binary files /dev/null and b/src/front/updateBanners/meowthhammer.webp differ diff --git a/src/front/updateBanners/meowthproductions.webp b/src/front/updateBanners/meowthproductions.webp new file mode 100644 index 00000000..56ef2568 Binary files /dev/null and b/src/front/updateBanners/meowthproductions.webp differ diff --git a/src/front/updateBanners/meowthsnap.webp b/src/front/updateBanners/meowthsnap.webp new file mode 100644 index 00000000..a1b94d53 Binary files /dev/null and b/src/front/updateBanners/meowthsnap.webp differ diff --git a/src/front/updateBanners/newdomain.webp b/src/front/updateBanners/newdomain.webp new file mode 100644 index 00000000..256784a2 Binary files /dev/null and b/src/front/updateBanners/newdomain.webp differ diff --git a/src/localization/languages/en.json b/src/localization/languages/en.json index 4f052578..7025f222 100644 --- a/src/localization/languages/en.json +++ b/src/localization/languages/en.json @@ -1,25 +1,25 @@ { "name": "english", "substrings": { - "ContactLink": "create an issue on github" + "ContactLink": "create an issue on github" }, "strings": { + "AppTitleCobalt": "cobalt", "LinkInput": "paste the link here", - "AboutSummary": "{appName} is your go-to place for downloads from social and media platforms. zero ads, trackers, or other creepy bullshit. simply paste a share link and you're ready to rock!", - "EmbedBriefDescription": "save what you love without ads, trackers, or other creepy bullshit.", + "AboutSummary": "cobalt is your go-to place for downloads from social and media platforms. zero ads, trackers, or other creepy bullshit. simply paste a share link and you're ready to rock!", + "EmbedBriefDescription": "save what you love. no ads, trackers, or other creepy bullshit.", "MadeWithLove": "made with <3 by wukko", "AccessibilityInputArea": "link input area", "AccessibilityOpenAbout": "open about popup", "AccessibilityDownloadButton": "download button", "AccessibilityOpenSettings": "open settings popup", - "AccessibilityClosePopup": "close the popup", "AccessibilityOpenDonate": "open donation popup", - "TitlePopupAbout": "what's {appName}?", + "TitlePopupAbout": "what's cobalt?", "TitlePopupSettings": "settings", "TitlePopupError": "uh-oh...", "TitlePopupChangelog": "what's new?", - "TitlePopupDonate": "support {appName}", - "TitlePopupDownload": "how to continue?", + "TitlePopupDonate": "support cobalt", + "TitlePopupDownload": "how to save?", "ErrorSomethingWentWrong": "something went wrong and i couldn't get anything for you. try again, but if issue persists, {ContactLink}.", "ErrorUnsupported": "it seems like this service is not supported yet or your link is invalid. have you pasted the right link?", "ErrorBrokenLink": "{s} is supported, but something is wrong with your link. maybe you didn't copy it fully?", @@ -29,8 +29,8 @@ "ErrorCouldntFetch": "i couldn't find anything about this link. check if it works and try again! some content may be region restricted, so keep that in mind.", "ErrorLengthLimit": "i can't process videos longer than {s} minutes, so pick something shorter instead!", "ErrorBadFetch": "something went wrong when i tried getting info about your link. are you sure it works? check if it does, and try again.", - "ErrorNoInternet": "there's no internet or {appName} api is down. check your connection and try again.", - "ErrorCantConnectToServiceAPI": "i couldn't connect to the service api. maybe it's down, or {appName} got blocked. try again, but if error persists, {ContactLink}.", + "ErrorNoInternet": "there's no internet or cobalt api is temporarily unavailable. check your connection and try again.", + "ErrorCantConnectToServiceAPI": "i couldn't connect to the service api. maybe it's down, or cobalt got blocked. try again, but if error persists, {ContactLink}.", "ErrorEmptyDownload": "i don't see anything i could download by your link. try a different one!", "ErrorLiveVideo": "this is a live video, i am yet to learn how to look into future. wait for the stream to finish and try again!", "SettingsAppearanceSubtitle": "appearance", @@ -46,10 +46,9 @@ "AccessibilityEnableDownloadPopup": "ask what to do with downloads", "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": "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\".", + "NoScriptMessage": "cobalt 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": "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, and press \"always allow\".\n\nalternative method:\npress 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", "Download": "download", "CopyURL": "copy", @@ -88,15 +87,14 @@ "MediaPickerTitle": "pick what to save", "MediaPickerExplanationPC": "click or right click to download what you want.", "MediaPickerExplanationPhone": "press or press and hold to download what you want.", - "MediaPickerExplanationPhoneIOS": "press and hold, hide the preview, and then select \"download linked file\" to save.", "TwitterSpaceWasntRecorded": "this twitter space wasn't recorded, so there's nothing to download. try another one!", "ErrorCantProcess": "i couldn't process your request :(\nyou can try again, but if issue persists, please {ContactLink}.", "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 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.", + "DonateSub": "help it stay online", + "DonateExplanation": "cobalt doesn't shove ads in your face and doesn't sell your personal data, and thus is completely free to use for everyone. but development and maintenance of a media-heavy service used by over 350k people is quite costly. both in terms of time and money. as a student, it's rather difficult for me to handle such expenses on my own.\n\nif cobalt has helped you in the past and you want to keep it growing and evolving, you can do so by making a donation!\n\nby donating you're helping everyone who uses cobalt: teachers, students, musicians, content creators, artists, lecturers, and many, many more!\n\nin past few months donations have let me:\n*; increase stability and uptime to nearly 100%.\n*; speed up ALL downloads, especially heavier ones.\n*; open cobalt api for free public use.\n*; withstand several huge user influxes with 0 downtime.\n*; move to a reliable and trustworthy cloud infrastructure provider.\n*; separate frontend and api for resilience and future decentralization.\n\nevery cent matters and is extremely appreciated, you can truly make a difference!", "DonateVia": "donate via", - "DonateHireMe": "...or you can hire me :)", + "DonateHireMe": "...or you can hire me :)", "SettingsVideoMute": "mute audio", "SettingsVideoMuteExplanation": "removes audio from video downloads when possible.", "ErrorSoundCloudNoClientId": "i couldn't get the temporary token that's required to download songs from soundcloud. try again, but if issue persists, {ContactLink}.", @@ -104,21 +102,47 @@ "CollapseSupport": "support & source code", "CollapsePrivacy": "privacy policy", "ServicesNote": "this list is not final and keeps expanding over time, make sure to check it once in a while!", - "FollowSupport": "follow {appName} on mastodon or twitter for support, polls, news, and more:", - "SupportNote": "please note that questions and issues may take a while to respond to, there's only one person managing everything.", + "FollowSupport": "keep in touch with cobalt for support, polls, news, and more:", + "SupportNote": "please note that response may take a while, there's only one person managing everything.", "SourceCode": "report issues, explore source code, star or fork the repo:", - "PrivacyPolicy": "{appName}'s privacy policy is simple: no data about you is ever collected or stored. zero, zilch, nada, nothing.\nwhat you download is your business, not mine.\n\nsome non-backtraceable data does get temporarily stored when requested download requires live render. it's necessary for that feature to function.\n\nin that case, salted sha256 hash of your ip address and information about requested stream are temporarily stored in server's RAM for 2 minutes. after 2 minutes all previously stored information is permanently removed. hash of your ip address is used for limiting stream access only to you.\nno one (even me) has access to this data, because official {appName} codebase doesn't provide a way to read it outside of processing functions in the first place.\n\nyou can check {appName}'s github repo yourself and see that everything is as stated.", - "ErrorYTUnavailable": "this youtube video is unavailable or age restricted. i am currently unable to download videos with sensitive content. try another one!", + "PrivacyPolicy": "cobalt's privacy policy is simple: no data about you is ever collected or stored. zero, zilch, nada, nothing.\nwhat you download is solely your business, not mine or anyone else's.\n\nif your download requires live render, some non-backtraceable data is temporarily stored in server's RAM. it's necessary for this feature to function.\n\nin this case info about requested content is stored for 20 seconds and then permanently removed.\nno one (even me) has access to this data. official cobalt codebase doesn't provide a way to read it outside of processing functions.\n\nyou can check cobalt's source code yourself and see that everything is as stated.", + "ErrorYTUnavailable": "this youtube video is unavailable, it could be region or age restricted. try another one!", "ErrorYTTryOtherCodec": "i couldn't find anything to download with your settings. try another codec or quality!\n\nnote: youtube api sometimes acts unexpectedly. blame google for this, not me.", "SettingsCodecSubtitle": "youtube codec", "SettingsCodecDescription": "h264: generally better player support, but quality tops out at 1080p.\nav1: low player support, but supports 8k & HDR.\nvp9: usually highest bitrate, preserves most detail. supports 4k & HDR.\n\npick h264 if you want best editor/player/social media compatibility.", "SettingsAudioDub": "youtube audio track", - "SettingsAudioDubDescription": "defines which audio track will be used. if dubbed track isn't available, original video language is used instead.\n\noriginal: original video language is used.\nauto: default browser (and {appName}) language is used.", + "SettingsAudioDubDescription": "defines which audio track will be used. if dubbed track isn't available, original video language is used instead.\n\noriginal: original video language is used.\nauto: default browser (and cobalt) language is used.", "SettingsDubDefault": "original", "SettingsDubAuto": "auto", "SettingsVimeoPrefer": "vimeo downloads type", - "SettingsVimeoPreferDescription": "progressive: direct file link to vimeo's cdn. max quality is 1080p.\ndash: video and audio are merged by {appName} into one file. max quality is 4k.\n\npick \"progressive\" if you want best editor/player/social media compatibility. if progressive download isn't available, dash is used instead.", + "SettingsVimeoPreferDescription": "progressive: direct file link to vimeo's cdn. max quality is 1080p.\ndash: video and audio are merged by cobalt into one file. max quality is 4k.\n\npick \"progressive\" if you want best editor/player/social media compatibility. if progressive download isn't available, dash is used instead.", "ShareURL": "share", - "ErrorTweetUnavailable": "couldn't find anything about this tweet. this could be because its visibility is limited. try another one!" + "ErrorTweetUnavailable": "couldn't find anything about this tweet. this could be because its visibility is limited. try another one!", + "ErrorTwitterRIP": "twitter has restricted access to any content to unauthenticated users. while there's a way to get regular tweets, spaces are, unfortunately, impossible to get at this time. i am looking into possible solutions.", + "UrgentDonate": "cobalt needs your help!", + "PopupCloseDone": "done", + "Accessibility": "accessibility", + "SettingsReduceTransparency": "reduce transparency", + "SettingsDisableAnimations": "disable animations", + "FeatureErrorGeneric": "your browser doesn't allow or support this feature. check if there are any updates available and try again!", + "ClipboardErrorFirefox": "you're using firefox where all clipboard reading functionality is disabled.\n\nyou can fix this by following steps listed here!\n\n...or you can paste the link manually instead.", + "ClipboardErrorNoPermission": "cobalt can't access the most recent item in your clipboard without your permission.\n\nif you don't want to give access, just paste the link manually instead.\n\nif you do, go to site settings and enable the clipboard permission.", + "SupportSelfTroubleshooting": "experiencing issues? try self-troubleshooting guide first!", + "AccessibilityGoBack": "go back and close the popup", + "CollapseKeyboard": "keyboard shortcuts", + "KeyboardShortcutsIntro": "use cobalt even faster with keyboard shortcuts:", + "KeyboardShortcutQuickPaste": "paste the link", + "KeyboardShortcutClear": "clear link input area", + "KeyboardShortcutClosePopup": "close all popups", + "CollapseLegal": "legal stuff", + "FairUse": "cobalt is a tool for easing content downloads from internet and takes zero liability. you are responsible for what you download, how you use and distribute that content.\n\ncobalt does not log any info about you, it's impossible for me to snitch on you, but please be mindful when using content of others and always credit original creators!\n\nwhen used in education purposes (lecture, homework, etc) please attach the source link.\n\nfair use and credits benefit everyone.", + "UrgentFeatureUpdate71": "more supported services!", + "UrgentThanks": "thank you for support!", + "SettingsDisableMetadata": "don't add metadata", + "UrgentNewDomain": "new domain, same cobalt", + "NewDomainWelcomeTitle": "hey there!", + "NewDomainWelcome": "cobalt is moving! same features, same owner, simply a more rememberable domain. and still no ads.\n\ncobalt.tools is the new main domain, aka where you are now. make sure to update your bookmarks and reinstall the web app!", + "DataTransferSuccess": "btw, your settings have been transferred automatically :)", + "DataTransferError": "something went wrong when transferring your preferences. you'll have to open settings and configure cobalt by hand." } } diff --git a/src/localization/languages/es.json b/src/localization/languages/es.json deleted file mode 100644 index 6f42e12d..00000000 --- a/src/localization/languages/es.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "name": "español", - "substrings": { - "ContactLink": "presenta un problema en github" - }, - "strings": { - "LinkInput": "pega tu enlace aquí", - "AboutSummary": "{appName} es tu lugar ideal para descargas de redes sociales. sin anuncios u otras mierdas sospechosas. ¡solo necesitas pegar un enlace y listo!", - "AboutSupportedServices": "servicios compatibles:", - "EmbedBriefDescription": "guarda contenido de redes sociales sin preocuparte por rastreadores", - "MadeWithLove": "hecho con <3 por wukko", - "AccessibilityInputArea": "cuadro de captura", - "AccessibilityOpenAbout": "abrir ventana emergente de acerca de", - "AccessibilityDownloadButton": "botón de descarga", - "AccessibilityOpenSettings": "abrir ventana emergente de ajustes", - "AccessibilityClosePopup": "cerrar la ventana emergente", - "AccessibilityOpenDonate": "abrir ventana emergente de donación", - "TitlePopupAbout": "¿qué es {appName}?", - "TitlePopupSettings": "ajustes", - "TitlePopupError": "oh-no...", - "TitlePopupChangelog": "¿qué hay de nuevo?", - "TitlePopupDonate": "apoya a {appName}", - "TitlePopupDownload": "descargar", - "ErrorSomethingWentWrong": "algo salió mal y no pude encontrar nada para ti. puedes intentar de nuevo, pero si el problema persiste, por favor {ContactLink}.", - "ErrorUnsupported": "parece que este servicio aún no es compatible o tu enlace no es válido.", - "ErrorBrokenLink": "{s} es compatible con cobalt, pero algo está mal con tu enlace. ¿tal vez no lo copiaste completamente?", - "ErrorNoLink": "¡no puedo adivinar qué quieres descargar! por favor introduce un enlace.", - "ErrorPageRenderFail": "algo salió mal y la página no se pudo procesar. si quieres que solucione esto, por favor {ContactLink}. sería útil si proporcionas el commit hash ({s}) junto con pasos de recreación, gracias :D", - "ErrorRateLimit": "estás haciendo demasiadas solicitudes. cálmate y vuelve a intentarlo en unos minutos.", - "ErrorCouldntFetch": "no se pudo obtener ninguna información sobre tu enlace. comprueba si tu enlace es correcto e inténtalo de nuevo.", - "ErrorLengthLimit": "el limite de duración actual es de {s} minutos. lo que intentaste descargar es mas largo que eso. ¡escoge otra cosa que descargar!", - "ErrorBadFetch": "algo salió mal con la obtención de info. puedes probar con un formato y una resolución diferentes o simplemente intentarlo de nuevo más tarde.", - "ErrorCorruptedStream": "parece que esta descarga está corrupta. inténtalo de nuevo o intenta con otro formato o resolución.", - "ErrorNoInternet": "parece que no hay internet o la api de {appName} no está disponible. revisa tu conexión e intenta de nuevo.", - "ErrorCantConnectToServiceAPI": "no pude conectarme a la api de {s} . parace que {s} no está disponible o la ip del servidor de {appName} fue bloqueada. inténtalo de nuevo mas tarde.", - "ErrorEmptyDownload": "parece que no hay nada que descargar. ¡intentalo de nuevo con otro enlace!", - "ErrorLiveVideo": "no se puede descargar un video en vivo. espera que termine la transmisión y vuelve a intentarlo.", - "SettingsAppearanceSubtitle": "apariencia", - "SettingsThemeSubtitle": "tema", - "SettingsFormatSubtitle": "formato de descarga", - "SettingsQualitySubtitle": "calidad", - "SettingsThemeAuto": "auto", - "SettingsThemeLight": "claro", - "SettingsThemeDark": "oscuro", - "SettingsQualitySwitchMax": "max", - "SettingsQualitySwitchHigh": "alta", - "SettingsQualitySwitchMedium": "media", - "SettingsQualitySwitchLow": "baja", - "SettingsQualitySwitchLowest": "mas baja", - "SettingsKeepDownloadButton": "mantener >> visible", - "AccessibilityKeepDownloadButton": "mantener el botón de descarga siempre visible", - "SettingsEnableDownloadPopup": "pregunta por la forma de guardar", - "AccessibilityEnableDownloadPopup": "preguntar qué hacer con las descargas", - "SettingsFormatDescription": "selecciona webm si necesitas la máxima calidad disponible. los videos webm suelen tener un mayor bitrate, pero los dispositivos ios no pueden reproducirlos de forma nativa.", - "SettingsQualityDescription": "si la calidad seleccionada no está disponible, la más cercana es elegida en su lugar.\nsi quieres publicar un vídeo de youtube en las redes sociales, selecciona una combinación de mp4 y 720p. esos videos normalmente no están en el códec av1, por lo que deberían reproducirse bien básicamente en todas partes.", - "LinkGitHubIssues": ">> informa sobre problemas y consulta el código fuente en github", - "LinkGitHubChanges": ">> mira los cambios anteriores y contribuye en github", - "NoScriptMessage": "{appName} usa javascript para las solicitudes de api y para la interfaz interactiva. tienes que permitir javascript en tu navegador para usar este sitio. no tenemos ningún anuncio ni rastreadores, lo prometo con el meñique.", - "DownloadPopupDescriptionIOS": "como tienes un dispositivo ios, debes mantener presionado el botón de descarga y luego seleccionar \"descargar video\" en la ventana emergente que aparece para guardar el video. esto será necesario mientras apple obligue a todos los desarrolladores de navegadores en ios a usar safari webview", - "DownloadPopupDescription": "el botón de descarga abre una nueva pestaña con el archivo solicitado. puedes desactivar esta ventana emergente en los ajustes.", - "DownloadPopupWayToSave": "elige una forma de guardar", - "ClickToCopy": "click para copiar", - "Download": "descargar", - "CopyURL": "copiar url", - "AboutTab": "acerca de", - "ChangelogTab": "changelog", - "DonationsTab": "donaciones", - "SettingsVideoTab": "vídeo", - "SettingsAudioTab": "audio", - "SettingsOtherTab": "otros", - "ChangelogLastMajor": "versión actual y commit", - "AccessibilityModeToggle": "cambiar el modo de descarga", - "DonateLinksDescription": "los enlaces de donación se abren en una nueva pestaña. esta es la mejor manera para donar dinero si quieres que lo reciba directamente.", - "SettingsAudioFormatBest": "mejor", - "SettingsAudioFormatDescription": "cuando seleccionas el formato mejor, obtienes audio en la mejor calidad disponible, porque el audio se mantiene en su formato original. si seleccionas otro formato obtendrás un archivo ligeramente comprimido", - "Keyphrase": "guarda lo que amas", - "SettingsRemoveWatermark": "desactivar marca de agua", - "ErrorPopupCloseButton": "vale", - "ErrorLengthAudioConvert": "el límite de duración actual para la conversión de audio es de {s} minutos. escoge el formato \"mejor\" !", - "SettingsAudioFullTikTok": "descargar el audio completo", - "SettingsAudioFullTikTokDescription": "se descarga el audio original o el sonido usado en el vídeo sin ningún cambio adicional por el autor del vídeo", - "ErrorCantGetID": "No pude obtener la info completa del enlace acortado. asegúrate de que funciona o prueba un enlace completo.", - "ErrorNoVideosInTweet": "este tweet no tiene videos o gifs. ¡inténtalo con otro!", - "ImagePickerTitle": "elige imágenes para descargar", - "ImagePickerDownloadAudio": "descargar audio", - "ImagePickerExplanationPC": "haz clic derecho en una imagen para guardarla.", - "ImagePickerExplanationPhone": "mantén presionada una imagen para guardarla.", - "ErrorNoUrlReturned": "el servidor no devolvió un enlace de descarga. Esto nunca debería suceder. recarga la página y vuelve a intentarlo, pero si eso no ayuda, {ContactLink}.", - "ErrorUnknownStatus": "he recibido una respuesta que no puedo procesar. lo más probable es que algo con el status esté mal. esto nunca debería suceder. recarga la página y vuelve a intentarlo, pero si eso no ayuda, {ContactLink}.", - "PasteFromClipboard": "pegar desde el portapapeles", - "FollowTwitter": "sigue la cuenta de {appName} en twitter para encuestas, actualizaciones y más: @justusecobalt", - "ChangelogOlder": "versiones anteriores", - "ChangelogPressToExpand": "presiona para expandir", - "Miscellaneous": "otros", - "ModeToggleAuto": "modo automático ", - "ModeToggleAudio": "modo audio", - "SettingsDisableNotifications": "ocultar burbujas de notificación", - "MediaPickerTitle": "elige qué guardar", - "MediaPickerExplanationPC": "haz clic o clic derecho para descargar lo que quieras.", - "MediaPickerExplanationPhone": "presiona o presiona y mantén pulsado para descargar lo que quieras.", - "MediaPickerExplanationPhoneIOS": "mantén presionado, oculta la vista previa, y luego selecciona \"descargar archivo enlazado\" para guardar.", - "TwitterSpaceWasntRecorded": "este espacio de twitter no fue grabado, así que no hay nada que descargar. ¡prueba con otro!", - "ErrorCantProcess": "no he podido procesar tu solicitud :(\npuedes intentarlo de nuevo, pero si el problema persiste, por favor {ContactLink}.", - "ChangelogPressToHide": "presiona para ocultar", - "Donate": "donar", - "DonateSub": "ayúdame a mantenerlo", - "DonateExplanation": "{appName} no muestra anuncios (y nunca lo hará) o vende tus datos, por lo tanto es completamente gratis de usar. pero resulta ser que mantener un servicio web usado por miles de personas es más o menos costoso\n\nsi alguna vez has encontrado que {appName} te es útil y quieres mantenerlo en línea, o simplemente quieres darle las gracias al desarrollador, ¡concidera aportar algo! cada centavo ayuda y es MUY apreciado\n", - "DonateVia": "donar vía", - "DonateHireMe": "o, como alternativa, puedes contratarme.", - "SettingsVideoMute": "silenciar audio", - "SettingsVideoMuteExplanation": "deshabilita el audio en el vídeo descargado cuando sea posible. obtendrás el archivo de vídeo fuente si los canales de vídeo y audio se sirven en dos archivos por el servicio de origen. se ignora cuando el modo de audio está encendido o si el servicio solo soporta audio.", - "SettingsVideoGeneral": "general", - "ErrorSoundCloudNoClientId": "no se pudo encontrar el client_id necesario para obtener datos de audio de soundcloud. Inténtalo de nuevo, y si el problema persiste, {ContactLink}." - } -} diff --git a/src/localization/languages/fr.json b/src/localization/languages/fr.json deleted file mode 100644 index ef3f08ae..00000000 --- a/src/localization/languages/fr.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "name": "français", - "substrings": { - "ContactLink": "fais-moi signe" - }, - "strings": { - "LinkInput": "collez le lien ici", - "AboutSummary": "{appName} est l'endroit idéal pour télécharger sur les réseaux sociaux. zero pubs, trackers, ou toute autre connerie effrayante attachée. il suffit de coller un lien de partage et vous êtes prêt à vous lancer!", - "AboutSupportedServices": "services actuellement supportés:", - "EmbedBriefDescription": "sauvegarder le contenu des médias sociaux sans être suivi par des personnes mal intentionnées", - "MadeWithLove": "crée avec <3 par wukko et tous les contributeurs sur github (traduction par Greep)", - "AccessibilityInputArea": "zone de saisie du lien", - "AccessibilityOpenAbout": "ouvrir la fenêtre popup à propos", - "AccessibilityDownloadButton": "bouton de téléchargement", - "AccessibilityOpenSettings": "ouvrir la fenêtre popup des paramètres", - "AccessibilityOpenChangelog": "voir la fenêtre popup du journal des modifications", - "AccessibilityClosePopup": "fermer la popup", - "AccessibilityOpenDonate": "ouvrir une popup de donation", - "TitlePopupAbout": "c'est quoi {appName}?", - "TitlePopupSettings": "paramètres", - "TitlePopupError": "ah! c'est cringe là...", - "TitlePopupChangelog": "Quoi de neuf ?", - "TitlePopupDonate": "supporter {appName}", - "TitlePopupDownload": "télecharger", - "ErrorSomethingWentWrong": "quelque chose s'est mal passé et je n'ai rien pu obtenir pour vous. vous pouvez réessayer, mais si le problème persiste, s'il vous plaît {ContactLink}.", - "ErrorUnsupported": "il semble que ce service ne soit pas encore supporté ou que votre lien ne soit pas valide.", - "ErrorBrokenLink": "{s} est supporté, mais quelque chose ne va pas avec votre lien. peut-être que vous ne l'avez pas copié entièrement ?", - "ErrorNoLink": "je ne peux pas deviner ce que vous voulez télécharger ! s'il vous plaît donnez-moi un lien.", - "ErrorPageRenderFail": "quelque chose s'est mal passé et la page n'a pas pu s'afficher. Si c'est un problème récurrent ou critique, veuillez {ContactLink}. il serait utile de fournir le hash du commit actuel ({s}) et les étapes de recréation d'erreur. merci :D", - "ErrorRateLimit": "vous faites beaucoup trop de demandes. calmez-vous et réessayez dans quelques minutes.", - "ErrorCouldntFetch": "Impossible de récupérer les métadonnées. Vérifiez si votre lien est correct et réessayez.", - "ErrorLengthLimit": "la durée limite actuelle est de {s} minutes. ce que vous avez essayé de télécharger est plus long que {s} minutes. choisissez autre chose à télécharger !", - "ErrorBadFetch": "Quelque chose s'est mal passé avec la récupération des informations. Vous pouvez essayer un autre format et une autre résolution ou réessayer plus tard.", - "ErrorCorruptedStream": "ce téléchargement est malheureusement corrompu. essayez à nouveau ou essayez un format et une résolution différents.", - "ErrorNoInternet": "il n'y a pas d'internet ou l'api de {appName} est en panne. Vérifiez votre connexion et réessayez.", - "ErrorCantConnectToServiceAPI": "je n'ai pas pu me connecter à l'api de {s}. il semble que {s} soit hors service ou que l'ip du serveur {appName} soit bloqué. réessayez plus tard.", - "ErrorEmptyDownload": "il n'y a rien à télécharger. essayez autre chose !", - "ErrorLiveVideo": "je ne peux pas télécharger une vidéo en direct. attendez que le flux se termine et réessayez.", - "SettingsAppearanceSubtitle": "apparence", - "SettingsThemeSubtitle": "thème", - "SettingsFormatSubtitle": "télecharger le format", - "SettingsMiscSubtitle": "plus de paramètres", - "SettingsDownloadsSubtitle": "télechargement", - "SettingsQualitySubtitle": "qualité", - "SettingsThemeAuto": "auto", - "SettingsThemeLight": "clair", - "SettingsThemeDark": "sombre", - "SettingsQualitySwitchMax": "max", - "SettingsQualitySwitchHigh": "haute", - "SettingsQualitySwitchMedium": "moyenne", - "SettingsQualitySwitchLow": "basse", - "SettingsQualitySwitchLowest": "plus basse", - "SettingsKeepDownloadButton": "garder >> visible", - "AccessibilityKeepDownloadButton": "garder le bouton de téléchargement toujours visible", - "SettingsEnableDownloadPopup": "demander un moyen de sauvegarder", - "AccessibilityEnableDownloadPopup": "demander ce qu'il faut faire avec les téléchargements", - "SettingsFormatDescription": "sélectionnez webm si vous avez besoin de la qualité maximale disponible. les vidéos webm sont généralement de meilleure qualité mais les appareils ios ne peuvent pas les lire en natif.", - "SettingsQualityDescription": "si la résolution choisie n'est pas disponible, la résolution la plus proche est choisie à la place. si vous voulez poster une vidéo youtube sur twitter, choisissez une combinaison de mp4 et 720p. twitter aime beaucoup plus les vidéos de ce type.", - "DonateSubtitle": "aidez-moi à payer l'hébergement", - "DonateDescription": "je n'aime pas vraiment la crypto dans son état actuel, mais c'est le seul moyen fiable pour moi de recevoir de l'argent et de payer quoi que ce soit à l'étranger.", - "LinkGitHubIssues": ">> signaler les problèmes et consulter le code source sur github", - "LinkGitHubChanges": ">> voir les changements précédents et contribuer sur github", - "LinkDonateContact": ">> faites-moi savoir si la monnaie que vous voulez donner n'est pas listée", - "NoScriptMessage": "{appName} utilise javascript pour les demandes d'api et l'interface interactive. vous devez autoriser javascript pour utiliser ce site. nous n'avons pas de publicités ou de traceurs, c'est promis.", - "DownloadPopupDescriptionIOS": "comme vous avez un appareil ios, vous devez appuyer sur le bouton de téléchargement et le maintenir enfoncé, puis sélectionner \"télécharger la vidéo\" dans la fenêtre popup qui apparaît pour enregistrer la vidéo. cela sera nécessaire tant qu'apple imposera safari webview à tous les développeurs de navigateurs sur ios.", - "DownloadPopupDescription": "le bouton de téléchargement ouvre un nouvel onglet avec le fichier demandé. vous pouvez désactiver cette popup dans les paramètres.", - "DownloadPopupWayToSave": "choisissez un moyen de sauvegarder", - "ClickToCopy": "appuyer pour copier", - "Download": "télecharger", - "CopyURL": "copier l'url", - "AboutTab": "à propos", - "ChangelogTab": "journal de modifications", - "DonationsTab": "donations", - "SettingsVideoTab": "vidéo", - "SettingsAudioTab": "audio", - "SettingsOtherTab": "autre", - "ChangelogLastCommit": "dernier commit", - "ChangelogLastMajor": "dernière mise à jour majeure", - "AccessibilityModeToggle": "basculer le mode de téléchargement", - "DonateLinksDescription": "les liens vers les dons s'ouvrent dans un nouvel onglet. c'est la meilleure façon de donner de l'argent, si vous voulez que je le reçoive directement.", - "SettingsAudioFormatBest": "meilleure", - "SettingsAudioFormatDescription": "lorsque le meilleur format est sélectionné, vous obtenez l'audio dans la meilleure qualité disponible, car l'audio est conservé dans son format d'origine. si vous sélectionnez autre chose, vous obtiendrez un fichier légèrement compressé.", - "Keyphrase": "sauvegardez ce que vous aimez", - "SettingsDisableChangelogOnUpdate": "ne pas afficher le journal de modifications après les mises à jour majeures", - "SettingsRemoveWatermark": "désactiver le filigrane", - "ErrorPopupCloseButton": "fermer", - "ModeToggle": "mode", - "ModeToggleSmart": "intélligent", - "ErrorLengthAudioConvert": "la longueur limite actuelle pour la conversion audio est de {s} minutes. choisissez plutôt le format \"meilleure\" !", - "SettingsAudioFullTikTok": "télécharger l'audio complet", - "SettingsAudioFullTikTokDescription": "cet audio est le plus souvent de la musique ou un son original utilisé dans une vidéo. un audio sans voix off, tts, ou découpage sera téléchargé, s'il est disponible, bien sûr.", - "ErrorCantGetID": "Je n'ai pas pu obtenir les informations complètes à partir du lien raccourci. Assurez-vous que cela fonctionne ou essayez un lien complet.", - "ErrorNoVideosInTweet": "Ce tweet n'a pas de vidéos ou de gifs. Essayez un autre !", - "ImagePickerTitle": "choisir les images à télécharger", - "ImagePickerDownloadAudio": "Télécharger l'audio", - "ImagePickerExplanationPC": "faites un clic droit sur une image pour l'enregistrer.", - "ImagePickerExplanationPhone": "appuyez et maintenez une image enfoncée pour l'enregistrer.", - "ErrorNoUrlReturned": "le serveur n'a pas retourné de lien de téléchargement. Cela ne devrait jamais se produire. Rechargez la page et réessayez, mais si cela n'aide pas, {ContactLink}.", - "ErrorUnknownStatus": "J'ai reçu une réponse que je ne peux pas traiter. Il est fort probable que quelque chose avec le statut est erroné. cela ne devrait jamais arriver. Rechargez la page et réessayez, mais si cela n'aide pas, {ContactLink}." - } -} diff --git a/src/localization/languages/id.json b/src/localization/languages/id.json deleted file mode 100644 index b58c34df..00000000 --- a/src/localization/languages/id.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "name": "indonesia", - "substrings": { - "ContactLink": "beri tau saya" - }, - "strings": { - "LinkInput": "tempel link kamu disini", - "AboutSummary": "{appName} adalah tempat terbaik kamu untuk download video sosial media tanpa iklan, pelacak, atau omong kosong lainnya. tinggal tempel link dan udah deh", - "AboutSupportedServices": "layanan yang didukung:", - "EmbedBriefDescription": "simpan konten dari sosial media tanpa hal aneh mengikuti kamu", - "AccessibilityInputArea": "tempat tempel link", - "AccessibilityOpenAbout": "buka bagian pengantar", - "AccessibilityDownloadButton": "tombol download", - "AccessibilityOpenSettings": "buka pengaturan", - "AccessibilityOpenChangelog": "buka log perubahan", - "AccessibilityClosePopup": "tutup popup ini", - "AccessibilityOpenDonate": "buka bagian donasi", - "TitlePopupAbout": "apa itu {appName}?", - "TitlePopupSettings": "pengaturan", - "TitlePopupError": "uh-oh...", - "TitlePopupChangelog": "apa yang baru?", - "TitlePopupDonate": "dukung {appName}", - "TitlePopupDownload": "download", - "ErrorSomethingWentWrong": "ada yang tidak beres dan saya tidak bisa mendapatkan apa-apa untuk kamu. tolong coba lagi, tapi kalo masih tidak bisa, tolong kontak {ContactLink}.", - "ErrorUnsupported": "sepertinya layanan atau sosial media kamu belom didukung oleh kita atau link kamu tidak sah.", - "ErrorBrokenLink": "{s} sudah didukung kita, tapi ada sesuatu yang salah dengan link kamu, mungkin kamu belom salin sepenuhnya?", - "ErrorNoLink": "saya tidak bisa menebak apa yang kamu mau download! tolong tempel link yang benar.", - "ErrorPageRenderFail": "ada sesuatu yang salah dan halaman tidak bisa dirender. kalo masalah ini terus berulang tolong beritahu {ContactLink}. akan sangat membantu kalo kamu juga tuliskan commit hash sekarang ({s}) dan langkah-langkah rekreasi error ini, terima kasih :D", - "ErrorRateLimit": "kamu membuat terlalu banyak permintaan. tunggu sebentar dan coba sebentar lagi.", - "ErrorCouldntFetch": "kita tidak bisa mendapatkan metadata. coba cek link kamu benar atau tidak dan coba lagi.", - "ErrorLengthLimit": "batas panjang file saat ini adalah {s} menit. hal yang kamu coba download itu lebih panjang dari {s} menit, pilih file lain untuk didownload!", - "ErrorBadFetch": "ada sesuatu yang salah saat pengambilan info. coba ganti pilihan format atau resolusi file, atau coba lagi nanti.", - "ErrorCorruptedStream": "download file ini sayangnya rusak. coba lagi atau coba memakai pilihan format dan resolusi yang beda.", - "ErrorNoInternet": "tidak ada internet atau api {AppName} sedang tidak tersedia. coba cek internet kamu dan coba lagi.", - "ErrorCantConnectToServiceAPI": "kita tidak bisa tidak bisa menghubungi api {s}. sepertinya {s} lagi tidak tersedia atau ip server {appName} diblokir. coba lagi nanti.", - "ErrorEmptyDownload": "tidak ada konten media untuk didownload. coba sesuatu yang lain!", - "ErrorLiveVideo": "kita tidak bisa mendownload video siaran langsung yang sedang berlangsung. tunggu untuk siaran langsungnya untuk selesai dan coba lagi.", - "ErrorNoStreamID": "streamId itu tidak ditemukan.", - "ErrorNoType": "tidak ada tipe respons yang diekspektasikan.", - "SettingsAppearanceSubtitle": "penampilan", - "SettingsThemeSubtitle": "tema", - "SettingsFormatSubtitle": "format download", - "SettingsMiscSubtitle": "pengaturan lebih lanjut", - "SettingsDownloadsSubtitle": "download", - "SettingsQualitySubtitle": "kualitas", - "SettingsThemeAuto": "otomatis", - "SettingsThemeLight": "terang", - "SettingsThemeDark": "gelap", - "SettingsQualitySwitchMax": "maksimal", - "SettingsQualitySwitchHigh": "tinggi", - "SettingsQualitySwitchMedium": "sedang", - "SettingsQualitySwitchLow": "rendah", - "SettingsQualitySwitchLowest": "paling rendah", - "SettingsFormatSwitchAudio": "audio saja", - "SettingsKeepDownloadButton": "biarkan >> tetap terlihat", - "AccessibilityKeepDownloadButton": "biarkan tombol download selalu kelihatan", - "SettingsEnableDownloadPopup": "tanya cara untuk simpan", - "AccessibilityEnableDownloadPopup": "tanyakan apa yang dilakukan dengan file yang baru didownload", - "SettingsFormatDescription": "pilih webm kalo kamu butuh kualitas tertinggi. kualitas video webm biasanya lebih tinggi tapi perangkat ios tidak bisa menjalankannya secara native.", - "SettingsQualityDescription": "jika resolusi yang dipilih tidak tersedia, resolusi yang dipilih akan diganti dengan resolusi tersedia yang terdekat. kalo kamu mau kirim video youtube di twitter, pilih kombinasi mp4 dan 720p. twitter lebih suka video seperti itu.", - "DonateSubtitle": "sekarang lagi susah untuk bayar hosting bagi saya", - "DonateDescription": "saya tidak suka crypto dengan keadaannya sekarang, tetapi saat ini itu adalah satu-satunya cara bagi saya untuk membayar apa pun yang di luar negeri. kartu mastercard/visa dan layanan yang mirip seperti paypal tidak lagi menjadi pilihan.", - "LinkGitHubIssues": ">> laporkan masalah atau liat source code di github", - "LinkGitHubChanges": ">> liat perubahan sebelumnya dan berkontribusi di github", - "LinkDonateContact": ">> beri tau saya jika mata uang yg kamu mau donasi belom ada di atas", - "NoScriptMessage": "{appName} memakai javascript untuk permintaan api dan ui interaktif. kamu harus mengizinkan javascript untuk menggunakan situs ini. kita tidak punya iklan atau pelacak, saya janji.", - "DownloadPopupDescriptionIOS": "karena kamu punya perangkat ios, kamu harus teken lama tombol download dan pilih \"download video\" di popup yang muncul untuk menyimpan videonya. ini akan diperlukan selama apple memaksa webview safari pada semua browser developer di ios.", - "DownloadPopupDescription": "tombol download membuka tab baru dengan file yang diminta. kamu bisa menonaktifkan popup ini di pengaturan.", - "DownloadPopupWayToSave": "pilih cara untuk disimpan", - "ClickToCopy": "tekan untuk salin", - "Download": "download", - "CopyURL": "salin url" - } -} diff --git a/src/localization/languages/it.json b/src/localization/languages/it.json deleted file mode 100644 index 17e0c663..00000000 --- a/src/localization/languages/it.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "name": "italiano", - "substrings": { - "ContactLink": "contatta il gestore/a>" - }, - "strings": { - "LinkInput": "incolla qui il link", - "AboutSummary": "{appName} è il sito perfetto per scaricare media dai social. niente pubblicità, trackers, o altre minchiate. incolla un link e via!", - "AboutSupportedServices": "servizi attualmente supportati:", - "EmbedBriefDescription": "salva contenuti dai social media senza alcun fastidio", - "MadeWithLove": "realizzato con <3 da wukko", - "AccessibilityInputArea": "qui puoi inserire un link", - "AccessibilityOpenAbout": "apri la sezione info", - "AccessibilityDownloadButton": "tasto download", - "AccessibilityOpenSettings": "apri le impostazioni", - "AccessibilityOpenChangelog": "apri la sezione aggiornamenti", - "AccessibilityClosePopup": "chiudi la finestra", - "AccessibilityOpenDonate": "apri sezione donazioni", - "TitlePopupAbout": "cos'è {appName}?", - "TitlePopupSettings": "impostazioni", - "TitlePopupError": "uh-oh...", - "TitlePopupChangelog": "cosa c'è di nuovo?", - "TitlePopupDonate": "supporta {appName}", - "TitlePopupDownload": "scarica", - "ErrorSomethingWentWrong": "qualcosa è andato storto e non ho potuto effettuare il download. puoi riprovare, ma se il problema persiste, {ContactLink}", - "ErrorUnsupported": "il servizio non è ancora supportato, oppure il tuo link è invalido.", - "ErrorBrokenLink": "{s} è supportato, ma c'è qualcosa che non va con il tuo link. forse non lo hai copiato completamente?", - "ErrorNoLink": "non posso indovinare cosa vuoi scaricare! inserisci un link.", - "ErrorPageRenderFail": "qualcosa è andato storto e la pagina non è riuscita a renderizzare. se il problema persiste, {ContactLink}. se è possibile, specifica l'hash del commit attuale ({s}) e i passaggi per ricreare l'errore. grazie in anticipo :D", - "ErrorRateLimit": "stai facendo troppe richieste! datti una calmata e riprova tra un po'.", - "ErrorCouldntFetch": "non ho potuto ottenere informazioni sul tuo link. controlla di averlo inserito correttamente e riprova.", - "ErrorLengthLimit": "spiacenti! il limite di lunghezza attuale è di {s} minuti. il video che hai provato a scaricare è più lungo di {s} minuti.", - "ErrorBadFetch": "si è verificato un errore quando ho cercato di ottenere informazioni sul tuo link. controlla se sia funzionante e riprova.", - "ErrorCorruptedStream": "purtroppo questo download è corrotto. prova di nuovo, oppure prova a cambiare formato o risoluzione.", - "ErrorNoInternet": "la connessione è assente oppure ci sono problemi con l'api di {appName}. controlla la tua connessione e riprova.", - "ErrorCantConnectToServiceAPI": "non riesco a connettermi all'api di {s}. sembra ci siano problemi con {s} o che l'ip di {appName} sia stato bloccato. riprova più tardi.", - "ErrorEmptyDownload": "non vedo nulla che possa scaricare da qui. prova un link diverso.", - "ErrorLiveVideo": "non posso guardare nel futuro e scaricare una diretta in corso! aspetta che la diretta finisca e riprova.", - "SettingsAppearanceSubtitle": "aspetto", - "SettingsThemeSubtitle": "tema", - "SettingsFormatSubtitle": "formato download", - "SettingsMiscSubtitle": "altre impostazioni", - "SettingsDownloadsSubtitle": "download", - "SettingsQualitySubtitle": "qualità", - "SettingsThemeAuto": "automatico", - "SettingsThemeLight": "chiaro", - "SettingsThemeDark": "scuro", - "SettingsQualitySwitchMax": "massima", - "SettingsQualitySwitchHigh": "alta", - "SettingsQualitySwitchMedium": "media", - "SettingsQualitySwitchLow": "bassa", - "SettingsQualitySwitchLowest": "minima", - "SettingsKeepDownloadButton": "mantieni >> visibile", - "AccessibilityKeepDownloadButton": "mantieni il tasto download sempre visibile", - "SettingsEnableDownloadPopup": "abilita il popup di esplora risorse al download", - "AccessibilityEnableDownloadPopup": "abilita il popup di esplora risorse al download", - "SettingsFormatDescription": "il formato webm offre qualità maggiore, ma potrebbe non essere supportato da alcuni sistemi operativi, come ios.", - "SettingsQualityDescription": "se la risoluzione selezionata non è disponibile, verrà scelta quella più vicina. se vuoi postare il video su twitter, scegliere il formato mp4 a 720p creerà meno problemi.", - "DonateSubtitle": "aiutami a pagare per l'hosting", - "DonateDescription": "le crypto nel loro stato attuale non mi fanno impazzire, ma per me è l'unico modo affidabile per ricevere e pagare soldi con i paesi esteri.", - "LinkGitHubIssues": ">> segnala problemi e visualizza il codice sorgente su github", - "LinkGitHubChanges": ">> vedi i cambiamenti precedenti e contribuisci su github", - "LinkDonateContact": ">> fammi sapere se la valuta che vuoi donare non è elencata", - "NoScriptMessage": "{appName} utilizza javascript per le richieste api e l'interfaccia utente. devi abilitare javascript per questo sito. non ci sono tracker o pubblicità, promesso!", - "DownloadPopupDescriptionIOS": "visto che hai un dispositivo ios, devi tenere premuto il tasto download e selezionare \"scarica video\" nel popup che appare. questo sarà necessario fin quando apple non smetterà di forzare safari webview su tutti i browser per ios.", - "DownloadPopupDescription": "il tasto download apre una nuova scheda con il file richiesto. puoi disabilitare questo popup nelle impostazioni.", - "DownloadPopupWayToSave": "scegli un modo per scaricare", - "ClickToCopy": "premi per copiare", - "Download": "scarica", - "CopyURL": "copia url", - "AboutTab": "info", - "ChangelogTab": "cambiamenti", - "DonationsTab": "donazioni", - "SettingsVideoTab": "video", - "SettingsAudioTab": "audio", - "SettingsOtherTab": "altro", - "ChangelogLastCommit": "ultimo commit (in inglese)", - "ChangelogLastMajor": "ultimo aggiornamento principale (in inglese)", - "AccessibilityModeToggle": "alternare la modalità download", - "DonateLinksDescription": "i link di donazione si apriranno in una nuova scheda. questo è il modo migliore per donare soldi, se vuoi che li riceva direttamente.", - "SettingsAudioFormatBest": "migliore", - "SettingsAudioFormatDescription": "quando il formato \"migliore\" viene selezionato, sarà scaricato in formato originale, con la qualità migliore possibile. scegliendo altri formati, ci sarà una leggera compressione.", - "Keyphrase": "salva ciò che ami", - "SettingsDisableChangelogOnUpdate": "non mostrare le novità dopo aggiornamenti principali", - "SettingsRemoveWatermark": "rimuovi filigrana", - "ErrorPopupCloseButton": "capito", - "ModeToggle": "modalità", - "ModeToggleSmart": "inteligente", - "ErrorLengthAudioConvert": "il limite di lunghezza attuale per la conversione audio è di {s} minuti. scegli il formato \"migliore\" se vuoi evitare limitazioni.", - "SettingsAudioFullTikTok": "scarica l'audio completo", - "SettingsAudioFullTikTokDescription": "scarica l'audio originale del video senza cambiamenti aggiuntivi dell'autore.", - "ErrorCantGetID": "non ho potuto ottenere informazioni sufficienti dal link accorciato. assicurati che funzioni, o prova con il link completo.", - "ErrorNoVideosInTweet": "questo tweet non contiene video o gif. provane un altro.", - "ImagePickerTitle": "scegli le immagini da scaricare", - "ImagePickerDownloadAudio": "scarica l'audio", - "ImagePickerExplanationPC": "fai clic destro su un'immagine per salvarla.", - "ImagePickerExplanationPhone": "tieni premuto su un'immagine per salvarla.", - "ErrorNoUrlReturned": "il server non ha restituito un link di download. questo non avrebbe dovuto succedere. ricarica la pagina e riprova, ma se il problema persiste, {ContactLink}", - "ErrorUnknownStatus": "ho ricevuto una risposta che non posso elaborare. questo non avrebbe dovuto succedere. ricarica la pagina e riprova, ma se il problema persiste, {ContactLink}" - } -} diff --git a/src/localization/languages/nl.json b/src/localization/languages/nl.json deleted file mode 100644 index cdb7f69c..00000000 --- a/src/localization/languages/nl.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "name": "nederlands", - "substrings": { - "ContactLink": "laat het me weten" - }, - "strings": { - "LinkInput": "plak de link hier", - "AboutSummary": "{appName} is je go-to plaats voor social media downloads. zonder advertenties, trackers, of wat voor creepy bullshit dan ook. plak gewoon een link en je bent er klaar voor!", - "AboutSupportedServices": "ondersteunde apps:", - "EmbedBriefDescription": "bewaar content van sociale media zonder creeps die je volgen", - "MadeWithLove": "met <3 gemaakt door wukko", - "AccessibilityInputArea": "link input plek", - "AccessibilityOpenAbout": "open over popup", - "AccessibilityDownloadButton": "download knop", - "AccessibilityOpenSettings": "instellingen openen popup", - "AccessibilityOpenChangelog": "bekijk de changelog popup ", - "AccessibilityClosePopup": "sluit de popup", - "AccessibilityOpenDonate": "open donatie popup", - "TitlePopupAbout": "wat is {appName}?", - "TitlePopupSettings": "instellingen", - "TitlePopupError": "oeps...", - "TitlePopupChangelog": "wat is er nieuw?", - "TitlePopupDonate": "ondersteun {appName}", - "TitlePopupDownload": "download", - "ErrorSomethingWentWrong": "er is iets misgegaan en ik kon niks voor je krijgen. je kan het opnieuw proberen, maar als het probleem door blijft gaan, please {ContactLink}.", - "ErrorUnsupported": "het lijkt erop dat deze service nog niet ondersteund word, of je link is ongeldig.", - "ErrorBrokenLink": "{s} wordt ondersteund, maar er is iets mis met de link, misschien heb je de link niet volledig gekopieerd?", - "ErrorNoLink": "ik kan je gedachten niet lezen! voer hier een link in.", - "ErrorPageRenderFail": "er is iets misgegaan en de pagina kan niet worden weergegeven. als het de hele tijd gebeurt, neem dan contact op: {ContactLink}. het zou handig zijn als je de huidige commit-hash ({s}) en de stappen om de error te laten gebeuren zou opgeven. bedankt :D", - "ErrorRateLimit": "je maakt te veel verzoeken. probeer opnieuw in een paar minuten.", - "ErrorCouldntFetch": "kan metadata niet ophalen. kijk of de link correct is en probeer opnieuw.", - "ErrorLengthLimit": "huidige lengtelimiet is {s} minuten. wat je geprobeerd hebt om te downloaden is langer dan {s} minuten. kies iets anders om te downloaden!", - "ErrorBadFetch": "er is iets misgegaan met het ophalen van info. je kan een ander formaat en resolutie kiezen of opnieuw proberen.", - "ErrorCorruptedStream": "deze download is helaas beschadigd. probeer het opnieuw of probeer een ander formaat en resolutie", - "ErrorNoInternet": "er is geen internet of de api van {appName} is niet beschikbaar. controleer je verbinding en probeer het opnieuw.", - "ErrorCantConnectToServiceAPI": "ik kon geen verbinding maken met {s} api. het lijkt erop dat {s} niet beschikbaar is of dat het server-ip van {appName} is geblokkeerd. probeer later opnieuw", - "ErrorEmptyDownload": "er is niks te downloaden. probeer iets anders!", - "ErrorLiveVideo": "ik kan geen live video downloaden. wacht tot de stream afgelopen is en probeer opnieuw.", - "SettingsAppearanceSubtitle": "uiterlijk", - "SettingsThemeSubtitle": "thema", - "SettingsFormatSubtitle": "download formaat", - "SettingsMiscSubtitle": "meer instellingen", - "SettingsDownloadsSubtitle": "downloads", - "SettingsQualitySubtitle": "kwaliteit", - "SettingsThemeAuto": "automatisch", - "SettingsThemeLight": "licht", - "SettingsThemeDark": "donker", - "SettingsQualitySwitchMax": "max", - "SettingsQualitySwitchHigh": "hoog", - "SettingsQualitySwitchMedium": "medium", - "SettingsQualitySwitchLow": "laag", - "SettingsQualitySwitchLowest": "laagst", - "SettingsKeepDownloadButton": "laat >> zichtbaar blijven", - "AccessibilityKeepDownloadButton": "laat de download know altijd zichtbaar blijven", - "SettingsEnableDownloadPopup": "vraag voor een manier om op te slaan", - "AccessibilityEnableDownloadPopup": "vraag wat te doen met de downloads", - "SettingsFormatDescription": "selecteer webm als je maximale beschikbare kwaliteit nodig hebt. webm video's zijn meestal van hogere kwaliteit, maar ios apparaten kunnen ze niet native afspelen.", - "SettingsQualityDescription": "als de geselecteerde resolutie niet beschikbaar is, wordt in plaats daarvan de dichtstbijzijnde gekozen. als je een youtube video op twitter wil plaatsen, selecteer dan een combinatie van mp4 en 720p. twitter houdt meer van zulke video's.", - "DonateSubtitle": "help me met het betalen van hosting", - "DonateDescription": "ik hou niet echt van crypto in zijn huidige staat, maar het is de enige betrouwbare manier voor mij om geld te ontvangen en te betalen voor iets in het buitenland.", - "LinkGitHubIssues": ">> meld problemen en bekijk de broncode op github", - "LinkGitHubChanges": ">> zie eerdere wijzigingen en draag bij op github", - "LinkDonateContact": ">> laat het me weten als de geld soort die je wil doneren niet in de lijst staat", - "NoScriptMessage": "{appName} gebruikt javascript voor api-verzoeken en interactieve interface. je moet javascript toestaan om deze site te gebruiken. we hebben geen advertenties of trackers, pinky promise.", - "DownloadPopupDescriptionIOS": "omdat je een ios-apparaat hebt, moet je de downloadknop ingedrukt houden en vervolgens \"download video\" selecteren in de verschenen pop-up om de video op te slaan. dit moet zolang Apple alle browserontwikkelaars op ios een safari webview forceert.", - "DownloadPopupDescription": "download knop opent een nieuw tabblad met het gevraagde bestand. je kunt deze popup uitschakelen in instellingen.", - "DownloadPopupWayToSave": "kies een manier om op te slaan", - "ClickToCopy": "click om te kopiëren", - "Download": "download", - "CopyURL": "kopieër url", - "AboutTab": "over", - "ChangelogTab": "veranderingen", - "DonationsTab": "donaties", - "SettingsVideoTab": "video", - "SettingsAudioTab": "audio", - "SettingsOtherTab": "ander", - "ChangelogLastCommit": "laatste commit", - "ChangelogLastMajor": "laatste grote update", - "AccessibilityModeToggle": "zet download modus aan of uit", - "DonateLinksDescription": "donatie linken openen in een nieuw tabblad. dit is de beste manier om geld te doneren, als je wil dat ik het direct krijg.", - "SettingsAudioFormatBest": "beste", - "SettingsAudioFormatDescription": "wanneer het formaat geselecteerd wordt, krijg je de audio in de beste kwaliteit beschikbaar, omdat de audio in zijn originele formaat is gebleven. als je iets anders selecteert dan dat, krijg je een lichtelijk gecompresseerd bestand.", - "Keyphrase": "sla op wat je houdt", - "SettingsDisableChangelogOnUpdate": "laat changelog niet zien na grote updates", - "SettingsRemoveWatermark": "zet watermark uit", - "ErrorPopupCloseButton": "snappie", - "ModeToggle": "modus", - "ModeToggleSmart": "slim", - "ErrorLengthAudioConvert": "huidige limit voor de lengte van audioconversie is {s} minuten. kies optie \"beste\" om limieten te voorkomen.", - "SettingsAudioFullTikTok": "download volledige audio", - "SettingsAudioFullTikTokDescription": "download de originele audio/geluid dat in de video gebruikt is, zonder extra veranderingen van de video auteur.", - "ErrorCantGetID": "ik kon niet de volledige info krijgen van de verkorte link, zorg ervoor dat het werkt of probeer de volledige link.", - "ErrorNoVideosInTweet": "deze tweet heeft geen video's of gifs. probeer een andere!", - "ImagePickerTitle": "kies afbeeldingen om te downloaden", - "ImagePickerDownloadAudio": "download audio", - "ImagePickerExplanationPC": "klik met de rechtermuisknop om een afbeelding op te slaan.", - "ImagePickerExplanationPhone": "houd een afbeelding ingedrukt om op te slaan.", - "ErrorNoUrlReturned": "server heeft geen downloadlink teruggegeven, dit zou nooit moeten gebeuren. ververs de pagina en probeer opnieuw, maar wanneer dit niet helpt, {ContactLink}.", - "ErrorUnknownStatus": "ik heb een antwoord ontvangen dat ik niet kan verwerken. hoogstwaarschijnlijk iets dat met de status fout is, dit hoort nooit te gebeuren. ververs de pagina en probeer opnieuw, maar wanneer dit niet helpt, {ContactLink}." - } -} diff --git a/src/localization/languages/pl.json b/src/localization/languages/pl.json deleted file mode 100644 index 03803d0f..00000000 --- a/src/localization/languages/pl.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "name": "polski", - "substrings": { - "ContactLink": "daj mi znać" - }, - "strings": { - "LinkInput": "wklej link tutaj", - "AboutSummary": "{appName} to najlepsze miejsce do pobierania z mediów społecznościowych. zero reklam, śledzenia i innych podobnych głupot. po prostu wklejasz link i lecisz!", - "AboutSupportedServices": "aktualnie wspierane strony:", - "EmbedBriefDescription": "pobieraj rzeczy z social mediów bez reklam i śledzenia", - "MadeWithLove": "zrobione z <3 przez wukko", - "AccessibilityInputArea": "pole wklejania linku", - "AccessibilityOpenAbout": "otwórz okno informacji", - "AccessibilityDownloadButton": "przycisk pobierania", - "AccessibilityOpenSettings": "otwórz okno ustawień", - "AccessibilityOpenChangelog": "otwórz okno aktualizacji", - "AccessibilityClosePopup": "zamknij okno", - "AccessibilityOpenDonate": "otwórz okno darowizn", - "TitlePopupAbout": "czym jest {appName}?", - "TitlePopupSettings": "ustawienia", - "TitlePopupError": "ups...", - "TitlePopupChangelog": "co nowego?", - "TitlePopupDonate": "wesprzyj {appName}", - "TitlePopupDownload": "pobierz", - "ErrorSomethingWentWrong": "coś poszło nie tak i nie udało się niczego dla ciebie pobrać. możesz spróbować jeszcze raz, ale jeżeli problem nie ustąpi, {ContactLink}.", - "ErrorUnsupported": "wygląda na to, że ta strona nie jest jeszcze wspierana, albo twój link jest nieprawidłowy.", - "ErrorBrokenLink": "{s} jest wspierany, ale coś jest nie tak z twoim linkiem. może nie został skopiowany w całości?", - "ErrorNoLink": "nie potrafię czytać ci w myślach! proszę, daj mi link", - "ErrorPageRenderFail": "coś poszło nie tak i strona nie mogła zostać wyrenderowana. jeżeli problem jest krytyczny lub się powtarza, proszę {ContactLink}. byłoby dobrze gdybym otrzymał hash commita ({s}) i kroki do odtworzenia błędu. dzięki :D", - "ErrorRateLimit": "wysyłasz zbyt dużo żądań. uspokój się i spróbuj ponownie za parę minut.", - "ErrorCouldntFetch": "nie udało się pobrać metadanych. sprawdź, czy twój link jest poprawny i spróbuj ponownie.", - "ErrorLengthLimit": "aktualny limit długości to {s} minut. to, co próbujesz pobrać, jest dłuższe niż {s} minut. pobierz coś innego!", - "ErrorBadFetch": "coś poszło nie tak z pobieraniem informacji. wybierz inny format i rozdzielczość albo po prostu spróbuj ponownie później.", - "ErrorCorruptedStream": "niestety ten plik jest uszkodzony. spróbuj ponownie lub wybierz inny format i rozdzielczość.", - "ErrorNoInternet": "nie masz dostępu do internetu albo api {appName} nie działa. sprawdź swoje połączenie i spróbuj ponownie.", - "ErrorCantConnectToServiceAPI": "nie mogę połączyć się z api {s}. wygląda na to, że {s} nie działa albo adres ip serwera {appName} został zablokowany. spróbuj ponownie później.", - "ErrorEmptyDownload": "nie ma tu nic do pobrania! spróbuj pobrać coś innego.", - "ErrorLiveVideo": "nie mogę pobierać transmisji na żywo. poczekaj, aż stream się zakończy i spróbuj ponownie.", - "SettingsAppearanceSubtitle": "wygląd", - "SettingsThemeSubtitle": "motyw", - "SettingsFormatSubtitle": "format pliku", - "SettingsDownloadsSubtitle": "pobrane pliki", - "SettingsQualitySubtitle": "jakość", - "SettingsThemeAuto": "automatyczny", - "SettingsThemeLight": "jasny", - "SettingsThemeDark": "ciemny", - "SettingsQualitySwitchMax": "maksymalna", - "SettingsQualitySwitchHigh": "wysoka", - "SettingsQualitySwitchMedium": "średnia", - "SettingsQualitySwitchLow": "niska", - "SettingsQualitySwitchLowest": "minimalna", - "SettingsKeepDownloadButton": "pozostaw >> widoczny", - "AccessibilityKeepDownloadButton": "pozostaw przycisk pobierania zawsze widoczny", - "SettingsEnableDownloadPopup": "pytaj o sposób zapisu", - "AccessibilityEnableDownloadPopup": "pytaj co zrobić z pobranymi plikami", - "SettingsFormatDescription": "wybierz webm, jeżeli potrzebujesz najwyższej możliwej jakości. filmy webm są zwykle wyższej jakości, ale urządzenia z ios nie odtwarzają ich natywnie.", - "SettingsQualityDescription": "jeżeli wybrana jakość nie będzie dostępna, zostanie wybrana najbliższa pasująca.\njeżeli chcesz wrzucić film z youtube na social media, wybierz połączenie mp4 i 720p. te filmy zazwyczaj nie używają kodeka av1, więc powinny się odtwarzać w zasadzie wszędzie.", - "DonateSubtitle": "ciężko się teraz płaci za hosting", - "DonateDescription": "nie podoba mi się stan w jakim są teraz kryptowaluty, ale na razie jest to dla mnie jedyny sposób żeby płacić za coś za granicą. karty mastercard/visa i usługi takie jak paypal nie są już dostępną opcją.", - "LinkGitHubIssues": ">> zgłoś problem lub zobacz kod źródłowy na githubie", - "LinkGitHubChanges": ">> zobacz poprzednie zmiany lub pomóż nam tworzyć na githubie", - "LinkDonateContact": ">> daj mi znać, jeżeli waluta, którą chcesz wesprzeć nie jest na liście", - "NoScriptMessage": "{appName} używa javascriptu do żądań api i interaktywnego interfejsu. musisz zezwolić na javascript, jeżeli chcesz używać tej strony. nie mamy żadnych reklam ani śledzenia, obiecujemy.", - "DownloadPopupDescriptionIOS": "ponieważ masz urządzenie z systemem ios, musisz nacisnąć i przytrzymać przycisk pobierania i wybrać \"pobierz film\" w wyskakującym oknie aby zapisać film. będzie to wymagane tak długo, jak apple będzie wymuszało safari webview na wszystkich deweloperach przeglądarek na ios.", - "DownloadPopupDescription": "przycisk pobierania otwiera nową kartę z pobieranym plikiem. możesz wyłączyć to okno w ustawieniach.", - "DownloadPopupWayToSave": "wybierz sposób zapisu", - "ClickToCopy": "kliknij, aby skopiować", - "Download": "pobierz", - "CopyURL": "skopiuj url", - "AboutTab": "o aplikacji", - "ChangelogTab": "lista zmian", - "DonationsTab": "darowizny", - "SettingsVideoTab": "wideo", - "SettingsAudioTab": "audio", - "SettingsOtherTab": "inne", - "ChangelogLastMajor": "bieżąca wersja i commit", - "AccessibilityModeToggle": "przełącz tryb pobierania", - "DonateLinksDescription": "linki do darowizn otwierają się w nowej karcie. to najlepszy sposób podarowania pieniędzy, jeśli chcesz, aby dotarły do mnie bezpośrednio.", - "SettingsAudioFormatBest": "najlepszy", - "SettingsAudioFormatDescription": "gdy wybierzesz najlepszy format, dostaniesz audio w najlepszej możliwej jakości, ponieważ jest zachowane w oryginalnym formacie. gdy wybierzesz któryś inny, dostaniesz lekko skompresowany plik.", - "Keyphrase": "zapisz to, co kochasz", - "SettingsRemoveWatermark": "wyłącz znak wodny", - "ErrorPopupCloseButton": "rozumiem", - "ErrorLengthAudioConvert": "aktualny limit długości konwersji dźwięku wynosi {s} minut. wybierz \"najlepszy\" format, jeśli chcesz uniknąć ograniczeń.", - "SettingsAudioFullTikTok": "pobierz pełny dźwięk", - "SettingsAudioFullTikTokDescription": "pobiera oryginalny dźwięk lub dźwięk używany w filmie bez żadnych dodatkowych zmian ze strony autora wideo.", - "ErrorCantGetID": "nie można było uzyskać informacji ze skróconego linku. upewnij się, że link działa lub spróbuj pełnego.", - "ErrorNoVideosInTweet": "ten tweet nie zawiera filmów ani gifów. spróbuj innego!", - "ImagePickerTitle": "wybierz obrazy do pobrania", - "ImagePickerDownloadAudio": "pobierz dźwięk", - "ImagePickerExplanationPC": "kliknij prawym przyciskiem myszy na obraz, aby go zapisać.", - "ImagePickerExplanationPhone": "naciśnij i przytrzymaj obraz, aby go zapisać.", - "ErrorNoUrlReturned": "serwer nie zwrócił linku do pobrania. to nie powinno się zdarzyć. odśwież stronę i spróbuj ponownie, ale jeśli to nie pomoże, {ContactLink}.", - "ErrorUnknownStatus": "otrzymano odpowiedź, której nie można przetworzyć. prawdopodobnie coś o statusie jest nieprawidłowe. to nigdy nie powinno się zdarzyć. odśwież stronę i spróbuj ponownie, ale jeśli to nie pomoże, {ContactLink}.", - "PasteFromClipboard": "wklej ze schowka", - "FollowTwitter": "obserwuj {appName} na twitterze po ankiety, aktualizacje i więcej: @justusecobalt", - "ChangelogOlder": "poprzednie wersje", - "ChangelogPressToExpand": "pokaż", - "Miscellaneous": "pozostałe", - "ModeToggleAuto": "tryb auto", - "ModeToggleAudio": "tryb audio", - "SettingsDisableNotifications": "ukryj plakietki z powiadomieniami", - "MediaPickerTitle": "wybierz co zapisać", - "MediaPickerExplanationPC": "kliknij lub kliknij prawym przyciskiem, aby pobrać to, co chcesz", - "MediaPickerExplanationPhone": "naciśnij lub naciśnij i przytrzymaj, aby zapisać to, co chcesz", - "MediaPickerExplanationPhoneIOS": "naciśnij i przytrzymaj, ukryj podgląd i wybierz \"odnośnik pobierania\", aby zapisać.", - "TwitterSpaceWasntRecorded": "ten pokój na twitterze nie był nagrywany, więc nie mogę nic pobrać. spróbuj inny!", - "ErrorCantProcess": "no i chuj, nie udało się :(\nmożesz spróbować ponownie, ale jeśli problem będzie się powtarzał, {ContactLink}.", - "ChangelogPressToHide": "zwiń" - } -} diff --git a/src/localization/languages/pt.json b/src/localization/languages/pt.json deleted file mode 100644 index 8c2f74f6..00000000 --- a/src/localization/languages/pt.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "name": "português (brasil)", - "substrings": { - "ContactLink": "abra um issue no github" - }, - "strings": { - "LinkInput": "cole seu link aqui", - "AboutSummary": "{appName} é o lugar ideal para baixar conteúdo das redes sociais. sem anúncios, rastreadores ou outras coisas suspeitas. apenas cole um link e pronto!", - "AboutSupportedServices": "serviços suportados atualmente:", - "EmbedBriefDescription": "salve conteúdo das redes sociais sem irritações", - "MadeWithLove": "feito com <3 por wukko", - "AccessibilityInputArea": "área de entrada de link", - "AccessibilityOpenAbout": "abrir janela sobre", - "AccessibilityDownloadButton": "botão de download", - "AccessibilityOpenSettings": "abrir janela de configurações", - "AccessibilityClosePopup": "fechar a janela", - "AccessibilityOpenDonate": "abrir janela de doação", - "TitlePopupAbout": "o que é {appName}?", - "TitlePopupSettings": "configurações", - "TitlePopupError": "Ah não...", - "TitlePopupChangelog": "o que há de novo?", - "TitlePopupDonate": "apoie {appName}", - "TitlePopupDownload": "baixar", - "ErrorSomethingWentWrong": "algo deu errado e eu não consegui encontrar nada para você. você pode tentar novamente, mas se o problema persistir, por favor {ContactLink}.", - "ErrorUnsupported": "parece que esse serviço ainda não é suportado, ou o link é inválido.", - "ErrorBrokenLink": "{s} é suportado, mas tem algo de errado com o link. talvez você não o copiou completamente?", - "ErrorNoLink": "não consigo adivinhar o que você quer baixar! por favor, me dê um link.", - "ErrorPageRenderFail": "algo deu errado e a página não pôde ser renderizada. se for um problema recorrente ou crítico, por favor {ContactLink}. seria útil se você fornecesse o hash da commit atual ({s}) e passos para recriar o erro. obrigado :D", - "ErrorRateLimit": "você está fazendo pedidos de mais. se acalme e tente novamente daqui a pouco.", - "ErrorCouldntFetch": "não consegui obter nenhuma informação sobre seu link. verifique se ele está correto e tente novamente.", - "ErrorLengthLimit": "o limite de duração atual é {s} minutos. o vídeo que você tentou baixar é maior que {s} minutos. escolha outra coisa para baixar!", - "ErrorBadFetch": "ocorreu um erro quando tentei obter informações sobre seu link. tem certeza de ele funciona? verifique e tente novamente.", - "ErrorCorruptedStream": "infelizmente, esse download está corrompido. tente novamente, ou tente um formato e resolução diferentes.", - "ErrorNoInternet": "não há internet, ou a api de {appName} está fora do ar. verifique sua conexão e tente novamente.", - "ErrorCantConnectToServiceAPI": "não foi possível conectar à api de {s}. parece que {s} está com problemas, ou o ip do {appName} foi bloqueado. tente novamente mais tarde.", - "ErrorEmptyDownload": "não vejo nada que eu poderia baixar daqui. tente um link diferente.", - "ErrorLiveVideo": "não tenho bola de cristal para conseguir baixar o vídeo de uma live que ainda não terminou. espere o fim da stream e tente de novo!", - "SettingsAppearanceSubtitle": "aparência", - "SettingsThemeSubtitle": "tema", - "SettingsFormatSubtitle": "formato do download", - "SettingsQualitySubtitle": "qualidade", - "SettingsThemeAuto": "auto", - "SettingsThemeLight": "claro", - "SettingsThemeDark": "escuro", - "SettingsQualitySwitchMax": "máx.", - "SettingsQualitySwitchHigh": "alta", - "SettingsQualitySwitchMedium": "média", - "SettingsQualitySwitchLow": "baixa", - "SettingsQualitySwitchLowest": "mais baixa", - "SettingsKeepDownloadButton": "manter >> visível", - "AccessibilityKeepDownloadButton": "manter o botão de download sempre visível", - "SettingsEnableDownloadPopup": "pergunte a maneira de salvar", - "AccessibilityEnableDownloadPopup": "perguntar o que fazer com os downloads", - "SettingsFormatDescription": "selecione o formato webm se você quer a melhor qualidade disponível. este formato normalmente tem uma taxa de bits maior, mas dispositivos ios não conseguem reproduzi-lo nativamente.", - "SettingsQualityDescription": "se a qualidade selecionada não estiver disponível, a mais próxima será usada.\nse quiser postar um vídeo do youtube nas redes sociais, selecione uma combinação de mp4 e 720p.", - "LinkGitHubIssues": ">> reporte problemas e confira o código-fonte no github", - "LinkGitHubChanges": ">> veja commits anteriores e contribua no github", - "NoScriptMessage": "{appName} usa javascript para a interface interativa e solicitações de api. você dever habilitar o javascript para usar este site. não tenho nenhum anúncio ou rastreador, eu prometo.", - "DownloadPopupDescriptionIOS": "pressione e segure o botão de download, esconda a pré-visualização do vídeo e, em seguida, selecione \"baixar arquivo\" para salvar.", - "DownloadPopupDescription": "o botão de download abre uma nova aba com o arquivo solicitado. você pode desativar este pop-up nas configurações.", - "DownloadPopupWayToSave": "escolha como salvar", - "ClickToCopy": "pressione para copiar", - "Download": "baixar", - "CopyURL": "copiar url", - "AboutTab": "sobre", - "ChangelogTab": "log de alterações (em inglês)", - "DonationsTab": "doações", - "SettingsVideoTab": "vídeo", - "SettingsAudioTab": "áudio", - "SettingsOtherTab": "outros", - "ChangelogLastMajor": "versão atual & commit", - "AccessibilityModeToggle": "alternar o modo de download", - "DonateLinksDescription": "links de doação abrem em uma nova aba. essa é a melhor maneira para doar se você deseja que eu receba sua doação diretamente.", - "SettingsAudioFormatBest": "melhor", - "SettingsAudioFormatDescription": "quando o melhor formato é selecionado, você obtém o áudio na melhor qualidade disponível, pois ele não é recodificado. ao selecionar outro formato, você obterá um arquivo um pouco comprimido. ", - "Keyphrase": "salve o que você ama", - "SettingsRemoveWatermark": "desativar marca d'água", - "ErrorPopupCloseButton": "entendido", - "ErrorLengthAudioConvert": "o limite de duração para a conversão de áudio é {s} minutos. selecione o formato \"melhor\" se você quiser evitar limitações.", - "SettingsAudioFullTikTok": "baixar áudio completo", - "SettingsAudioFullTikTokDescription": "baixa o áudio ou som original usado no vídeo sem as mudanças feitas pelo autor do vídeo.", - "ErrorCantGetID": "não conseguir obter toda a informação do link encurtado. verifique se o link funciona, ou tente usar um completo.", - "ErrorNoVideosInTweet": "não achei nenhum vídeo ou gif nesse tweet. tente outro!", - "ImagePickerTitle": "escolha imagens pra baixar", - "ImagePickerDownloadAudio": "baixar áudio", - "ImagePickerExplanationPC": "clique com o botão direito em uma imagem para salvá-la", - "ImagePickerExplanationPhone": "pressione e segure uma imagem para salvá-la", - "ErrorNoUrlReturned": "o servidor não retornou um link de download. isso nunca deveria acontecer. recarregue a página e tente novamente, mas se isso não ajudar, {ContactLink}.", - "ErrorUnknownStatus": "eu recebi uma resposta que não consigo processar. o provável é que há algo de errado com o status. isso nunca deveria acontecer. recarregue a página e tente novamente. se isso não ajudar, {ContactLink}.", - "PasteFromClipboard": "colar da área de transferência", - "FollowTwitter": "siga a conta do {appName} no twitter para enquetes, atualizações e muito mais: @justusecobalt", - "ChangelogOlder": "versões anteriores (em inglês)", - "ChangelogPressToExpand": "clique para expandir", - "Miscellaneous": "outros", - "ModeToggleAuto": "modo automático", - "ModeToggleAudio": "modo áudio", - "SettingsDisableNotifications": "esconder pontos de notificação", - "MediaPickerTitle": "escolha o que salvar", - "MediaPickerExplanationPC": "clique ou clique com o botão direito para baixar o que você quer.", - "MediaPickerExplanationPhone": "pressione ou pressione e segure para baixar o que você quer.", - "MediaPickerExplanationPhoneIOS": "aperte e segure, oculte a pré-visualização e então selecione \"baixar arquivo\" para salvar.", - "TwitterSpaceWasntRecorded": "este espaço do twitter não foi gravado, então não há nada para baixar. tente outro!", - "ErrorCantProcess": "não pude processar o seu pedido :(\nvocê pode tentar novamente, mas se eu problema persistir, por favor {ContactLink}.", - "ChangelogPressToHide": "pressione aqui para recolher", - "Donate": "doar", - "DonateSub": "me ajude a mantê-lo", - "DonateExplanation": "{appName} não serve anúncios ou vende os seus dados (e nunca irá), portanto é completamente gratuito para uso. mas ei! aparentemente, a manutenção de um serviço usado por milhares de pessoas é uma coisa cara.\n\nse alguma vez você achou o {appName} útil e quer ajudar a mantê-lo online, ou simplesmente deseja agradecer ao desenvolvedor, considere doar algo! cada centavo ajuda, e é aceito com MUITA gratidão.", - "DonateVia": "doar via", - "DonateHireMe": "ou, alternativamente, você pode me contratar.", - "SettingsVideoMute": "silenciar áudio", - "SettingsVideoMuteExplanation": "desativa o áudio do vídeo baixado, quando possível. ignorado quando o modo áudio está ativado ou se o serviço só suporta áudio.", - "SettingsVideoGeneral": "geral", - "ErrorSoundCloudNoClientId": "não consegui encontrar o client_id necessário para obter os dados de áudio do soundclound. tente novamente, e se o problema persistir, {ContactLink}" - } -} diff --git a/src/localization/languages/ru.json b/src/localization/languages/ru.json index 7f59f356..7bd78e8b 100644 --- a/src/localization/languages/ru.json +++ b/src/localization/languages/ru.json @@ -1,25 +1,25 @@ { "name": "русский", "substrings": { - "ContactLink": "напиши об этом на github (можно на русском)" + "ContactLink": "напиши об этом на github (можно на русском)" }, "strings": { + "AppTitleCobalt": "кобальт", "LinkInput": "вставь ссылку сюда", - "AboutSummary": "{appName} - твой друг при скачивании контента из соцсетей и других сервисов. никакой рекламы, трекеров и прочего мусора. вставляешь ссылку и получаешь файл. всё. ничего лишнего.", + "AboutSummary": "кобальт - твой друг при скачивании контента из соцсетей и других сервисов. никакой рекламы, трекеров и прочего мусора. вставляешь ссылку и получаешь файл. всё. ничего лишнего.", "EmbedBriefDescription": "сохраняй то, что любишь. без рекламы, трекеров и лишней мороки.", "MadeWithLove": "сделано wukko, с <3", "AccessibilityInputArea": "зона вставки ссылки", "AccessibilityOpenAbout": "открыть окно с инфой", "AccessibilityDownloadButton": "кнопка скачивания", "AccessibilityOpenSettings": "открыть настройки", - "AccessibilityClosePopup": "закрыть окно", "AccessibilityOpenDonate": "сделать пожертвование", - "TitlePopupAbout": "что за {appName}?", + "TitlePopupAbout": "что за кобальт?", "TitlePopupSettings": "настройки", "TitlePopupError": "опаньки...", "TitlePopupChangelog": "что нового?", - "TitlePopupDonate": "поддержи {appName}", - "TitlePopupDownload": "как продолжить?", + "TitlePopupDonate": "поддержи кобальт", + "TitlePopupDownload": "как сохранить?", "ErrorSomethingWentWrong": "что-то пошло совсем не так и у меня не получилось ничего для тебя достать. попробуй ещё раз, но если так и не получится, {ContactLink}.", "ErrorUnsupported": "с твоей ссылкой что-то не так, или же этот сервис ещё не поддерживается. может быть, ты вставил не ту ссылку?", "ErrorBrokenLink": "{s} поддерживается, но с твоей ссылкой что-то не так. может быть, ты её не полностью скопировал?", @@ -30,7 +30,7 @@ "ErrorLengthLimit": "я не могу обрабатывать видео длиннее чем {s} минут(ы), так что скачай что-нибудь покороче!", "ErrorBadFetch": "произошла какая-то ошибка при получении данных по твоей ссылке. убедись, что она работает, и попробуй ещё раз.", "ErrorNoInternet": "не получилось подключиться к серверу. проверь подключение к интернету и попробуй ещё раз!", - "ErrorCantConnectToServiceAPI": "у меня не получилось подключиться к серверу этого сервиса. возможно он лежит, или же {appName} заблокировали. попробуй ещё раз, но если так и не получится, {ContactLink}.", + "ErrorCantConnectToServiceAPI": "у меня не получилось подключиться к серверу этого сервиса. возможно он лежит, или же кобальт заблокировали. попробуй ещё раз, но если так и не получится, {ContactLink}.", "ErrorEmptyDownload": "я не нашёл того, что могу скачать. попробуй другую ссылку!", "ErrorLiveVideo": "я пока что не умею заглядывать в будущее, поэтому дождись окончания прямого эфира, и потом уже скачивай видео!", "SettingsAppearanceSubtitle": "внешний вид", @@ -38,22 +38,21 @@ "SettingsFormatSubtitle": "формат", "SettingsQualitySubtitle": "качество", "SettingsThemeAuto": "авто", - "SettingsThemeLight": "светлая", - "SettingsThemeDark": "тёмная", + "SettingsThemeLight": "светлый", + "SettingsThemeDark": "тёмный", "SettingsKeepDownloadButton": "всегда показывать >>", "AccessibilityKeepDownloadButton": "всегда показывать кнопку скачивания на экране", "SettingsEnableDownloadPopup": "выбор метода скачивания", "AccessibilityEnableDownloadPopup": "спрашивать, что делать с загрузками", "SettingsQualityDescription": "если выбранное качество недоступно, то выбирается ближайшее к нему.", "LinkGitHubChanges": ">> смотри предыдущие изменения на github", - "NoScriptMessage": "{appName} использует javascript для обработки ссылок и интерактивного интерфейса. ты должен разрешить использование javascript, чтобы пользоваться сайтом. тут нет никаких зловредных скриптов, обещаю.", - "DownloadPopupDescriptionIOS": "наиболее простой метод скачивания видео на ios:\n1. добавь этот сценарий siri.\n2. нажми \"поделиться\" выше и выбери \"save to photos\" в открывшемся окне.\nесли появляется окно с запросом разрешения, то прочитай его, потом нажми \"всегда разрешать\".\n\nальтернативный метод: зажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.\nпотом открой загрузки в safari, выбери скачанный файл, нажми иконку \"поделиться\", и, наконец, нажми \"сохранить видео\".", + "NoScriptMessage": "кобальт использует javascript для обработки ссылок и интерактивного интерфейса. ты должен разрешить использование javascript, чтобы пользоваться сайтом. тут нет никаких зловредных скриптов, обещаю.", + "DownloadPopupDescriptionIOS": "наиболее простой метод скачивания видео на ios:\n1. добавь этот сценарий siri.\n2. нажми \"поделиться\" выше и выбери \"save to photos\" в открывшемся окне.\nесли появляется окно с запросом разрешения, то прочитай его, потом нажми \"всегда разрешать\".\n\nальтернативный метод:\nзажми кнопку \"скачать\", затем скрой превью и выбери \"загрузить файл по ссылке\" в появившемся окне.\nпотом открой загрузки в safari, выбери скачанный файл, нажми иконку \"поделиться\", и, наконец, нажми \"сохранить видео\".", "DownloadPopupDescription": "кнопка скачивания открывает новое окно с файлом. ты можешь отключить выбор метода скачивания файла в настройках.", - "DownloadPopupWayToSave": "выбери, как сохранить", "ClickToCopy": "нажми, чтобы скопировать", "Download": "скачать", "CopyURL": "скопировать", - "AboutTab": "о {appName}", + "AboutTab": "о сайте", "ChangelogTab": "изменения", "DonationsTab": "донаты", "SettingsVideoTab": "видео", @@ -65,11 +64,11 @@ "SettingsAudioFormatBest": "лучший", "SettingsAudioFormatDescription": "когда выбран \"лучший\", ты получишь аудио без каких-либо изменений. такое, какое оно есть на стороне сервиса. если же выбрано что-то другое, то аудио будет немного сжато.", "Keyphrase": "сохраняй то, что любишь", - "SettingsRemoveWatermark": "убирать ватермарку", + "SettingsRemoveWatermark": "убрать ватермарку", "ErrorPopupCloseButton": "ясно", "ErrorLengthAudioConvert": "я не могу конвертировать аудио дольше чем {s} минут(ы). выбери \"лучший\" формат, чтобы обойти ограничения.", "SettingsAudioFullTikTok": "полное аудио", - "SettingsAudioFullTikTokDescription": "скачивает оригинальный звук, использованный в видео. без каких-либо изменений от автора поста.", + "SettingsAudioFullTikTokDescription": "скачивает оригинальный звук, использованный в видео, без каких-либо изменений от автора поста.", "ErrorCantGetID": "у меня не получилось достать инфу по этой короткой ссылке. попробуй полную ссылку, а если так и не получится, то {ContactLink}.", "ErrorNoVideosInTweet": "я не смог найти никакого медиа контента в этом твите. попробуй другой!", "ImagePickerTitle": "выбери картинки для скачивания", @@ -79,46 +78,72 @@ "ErrorNoUrlReturned": "я не получил ссылку для скачивания от сервера. такого происходить не должно. попробуй ещё раз, а если не поможет, то {ContactLink}.", "ErrorUnknownStatus": "сервер ответил мне чем-то непонятным. такого происходить не должно. попробуй ещё раз, а если не поможет, то {ContactLink}.", "PasteFromClipboard": "вставить и скачать", - "ChangelogOlder": "предыдущие версии (на английском)", + "ChangelogOlder": "предыдущие версии (тоже на английском)", "ChangelogPressToExpand": "раскрыть", "Miscellaneous": "разное", "ModeToggleAuto": "авто режим", "ModeToggleAudio": "аудио режим", "SettingsDisableNotifications": "cкрыть уведомления", "MediaPickerTitle": "выбери, что сохранить", - "MediaPickerExplanationPC": "кликни, чтобы скачать. также можно скачать через контекстное меню правой кнопки мыши.", + "MediaPickerExplanationPC": "кликни то, что хочешь скачать. также можно скачать правой кнопки мыши.", "MediaPickerExplanationPhone": "нажми, или нажми и удерживай, чтобы скачать.", "MediaPickerExplanationPhoneIOS": "нажми и удерживай, затем скрой превью и выбери \"загрузить файл по ссылке\", чтобы скачать.", "TwitterSpaceWasntRecorded": "мне нечего скачать, так как этот twitter space не был записан. попробуй другой!", "ErrorCantProcess": "я не смог обработать твой запрос :(\nты можешь попробовать ещё раз, но если не поможет, то {ContactLink}.", "ChangelogPressToHide": "скрыть", - "Donate": "задонатить", + "Donate": "донаты", "DonateSub": "ты можешь помочь!", - "DonateExplanation": "{appName} не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает совершенно бесплатно. но оказывается, что разработка и поддержка сервиса, которым пользуются более 150 тысяч людей, обходится довольно затратно.\n\nесли {appName} тебе помог и ты хочешь поблагодарить разработчика, то это можно сделать через донаты! каждый рубль помогает мне, моим котам, и {appName}! спасибо :)", + "DonateExplanation": "кобальт не пихает рекламу тебе в лицо и не продаёт твои личные данные, а значит работает совершенно бесплатно для всех. но разработка и поддержка медиа сервиса, которым пользуются более 350 тысяч людей, обходится довольно затратно. мне, как студенту, оплачивать такое в одиночку довольно трудно.\n\nесли кобальт тебе помог и ты хочешь, чтобы он продолжал работать и развиваться, то это можно сделать через донаты!\n\nделая донат ты помогаешь всем, кто пользуется кобальтом: преподавателям, студентам, музыкантам, художникам, контент-мейкерам и многим-многим другим!\n\nза последние несколько месяцев благодаря донатам я смог:\n*; повысить стабильность и аптайм почти до 100%.\n*; ускорить ВСЕ загрузки, особенно наиболее тяжёлые.\n*; открыть api кобальта для свободного публичного использования.\n*; выдержать несколько огромных наплывов пользователей без перебоев.\n*; перейти к надёжному поставщику облачной инфры.\n*; разделить фронтенд и api для обеспечения отказоустойчивости и децентрализации в будущем.\n\nкаждый донат невероятно ценится и помогает кобальту развиваться!", "DonateVia": "открыть", - "DonateHireMe": "...или же ты можешь пригласить меня на работу :)", + "DonateHireMe": "...или же ты можешь пригласить меня на работу :)", "SettingsVideoMute": "убрать аудио", - "SettingsVideoMuteExplanation": "убирает аудио при загрузке видео, но только когда это возможно.", + "SettingsVideoMuteExplanation": "убирает звук при загрузке видео, но только когда это возможно.", "ErrorSoundCloudNoClientId": "мне не удалось достать временный токен, который необходим для скачивания аудио из soundcloud. попробуй ещё раз, но если так и не получится, {ContactLink}.", "CollapseServices": "что поддерживается?", "CollapseSupport": "поддержка и исходный код", "CollapsePrivacy": "политика конфиденциальности", "ServicesNote": "этот список далеко не финальный и постоянно пополняется. заглядывай сюда почаще, тогда точно будешь знать, что поддерживается!", - "FollowSupport": "подписывайся на аккаунты {appName} на mastodon или twitter для новостей, поддержки, участия в опросах, и многого другого:", - "SupportNote": "так как я один занимаюсь разработкой и поддержкой в одиночку, время ожидания ответа может достигать нескольких часов. я отвечаю всем, не стесняйся.", + "FollowSupport": "оставайтесь на связи с кобальтом для новостей, поддержки, участия в опросах, и многого другого:", + "SupportNote": "так как я занимаюсь разработкой и поддержкой в одиночку, время ожидания ответа может достигать нескольких часов. но я отвечаю всем, так что не стесняйся.", "SourceCode": "пиши о проблемах, шарься в исходнике, или же форкай репозиторий:", - "PrivacyPolicy": "политика конфиденциальности {appName} довольно проста: ничего не хранится об истории твоих действий или загрузок. совсем. даже ошибки.\nто, что ты скачиваешь - только твоё личное дело.\n\nв случаях, когда твоей загрузке требуется лайв-рендер, временно хранится неотслеживаемая информация. это необходимо для работы такого типа загрузок.\n\nв этом случае, sha256 хэш (с солью) твоего ip адреса и данные о запрошенном стриме хранятся в ОЗУ сервера в течение двух минут. по истечении этого периода всё стирается. хэш твоего ip адреса используется для предоставления доступа к стриму только тебе. ни у кого (даже у меня) нет доступа к временно хранящимся данным, так как оригинальный код {appName} не предоставляет такой возможности.\n\nты всегда можешь посмотреть исходный код {appName} и убедиться, что всё так, как описано.", - "ErrorYTUnavailable": "это видео недоступно или же ограничено по возрасту на youtube. пока что я не умею скачивать подобные видео. попробуй другое!", + "PrivacyPolicy": "политика конфиденциальности кобальта довольно проста: никакие данные о тебе никогда не собираются и не хранятся. нуль, ноль, нада, ничего.\nто, что ты скачиваешь, - твоё личное дело, а не чьё-либо ещё.\n\nесли твоей загрузке требуется лайв рендер, то некоторые неотслеживаемые данные временно держатся в ОЗУ сервера. это необходимо для работы данной функции.\n\nв этом случае данные о запрошенном контенте хранятся в течение 20 секунд. по истечении этого времени всё стирается. ни у кого (даже у меня) нет доступа к временно хранящимся данным, так как официальная кодовая база кобальта не предусматривает возможности их чтения вне функций обработки.\n\nты всегда можешь посмотреть исходный код кобальта и убедиться, что всё так, как заявлено.", + "ErrorYTUnavailable": "это видео недоступно, возможно оно ограничено по региону или доступу. попробуй другое!", "ErrorYTTryOtherCodec": "я не нашёл того, что мог бы скачать с твоими настройками. попробуй другой кодек или качество!", "SettingsCodecSubtitle": "кодек для видео с youtube", "SettingsCodecDescription": "h264: обширная поддержка плеерами, но макс. качество всего лишь 1080p.\nav1: слабая поддержка плеерами, но поддерживает 8k и HDR.\nvp9: обычно наиболее высокий битрейт, лучше сохраняется качество видео. поддерживает 4k и HDR.\n\nвыбирай h264, если тебе нужна наилучшая совместимость с плеерами/редакторами/соцсетями.", "SettingsAudioDub": "звуковая дорожка для видео с youtube", - "SettingsAudioDubDescription": "определяет, какая звуковая дорожка используется при скачивании видео. если дублированная дорожка недоступна, то вместо неё используется оригинальная.\n\nоригинал: используется оригинальная дорожка.\nавто: используется язык браузера (и {appName}).", + "SettingsAudioDubDescription": "определяет, какая звуковая дорожка используется при скачивании видео. если дублированная дорожка недоступна, то вместо неё используется оригинальная.\n\nоригинал: используется оригинальная дорожка.\nавто: используется язык браузера и интерфейса кобальта.", "SettingsDubDefault": "оригинал", "SettingsDubAuto": "авто", "SettingsVimeoPrefer": "тип загрузок с vimeo", - "SettingsVimeoPreferDescription": "progressive: прямая ссылка на файл с сервера vimeo. максимальное качество: 1080p.\ndash: {appName} совмещает видео и аудио в один файл. максимальное качество: 4k.\n\nвыбирай \"progressive\", если тебе нужна наилучшая совместимость с плеерами/редакторами/соцсетями. если \"progressive\" файл недоступен, {appName} скачает \"dash\".", + "SettingsVimeoPreferDescription": "progressive: прямая ссылка на файл с сервера vimeo. максимальное качество: 1080p.\ndash: кобальт совмещает видео и аудио в один файл. максимальное качество: 4k.\n\nвыбирай \"progressive\", если тебе нужна наилучшая совместимость с плеерами/редакторами/соцсетями. если \"progressive\" файл недоступен, кобальт скачает \"dash\".", "ShareURL": "поделиться", - "ErrorTweetUnavailable": "не смог найти что-либо об этом твите. возможно его видимость была ограничена. попробуй другой!" + "ErrorTweetUnavailable": "не смог найти что-либо об этом твите. возможно его видимость была ограничена. попробуй другой!", + "ErrorTwitterRIP": "твиттер ограничил доступ к любому контенту на сайте для пользователей без аккаунтов. я нашёл лазейку, чтобы доставать обычные твиты, а для spaces, к сожалению, нет. я ищу возможные варианты выхода из ситуации.", + "UrgentDonate": "нужна твоя помощь!", + "PopupCloseDone": "готово", + "Accessibility": "общедоступность", + "SettingsReduceTransparency": "уменьшить прозрачность", + "SettingsDisableAnimations": "убрать анимации", + "FeatureErrorGeneric": "твой браузер не разрешает или не поддерживает эту функцию. проверь наличие обновлений и попробуй ещё раз!", + "ClipboardErrorFirefox": "ты используешь firefox в котором все функции чтения из буфера обмена отключены по умолчанию.\n\nно это можно исправить следуя шагам, описанным здесь\n\n...или же ты можешь просто вставить ссылку вручную.", + "ClipboardErrorNoPermission": "кобальт не может прочитать последний элемент в буфере обмена без твоего разрешения.\n\nесли ты не хочешь давать доступ, просто вставь ссылку вручную.\n\nну а если хочешь, то открой настройки сайта и разреши доступ на чтение буфера обмена.", + "SupportSelfTroubleshooting": "возникли проблемы? попробуй сначала исправить всё сам по этому гиду!", + "AccessibilityGoBack": "вернуться назад и закрыть окно", + "CollapseKeyboard": "горячие клавиши", + "KeyboardShortcutsIntro": "пользуйся кобальтом ещё быстрее с горячими клавишами:", + "KeyboardShortcutQuickPaste": "вставить ссылку", + "KeyboardShortcutClear": "очистить зону вставки ссылки", + "KeyboardShortcutClosePopup": "закрыть все окна", + "CollapseLegal": "правовые штучки", + "FairUse": "кобальт - это инструмент для облегчения скачивания контента из интернета, и он не несёт никакой ответственности. ты несёшь ответственность за то, что скачиваешь, как используешь и распространяешь скачанный контент.\n\nкобальт не собирает никакой информации о тебе, и не может донести на тебя, но, пожалуйста, будь сознателен при использовании чужого контента и всегда указывай авторов!\n\nпри использовании в образовательных целях (лекции, домашние задания и т.д.), пожалуйста, прикладывай ссылку на источник.\n\nчестное использование и указание авторства выгодно всем.", + "UrgentFeatureUpdate71": "расширение поддержки сервисов!", + "UrgentThanks": "спасибо за поддержку!", + "SettingsDisableMetadata": "не добавлять метаданные", + "UrgentNewDomain": "новый домен, тот же кобальт", + "NewDomainWelcomeTitle": "привет!", + "NewDomainWelcome": "кобальт переезжает! те же функции, тот же владелец, просто более запоминающийся домен. по-прежнему без рекламы.\n\ncobalt.tools - новый основной домен, т.е. где ты сейчас находишься. не забудь обновить закладки и переустановить веб-приложение!", + "DataTransferSuccess": "кстати, твои настройки были перенесены автоматически :)", + "DataTransferError": "при переносе настроек что-то пошло не так. придётся зайти в настройки и настроить кобальт вручную." } } diff --git a/src/localization/languages/uk.json b/src/localization/languages/uk.json deleted file mode 100644 index b2264585..00000000 --- a/src/localization/languages/uk.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "українська", - "substrings": { - "ContactLink": "звернись до творця" - }, - "strings": { - "LinkInput": "встав посилання сюди", - "AboutSummary": "{appName} - твій помічник з завантаження контенту з соцмереж. ніякої реклами, трекерів та іншого лайна. вставляєш посилання, отримуєш файл, і допиваєш свій смузі у спокої.", - "AboutSupportedServices": "сервіси, що підтримуються станом на зараз:", - "EmbedBriefDescription": "зберігай контент із соцмереж без роздратувань", - "MadeWithLove": "wukko створив це все з <3", - "AccessibilityInputArea": "місце для посилання", - "AccessibilityOpenAbout": "про {appName}", - "AccessibilityDownloadButton": "кнопка завантаження", - "AccessibilityOpenSettings": "відкрити налаштування", - "AccessibilityOpenChangelog": "відкрити список змін", - "AccessibilityClosePopup": "закрити вікно", - "AccessibilityOpenDonate": "відкрити інфу щодо пожертв", - "TitlePopupAbout": "що таке {appName}?", - "TitlePopupSettings": "налаштування", - "TitlePopupError": "от халепа...", - "TitlePopupChangelog": "що нового?", - "TitlePopupDonate": "підтримай {appName}", - "TitlePopupDownload": "завантажити", - "ErrorSomethingWentWrong": "щось пішло не так, і нічого з того, що ти просив, отримати не вдалось. ти можеш спробувати ще раз, але якщо проблема не зникне, будь ласка, {ContactLink}", - "ErrorUnsupported": "схоже, цей сервіс ще не підтримується, або твоє посилання недійсне.", - "ErrorBrokenLink": "{s} підтримується, але з твоїм посиланням щось не так. можливо, ти не повністю його скопіював?", - "ErrorNoLink": "я не вмію вгадувати, що ти хочеш завантажити! будь ласка, дай мені посилання.", - "ErrorPageRenderFail": "щось пішло не так і сторінку відобразити не вдалося. якщо ця проблема повторюється або надзвичайно важлива, будь ласка, {ContactLink}. було б корисно, якби ти надав поточний хеш коміту ({s}) та кроки відтворення помилки. наперед дякую :D", - "ErrorRateLimit": "ти надсилаєш забагато запитів. заспокойся та спробуй ще раз пізніше.", - "ErrorCouldntFetch": "не зміг отримати ніякої інформації з твого посилання. перевір, щоб посилання було дійсним, та спробуй ще раз.", - "ErrorLengthLimit": "поточний ліміт тривалості становить {s} хв. відео, яке ти намагався завантажити, триває більше {s} хв. спробуй щось інше!", - "ErrorBadFetch": "я намагався отримати інформацію з твого посилання, але сталася помилка. ти впевнений, що воно працює? переконайся у правильності посилання та спробуй ще раз.", - "ErrorCorruptedStream": "на жаль, це завантаження пошкоджено. повтори спробу або спробуй інший формат та роздільну здатність.", - "ErrorNoInternet": "немає інтернету, або api {appName} не працює. перевір з'єднання з інтернетом та спробуй ще раз.", - "ErrorCantConnectToServiceAPI": "у мене не вийшло під'єднатися до api {s}. можливо, {s} не працює, або ip сервера {appName} було заблоковано. спробуй ще раз пізніше.", - "ErrorEmptyDownload": "тут я не бачу нічого, що можна було б завантажити. спробуй інше посилання.", - "ErrorLiveVideo": "я не можу дивитися в майбутнє і завантажувати відео з прямого етеру. почекай, доки трансляція закінчиться, та спробуй ще раз!", - "SettingsAppearanceSubtitle": "вигляд", - "SettingsThemeSubtitle": "тема", - "SettingsFormatSubtitle": "формат завантаження", - "SettingsMiscSubtitle": "інші налаштування", - "SettingsDownloadsSubtitle": "завантаження", - "SettingsQualitySubtitle": "якість", - "SettingsThemeAuto": "авто", - "SettingsThemeLight": "світла", - "SettingsThemeDark": "темна", - "SettingsQualitySwitchMax": "макс", - "SettingsQualitySwitchHigh": "висока", - "SettingsQualitySwitchMedium": "середня", - "SettingsQualitySwitchLow": "низька", - "SettingsQualitySwitchLowest": "найнижча", - "SettingsKeepDownloadButton": "зробити >> видимим", - "AccessibilityKeepDownloadButton": "завжди показувати кнопку завантаження", - "SettingsEnableDownloadPopup": "питати щодо методу зберігання", - "AccessibilityEnableDownloadPopup": "питати, що робити з завантаженнями", - "SettingsFormatDescription": "обери webm, якщо ти бажаєш максимальної якості. webm зазвичай кращий за якістю, але пристрої на ios не можуть програвати їх без сторонніх програм.", - "SettingsQualityDescription": "якщо вибрана роздільна здатність недоступна, замість неї вибирається найближча. якщо ти хочеш опублікувати відео з youtube у twitter, вибери комбінацію mp4 і 720p. з такими відео twitter працює найкраще.", - "DonateSubtitle": "допоможи платити за оренду серверу", - "DonateDescription": "мені не дуже подобається криптовалюта у її сучасному стані, але наразі для мене це єдиний надійний спосіб отримувати гроші та платити за що-небудь за кордоном.", - "LinkGitHubIssues": ">> повідомляй про помилки та переглядай код на github", - "LinkGitHubChanges": ">> ознайомся з попередніми комітами та зроби свій внесок на github", - "LinkDonateContact": ">> дай нам знати, якщо валюти, у якій ти б хотів задонатити, немає у списку", - "NoScriptMessage": "{appName} використовує javascript, щоб отримувати інформацію з сайтів та мати інтерактивний інтерфейс. тобі доведеться дозволити javascript, щоб користуватися сайтом. тут ніколи не буде ніякої реклами чи трекерів.", - "DownloadPopupDescriptionIOS": "в тебе пристрій на ios, тож для завантаження тобі треба натиснути та утримувати кнопку завантаження, а потім у вікні, яке з'явиться, вибрати \"завантажити відео\". такий обряд доведеться виконувати допоки apple не припинить змушувати розробників використовувати safari webview в усіх браузерах.", - "DownloadPopupDescription": "кнопка завантаження відкриває нову вкладку з запитуваним файлом. це можна змінити у налаштуваннях.", - "DownloadPopupWayToSave": "вибери спосіб зберігання", - "ClickToCopy": "натисни, щоб скопіювати", - "Download": "завантажити", - "CopyURL": "скопіювати url", - "AboutTab": "інфа", - "ChangelogTab": "список змін", - "DonationsTab": "донати", - "SettingsVideoTab": "відео", - "SettingsAudioTab": "аудіо", - "SettingsOtherTab": "інше", - "ChangelogLastCommit": "останній коміт (англійською мовою)", - "ChangelogLastMajor": "останнє оновлення", - "AccessibilityModeToggle": "змінити режим завантаження", - "DonateLinksDescription": "лінки на донати відкриваються у нових вкладках. це найкращий спосіб донатити, якщо хочеш, щоб ми безпосередньо отримували гроші.", - "SettingsAudioFormatBest": "найкращий", - "SettingsAudioFormatDescription": "якщо вибрано найкращий формат, буде завантажено оригінал аудіо. якщо вибрано щось інше, завантажений файл буде трохи стисненим.", - "Keyphrase": "зберігай те, що любиш", - "SettingsDisableChangelogOnUpdate": "не показувати \"що нового\" після суттєвих оновлень", - "SettingsRemoveWatermark": "прибрати вотермарку", - "ErrorPopupCloseButton": "зрозуміло", - "ModeToggle": "режим", - "ModeToggleSmart": "розумний", - "ErrorLengthAudioConvert": "я не можу конвертувати аудіо, якщо воно довше ніж {s} хв. вибери \"найкращий\" формат аудіо, щоб завантажити аудіо такої тривалості.", - "SettingsAudioFullTikTok": "завантажувати повне аудіо", - "SettingsAudioFullTikTokDescription": "зазвичай таке аудіо - оригінальний звук або пісня, яке використовується у відео. тобто це аудіо без обрізань, голосу за кадром тощо.", - "ErrorCantGetID": "я не зміг отримати повну інформацію за скороченим посиланням. переконайся, що воно працює, або спробуй повне посилання.", - "ErrorNoVideosInTweet": "цей твіт не містить відео чи gif. спробуй інший!", - "ImagePickerTitle": "вибери зображення для завантаження", - "ImagePickerDownloadAudio": "завантажити аудіо", - "ImagePickerExplanationPC": "клацни на зображення правою кнопкою миші, щоб зберегти.", - "ImagePickerExplanationPhone": "натисни та утримуй зображення, щоб зберегти.", - "ErrorNoUrlReturned": "сервер не повернув посилання для завантаження. таке не має траплятись. онови сторінку і спробуй ще раз, але якщо це не допоможе, {ContactLink}", - "ErrorUnknownStatus": "я отримав відповідь, яку я не можу обробити. найімовірніше, щось не так зі статусом. таке не має траплятись. онови сторінку і спробуй ще раз, але якщо це не допоможе, {ContactLink}", - "PasteFromClipboard": "вставити з буфера обміну", - "SettingsDisableClipboard": "приховати кнопку буфера обміну", - "FollowTwitter": "читай твіттер акаунт {appName}, щоб слідкувати за опитуваннями, новинами та більше: @justusecobalt", - "ChangelogOlder": "попередні оновлення", - "ChangelogPressToExpand": "натисни, щоб завантажити" - } -} diff --git a/src/localization/manager.js b/src/localization/manager.js index 2f5a334a..76b68737 100644 --- a/src/localization/manager.js +++ b/src/localization/manager.js @@ -1,5 +1,5 @@ import * as fs from "fs"; -import { appName, links, repo } from "../modules/config.js"; +import { links, repo } from "../modules/config.js"; import loadJson from "../modules/sub/loadJSON.js"; const locPath = './src/localization/languages'; @@ -7,19 +7,16 @@ const locPath = './src/localization/languages'; let loc = {} let languages = []; -export function loadLoc() { - fs.readdir(locPath, (err, files) => { - if (err) return false; - files.forEach(file => { - loc[file.split('.')[0]] = loadJson(`${locPath}/${file}`); - languages.push(file.split('.')[0]) - }); - }) +export async function loadLoc() { + const files = await fs.promises.readdir(locPath).catch((e) => { return [] }); + files.forEach(file => { + loc[file.split('.')[0]] = loadJson(`${locPath}/${file}`); + languages.push(file.split('.')[0]) + }); } -loadLoc(); export function replaceBase(s) { - return s.replace(/\n/g, '
').replace(/{saveToGalleryShortcut}/g, links.saveToGalleryShortcut).replace(/{appName}/g, appName).replace(/{repo}/g, repo).replace(/\*;/g, "•"); + return s.replace(/\n/g, '
').replace(/{saveToGalleryShortcut}/g, links.saveToGalleryShortcut).replace(/{repo}/g, repo).replace(/\*;/g, "•"); } export function replaceAll(lang, str, string, replacement) { let s = replaceBase(str[string]) diff --git a/src/modules/api.js b/src/modules/api.js index d5446810..92fa5374 100644 --- a/src/modules/api.js +++ b/src/modules/api.js @@ -6,36 +6,25 @@ import { cleanURL, apiJSON } from "./sub/utils.js"; import { errorUnsupported } from "./sub/errors.js"; import loc from "../localization/manager.js"; import match from "./processing/match.js"; +import hostOverrides from "./processing/hostOverrides.js"; export async function getJSON(originalURL, lang, obj) { try { let patternMatch, url = decodeURIComponent(originalURL), hostname = new URL(url).hostname.split('.'), host = hostname[hostname.length - 2]; + if (!url.startsWith('https://')) return apiJSON(0, { t: errorUnsupported(lang) }); - switch(host) { - case "youtu": - host = "youtube"; - url = `https://youtube.com/watch?v=${url.replace("youtu.be/", "").replace("https://", "")}`; - break; - case "goo": - if (url.substring(0, 30) === "https://soundcloud.app.goo.gl/") { - host = "soundcloud"; - url = `https://soundcloud.com/${url.replace("https://soundcloud.app.goo.gl/", "").split('/')[0]}` - } - break; - case "tumblr": - if (!url.includes("blog/view")) { - if (url.slice(-1) === '/') url = url.slice(0, -1); - url = url.replace(url.split('/')[5], '') - } - break; - } + let overrides = hostOverrides(host, url); + host = overrides.host; + url = overrides.url; + if (!(host && host.length < 20 && host in patterns && patterns[host]["enabled"])) return apiJSON(0, { t: errorUnsupported(lang) }); + let pathToMatch = cleanURL(url, host).split(`.${patterns[host]['tld'] ? patterns[host]['tld'] : "com"}/`)[1].replace('.', ''); for (let i in patterns[host]["patterns"]) { - patternMatch = new UrlPattern(patterns[host]["patterns"][i]).match(cleanURL(url, host).split(`.${patterns[host]['tld'] ? patterns[host]['tld'] : "com"}/`)[1].replace('.', '')); + patternMatch = new UrlPattern(patterns[host]["patterns"][i]).match(pathToMatch); if (patternMatch) break } if (!patternMatch) return apiJSON(0, { t: errorUnsupported(lang) }); diff --git a/src/modules/build.js b/src/modules/build.js index 6c4bee85..887ffb50 100644 --- a/src/modules/build.js +++ b/src/modules/build.js @@ -1,15 +1,15 @@ import * as esbuild from "esbuild"; import * as fs from "fs"; -import { languageList } from "../localization/manager.js"; +import { loadLoc, languageList } from "../localization/manager.js"; +import { cleanHTML } from "./sub/utils.js"; + import page from "./pageRender/page.js"; -function cleanHTML(html) { - let clean = html.replace(/ {4}/g, ''); - clean = clean.replace(/\n/g, ''); - return clean -} export async function buildFront(commitHash, branch) { try { + // preload localization files + await loadLoc(); + // build html if (!fs.existsSync('./build/')){ fs.mkdirSync('./build/'); @@ -17,6 +17,10 @@ export async function buildFront(commitHash, branch) { fs.mkdirSync('./build/pc/'); fs.mkdirSync('./build/mob/'); } + // get rid of old build path + if (fs.existsSync('./min')) { + fs.rmSync('./min', { recursive: true, force: true }); + } for (let i in languageList) { i = languageList[i]; let params = { @@ -36,7 +40,7 @@ export async function buildFront(commitHash, branch) { // build js & css await esbuild.build({ entryPoints: ['src/front/cobalt.js', 'src/front/cobalt.css'], - outdir: 'min/', + outdir: 'build/min/', minify: true, loader: { '.js': 'js', '.css': 'css', }, charset: 'utf8' diff --git a/src/modules/buildStatic.js b/src/modules/buildStatic.js new file mode 100644 index 00000000..d3ed909f --- /dev/null +++ b/src/modules/buildStatic.js @@ -0,0 +1,7 @@ +import { buildFront } from "./build.js"; +import { getCurrentBranch, shortCommit } from "./sub/currentCommit.js"; + +const commitHash = shortCommit(); +const branch = getCurrentBranch(); + +await buildFront(commitHash, branch); diff --git a/src/modules/changelog/changelog.json b/src/modules/changelog/changelog.json index 0636d947..57363b3e 100644 --- a/src/modules/changelog/changelog.json +++ b/src/modules/changelog/changelog.json @@ -1,54 +1,154 @@ { "current": { - "version": "5.4", - "title": "instagram support, hop, docker, and more!", - "banner": "catphonestand.webp", - "content": "something many of you've been waiting for is finally here! try it out and let me know what you think :)\n\ntl;dr:\n*; added experimental instagram support! download any reels or videos you like, and make sure to report any issues you encounter. yes, you can convert either to audio.\n*; fixed support for on.soundcloud links.\n*; added share button to \"how to save?\" popup.\n*; added docker support.\n*; main instance is now powered by hop.io.\n\nservice improvements:\n*; added experimental support for videos from instagram. currently only reels and post videos are downloadable, but i'm looking into ways to save high resolution photos too. if you experience any issues, please report them on either of support platforms.\n*; fixed support for on.soundcloud share links. should work just as well as other versions!\n*; fixed an issue that made some youtube videos impossible to download.\n\ninterface improvements:\n*; new css-only checkmark! yes, i can't stop tinkering with it because slight flashing on svg load annoyed me. now it loads instantly (and also looks slightly better).\n*; fixed copy animation.\n*; minor localization improvements.\n*; fixed the embed logo that i broke somewhere in between 5.3 and 5.4.\n\ninternal improvements:\n*; now using nanoid for live render stream ids.\n*; added support for docker. it's kind of clumsy because of how i get .git folder inside the container, but if you know how to do it better, feel free to make a pr.\n*; cobalt now checks only for existence of environment variables, not exactly the .env file.\n*; changed the way user ip address is retrieved for instances using cloudflare.\n*; added ability to disable cors, both to setup script and environment variables.\n*; moved main instance to hop.io infra. there should no longer be random downtimes. huge shout out to the hop team for being so nice and helping me out :D\n\ni can't believe how diverse and widespread cobalt has become. it's used in all fields: music production, education, content creation, and even game development. thank you. this is absolutely nuts.\nif you don't mind sharing, please tell me about your use case. i'd really love to hear how you use cobalt and how i could make it even more useful for you." + "version": "7.4", + "date": "September 9, 2023", + "title": "new domain, what's coming in future, bug fixes, and more!", + "banner": { + "file": "newdomain.webp", + "width": 960, + "height": 540 + }, + "content": "cobalt is finally moving to its own domain! many of you have been anticipating this, and many kept forgetting the link due to how cryptic it was.\n\nwell, worry no more - cobalt.tools is here.\n\nif you haven't yet, open co.wukko.me to transfer your settings here! no additional action from you is required. just open the old link and cobalt will do everything for you :)\n\nmake sure to update your bookmarks and reinstall the web app!\n\nhere's what domain change means:\n*; still no ads, same owner, same features, same reliability. just a way more rememberable link (it's literally two words).\n*; cobalt.tools makes it clear that cobalt is a tool and that it's \"cobalt\", not \"wukko\".\n*; i can host various versions of cobalt on subdomains without links looking awkward.\n*; i can host cobalt-related websites without polluting my personal domain's dns (such as crowdin).\n*; i stand by same privacy policies (and in fact am using the same exact server as before).\n\nthe domain change is required for the future of cobalt.\n\nhere's what's coming soon:\n*; support for many top-requested sites, such as (but not limited to) twitch and niconico.\n*; education version of cobalt, as often requested by students and educators.\n*; major localization system upgrade, allowing for simpler community contributions.\n*; region-specific versions with 100% translations and tweaks.\n*; native clients for desktop and mobile (not sure about this one, i'm no superman).\n*; ...and more!\n\nnow, here's what's new in 7.4:\n*; tabs in popups now scroll to top on tab bar tap.\n*; padding across web app was tuned.\n*; (obviously) a migration agent. soon will be used for importing and exporting settings.\n*; some minor clean ups in codebase.\n\nif you want to help cobalt achieve goals listed above, consider donating! donations are the only way i can keep cobalt ad-less, powerful, (basically) limitless, and also 100% free.\n\nin fact, donations have helped me grow cobalt more than i've ever anticipated. just imagine how much better it will be in a year.\n\ngo to donations down below to find ways to donate!\n\nthank you for reading through all of this. i hope you enjoy this update and have a great day :D" }, "history": [{ + "version": "7.2 & 7.3", + "date": "September 6, 2023", + "title": "extended video length limit, metadata toggle, ui improvements, and more!", + "banner": { + "file": "meowthsnap.webp", + "width": 500, + "height": 280 + }, + "content": "this update gives cobalt a sharp look in chromium browsers and makes it even more useful than before. check out the full changelog below!\n\nservice improvements:\n*; increased video length limit from 3 hours to 5 hours. feel free to download lectures you need :)\n*; you can now disable file metadata in settings.\n*; fixed a bug which previously caused some downloads to end up being 0 bytes.\n\nui improvements:\n*; fixed clickable area for urgent notice (text on top).\n*; fixed blurry header in chrome.\n*; fixed blurry tab bar in chrome.\n*; fixed blurry switches in chrome.\n*; fixed weirdly rounded corners in popups.\n*; fixed 1px gap on edges of various elements in popup in chrome.\n*; fixed overscrolling in other settings tab on ios.\n*; fixed unexpected button highlight effect on phones.\n*; removed outdated fixes for tiny screens.\n\nother improvements:\n*; cobalt web & api start faster than before, additional preparation functions aren't unexpectedly run anymore.\n*; cobalt is now available as a docker package. check it out on github.\n\nthank you for being here. i hope you have a great day :D" + }, { + "version": "7.1", + "date": "August 20, 2023", + "title": "instagram, streamable, video metadata, and more!", + "banner": { + "file": "meowthproductions.webp", + "width": 640, + "height": 358 + }, + "content": "service improvements:\n*; extended instagram support: high quality photos, videos, reels. everything should work without any issues, enjoy! :)\n*; added support for streamable.com (thanks to #179)\n*; added video metadata to youtube videos.\n*; fixed vk video downloads.\n*; vxtwitter links are now supported.\n*; fixed support for youtube audio dubs.\n\nui improvements:\n*; fixed picker popup: it's now scrollable in all cases and clickable areas don't overlap each other.\n\nbackend improvements:\n*; cobalt will now let you know if something goes wrong during video download instead of nuking the stream.\n*; added support for cookies (thanks to #177)\n*; replaced got with undici (thanks to #182). downloads should be slightly faster and clean of garbage in headers.\n\ninternal improvements:\n*; moved host overrides into its own module.\n*; minor clean ups.\n\neven more cool stuff is coming in future updates! thank you for using cobalt :D" + }, { + "version": "7.0", + "date": "August 15, 2023", + "title": "biggest ui refresh yet!", + "banner": { + "file": "meowthcooking.webp", + "width": 640, + "height": 360 + }, + "content": "hey! this update is huge and mostly aimed to refresh the ui, but there are also some other nice fixes/additions. read below for more info :)\n\ntl;dr:\n*; entirety of web app has been refreshed. it's more prettier and optimized than ever, both on phone and desktop.\n*; if you're on ios, try adding cobalt to home screen! it'll look and act like a native app.\n*; all soundcloud links are now supported and audio quality is higher than before.\n*; all x (previously twitter) links are now supported and work properly.\n*; newer reddit videos are downloadable now.\n*; added some sort of eula, list of keyboard shortcuts, updated privacy policy for more clarity. check it all in refreshed about tab!\n*; cobalt now lets you know if your browser doesn't support clipboard pasting and helps you fix it.\n\naccessibility notice:\nthis update includes animations and transparency, if you'd like to disable any or all of them, head to settings > other > accessibility.\n\n[full changelog]\n\nservice improvements:\n*; fixed unexpected 502 errors when downloading newer reddit videos.\n*; newer reddit videos (with audio) are downloadable now.\n*; upgraded soundcloud downloads to use higher audio quality than before.\n*; all soundcloud links are now supported.\n*; added support for x.com urls.\n*; changed twitter api once again. now everything works, again.\n\nweb improvements:\n*; all-new matte glass aesthetic, applied to revamped popup headers, tab selectors, and also small popups.\n*; rounded corners everywhere! cobalt is now safe for everyone who can't handle sharp objects.\n*; paddings everywhere are smaller, more content fits on the screen at once.\n*; optimized installed web app to look and act like a native app, especially on ios.\n*; added update release dates to changelogs.\n*; cobalt now lets you know if your browser doesn't support clipboard api and helps you fix it.\n*; refreshed all popups: less padding, more content.\n*; completely remade error and download popups, they're consistent with the rest of refreshed design.\n*; refreshed the look of entire changelog tab: separated title and version/commit, made title bigger, evened out all paddings.\n*; replaced close button with back button, moved it to left.\n*; added interaction animations.\n*; added more keyboard shorcuts.\n*; added a list of keyboard shortcuts to about tab.\n*; added eula to about tab. check it out.\n*; added more accessibility options, put them all into one category. you can disable animations and transparency if you want to.\n*; added a link to self-troubleshooting guide to about tab.\n*; renamed 2160p and 4320p to 4k and 8k respectfully for better clarity.\n*; popups now work without any weird workarounds, especially on mobile. they're clean and nice.\n*; home screen now also works without any weird workarounds. it is also clean and nice.\n*; optimized css of almost all ui elements. should be even more consistent across platforms now.\n*; added ability to translate \"cobalt\" more in-depth localization. for example, in russian \"cobalt\" is now \"кобальт\", that's the style i'll be going with from now on.\n*; updated many localization strings for more clarity.\n*; removed ability to change the app name dynamically in all locations. cobalt is a sustained app name.\n*; updated donation and privacy policy texts for more clarity in both english and russian.\n*; home screen now smoothly fades in instead of popping in.\n*; proper banner loading. no more jumping text!\n*; proper banner error handling. if banner wasn't loaded, it'll simply go grey instead of disappearing.\n*; links are no longer italic and are instead underlined.\n*; collapsible lists now have corresponding emoji.\n*; donate button is now highlighted with magenta instead of white.\n*; proper dropdown arrow.\n*; removed 6.0 api fallback.\n*; fixed celebrations emoji. again.\n*; cleaned up all related frontend modules, especially page.js.\n*; urgent notice is now a js element, not a static piece of text. can be updated easily.\n\napi improvements:\n*; now catching all json api related errors.\n*; moved on demand blocks to web server, now changelog can be updated independently from preferred api server.\n*; now sending standard rate limiting headers.\n*; better readability in source.\n\nother improvements:\n*; renamed docker-compose.yml.example to docker-compose.example.yml for linting in code editors.\n*; added a wiki with wip troubleshooting guide on github. more guides are coming soon!\n\nthat's a ton of changes! i really hope you like this update as much as i do.\n\nif you experience any issues, feel free to contact me on any platform listed in about tab! i'd love to hear back from you.\n\nthank you for sticking with me and cobalt, i hope you have THE best day :D" + }, { + "version": "6.2", + "date": "June 27 2023", + "title": "all network issues have been fixed!", + "banner": { + "file": "meowthhammer.webp", + "width": 1280, + "height": 827 + }, + "content": "hey! there have been some hiccups in cobalt's stability lately, i was going through finals while trying to scale up the infrastructure, and that didn't really work out, lol.\nBUT i'm happy to announce that i've optimized all nodes! there should no longer be any networking issues.\n\nenjoy stable experience while i work in background to make cobalt even better :)\n\nhere's what's new in this update:\n*; better button contrast in both themes. \n*; button highlight in light theme now actually looks like a highlight.\n*; removed ip gate for streamables and updated privacy policy to reflect this change.\n*; streamable links now last for 20 seconds instead of 2 minutes.\n*; cleaned up stream verification algorithm. now the same function doesn't run 4 times in a row.\n*; removed deprecated way of hosting a cobalt instance.\n\nthank you for sticking with cobalt, and i hope you have a great day :D\n\nbanner photo is by @halftroller on twitter, thank you so much!" + }, { + "version": "6.0", + "date": "June 7, 2023", + "title": "better reliability, new infrastructure, pinterest support, and way more!", + "banner": { + "file": "catswitchboxes.webp", + "width": 600, + "height": 314 + }, + "content": "hey! long time no see, hopefully over 40 changes will make up for it :)\n\ncobalt now has an official community discord server. you can go there for news, support, or just to chat. go check it out!\n\ntl;dr\n*; new infra, new hosting structure, new main instance api url. developers, get it here.\n*; added support for pinterest, vine archive, tumblr audio, youtube vr videos.\n*; better web app performance and look.\n*; better stability thanks to load balancing.\n*; (hopefully) no more random video/audio download drops.\n\nservice improvements:\n*; added support for pinterest videos and stories (pr by @Snazzah).\n*; added support for tumblr audio. sorry, tumblr.\n*; added support for youtube vr videos. please note that they're in youtube's proprietary ratio.\n*; added support for vine archive.\n*; added support for ancient vk videos in 240p.\n*; fixed an issue related to muted video downloads from tumblr.\n*; moved to twitter v2 api.\n*; soundcloud share links are now processed without errors.\n\nui improvements:\n*; lazy image loading. should significantly speed up the page load.\n*; fixed checkbox width on mobile devices.\n*; addition of a temporary urgent notice.\n*; added hover border to all buttons.\n*; less annoying donation button highlight.\n*; more consistent color scheme.\n*; added link to a discord server into about popup.\n*; remember celebratory emoji changes? they've been fixed, and are now dynamically loaded!\n*; changelog history now lets you try to load it again if first attempt failed for whatever reason.\n*; padding (everywhere) has been slightly reduced to fit in more content and be consistent across ui.\n*; added more info to the \"how to save\" popup for ios devices.\n*; crypto wallet press-to-copy buttons now look like buttons.\n*; improved ui layout for smallest screens (iphone 5, 5s, se, etc).\n*; removed partial translations for sake of clarity and consistency.\n\ninternal improvements:\n*; separated web and api servers. they're now completely independent and therefore more stress-resistant.\n*; added a dedicated script for building the web app if you don't want to reload the frontend server.\n*; web app building improvements.\n*; async localization preloading.\n*; consistent server start time reporting.\n*; dynamic stream and ip hashing salt generation.\n\ninfrastructure improvements:\n*; load balancing: your api requests are now sent to the least busy server. yes, there are now several of them with more to come in the future.\n*; when possible, server in closest region is used instead of a far-away one. this should help with download speeds.\n*; currently there are multiple servers in europe. i will let you know when (and if) i manage to get an american one.\n\nupdates for developers and instance hosters:\n*; server info api endpoint: you can now check up on the api server of choice. it reports all the basic info you may need. check the api docs for more info.\n*; api names: each and every api instance should have a distinctive name. this will be useful in the future :)\n*; added docker compose sample config.\n*; updated and more granular setup script.\n*; better api scalability and faster server start up thanks to web and api separation.\n*; added ability to specify ffmpeg threads. simply add ffmpegThreads to your environment variables!\n\ni'm still in awe from how popular cobalt has become. there are now over 200k of unique users monthly, and that number only keeps growing. i even had to come up with something to accommodate for larger traffic, it's absolutely insane.\n\nlove you all, have a great day :D" + }, { + "version": "5.4", + "title": "instagram support, docker, and more!", + "banner": { + "file": "catphonestand.webp", + "width": 451, + "height": 272 + }, + "content": "something many of you've been waiting for is finally here! try it out and let me know what you think :)\n\ntl;dr:\n*; added experimental instagram support! download any reels or videos you like, and make sure to report any issues you encounter. yes, you can convert either to audio.\n*; fixed support for on.soundcloud links.\n*; added share button to \"how to save?\" popup.\n*; added docker support.\n\nservice improvements:\n*; added experimental support for videos from instagram. currently only reels and post videos are downloadable, but i'm looking into ways to save high resolution photos too. if you experience any issues, please report them on either of support platforms.\n*; fixed support for on.soundcloud share links. should work just as well as other versions!\n*; fixed an issue that made some youtube videos impossible to download.\n\ninterface improvements:\n*; new css-only checkmark! yes, i can't stop tinkering with it because slight flashing on svg load annoyed me. now it loads instantly (and also looks slightly better).\n*; fixed copy animation.\n*; minor localization improvements.\n*; fixed the embed logo that i broke somewhere in between 5.3 and 5.4.\n\ninternal improvements:\n*; now using nanoid for live render stream ids.\n*; added support for docker. it's kind of clumsy because of how i get .git folder inside the container, but if you know how to do it better, feel free to make a pr.\n*; cobalt now checks only for existence of environment variables, not exactly the .env file.\n*; changed the way user ip address is retrieved for instances using cloudflare.\n*; added ability to disable cors, both to setup script and environment variables.\n\ni can't believe how diverse and widespread cobalt has become. it's used in all fields: music production, education, content creation, and even game development. thank you. this is absolutely nuts.\nif you don't mind sharing, please tell me about your use case. i'd really love to hear how you use cobalt and how i could make it even more useful for you." + }, { "version": "5.3", "title": "better looks, better feel", - "banner": "cattired.webp", + "banner": { + "file": "cattired.webp", + "width": 640, + "height": 286 + }, "content": "this update isn't as big as previous ones, but it still greatly enhances the cobalt experience.\n\nhere's what's up:\n*; new mode switcher! elegant and 100% clear. should no longer cause any confusion. let me know if you like it better this way :D\n*; wide paste button on mobile is back, but now it's even closer to your finger.\n*; removed the weird grey chin on changelog banners.\n*; removed left-handed layout toggle since it is no longer needed.\n*; fixed input area display in chromium 112+.\n*; centered the main action box.\n*; cleaned up css of main action box to get rid of tricks and ensure correct display on all devices.\n*; fixed a bug that'd cause notifications dots to disappear when an unrelated checkbox was checked.\n\nhopefully from now on i'll focus on adding support for more services.\nthank you for using cobalt. stay cool :)" }, { "version": "5.2", "title": "fastest one in the game", - "banner": "catspeed.webp", + "banner": { + "file": "catspeed.webp", + "width": 640, + "height": 356 + }, "content": "hey, notice anything different? well, at very least the page loaded way faster! this update includes many improvements and fixes, but also some new features.\n\ntl;dr:\n*; twitter retweet links are now supported.\n*; all vimeo videos should now be possible to download.\n*; you now can download audio from vimeo.\n*; it's now possible to pick between preferred vimeo download method in settings.\n*; fixed issues related to tiktok, twitter, twitter spaces, and vimeo downloads.\n*; overall cobalt performance should be MUCH better.\n\nservice improvements:\n*; added support for twitter retweet links. now all kinds of tweet links are supported.\n*; fixed the issue related to periods in tiktok usernames (#96).\n*; fixed twitter spaces downloads.\n*; added support for audio downloads from vimeo.\n*; added ability to choose between \"progressive\" and \"dash\" vimeo downloads. go to settings > video to pick your preference.\n*; fixed the issue related to vimeo quality picking.\n*; fixed the issue when vimeo module wouldn't show appropriate errors and instead would fallback to default ones.\n*; improved audio only downloads for some edge cases.\n*; (hopefully) better youtube reliability.\n*; temporarily disabled douyin support due to api endpoint cut off.\n\ninterface improvements:\n*; merged clipboard and mode switcher rows into one for mobile view.\n*; added left-handed layout toggle for those who prefer to have the clipboard button on left.\n*; new custom-made clipboard icon. now it clearly indicates what it does.\n*; improved english and russian localization. both are way more direct and less bloaty.\n*; frontend page is now rendered once and is cached on disk instead of being rendered every time someone requests a page. this greatly improves page loading speeds and further reduces strain put on the server.\n*; frontend page is now minimized just like js and css files. this should minimize traffic wasted on loading the page, along with minor loading speed improvement.\n*; added proper checkbox icon for better clarity.\n*; checkboxes are now stretched edge-to-edge on phone to be easier to manage for right-handed people.\n*; removed button hover highlights on phones.\n*; fixed button press animations for safari on ios.\n*; fixed text selection on ios. previously you could select text or images anywhere, but now they're selectable in limited places, just like on other platforms.\n*; frontend platform is now marked in settings: p is for pc; m is for mobile; i is for ios. this is done for possible future debugging and issue-solving.\n*; better error messaging.\n\ninternal improvements:\n*; better rate limiting, there should be way less cases of accidental limits.\n*; added support for m3u8 playlists. this will be useful for future additions, and is currently used by vimeo module.\n*; added support for \"chop\" stream format for vimeo downloads.\n*; fixed vk user id extraction. i assumed the - in url was a separator, but it's actually a part of id.\n*; completely reworked the vimeo module. it's much cleaner and better performant now.\n*; minor clean ups across the board.\n\nnot really related to this update, but thank you for 50k monthly users! i really appreciate that you're still here, because that means i'm doing some things right :D" }, { "version": "5.1", "title": "the evil has been defeated", - "banner": "happymeowth.webp", + "banner": { + "file": "happymeowth.webp", + "width": 500, + "height": 330 + }, "content": "hey, ever wanted to download a youtube video without a hassle? cobalt is here to help. this update fixes all issues related to youtube downloads.\nnot only that, but it also introduces features never before seen in a downloader, such as youtube dub downloads! read below to see what's up :)\n\ntl;dr:\n*; audio in youtube videos FINALLY no longer gets cut off.\n*; you now can pick any video resolution you want (from 360p to 8k) and any possible youtube video codec (h264/av1/vp9).\n*; you now can download youtube videos with dubs in your native language. just check settings > audio.\n*; youtube processing has been vastly sped up.\n\nok, now onto the nerdy part of changelog. this update is pretty huge and includes improvements across the board.\n\nservice improvements:\n*; all youtube functionality has been reworked. cobalt now relies on innertube apis, not web scraping.\n*; random audio cut off issue has been fixed, let me know if it ever occurs again. (closes #62, #66, #75, #88).\n*; added support for youtube dubs. currently it's using your browser's default language when enabled, but i have plans on making a picker. i'll ask people on twitter and mastodon if this feature is needed, and add a picker in next updates.\n*; instead of adding more quality presets, i added granular quality options. pick whatever you like, from 360p up to 4320p (for all services, not just youtube).\n*; replaced a format picker with codec picker for youtube. you can pick h264, av1, or vp9. all of them should work as expected (closes #88).\n*; youtube audio files are now properly matched to corresponding video files.\n*; it's now always possible to download pristine h264 720p/360p videos from youtube. these videos will work ANYWHERE, so they're default for mobile.\n*; youtube requests are no longer permanently cached, ram usage should drop even further.\n*; youtube video and audio file names now include codec and dub language when applicable.\n*; max video and audio duration limits have been bumped up to 3 hours.\n*; general performance of entire youtube download process has been greatly improved.\n*; vk module has been reworked to be more compact and not make use of outdated technique of quality picking. should also be way more reliable.\n\ninternal improvements:\n*; cleaned up services config, all constants have been moved directly to modules for quicker access.\n*; matching module has been slightly cleaned up.\n\ninterface improvements:\n*; many descriptions and error messages have been slightly tuned to be less wordy.\n*; unnecessary title duplications in settings have been merged into one.\n*; added more clarity to quality and codec descriptions.\n\nif you use cobalt api, please note that you have to update your creation to support new features.\n\nthis is the second batch of 5.x improvements, there's way more to come. thank you for being here, i really appreciate your support.\n\nif you want to thank me (the developer), there's a nice tab under this changelog that has \"donations\" text on it. anything helps me continue developing and hosting the friendliest media downloader :D" }, { "version": "5.0", "title": "it's all about attention to detail!", - "banner": "valentines.webp", + "banner": { + "file": "valentines.webp", + "width": 489, + "height": 374 + }, "content": "happy valentine's day! i have an update for you, as a gift :D\n\ntl;dr: added support for reddit gifs, fixed douyin downloads, fixed vimeo quality picking, revamped entirety of codebase, and many other fixes.\n\nhere's more info:\n\nthis update is mostly about cleaning up and polishing the codebase, but it also has some new features. here's what's up:\n\nservice-related improvements:\n*; you now can download gifs from reddit!\n*; attempting to download a video from douyin no longer throws an error (bytedance changed the api endpoint, yet again).\n*; fixed quality picking for vimeo downloads.\n*; fixed length limit check in vimeo module.\n*; fixed support for \"user view\" vk clips links.\n*; various twitter errors are now displayed correctly instead of falling back to the default error.\n*; state of all services is now tested on each commit.\n\nui improvements:\n*; cobalt social links no longer disappear if you have an aggressive ad blocking extension installed.\n*; various localization improvements for both english and russian.\n*; changed some service aliases to display full list of supported downloads.\n*; added current branch information to version text (in settings).\n*; fixed typos in older changelogs.\n\ninternal improvements:\n*; everything has been sanitized, improved, and refactored. code is now much easier to read and maintain.\n*; rewrote and/or optimized all modules that were messy or inefficient.\n*; all git interaction functions now store info in cache instead of fetching it every time the function is called.\n*; added a test script that checks functionality of all supported services.\n*; updated deepsource config. checks are more accurate now.\n*; requests from internet explorer are now dropped entirely instead of redirecting people stuck in 90s to a proper browser download page. this was done to avoid (my) personal bias towards browsers.\n\ni put a ton of effort into this version, and i hope you like it as much as i do.\n\nthank you for using cobalt. there's so much more to come :)" }, { "version": "4.8", "title": "prettier than ever", - "banner": "catmakeup.webp", - "content": "this version brings many visual improvements and a completely revamped \"about\" tab.\n\nwhat's new in \"about\" tab:\n*; all information is now split into collapsible sections, making it easier to navigate.\n*; added privacy policy to further prove that none of your data is collected.\n*; added emoji to the page title to make it look consistent with other pages.\n*; added mastodon account handle and link.\n*; there are now short notes at the end of each section.\n*; other changes that are too small to describe. just go check it out!\n\nvisual improvements:\n*; less wasted space: paddings and margins have been reduced and optimized for usability, consistency, and overall beauty.\n*; all links are now in italic. it's much easier to tell them apart from regular highlights.\n*; error popup no longer looks broken and out of place.\n*; download popup now has a proper close button, not something from 2.x era.\n*; emoji are no longer selectable or draggable.\n*; better scalability: desktop layout for home screen is shown if device viewport is wide enough to fit in three action buttons.\n*; page shouldn't look broken on phones in landscape mode (i still highly recommend using cobalt in portrait mode).\n*; removed bulletpoint padding. it was unnecessary.\n*; updated some service names.\n\nas always, you can suggest features or report bugs on any platform listed in the \"support\" section of about tab.\n\nthank you for using cobalt. i hope you have a good day :)" + "banner": { + "file": "catmakeup.webp", + "width": 394, + "height": 266 + }, + "content": "this version brings many visual improvements and a completely revamped \"about\" tab.\n\nwhat's new in \"about\" tab:\n*; all information is now split into collapsible sections, making it easier to navigate.\n*; added privacy policy to further prove that none of your data is collected.\n*; added emoji to the page title to make it look consistent with other pages.\n*; added mastodon account handle and link.\n*; there are now short notes at the end of each section.\n*; other changes that are too small to describe. just go check it out!\n\nvisual improvements:\n*; less wasted space: paddings and margins have been reduced and optimized for usability, consistency, and overall beauty.\n*; all links are now in italic. it's much easier to tell them apart from regular highlights.\n*; error popup no longer looks broken and out of place.\n*; download popup now has a proper close button, not something from 2.x era.\n*; emoji are no longer selectable or draggable.\n*; better scalability: desktop layout for home screen is shown if device viewport is wide enough to fit in three action buttons.\n*; page shouldn't look broken on phones in landscape mode (i still highly recommend using cobalt in portrait mode).\n*; removed bulletpoint padding. it was unnecessary.\n*; updated some service names.\n\nas always, you can suggest features or report bugs on any platform listed in the \"support\" section of about tab.\n\nthank you for using cobalt. i hope you have a good day :)" }, { "version": "4.7", "title": "we're better together! thank you for bug reports.", - "banner": "bettertogether.webp", - "content": "this update includes a bunch of improvements, many of which were made thanks to the community :D\n\nservice-related improvements:\n*; private soundcloud links are now supported (#68);\n*; tiktok usernames with dots in them no longer confuse cobalt (#71);\n*; .ogg files no longer wrongfully include a video channel (#67);\n*; fixed an issue that caused cobalt to freak out when user attempted to download an audio from audio-only service with \"mute video\" option enabled.\n\nui improvements:\n*; popup padding has been evened out. popups are now able to fit in more information on scroll, especially on mobile;\n*; all buttons are now of even size and are displayed without any padding issues across all modern browsers and devices;\n*; checkbox is no longer crippled on ios;\n*; many explanation texts have been simplified to get rid of unnecessary bloat (no bullshit, remember?);\n*; moved tiktok section in video settings higher due to higher priority;\n*; fixed unexpectedly displayed scrollbars on switch rows in firefox.\n\nstability improvements:\n*; ffmpeg process now should end upon finishing the render;\n*; ffmpeg should also quit when download is abruptly cut off;\n*; fixed a memory leak that was caused by misconfigured stream information caching (#63).\n\ninternal improvements:\n*; requested streams are now stored in cache for 2 minutes instead of 1000 hours (yes, 1000 hours, i fucked up);\n*; cached data is now reused if user requests same content within 2 minutes;\n*; page render module is now even cleaner than before;\n*; proper support for bullet-points in loc strings.\n\nyou can suggest features or report bugs on github or twitter. both work just fine, use whichever you're more comfortable with.\n\nthank you for using cobalt, and thank you for reading this changelog.\n\nyou're amazing, keep it up :)" + "banner": { + "file": "bettertogether.webp", + "width": 640, + "height": 358 + }, + "content": "this update includes a bunch of improvements, many of which were made thanks to the community :D\n\nservice-related improvements:\n*; private soundcloud links are now supported (#68);\n*; tiktok usernames with dots in them no longer confuse cobalt (#71);\n*; .ogg files no longer wrongfully include a video channel (#67);\n*; fixed an issue that caused cobalt to freak out when user attempted to download an audio from audio-only service with \"mute video\" option enabled.\n\nui improvements:\n*; popup padding has been evened out. popups are now able to fit in more information on scroll, especially on mobile;\n*; all buttons are now of even size and are displayed without any padding issues across all modern browsers and devices;\n*; checkbox is no longer crippled on ios;\n*; many explanation texts have been simplified to get rid of unnecessary bloat (no bullshit, remember?);\n*; moved tiktok section in video settings higher due to higher priority;\n*; fixed unexpectedly displayed scrollbars on switch rows in firefox.\n\nstability improvements:\n*; ffmpeg process now should end upon finishing the render;\n*; ffmpeg should also quit when download is abruptly cut off;\n*; fixed a memory leak that was caused by misconfigured stream information caching (#63).\n\ninternal improvements:\n*; requested streams are now stored in cache for 2 minutes instead of 1000 hours (yes, 1000 hours, i fucked up);\n*; cached data is now reused if user requests same content within 2 minutes;\n*; page render module is now even cleaner than before;\n*; proper support for bullet-points in loc strings.\n\nyou can suggest features or report bugs on github or twitter. both work just fine, use whichever you're more comfortable with.\n\nthank you for using cobalt, and thank you for reading this changelog.\n\nyou're amazing, keep it up :)" }, { "version": "4.6", "title": "mute videos and proper soundcloud support", - "banner": "shutup.png", + "banner": { + "file": "shutup.webp", + "width": 1024, + "height": 665 + }, "content": "i've been longing to implement both of these things, and here they finally are.\n\nservice-related improvements:\n*; you now can download videos with no audio! simply enable the \"mute audio\" option in settings > audio.\n*; soundcloud module has been updated, and downloads should no longer break after some time.\nvisual improvements:\n*; moved some things around in settings popup, and added separators where separation is needed.\n*; updated some texts in english and russian.\n*; version and commit hash have been joined together, now they're a single unit.\ninternal improvements:\n*; updated api documentation to include isAudioMuted.\n*; simplified the startup message.\n*; created render elements for separator and explanation due to high duplication of them in the page.\n*; fully deprecated GET method for API requests.\n*; fixed some code quirks.\nhere's how soundcloud downloads got fixed:\n\npreviously, client_id was (stupidly) hardcoded. that means cobalt wasn't able to fetch song data if soundcloud web app got updated.\nnow, cobalt tries to find the up-to-date client_id, caches it in memory, and checks if web app version has changed to update the id accordingly. you can see this change for yourself on github." }, { "version": "4.5", "title": "better, faster, stronger, stable", - "banner": "meowthstrong.webp", - "content": "your favorite social media downloader just got even better! this update includes a ton of improvements and fixes.\n\nin fact, there are so many changes, i had to split them in sections.\n\nservice-related improvements:\n*; vimeo module has been revamped, all sorts of videos should now be supported.\n*; vimeo audio downloads! you now can download audios from more recent videos.\n*; cobalt now supports all sorts of tumblr links. (even those scary ones from the mobile app)\n*; vk clips support has been fixed. they rolled back the separation of videos and clips, so i had to do the same.\n*; youtube videos with community warnings should now be possible to download.\nuser interface improvements:\n*; list of supported services is now MUCH easier to read.\n*; banners in changelog history should no longer overlap each other.\n*; bullet points! they have a bit of extra padding, so it makes them stand out of the rest of text.\ninternal improvements:\n*; cobalt will now match the link to regex when using ?u= query for autopasting it into input area.\n*; better rate limiting: limiting now is done per minute, not per 20 minutes. this ensures less waiting and less attack area for request spammers.\n*; moved to my own fork of ytdl-core, cause main project seems to have been abandoned. go check it out on github or npm!\n*; ALL user inputs are now properly sanitized on the server. that includes variables for POST api method, too.\n*; \"got\" package has been (mostly) replaced by native fetch api. this should greatly reduce ram usage.\n*; all unnecessary duplications of module imports have been gotten rid of. no more error passing strings from inside of service modules. you don't make mistakes only if you don't do anything, right?\n*; other code optimizations. there's less clutter overall.\nhuge update, right? seems like everything's fixed now?\n\nnope, one issue still persists: sometimes youtube server drops packets for an audio file while cobalt's rendering the video for you. this results in abrupt cuts of audio. if you want to help solving this issue, please feel free to do it on github!\n\nthank you for reading this, and thank you for sticking with cobalt and me." + "banner": { + "file": "meowthstrong.webp", + "width": 500, + "height": 280 + }, + "content": "your favorite social media downloader just got even better! this update includes a ton of improvements and fixes.\n\nin fact, there are so many changes, i had to split them in sections.\n\nservice-related improvements:\n*; vimeo module has been revamped, all sorts of videos should now be supported.\n*; vimeo audio downloads! you now can download audios from more recent videos.\n*; cobalt now supports all sorts of tumblr links. (even those scary ones from the mobile app)\n*; vk clips support has been fixed. they rolled back the separation of videos and clips, so i had to do the same.\n*; youtube videos with community warnings should now be possible to download.\nuser interface improvements:\n*; list of supported services is now MUCH easier to read.\n*; banners in changelog history should no longer overlap each other.\n*; bullet points! they have a bit of extra padding, so it makes them stand out of the rest of text.\ninternal improvements:\n*; cobalt will now match the link to regex when using ?u= query for autopasting it into input area.\n*; better rate limiting: limiting now is done per minute, not per 20 minutes. this ensures less waiting and less attack area for request spammers.\n*; moved to my own fork of ytdl-core, cause main project seems to have been abandoned. go check it out on github or npm!\n*; ALL user inputs are now properly sanitized on the server. that includes variables for POST api method, too.\n*; \"got\" package has been (mostly) replaced by native fetch api. this should greatly reduce ram usage.\n*; all unnecessary duplications of module imports have been gotten rid of. no more error passing strings from inside of service modules. you don't make mistakes only if you don't do anything, right?\n*; other code optimizations. there's less clutter overall.\nhuge update, right? seems like everything's fixed now?\n\nnope, one issue still persists: sometimes youtube server drops packets for an audio file while cobalt's rendering the video for you. this results in abrupt cuts of audio. if you want to help solving this issue, please feel free to do it on github!\n\nthank you for reading this, and thank you for sticking with cobalt and me." }, { "version": "4.4", "title": "over 1 million monthly requests. thank you.", - "banner": "onemillionr.webp", + "banner": { + "file": "onemillionr.webp", + "width": 1441, + "height": 1441 + }, "content": "this is a huge milestone for me, i cannot express enough how grateful i am for each and every one of you.\nthank you for using cobalt, and thank you for showing that people love the web that's friendly and bullshit-free. i'm hoping to never disappoint you in the future and keep up the good work.\n\nthank you <3\n\nif you want to thank ME, check out the renovated donations tab, which now is also linked alongside bottom action buttons." }, { "version": "4.3.2", @@ -57,8 +157,12 @@ }, { "version": "4.3", "title": "developers, developers, developers, developers", - "banner": "developersdevelopersdevelopers.webp", - "content": "this update features a TON of improvements.\n\ndevelopers, you now can rely on cobalt for getting content from social media. the api has been revamped and documentation is now available. you can read more about API changes down below. go crazy, and have fun :D\n\nif you're not a developer, here's a list of changes that you probably care about:\n- rate limit is now approximately 8 times bigger. no more waiting, even if you want to download entirety of your tiktok \"for you\" page.\n- some updates will now have expressive banners, just like this one.\n- fixed what was causing an error when a youtube video had no description.\n- mp4 format button text should now be displayed properly, no matter if you touched the switcher or not.\n\nnext, the star of this update — improved api!\n- main endpoint now uses POST method instead of GET.\n- internal variables for preferences have been updated to be consistent and easier to understand.\n- ip address is now hashed right upon request, not somewhere deep inside the code.\n- global stream salt variable is no longer unnecessarily passed over a billion functions.\n- url and picker keys are now separate in the json response.\n- cobalt web app now correctly processes responses with \"success\" status.\n\nif you currently have a siri shortcut or some other script that uses the GET method, make sure to update it soon. this method is deprecated, limited, and will be removed entirely in coming updates.\n\nif you ever make something using cobalt's api, make sure to mention @justusecobalt on twitter, i would absolutely love to see what you made." + "banner": { + "file": "developers.webp", + "width": 640, + "height": 360 + }, + "content": "this update features a TON of improvements.\n\ndevelopers, you now can rely on cobalt for getting content from social media. the api has been revamped and documentation is now available. you can read more about API changes down below. go crazy, and have fun :D\n\nif you're not a developer, here's a list of changes that you probably care about:\n- rate limit is now approximately 8 times bigger. no more waiting, even if you want to download entirety of your tiktok \"for you\" page.\n- some updates will now have expressive banners, just like this one.\n- fixed what was causing an error when a youtube video had no description.\n- mp4 format button text should now be displayed properly, no matter if you touched the switcher or not.\n\nnext, the star of this update — improved api!\n- main endpoint now uses POST method instead of GET.\n- internal variables for preferences have been updated to be consistent and easier to understand.\n- ip address is now hashed right upon request, not somewhere deep inside the code.\n- global stream salt variable is no longer unnecessarily passed over a billion functions.\n- url and picker keys are now separate in the json response.\n- cobalt web app now correctly processes responses with \"success\" status.\n\nif you currently have a siri shortcut or some other script that uses the GET method, make sure to update it soon. this method is deprecated, limited, and will be removed entirely in coming updates.\n\nif you ever make something using cobalt's api, make sure to mention @justusecobalt on twitter, i would absolutely love to see what you made." }, { "version": "4.2", "title": "optimized quality picking and 8k video support", @@ -70,7 +174,7 @@ }, { "version": "4.0", "title": "better and faster than ever", - "content": "this update has a ton of improvements and new features.\n\nchanges you probably care about:\n- cobalt now has support for recorded twitter spaces! download the previous conversation no matter how long it was.\n- download speeds from youtube are at least 10 times better now. you're welcome.\n- both video and audio length limits have been extended to 2 hours.\n- audio downloads from youtube, youtube music, twitter spaces, and soundcloud now have metadata! most often it's just title and artist, but when cobalt is able to get more info, it adds that metadata too.\n- tiktok downloads have been fixed, yet again, and if they ever break in the future, cobalt will fall back to downloading a less annoyingly watermarked video.\n- soundcloud downloads have been fixed, too.\n\nless notable changes:\n- currently experimenting with using mp3 as default audio format. if you set something other than mp3 before, it'll be set to mp3. you can always change it back in settings. let me know what you think about this.\n- \"download audio\" button from image picker no longer stays on the screen after popup was closed.\n- clipboard button now shows up depending on your browser's support for it.\n- you can no longer manually hide the clipboard button, 'cause it's unnecessary.\n- small internal improvements such as separation of changelog version and title.\n- fair bit of internal clean up.\n\nif you want to help me implement covers for downloaded audios, you can do it on github." + "content": "this update has a ton of improvements and new features.\n\nchanges you probably care about:\n- cobalt now has support for recorded twitter spaces! download the previous conversation no matter how long it was.\n- download speeds from youtube are at least 10 times better now. you're welcome.\n- both video and audio length limits have been extended to 2 hours.\n- audio downloads from youtube, youtube music, twitter spaces, and soundcloud now have metadata! most often it's just title and artist, but when cobalt is able to get more info, it adds that metadata too.\n- tiktok downloads have been fixed, yet again, and if they ever break in the future, cobalt will fall back to downloading a less annoyingly watermarked video.\n- soundcloud downloads have been fixed, too.\n\nless notable changes:\n- currently experimenting with using mp3 as default audio format. if you set something other than mp3 before, it'll be set to mp3. you can always change it back in settings. let me know what you think about this.\n- \"download audio\" button from image picker no longer stays on the screen after popup was closed.\n- clipboard button now shows up depending on your browser's support for it.\n- you can no longer manually hide the clipboard button, 'cause it's unnecessary.\n- small internal improvements such as separation of changelog version and title.\n- fair bit of internal clean up.\n\nif you want to help me implement covers for downloaded audios, you can do it on github." }, { "version": "3.7", "title": "support for multi media tweets is here!", @@ -86,7 +190,7 @@ }, { "version": "3.5.4", "title": "tiktok support is back :D", - "content": "you can download videos, sounds, and images from tiktok again!\nhuge thank you to @minzique for finding another api endpoint that works." + "content": "you can download videos, sounds, and images from tiktok again!\nhuge thank you to @minzique for finding another api endpoint that works." }, { "version": "3.5.2", "title": "vk clips support, improved changelog system, and less bugs", diff --git a/src/modules/changelog/changelogManager.js b/src/modules/changelog/changelogManager.js index 306c6e15..40ddc5a0 100644 --- a/src/modules/changelog/changelogManager.js +++ b/src/modules/changelog/changelogManager.js @@ -6,19 +6,33 @@ let changelog = loadJSON('./src/modules/changelog/changelog.json') export default function(string) { try { switch (string) { + case "version": + return `v.${changelog["current"]["version"]}${ + changelog["current"]["date"] ? `· ${changelog["current"]["date"]}` : '' + }` case "title": - return `${changelog["current"]["version"]}: ${replaceBase(changelog["current"]["title"])}`; + return replaceBase(changelog["current"]["title"]); case "banner": - return changelog["current"]["banner"] ? `updateBanners/${changelog["current"]["banner"]}` : false; + return changelog["current"]["banner"] ? { + url: `updateBanners/${changelog["current"]["banner"]["file"]}`, + width: changelog["current"]["banner"]["width"], + height: changelog["current"]["banner"]["height"] + } : false; case "content": return replaceBase(changelog["current"]["content"]); case "history": return changelog["history"].map((i) => { return { - title: `${i["version"]}: ${replaceBase(i["title"])}`, + title: replaceBase(i["title"]), + version: `v.${i["version"]}${ + i["date"] ? `· ${i["date"]}` : '' + }`, content: replaceBase(i["content"]), - version: i["version"], - banner: i["banner"] ? `updateBanners/${i["banner"]}` : false, + banner: i["banner"] ? { + url: `updateBanners/${i["banner"]["file"]}`, + width: i["banner"]["width"], + height: i["banner"]["height"] + } : false, } }); default: diff --git a/src/modules/config.js b/src/modules/config.js index 00b95667..5268b8dd 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -6,7 +6,6 @@ const servicesConfigJson = loadJson("./src/modules/processing/servicesConfig.jso export const services = servicesConfigJson.config, audioIgnore = servicesConfigJson.audioIgnore, - appName = packageJson.name, version = packageJson.version, streamLifespan = config.streamLifespan, maxVideoDuration = config.maxVideoDuration, diff --git a/src/modules/emoji.js b/src/modules/emoji.js index 284404d4..068e6bdb 100644 --- a/src/modules/emoji.js +++ b/src/modules/emoji.js @@ -10,7 +10,6 @@ const names = { "🀄": "dragon_face_wukko", "💸": "money_with_wings", "⚙️": "gear", - "☹️": "frowning_face", "📋": "clipboard", "🎃": "pumpkin", "🎄": "christmas_tree", @@ -23,18 +22,36 @@ const names = { "🐙": "octopus", "🔮": "crystal_ball", "💪": "biceps", - "💖": "sparkling_heart" + "💖": "sparkling_heart", + "👾": "alien_monster", + "😿": "cat_crying", + "🙀": "cat_flabbergasted", + "🐱": "cat_smile", + "❤️‍🩹": "mending_heart", + "🔒": "locked", + "🔍": "magnifying_glass", + "🔗": "link", + "⌨": "keyboard", + "📑": "boring_document", + "🧮": "abacus", + "😸": "cat_grin" } let sizing = { + 18: 0.8, 22: 0.4, 30: 0.7, 48: 0.9, - 64: 0.9 + 64: 0.9, + 78: 0.9 } -export default function(emoji, size, disablePadding) { +export default function(emoji, size, disablePadding, fluent) { if (!size) size = 22; let padding = size !== 22 ? `margin-right:${sizing[size] ? sizing[size] : "0.4"}rem;` : false; if (disablePadding) padding = 'margin-right:0!important;'; + if (!names[emoji]) emoji = "❓"; - return `` + + let filePath = `emoji/${names[emoji]}.svg`; + if (fluent) filePath = `emoji/3d/${names[emoji]}.svg`; + return `` } diff --git a/src/modules/pageRender/elements.js b/src/modules/pageRender/elements.js index cdf155ed..824814e6 100644 --- a/src/modules/pageRender/elements.js +++ b/src/modules/pageRender/elements.js @@ -1,13 +1,23 @@ import { celebrations } from "../config.js"; import emoji from "../emoji.js"; +export const backButtonSVG = ` + +` + +export const dropdownSVG = ` + +` + export function switcher(obj) { let items = ``; if (obj.name === "download") { items = obj.items; } else { for (let i = 0; i < obj.items.length; i++) { - let classes = obj.items[i]["classes"] ? obj.items[i]["classes"] : [] + let classes = obj.items[i]["classes"] ? obj.items[i]["classes"] : []; + if (i === 0) classes.push("first"); + if (i === (obj.items.length - 1)) classes.push("last"); items += `` } } @@ -19,26 +29,18 @@ export function switcher(obj) { ${obj.explanation ? `
${obj.explanation}
` : ``} ` } +export function checkbox(obj) { + let paddings = ["bottom-margin", "top-margin", "no-margin", "top-margin-only"]; + let checkboxes = ``; + for (let i = 0; i < obj.length; i++) { + let paddingClass = obj[i].padding && paddings.includes(obj[i].padding) ? ` ${obj[i].padding}` : ''; -export function checkbox(action, text, paddingType, aria) { - let paddingClass = ` ` - switch (paddingType) { - case 1: - paddingClass += "bottom-margin" - break; - case 2: - paddingClass += "top-margin" - break; - case 3: - paddingClass += "no-margin" - break; - case 4: - paddingClass += "top-margin-only" + checkboxes += `` } - return `` + return checkboxes } export function sep(paddingType) { let paddingClass = `` @@ -50,7 +52,7 @@ export function sep(paddingType) { return `
` } export function popup(obj) { - let classes = obj.classes ? obj.classes : [] + let classes = obj.classes ? obj.classes : []; let body = obj.body; if (Array.isArray(obj.body)) { body = `` @@ -65,47 +67,63 @@ export function popup(obj) { } } return ` - ${obj.standalone ? `