PHP7 and new dotnet parser

Fixed RSS pubDate
Hide warnings
2024-12-06 19:27:30 +01:00 · 2022-05-22 11:48:06 +02:00 · 2022-05-18 11:44:58 +02:00 · 2022-04-24 08:09:45 +02:00 · 2022-04-23 19:56:57 +02:00 · 2022-04-21 19:59:55 +02:00
29 changed files with 259 additions and 351 deletions
@@ -2,10 +2,10 @@
 # LATTE_CACHE=/tmp/proxitok_api # Path for Latte cache, leave commented for ./cache/latte

 # API CONFIG
-# API_FORCE_LEGACY=1 # Force legacy mode for wrapper
+# API_FORCE_LEGACY=true # Force legacy mode for wrapper
 # API_SIGNER_URL="https://example.com" # External signing service
 # API_BROWSER_URL="http://localhost:4444" # chromedriver url
-# API_TEST_ENDPOINTS=1 # Discomment for usage of testing TikTok endpoints, may help sometimes
+# API_TEST_ENDPOINTS=true # Discomment for usage of testing TikTok endpoints, may help sometimes
 # API_CACHE=redis

 # Redis cache, used on Helpers\CacheEngines\RedisCache (CHOOSE ONE)
@@ -34,7 +34,7 @@ Apply to: Main window (address bar)

 ## TODO / Known issues
 * Make video on /video fit screen and don't overflow
