From 572dc20e415b0cc563c26aa19262b455b683f2a7 Mon Sep 17 00:00:00 2001 From: wukko Date: Sat, 9 Sep 2023 22:31:24 +0600 Subject: [PATCH] 7.4 - updated more files to be up-to-date with domain change. - 7.4 changelog. - updated docker compose example with watchtower and cobalt image. --- README.md | 2 +- docker-compose.example.yml | 20 +++++++++++++--- docs/API.md | 27 +++++++++++----------- src/modules/changelog/changelog.json | 2 +- src/modules/processing/servicesConfig.json | 4 ++-- src/modules/setup.js | 2 +- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e37752e2..0964d5dd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # cobalt Best way to save what you love. -Live web app: [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") diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 5900b327..678633e3 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -2,7 +2,7 @@ version: '3.5' services: cobalt-api: - build: . + image: ghcr.io/wukko/cobalt:latest restart: unless-stopped container_name: cobalt-api @@ -24,8 +24,11 @@ services: #- cookiePath=cookies.json # see src/modules/processing/cookie/cookies_example.json for example file. + labels: + - com.centurylinklabs.watchtower.scope=cobalt + cobalt-web: - build: . + image: ghcr.io/wukko/cobalt:latest restart: unless-stopped container_name: cobalt-web @@ -40,6 +43,17 @@ services: environment: - webPort=9001 # replace webURL with your instance's target url in same format - - webURL=https://co.wukko.me/ + - 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 90351e27..9957d517 100644 --- a/docs/API.md +++ b/docs/API.md @@ -4,8 +4,7 @@ This document provides info about methods and acceptable variables for all cobal ``` ⚠️ Main API instance has moved to https://co.wuk.sh/ -Previous API domain will stop redirecting users to correct API instance after July 25th. -Make sure to update your projects in time. +Make sure your projects use the correct API domain. ``` ## POST: ``/api/json`` @@ -15,18 +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``. | -| disableMetadata | boolean | ``true / false`` | ``false`` | Disables file metadata when set to ``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 | diff --git a/src/modules/changelog/changelog.json b/src/modules/changelog/changelog.json index 1d60571e..57363b3e 100644 --- a/src/modules/changelog/changelog.json +++ b/src/modules/changelog/changelog.json @@ -8,7 +8,7 @@ "width": 960, "height": 540 }, - "content": "cobalt is finally moving to its own domain, making it possible to host branches and various versions with ease and 0 confusion. bla bla bla. bla. bla bla." + "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", diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json index c8d37143..29b44894 100644 --- a/src/modules/processing/servicesConfig.json +++ b/src/modules/processing/servicesConfig.json @@ -22,7 +22,7 @@ "enabled": true }, "youtube": { - "alias": "youtube videos & shorts & music", + "alias": "youtube videos, shorts & music", "patterns": ["watch?v=:id", "embed/:id"], "bestAudio": "opus", "enabled": true @@ -32,7 +32,7 @@ "enabled": true }, "tiktok": { - "alias": "tiktok videos & photos & audio", + "alias": "tiktok videos, photos & audio", "patterns": [":user/video/:postId", ":id", "t/:id"], "audioFormats": ["best", "m4a", "mp3"], "enabled": true diff --git a/src/modules/setup.js b/src/modules/setup.js index 78a62420..cb5aa184 100644 --- a/src/modules/setup.js +++ b/src/modules/setup.js @@ -70,7 +70,7 @@ function setup() { }) break; case 'web': - console.log(Bright("\nAwesome! What's the domain this web app instance will be running on? (localhost)\nExample: co.wukko.me")); + console.log(Bright("\nAwesome! What's the domain this web app instance will be running on? (localhost)\nExample: cobalt.tools")); rl.question(q, webURL => { ob['webURL'] = `http://localhost:9001/`;