From 1031ad152d9ecd414c81c9ada755bc12317a7d9e Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Sun, 16 Oct 2022 15:22:47 +0200 Subject: [PATCH] Remove every reference to alltubedownload.net (#422) --- .htaccess | 3 --- README.md | 4 ++-- app.json | 4 +--- classes/Factory/ViewFactory.php | 18 ------------------ composer.json | 1 - resources/FAQ.md | 16 +--------------- resources/sitemap.xml | 12 ------------ robots.txt | 1 - templates/inc/head.tpl | 1 - 9 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 resources/sitemap.xml delete mode 100644 robots.txt diff --git a/.htaccess b/.htaccess index cb3ca35..264ed2a 100644 --- a/.htaccess +++ b/.htaccess @@ -18,9 +18,6 @@ FileETag None RewriteEngine On - RewriteCond %{HTTP_HOST} ^alltube\.herokuapp\.com$ [NC] - RewriteRule ^(.*)$ https://www.alltubedownload.net/$1 [R=301,L] - RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^ index.php [QSA,L] diff --git a/README.md b/README.md index 09d0d7c..787d7df 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # AllTube Download -HTML GUI for youtube-dl ([alltubedownload.net](http://alltubedownload.net/)) +HTML GUI for youtube-dl ![Screenshot](img/screenshot.png "AllTube GUI screenshot") @@ -165,7 +165,7 @@ so that you can reuse it in your projects. ## JSON API We also provide a JSON API that you can use like this: -[/json?url=https%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DdQw4w9WgXcQ](https://alltubedownload.net/json?url=https%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DdQw4w9WgXcQ) +`/json?url=https%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DdQw4w9WgXcQ` It returns a JSON object generated by youtube-dl. You can find a list of all the properties [in the youtube-dl documentation](https://github.com/ytdl-org/youtube-dl#output-template). diff --git a/app.json b/app.json index 32b2202..efe8aa1 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,6 @@ "name": "AllTube Download", "description": "HTML GUI for youtube-dl", "repository": "https://github.com/Rudloff/alltube.git", - "logo": "https://alltubedownload.net/img/logo.png", "keywords": [ "alltube", "download", @@ -28,6 +27,5 @@ "value": "false", "required": false } - }, - "website": "https://alltubedownload.net/" + } } diff --git a/classes/Factory/ViewFactory.php b/classes/Factory/ViewFactory.php index c360672..0c34bac 100644 --- a/classes/Factory/ViewFactory.php +++ b/classes/Factory/ViewFactory.php @@ -20,23 +20,6 @@ use SmartyException; */ class ViewFactory { - /** - * Generate the canonical URL of the current page. - * - * @param Request $request PSR-7 Request - * - * @return string URL - */ - private static function getCanonicalUrl(Request $request): string - { - /** @var Uri $uri */ - $uri = $request->getUri(); - - return $uri->withBasePath('') - ->withHost('alltubedownload.net') - ->withScheme('https') - ->withPort(443); - } /** * @param Uri $uri @@ -123,7 +106,6 @@ class ViewFactory $view->registerPlugin('function', 'base_url', [$smartyPlugins, 'baseUrl']); $view->registerPlugin('block', 't', [$localeManager, 'smartyTranslate']); - $view->offsetSet('canonical', self::getCanonicalUrl($request)); $view->offsetSet('locale', $container->get('locale')); $view->offsetSet('config', $container->get('config')); $view->offsetSet('domain', $uri->withBasePath('')->getBaseUrl()); diff --git a/composer.json b/composer.json index b7bb532..2a252c4 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,6 @@ "role": "Designer" } ], - "homepage": "https://alltubedownload.net/", "require": { "php": ">=7.3", "ext-intl": "*", diff --git a/resources/FAQ.md b/resources/FAQ.md index 3f13846..92fcf04 100644 --- a/resources/FAQ.md +++ b/resources/FAQ.md @@ -6,19 +6,6 @@ Most recent browsers automatically play a video if it is a format they know how to play. You can usually download the video by doing *File > Save to* or *ctrl + S*. -## [alltubedownload.net](https://alltubedownload.net) is too slow - -[alltubedownload.net](https://alltubedownload.net) is hosted on a free [Heroku server](https://www.heroku.com/pricing) -so it has low RAM and CPU. - -AllTube probably won't switch to a more expensive hosting -because this project does not earn any financial resources -and you are encouraged to host it yourself. - -## alltubedownload.net often says "An error occurred in the application…" - -See above. - ## Change config parameters You need to create a YAML file called `config.yml` in the `config/` folder. @@ -68,8 +55,7 @@ There are two known workarounds: * You can run AllTube locally on your computer. * You can enable streaming videos through the server (see below). - Please note that this can use a lot of resources on the server - (which is why we won't enable it on alltubedownload.net). + Please note that this can use a lot of resources on the server. ## I get a 404 error on every page except the index diff --git a/resources/sitemap.xml b/resources/sitemap.xml deleted file mode 100644 index f6331f0..0000000 --- a/resources/sitemap.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - https://alltubedownload.net/ - yearly - 1 - - - https://alltubedownload.net/extractors - weekly - - diff --git a/robots.txt b/robots.txt deleted file mode 100644 index fa5e4af..0000000 --- a/robots.txt +++ /dev/null @@ -1 +0,0 @@ -Sitemap: https://alltubedownload.net/resources/sitemap.xml diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index e5c9203..22409ef 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -9,7 +9,6 @@ {$config->appName}{if isset($title)} - {$title|escape}{/if} -