-* Search
+* Fix embed styling

 ## Credits
 [@TheFrenchGhosty](https://github.com/TheFrenchGhosty): Initial Dockerfile and fixes to a usable state. You can check his Docker image [here](https://github.com/PussTheCat-org/docker-proxitok-quay) on Github or [here](https://quay.io/repository/pussthecatorg/proxitok) on Quay
@@ -0,0 +1,20 @@
+<?php
+namespace App\Controllers;
+
+use App\Helpers\ErrorHandler;
+use App\Helpers\Misc;
+use App\Helpers\Wrappers;
+use App\Models\VideoTemplate;
+
+class EmbedController {
+    static public function v2(int $id) {
+        $api = Wrappers::api();
+        $feed = $api->getVideoByID($id);
+        if ($feed->meta->success) {
+            $latte = Wrappers::latte();
+            $latte->render(Misc::getView('video'), new VideoTemplate($feed->items[0], $feed->info->detail, true));
+        } else {
+            ErrorHandler::show($feed->meta);
+        }
+    }
+}
@@ -9,12 +9,20 @@ class RedirectController {
    static public function redirect() {
        $endpoint = '/';
        if (isset($_GET['type'], $_GET['term'])) {
-            $term = $_GET['term'];
+            $term = trim($_GET['term']);
            switch ($_GET['type']) {
                case 'user':
+                    // Remove @ if sent
+                    if ($term[0] === '@') {
+                        $term = substr($term, 1);
+                    }
                    $endpoint = '/@' . $term;
                    break;
                case 'tag':
+                    // Remove # if sent
+                    if ($term[0] === '#') {
+                        $term = substr($term, 1);
+                    }
                    $endpoint = '/tag/' . $term;
                    break;
                case 'music':
@@ -11,8 +11,8 @@ class TrendingController {
    static public function get() {
        $api = Wrappers::api();

-        // Ttwid if normal, cursor if legacy
-        if ($api::class === 'TikScraper\Api') {
+        // Ttwid if standard, cursor if legacy
+        if ($api::MODE === 'STANDARD') {
            $cursor = Misc::getTtwid();
        } else {
            $cursor = Misc::getCursor();
@@ -6,6 +6,7 @@ use App\Helpers\Misc;
 use App\Helpers\Wrappers;
 use App\Models\FeedTemplate;
 use App\Models\RSSTemplate;
+use App\Models\VideoTemplate;

 class UserController {
    static public function get(string $username) {
@@ -30,7 +31,7 @@ class UserController {
        $feed = $api->getVideoByID($video_id);
        if ($feed->meta->success) {
            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('video'), new FeedTemplate('Video', $feed));
+            $latte->render(Misc::getView('video'), new VideoTemplate($feed->items[0], $feed->info->detail));
        } else {
            ErrorHandler::show($feed->meta);
        }
@@ -11,9 +11,7 @@ class Misc {
    }

    static public function url(string $endpoint = ''): string {
-        $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http";
-        $root = $protocol . '://' . $_SERVER['HTTP_HOST'];
-        return $root . self::env('APP_PATH', '') . $endpoint;
+        return self::env('APP_URL', '') . $endpoint;
    }

    static public function env(string $key, $default_value) {
@@ -0,0 +1,22 @@
+<?php
+namespace App\Models;
+
+/**
+* Base for templates with a feed
+*/
+class VideoTemplate extends BaseTemplate {
+    public object $item;
+    public object $detail;
+    public string $layout = 'hero';
+
+    function __construct(object $item, object $detail, bool $isEmbed = false) {
+        parent::__construct('Video');
+        $this->item = $item;
+        $this->detail = $detail;
+        if ($isEmbed) {
+            $this->layout = 'embed';
+        } else {
+            $this->layout = 'hero';
+        }
+    }
+}
@@ -1,8 +0,0 @@
-<footer class="footer">
-  <div class="content has-text-centered">
-    <p>
-      Made with <span style="color: #e25555;">&#9829;</span> in <a href="https://github.com/pablouser1/ProxiTok">Github</a>
-    </p>
-		<p>Version: {version()}</p>
-  </div>
-</footer>
@@ -1,3 +1,3 @@
-<a href="{path($_SERVER['REQUEST_URI'] . '/rss')}">
+<a href="{$_SERVER['REQUEST_URI'] . '/rss'}">
 	{include './icon.latte', icon: 'feed', text: 'RSS Feed'}
 </a>
@@ -6,7 +6,7 @@
 	</div>
 	<div class="dropdown-menu" role="menu">
 		<div class="dropdown-content">
-			<a target="_blank" href="{path('/download?url=' . urlencode($playAddr) . '&id=' . $item->id . '&user=' . $uniqueId) . '&watermark=1'}" class="dropdown-item">Watermark</a>
+			<a target="_blank" href="{path('/download?url=' . urlencode($playAddr) . '&id=' . $id . '&user=' . $uniqueId) . '&watermark=1'}" class="dropdown-item">Watermark</a>
 			<a target="_blank" href="{path('/download?id=' . $id . '&user=' . $uniqueId)}" class="dropdown-item">No watermark</a>
 		</div>
 	</div>
@@ -1,5 +1,5 @@
 {do $endpoint = '/@' . $uniqueId . '/video/' . $id}
 <div class="buttons is-centered">
-	<a class="button is-success is-small" href="{path($endpoint)}">Instace Link</a>
+	<a class="button is-success is-small" href="{path($endpoint)}">Instance Link</a>
 	<a class="button is-danger is-small" href="https://www.tiktok.com{$endpoint}">Original Link</a>
 </div>
@@ -1,22 +1,29 @@
 {
    "name": "pablouser1/proxitok",
    "description": "An alternative frontend for TikTok",
-    "version": "2.2.0.0",
+    "version": "2.2.2.0",
    "license": "AGPL-3.0-or-later",
    "type": "project",
-    "homepage": "https://github.com/pablouser1/ProxiTok",
    "authors": [
        {
            "name": "Pablo Ferreiro",
            "homepage": "https://github.com/pablouser1"
        }
    ],
+    "homepage": "https://github.com/pablouser1/ProxiTok",
+	"config": {
+		"optimize-autoloader": true,
+		"platform": {
+			"php": "7.4"
+		}
+	},
    "require": {
+        "php": ">=7.4|^8.0",
        "ext-redis": "^5.3.2",
        "ext-mbstring": "*",
-        "latte/latte": "^2.10",
-        "vlucas/phpdotenv": "^5.4",
+        "latte/latte": "^2.11",
        "bramus/router": "^1.6",
+        "josegonzalez/dotenv": "dev-master",
        "pablouser1/tikscraper": "^1.3"
    },
    "autoload": {
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "def7d3d4bbdae6916d99e50b33b3595a",
+    "content-hash": "f1c0945357108862633ea87a1f6bbdd8",
    "packages": [
        {
            "name": "bramus/router",
@@ -58,30 +58,36 @@
            "time": "2021-11-18T19:24:07+00:00"
        },
        {
-            "name": "graham-campbell/result-type",
-            "version": "v1.0.4",
+            "name": "josegonzalez/dotenv",
+            "version": "dev-master",
            "source": {
                "type": "git",
-                "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca"
+                "url": "https://github.com/josegonzalez/php-dotenv.git",
+                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca",
+                "url": "https://api.github.com/repos/josegonzalez/php-dotenv/zipball/f6d2fb63610f98b7ae859031566228dbade1a79c",
+                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c",
                "shasum": ""
            },
            "require": {
-                "php": "^7.0 || ^8.0",
-                "phpoption/phpoption": "^1.8"
+                "m1/env": "2.*",
+                "php": ">=5.5.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+                "php-mock/php-mock-phpunit": "^1.1",
+                "satooshi/php-coveralls": "1.*",
+                "squizlabs/php_codesniffer": "2.*"
            },
+            "default-branch": true,
            "type": "library",
            "autoload": {
-                "psr-4": {
-                    "GrahamCampbell\\ResultType\\": "src/"
+                "psr-0": {
+                    "josegonzalez\\Dotenv": [
+                        "src",
+                        "tests"
+                    ]
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -90,47 +96,37 @@
            ],
            "authors": [
                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
+                    "name": "Jose Diaz-Gonzalez",
+                    "email": "dotenv@josegonzalez.com",
+                    "homepage": "http://josediazgonzalez.com",
+                    "role": "Maintainer"
                }
            ],
-            "description": "An Implementation Of The Result Type",
+            "description": "dotenv file parsing for PHP",
+            "homepage": "https://github.com/josegonzalez/php-dotenv",
            "keywords": [
-                "Graham Campbell",
-                "GrahamCampbell",
-                "Result Type",
-                "Result-Type",
-                "result"
+                "configuration",
+                "dotenv",
+                "php"
            ],
            "support": {
-                "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4"
+                "issues": "https://github.com/josegonzalez/php-dotenv/issues",
+                "source": "https://github.com/josegonzalez/php-dotenv/tree/master"
            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-11-21T21:41:47+00:00"
+            "time": "2019-07-07T21:21:39+00:00"
        },
        {
            "name": "latte/latte",
-            "version": "v2.11.0",
+            "version": "v2.11.3",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/latte.git",
-                "reference": "a815687bfadaf3af51ae99f92edb4ea310c43426"
+                "reference": "f2e16d3ec6968854029740452c20c38a514e6842"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/a815687bfadaf3af51ae99f92edb4ea310c43426",
-                "reference": "a815687bfadaf3af51ae99f92edb4ea310c43426",
+                "url": "https://api.github.com/repos/nette/latte/zipball/f2e16d3ec6968854029740452c20c38a514e6842",
+                "reference": "f2e16d3ec6968854029740452c20c38a514e6842",
                "shasum": ""
            },
            "require": {
@@ -143,9 +139,9 @@
            },
            "require-dev": {
                "nette/php-generator": "^3.3.4",
-                "nette/tester": "~2.0",
+                "nette/tester": "^2.0",
                "nette/utils": "^3.0",
-                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan": "^1",
                "tracy/tracy": "^2.3"
            },
            "suggest": {
@@ -199,26 +195,88 @@
            ],
            "support": {
                "issues": "https://github.com/nette/latte/issues",
-                "source": "https://github.com/nette/latte/tree/v2.11.0"
+                "source": "https://github.com/nette/latte/tree/v2.11.3"
            },
-            "time": "2022-02-22T18:39:58+00:00"
+            "time": "2022-05-08T03:22:55+00:00"
        },
        {
-            "name": "pablouser1/tikscraper",
-            "version": "v1.3.2.0",
+            "name": "m1/env",
+            "version": "2.2.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "8aa4524d3f11c4087dcae565a874b9440b1468c7"
+                "url": "https://github.com/m1/Env.git",
+                "reference": "5c296e3e13450a207e12b343f3af1d7ab569f6f3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/8aa4524d3f11c4087dcae565a874b9440b1468c7",
-                "reference": "8aa4524d3f11c4087dcae565a874b9440b1468c7",
+                "url": "https://api.github.com/repos/m1/Env/zipball/5c296e3e13450a207e12b343f3af1d7ab569f6f3",
+                "reference": "5c296e3e13450a207e12b343f3af1d7ab569f6f3",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.3|^8.0",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*",
+                "scrutinizer/ocular": "~1.1",
+                "squizlabs/php_codesniffer": "^2.3"
+            },
+            "suggest": {
+                "josegonzalez/dotenv": "For loading of .env",
+                "m1/vars": "For loading of configs"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "M1\\Env\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Miles Croxford",
+                    "email": "hello@milescroxford.com",
+                    "homepage": "http://milescroxford.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Env is a lightweight library bringing .env file parser compatibility to PHP. In short - it enables you to read .env files with PHP.",
+            "homepage": "https://github.com/m1/Env",
+            "keywords": [
+                ".env",
+                "config",
+                "dotenv",
+                "env",
+                "loader",
+                "m1",
+                "parser",
+                "support"
+            ],
+            "support": {
+                "issues": "https://github.com/m1/Env/issues",
+                "source": "https://github.com/m1/Env/tree/2.2.0"
+            },
+            "time": "2020-02-19T09:02:13+00:00"
+        },
+        {
+            "name": "pablouser1/tikscraper",
+            "version": "v1.3.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pablouser1/TikScraperPHP.git",
+                "reference": "cb2580e9868cd4f77f3ab93987786fbd57e4efaf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/cb2580e9868cd4f77f3ab93987786fbd57e4efaf",
+                "reference": "cb2580e9868cd4f77f3ab93987786fbd57e4efaf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4|^8.0",
                "php-webdriver/webdriver": "^1.12",
                "sapistudio/seleniumstealth": "^1.0"
            },
@@ -240,22 +298,22 @@
            "description": "Get data from TikTok API",
            "support": {
                "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v1.3.2.0"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v1.3.5.2"
            },
-            "time": "2022-03-29T17:10:36+00:00"
+            "time": "2022-05-22T09:33:26+00:00"
        },
        {
            "name": "php-webdriver/webdriver",
-            "version": "1.12.0",
+            "version": "1.12.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb"
+                "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
-                "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
+                "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
                "shasum": ""
            },
            "require": {
@@ -305,80 +363,9 @@
            ],
            "support": {
                "issues": "https://github.com/php-webdriver/php-webdriver/issues",
-                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.0"
+                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.1"
            },
-            "time": "2021-10-14T09:30:02+00:00"
-        },
-        {
-            "name": "phpoption/phpoption",
-            "version": "1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpOption\\": "src/PhpOption/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh"
-                },
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                }
-            ],
-            "description": "Option Type for PHP",
-            "keywords": [
-                "language",
-                "option",
-                "php",
-                "type"
-            ],
-            "support": {
-                "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.8.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-12-04T23:24:31+00:00"
+            "time": "2022-05-03T12:16:34+00:00"
        },
        {
            "name": "sapistudio/seleniumstealth",
@@ -410,88 +397,6 @@
            },
            "time": "2022-01-10T20:04:41+00:00"
        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.25.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-10-20T20:35:02+00:00"
-        },
        {
            "name": "symfony/polyfill-mbstring",
            "version": "v1.25.0",
@@ -660,20 +565,21 @@
        },
        {
            "name": "symfony/process",
-            "version": "v6.0.5",
+            "version": "v5.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1"
+                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/1ccceccc6497e96f4f646218f04b97ae7d9fa7a1",
-                "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1",
+                "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
+                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.0.2"
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
            },
            "type": "library",
            "autoload": {
@@ -701,7 +607,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v6.0.5"
+                "source": "https://github.com/symfony/process/tree/v5.4.8"
            },
            "funding": [
                {
@@ -717,99 +623,25 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-01-30T18:19:12+00:00"
-        },
-        {
-            "name": "vlucas/phpdotenv",
-            "version": "v5.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f",
-                "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.0.2",
-                "php": "^7.1.3 || ^8.0",
-                "phpoption/phpoption": "^1.8",
-                "symfony/polyfill-ctype": "^1.23",
-                "symfony/polyfill-mbstring": "^1.23.1",
-                "symfony/polyfill-php80": "^1.23.1"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "ext-filter": "*",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10"
-            },
-            "suggest": {
-                "ext-filter": "Required to use the boolean validator."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dotenv\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Vance Lucas",
-                    "email": "vance@vancelucas.com",
-                    "homepage": "https://github.com/vlucas"
-                }
-            ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-            "keywords": [
-                "dotenv",
-                "env",
-                "environment"
-            ],
-            "support": {
-                "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-12-12T23:22:04+00:00"
+            "time": "2022-04-08T05:07:18+00:00"
        }
    ],
    "packages-dev": [],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "josegonzalez/dotenv": 20
+    },
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
+        "php": ">=7.4|^8.0",
        "ext-redis": "^5.3.2",
        "ext-mbstring": "*"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "platform-overrides": {
+        "php": "7.4"
+    },
+    "plugin-api-version": "2.3.0"
 }
@@ -0,0 +1,15 @@
+// Workaround to allow TikTok embed
+
+const blockquotes = document.getElementsByClassName('tiktok-embed')
+for (let i = 0; i < blockquotes.length; i++) {
+  const blockquote = blockquotes[i]
+  if (blockquote.children.length > 0 && blockquote.children[0].tagName !== 'iframe') {
+    const iframe = document.createElement('iframe')
+    iframe.style = 'width: 100%; height: 710px; display: block; visibility: unset; max-height: 710px;'
+    iframe.src = 'https://www.tiktok.com/embed/v2/' + blockquote.dataset.videoId // This url will get redirected
+    // Remove placeholder section
+    blockquote.children[0].remove()
+    // Add iframe
+    blockquote.appendChild(iframe)
+  }
+}
@@ -1,9 +1,9 @@
 <?php
 require __DIR__ . "/vendor/autoload.php";

-// LOAD DOTENV
-$dotenv = Dotenv\Dotenv::createImmutable(__DIR__);
-$dotenv->safeLoad();
+$dotenv = new josegonzalez\Dotenv\Loader(__DIR__ . '/.env');
+$dotenv->parse();
+$dotenv->toEnv();

 // ROUTER
 $router = new Bramus\Router\Router();
@@ -15,7 +15,6 @@
  <section class="section">
 		{block content}{/block}
  </section>
-  {include '../components/footer.latte'}
 	{block extra}{/block}
 </body>
 </html>
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+
+{include '../components/head.latte'}
+
+<body>
+	{block content}{/block}
+	{block extra}{/block}
+</body>
+</html>
@@ -12,9 +12,6 @@
 			<div class="container has-text-centered">
 				{block content}{/block}
 			</div>
-    </div>
-    <div class="hero-foot">
-			{include '../components/footer.latte'}
    </div>
 	</section>
 	{block extra}{/block}
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
@@ -54,3 +54,6 @@ $router->mount('/settings', function () use ($router) {
 });

 $router->get('/discover', 'DiscoverController@get');
+
+// -- EMBED -- //
+$router->get('/embed/v2/(\d+)', 'EmbedController@v2');
@@ -23,9 +23,9 @@ braces@~3.0.2:
    fill-range "^7.0.1"

 bulma@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.3.tgz#ddccb7436ebe3e21bf47afe01d3c43a296b70243"
-  integrity sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.4.tgz#0ca8aeb1847a34264768dba26a064c8be72674a1"
+  integrity sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==

 bulmaswatch@^0.8.1:
  version "0.8.1"
@@ -118,9 +118,9 @@ readdirp@~3.6.0:
    picomatch "^2.2.1"

 sass@^1.46.0:
-  version "1.49.9"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9"
-  integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
+  version "1.52.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.1.tgz#554693da808543031f9423911d62c60a1acf7889"
+  integrity sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==
  dependencies:
    chokidar ">=3.0.0 <4.0.0"
    immutable "^4.0.0"
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../scss/node_modules/css.gg/icons/scss/home.scss","../../scss/node_modules/css.gg/icons/scss/info.scss","../../scss/node_modules/css.gg/icons/scss/search.scss","../../scss/node_modules/css.gg/icons/scss/feed.scss","../../scss/node_modules/css.gg/icons/scss/eye.scss","../../scss/node_modules/css.gg/icons/scss/heart.scss","../../scss/node_modules/css.gg/icons/scss/comment.scss","../../scss/node_modules/css.gg/icons/scss/share.scss","../../scss/node_modules/css.gg/icons/scss/software-download.scss"],"names":[],"mappings":"AAAA,SACE,yLACA,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,aACA,gBACA,4BACA,2BACA,6BACA,4BACA,mBAEA,gBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,cACA,sBACA,kBACA,qBACA,sBACA,2BACA,wBACA,SACA,kBACA,WACA,YACA,OAGF,gBACE,UACA,YACA,iBACA,oBACA,4BACA,6BACA,gBACA,SACA,SCjDJ,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBAEA,iCACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,wBACA,SAGF,gBACE,WACA,WAGF,iBACE,WACA,QC5BN,WACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBACA,iBACA,gBAEA,kBACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,WACA,wBACA,yBACA,SACA,UCvBN,SACI,cACA,sBACA,wBACA,sBASA,iBACA,gBACA,kBACA,+BACA,UACA,WACA,kBAbA,iCACE,cACA,sBACA,wBACA,sBAWF,iCACE,WACA,kBACA,kBACA,WACA,WACA,QACA,SACA,WAGF,gBACE,UACA,QACA,WCnCN,QACI,kBACA,cACA,+BACA,WACA,YACA,iCACA,gCACA,gBACA,sBAEA,+BACE,WACA,cACA,oBACA,kBACA,sBAGF,eACE,QACA,8CACA,WACA,YAGF,gBACE,UACA,WACA,iBACA,WACA,SC/BN,UACI,iBACA,6BACA,8BACA,WACA,WACA,gBAeA,sBACA,kBACA,gHACA,cAhBA,iBACE,iBACA,6BACA,8BACA,WACA,WACA,gBACA,WACA,cACA,sBACA,kBAQF,kBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,wBACA,QAGF,kBACE,WACA,YACA,sBACA,wBACA,UACA,QC7CN,YACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,gBACA,0CAEA,mBACE,WACA,cACA,sBACA,kBACA,UAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,iBACA,6BACA,+BACA,UACA,YACA,WAGF,mBACE,WACA,wBACA,qBACA,SACA,QCtCN,UACI,sBACA,kBACA,cACA,+BACA,UACA,WACA,wBACA,oBACA,kCAEA,iBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SAGF,kBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SACA,MACA,yBAGF,iBACE,SACA,wBCvCN,sBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,aACA,8BACA,+BACA,eAEA,6BACE,WACA,cACA,sBACA,kBACA,UACA,WACA,sBACA,wBACA,yBACA,SACA,WAGF,8BACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,YACA,wBACA,SACA","file":"cssgg.min.css"}
+{"version":3,"sourceRoot":"","sources":["../../scss/node_modules/css.gg/icons/scss/home.scss","../../scss/node_modules/css.gg/icons/scss/info.scss","../../scss/node_modules/css.gg/icons/scss/search.scss","../../scss/node_modules/css.gg/icons/scss/feed.scss","../../scss/node_modules/css.gg/icons/scss/eye.scss","../../scss/node_modules/css.gg/icons/scss/heart.scss","../../scss/node_modules/css.gg/icons/scss/comment.scss","../../scss/node_modules/css.gg/icons/scss/share.scss","../../scss/node_modules/css.gg/icons/scss/software-download.scss"],"names":[],"mappings":"AAAA,SACE,yLACA,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,aACA,gBACA,4BACA,2BACA,6BACA,4BACA,mBAEA,gBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,cACA,sBACA,kBACA,qBACA,sBACA,2BACA,wBACA,SACA,kBACA,WACA,YACA,OAGF,gBACE,UACA,YACA,iBACA,oBACA,4BACA,6BACA,gBACA,SACA,SCjDJ,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBAEA,iCACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,wBACA,SAGF,gBACE,WACA,WAGF,iBACE,WACA,QC5BN,WACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBACA,iBACA,gBAEA,kBACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,WACA,wBACA,yBACA,SACA,UCvBN,SACI,cACA,sBACA,wBACA,sBASA,iBACA,gBACA,kBACA,+BACA,UACA,WACA,kBAbA,iCACE,cACA,sBACA,wBACA,sBAWF,iCACE,WACA,kBACA,kBACA,WACA,WACA,QACA,SACA,WAGF,gBACE,UACA,QACA,WCnCN,QACI,kBACA,cACA,+BACA,WACA,YACA,iCACA,gCACA,gBACA,sBAEA,+BACE,WACA,cACA,oBACA,kBACA,sBAGF,eACE,QACA,8CACA,WACA,YAGF,gBACE,UACA,WACA,iBACA,WACA,SC/BN,UACI,iBACA,6BACA,8BACA,WACA,WACA,gBAeA,sBACA,kBACA,gHACA,cAhBA,iBACE,iBACA,6BACA,8BACA,WACA,WACA,gBACA,WACA,cACA,sBACA,kBAQF,kBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,wBACA,QAGF,kBACE,WACA,YACA,sBACA,wBACA,UACA,QC7CN,YACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,gBACA,0CAEA,mBACE,WACA,cACA,sBACA,kBACA,UAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,iBACA,+BACA,+BACA,UACA,YACA,WAGF,mBACE,WACA,wBACA,qBACA,SACA,QCtCN,UACI,sBACA,kBACA,cACA,+BACA,UACA,WACA,wBACA,oBACA,kCAEA,iBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SAGF,kBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SACA,MACA,yBAGF,iBACE,SACA,wBCvCN,sBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,aACA,8BACA,+BACA,eAEA,6BACE,WACA,cACA,sBACA,kBACA,UACA,WACA,sBACA,wBACA,yBACA,SACA,WAGF,8BACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,YACA,wBACA,SACA","file":"cssgg.min.css"}
@@ -2,11 +2,14 @@

 {block header}
 	<p class="title">Welcome to Proxitok!</p>
-	<p class="subtitle">An alternative frontend for TikTok</p>
+	<p class="subtitle">
+    Made with <span style="color: #e25555;">&#9829;</span> in <a href="https://github.com/pablouser1/ProxiTok">Github</a>
+	</p>
 {/block}

 {block content}
 	<p class="title">About this instance</p>
+	<p>Version: {version()}</p>
 	<p>Forcing Legacy mode: {isset($_ENV['API_FORCE_LEGACY']) ? 'yes' : 'no'}</p>
 	<hr />
 	<p class="title">Why would I want to use ProxiTok?</p>
@@ -14,7 +14,7 @@
 				<title>{$item->desc}</title>
 				<description><![CDATA[{$item->desc}]]></description>
 				<link>{path('/@' . $item->author->uniqueId . '/video/' . $item->id)}</link>
-				<pubDate>{(int) $item->createTime}</pubDate>
+				<pubDate>{date('r', $item->createTime)}</pubDate>
 				<guid isPermaLink="false">{$item->id}</guid>
 				<enclosure length="{$download->file_size($item->video->playAddr)}" type="video/mp4" url="{path('/stream?url=' . urlencode($item->video->playAddr))}"></enclosure>
 			</item>
@@ -1,21 +1,20 @@
-{layout '../layouts/hero.latte'}
+{layout "../layouts/{$layout}.latte"}

 {block content}
-	{do $item = $feed->items[0]}
-	<div class="columns is-centered is-vcentered">
-		<div class="column">
-			<video width="{$item->video->width}" height="{$item->video->height}" controls poster="{path('/stream?url=' . urlencode($item->video->originCover))}">
+	<div class="columns is-centered is-vcentered is-gapless">
+		<div class="column is-three-quarters">
+			<video controls autoplay playsinline poster="{path('/stream?url=' . urlencode($item->video->originCover))}">
 				<source src="{path('/stream?url=' . urlencode($item->video->playAddr))}" type="video/mp4" />
 			</video>
 		</div>
 		<div class="column has-text-centered">
 			<div class="box">
-				<p class="title">Video by <a href="{path('/@'.$feed->info->detail->uniqueId)}">{$feed->info->detail->uniqueId}</a></p>
+				<p class="title">Video by <a href="{path('/@'.$detail->uniqueId)}">{$detail->uniqueId}</a></p>
 				<p class="subtitle">{$item->desc}</p>
 				{include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 				<hr />
-				{include '../components/themes/common/share.latte', uniqueId: $feed->info->detail->uniqueId, id: $item->id}
-				{include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $feed->info->detail->uniqueId}
+				{include '../components/themes/common/share.latte', uniqueId: $detail->uniqueId, id: $item->id}
+				{include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $detail->uniqueId}
      	<p>{$item->music->title}</p>
      	<audio src="{path('/stream?url=' . urlencode($item->music->playUrl))}" controls preload="none"></audio>
 			</div>
Author	SHA1	Message	Date
Pablo Ferreiro	33d5994159	PHP7 and new dotnet parser	2022-05-22 11:48:06 +02:00
Pablo Ferreiro	9a662ffe1b	Fixed RSS pubDate	2022-05-18 11:44:58 +02:00
Pablo Ferreiro	4232ca8d64	Hide warnings	2022-04-24 08:09:45 +02:00
Pablo Ferreiro	47a3dc7e76	Added new TikTok Sigi state script	2022-04-23 19:56:57 +02:00
Pablo Ferreiro	288add48d5	Redirect: Remove @ or # if sent accidentally	2022-04-21 19:59:55 +02:00
Pablo Ferreiro	e545bd6ddd	Removed deprecated option from Signer	2022-04-17 23:55:45 +02:00
Pablo Ferreiro	c04122d11f	Trending fix	2022-04-17 23:16:00 +02:00
Pablo Ferreiro	d9165d693f	hotfix	2022-04-17 23:02:37 +02:00
Pablo Ferreiro	717997685a	Hashtag fix	2022-04-17 22:57:41 +02:00
Pablo Ferreiro	2c68b34d06	hotfix	2022-04-12 15:30:49 +02:00
Pablo Ferreiro	816c5cf55f	Strict robots again	2022-04-10 13:06:42 +02:00
Pablo Ferreiro	568c9c9ea9	revert robots	2022-04-10 13:03:00 +02:00
Pablo Ferreiro	47a232de3d	Strict robots.txt	2022-04-10 12:16:55 +02:00
Pablo Ferreiro	3730c95f29	hotfix	2022-04-10 12:12:55 +02:00
Pablo Ferreiro	d0d36c26f3	WIP embed.js support and robots.txt	2022-04-10 12:10:48 +02:00
Pablo Ferreiro	5368c08039	Fixed undefined variable	2022-04-04 10:34:14 +02:00
Pablo Ferreiro	bed4ef9d3a	Merge pull request #24 from Zottelchen/patch-1 fix typo	2022-03-31 19:26:54 +02:00
Zottelchen	fdcb33fb18	fix typo	2022-03-31 15:03:01 +00:00
Pablo Ferreiro	bc4468c5ab	Reverting APP_PATH to APP_URL	2022-03-29 19:37:57 +02:00
Pablo Ferreiro	1a86abeb2d	Small patch	2022-03-29 19:35:29 +02:00