Fixed isAd crash

changed keyword order
RSS TextExtra and Gallery support
2024-12-06 19:27:30 +01:00 · 2023-06-12 15:08:02 +02:00 · 2023-04-27 20:23:23 +02:00 · 2023-04-27 20:22:55 +02:00 · 2023-04-08 12:03:33 +02:00 · 2023-04-05 17:09:22 +02:00
44 changed files with 505 additions and 177 deletions
@@ -1,5 +1,6 @@
 node_modules
 /.env
+/.git
 /.vscode
 /vendor
 /cache/latte/*
@@ -20,3 +20,5 @@
 # PROXY_PORT=8080
 # PROXY_USERNAME=username
 # PROXY_PASSWORD=password
+
+# USER_AGENT="Mozilla/5.0 (Android 12; Mobile; rv:109.0) Gecko/109.0 Firefox/109.0"
@@ -40,7 +40,8 @@ Apply to: Main window (address bar)
 * Add custom amount of videos per page

 ## Credits
-[TheFrenchGhosty](https://thefrenchghosty.me) ([Github](https://github.com/TheFrenchGhosty)): Initial Dockerfile and fixes to a usable state.
+* [TheFrenchGhosty](https://thefrenchghosty.me) ([Github](https://github.com/TheFrenchGhosty)): Initial Dockerfile and fixes to a usable state.
+* [Jennifer Wjertzoch](https://wjertzochjennifer.medium.com): Carousel CSS Implementation

 ### External libraries
 * [TikScraperPHP](https://github.com/pablouser1/TikScraperPHP)
@@ -0,0 +1,25 @@
+<?php
+namespace App\Cache;
+
+use TikScraper\Interfaces\CacheInterface;
+
+class ApcuCache implements CacheInterface {
+    function __construct() {
+        if (!(extension_loaded('apcu') && apcu_enabled())) {
+            throw new \Exception('APCu not enabled');
+        }
+    }
+
+    public function get(string $cache_key): ?object {
+        $data = apcu_fetch($cache_key);
+        return $data !== false ? json_decode($data) : null;
+    }
+
+    public function exists(string $cache_key): bool {
+        return apcu_exists($cache_key);
+    }
+
+    public function set(string $cache_key, string $data, $timeout = 3600): void {
+        apcu_store($cache_key, $data, $timeout);
+    }
+}
@@ -3,5 +3,6 @@ namespace App\Constants;

 abstract class CacheMethods {
    const JSON = 'json';
+    const APCU = 'apcu';
    const REDIS = 'redis';
 }
@@ -0,0 +1,7 @@
+<?php
+namespace App\Constants;
+
+abstract class TextExtras {
+    const USER = 0;
+    const HASHTAG = 1;
+}
@@ -3,16 +3,16 @@ namespace App\Controllers;

 use App\Helpers\ErrorHandler;
 use App\Helpers\Wrappers;
-use App\Models\FeedTemplate;
+use App\Models\DiscoverTemplate;

 class DiscoverController {
-    static public function get() {
+    public static function get() {
        $api = Wrappers::api();
-        $feed = $api->discover();
-        if ($feed->meta->success) {
-            Wrappers::latte('discover', new FeedTemplate('Discover', $feed));
+        $data = $api->discover();
+        if ($data->meta->success) {
+            Wrappers::latte('discover', new DiscoverTemplate($data));
        } else {
-            ErrorHandler::showMeta($feed->meta);
+            ErrorHandler::showMeta($data->meta);
        }
    }
 }
@@ -6,7 +6,7 @@ use App\Helpers\Wrappers;
 use App\Models\VideoTemplate;

 class EmbedController {
-    static public function v2(int $id) {
+    public static function v2(int $id) {
        $api = Wrappers::api();
        $video = $api->video($id);
        $video->feed();
@@ -7,7 +7,7 @@ use App\Helpers\Wrappers;
 use App\Models\FullTemplate;

 class MusicController {
-    static public function get(string $music_id) {
+    public static function get(string $music_id) {
        $cursor = Misc::getCursor();

        $api = Wrappers::api();
@@ -2,49 +2,23 @@
 namespace App\Controllers;

 use App\Helpers\Cookies;
+use App\Helpers\Misc;
+use TikScraper\Constants\UserAgents as TikScraperUserAgents;

 class ProxyController {
    const VALID_TIKTOK_DOMAINS = [
        "tiktokcdn.com", "tiktokcdn-us.com", "tiktok.com"
    ];

-    static private function isValidDomain(string $url) {
-        $host = parse_url($url, PHP_URL_HOST);
-        $host_split = explode('.', $host);
-        $host_count = count($host_split);
-        if ($host_count === 2) {
-            // Using no watermark
-            return in_array($host_split[0] . '.' . $host_split[1], self::VALID_TIKTOK_DOMAINS);
-        } elseif ($host_count === 3) {
-            return in_array($host_split[1] . '.' . $host_split[2], self::VALID_TIKTOK_DOMAINS);
-        }
-        return false;
-    }
-
-    static private function checkUrl() {
-        if (!isset($_GET['url'])) {
-            die('You need to send a URL');
-        }
-
-        if (!filter_var($_GET['url'], FILTER_VALIDATE_URL) || !self::isValidDomain($_GET['url'])) {
-            die('Not a valid URL');
-        }
-
-    }
-
-    static private function getFilename(string $id, string $user): string {
-        $filename = 'tiktok-video-' . $id . '-' . $user;
-        return $filename;
-    }
-
-    static public function stream() {
+    public static function stream() {
        self::checkUrl();
        $url = $_GET['url'];
-        $streamer = new \TikScraper\Stream();
+        $config['user_agent'] = Misc::env("USER_AGENT", TikScraperUserAgents::DEFAULT);
+        $streamer = new \TikScraper\Stream($config);
        $streamer->url($url);
    }

-    static public function download() {
+    public static function download() {
        self::checkUrl();
        $method = Cookies::downloader();
        $downloader = new \TikScraper\Download($method);
@@ -59,4 +33,34 @@ class ProxyController {
        // Running
        $downloader->url($url, $filename, $watermark);
    }
+
+    static private function isValidDomain(string $url): bool {
+        $valid = false;
+        $host = parse_url($url, PHP_URL_HOST);
+        $host_split = explode('.', $host);
+        $host_count = count($host_split);
+        if ($host_count === 2) {
+            // Using no watermark
+            $valid = in_array($host_split[0] . '.' . $host_split[1], self::VALID_TIKTOK_DOMAINS);
+        } elseif ($host_count === 3) {
+            $valid = in_array($host_split[1] . '.' . $host_split[2], self::VALID_TIKTOK_DOMAINS);
+        }
+        return $valid;
+    }
+
+    static private function checkUrl(): void {
+        if (!isset($_GET['url'])) {
+            die('You need to send a URL');
+        }
+
+        if (!filter_var($_GET['url'], FILTER_VALIDATE_URL) || !self::isValidDomain($_GET['url'])) {
+            die('Not a valid URL');
+        }
+
+    }
+
+    static private function getFilename(string $id, string $user): string {
+        $filename = 'tiktok-video-' . $id . '-' . $user;
+        return $filename;
+    }
 }
@@ -8,7 +8,7 @@ use App\Helpers\UrlBuilder;
 * Used to be compatible with HTML forms
 */
 class RedirectController {
-    static public function search() {
+    public static function search() {
        $endpoint = '/';
        if (isset($_GET['type'], $_GET['term'])) {
            $term = trim($_GET['term']);
@@ -49,7 +49,7 @@ class RedirectController {
        header("Location: {$url}");
    }

-    static public function download() {
+    public static function download() {
        if (!(isset($_GET['videoId'], $_GET['authorUsername'], $_GET['playAddr']))) {
            ErrorHandler::showText(400, 'Request incomplete');
            return;
@@ -71,7 +71,7 @@ class RedirectController {
     * to_endpoint maps a TikTok URL into a ProxiTok-compatible endpoint URL.
     */
    static private function to_endpoint(string $url): string {
-        if (preg_match('%^(?:https?://|www\.)?(?:vm\.|vt\.)?tiktok\.com/(?:t/)?([A-Za-z0-9]+)%', $url, $m)) {
+        if (preg_match('%^(?:https?://)?(?:www\.)?(?:vm\.|vt\.)?tiktok\.com/(?:t/)?([A-Za-z0-9]+)%', $url, $m)) {
            // Short video URL
            return '/@placeholder/video/' . $m[1];
        } elseif (preg_match('%^https://www\.tiktok\.com/(.+)%', $url, $m)) {
@@ -7,11 +7,11 @@ use App\Helpers\Wrappers;
 use App\Models\SettingsTemplate;

 class SettingsController {
-    static public function index() {
+    public static function index() {
        Wrappers::latte('settings', new SettingsTemplate());
    }

-    static public function general() {
+    public static function general() {
        if (isset($_POST['theme'])) {
            $theme = $_POST['theme'];
            Cookies::set('theme', $theme);
@@ -19,7 +19,7 @@ class SettingsController {
        self::redirect();
    }

-    static public function api() {
+    public static function api() {
        // TODO, ADD COUNT
        if (isset($_POST['api-test_endpoints'])) {
            $test_endpoints = $_POST['api-test_endpoints'];
@@ -9,7 +9,7 @@ use App\Models\FullTemplate;
 use App\Models\RSSTemplate;

 class TagController {
-    static public function get(string $name) {
+    public static function get(string $name) {
        $cursor = Misc::getCursor();
        $api = Wrappers::api();
        $hashtag = $api->hashtag($name);
@@ -23,7 +23,7 @@ class TagController {
        }
    }

-    static public function rss(string $name) {
+    public static function rss(string $name) {
        $api = Wrappers::api();
        $hashtag = $api->hashtag($name);
        $hashtag->feed();
@@ -8,7 +8,7 @@ use App\Helpers\Wrappers;
 use App\Models\RSSTemplate;

 class TrendingController {
-    static public function get() {
+    public static function get() {
        $api = Wrappers::api();
        $cursor = Misc::getTtwid();

@@ -23,7 +23,7 @@ class TrendingController {
        }
    }

-    static public function rss() {
+    public static function rss() {
        $api = Wrappers::api();
        $trending = $api->trending();
        $trending->feed();
@@ -10,7 +10,7 @@ use App\Models\RSSTemplate;
 use App\Models\VideoTemplate;

 class UserController {
-    static public function get(string $username) {
+    public static function get(string $username) {
        $cursor = Misc::getCursor();
        $api = Wrappers::api();
        $user = $api->user($username);
@@ -18,17 +18,13 @@ class UserController {
        if ($user->ok()) {
            $info = $user->getInfo();
            $feed = $user->getFeed();
-            if ($info->detail->privateAccount) {
-                ErrorHandler::showText(401, "Private account detected! Not supported");
-                return;
-            }
            Wrappers::latte('user', new FullTemplate($info->detail->nickname, $info, $feed));
        } else {
            ErrorHandler::showMeta($user->error());
        }
    }

-    static public function video(string $username, string $video_id) {
+    public static function video(string $username, string $video_id) {
        $api = Wrappers::api();
        $video = $api->video($video_id);
        $video->feed();
@@ -41,7 +37,7 @@ class UserController {
        }
    }

-    static public function rss(string $username) {
+    public static function rss(string $username) {
        $api = Wrappers::api();
        $user = $api->user($username);
        $user->feed();
@@ -2,7 +2,7 @@
 namespace App\Controllers;

 class VideoController {
-    static public function get(string $video_id) {
+    public static function get(string $video_id) {
        UserController::video('placeholder', $video_id);
    }
 }
@@ -4,14 +4,14 @@ namespace App\Helpers;
 use App\Constants\Themes;

 class Cookies {
-    static public function get(string $name, string $default_value = ''): string {
+    public static function get(string $name, string $default_value = ''): string {
        if (isset($_COOKIE[$name]) && !empty($_COOKIE[$name])) {
            return $_COOKIE[$name];
        }
        return $default_value;
    }

-    static public function theme(): string {
+    public static function theme(): string {
        $theme = self::get('theme');
        $ref = new \ReflectionClass(Themes::class);
        $themes = $ref->getConstants();
@@ -21,20 +21,20 @@ class Cookies {
        return 'default';
    }

-    static public function downloader(): string {
+    public static function downloader(): string {
        $downloader = self::get('api-downloader', 'default');
        return $downloader;
    }

-    static public function exists(string $name): bool {
+    public static function exists(string $name): bool {
        return isset($_COOKIE[$name]);
    }

-    static public function check(string $name, string $value): bool {
+    public static function check(string $name, string $value): bool {
        return self::exists($name) && $_COOKIE[$name] === $value;
    }

-    static public function set(string $name, string $value) {
+    public static function set(string $name, string $value) {
        setcookie($name, $value, time()+60*60*24*30, '/', '', isset($_SERVER['HTTPS']), true);
    }
 };
@@ -5,12 +5,12 @@ use App\Models\ErrorTemplate;
 use TikScraper\Models\Meta;

 class ErrorHandler {
-    static public function showMeta(Meta $meta) {
+    public static function showMeta(Meta $meta) {
        http_response_code($meta->http_code);
        Wrappers::latte('error', new ErrorTemplate($meta->http_code, $meta->tiktok_msg, $meta->tiktok_code));
    }

-    static public function showText(int $code, string $msg) {
+    public static function showText(int $code, string $msg) {
        http_response_code($code);
        Wrappers::latte('error', new ErrorTemplate($code, $msg));
    }
@@ -2,33 +2,34 @@
 namespace App\Helpers;

 class Misc {
-    static public function getCursor(): int {
+    public static function getCursor(): int {
        return isset($_GET['cursor']) && is_numeric($_GET['cursor']) ? (int) $_GET['cursor'] : 0;
    }

-    static public function getTtwid(): string {
+    public static function getTtwid(): string {
        return isset($_GET['cursor']) ? $_GET['cursor'] : '';
    }

-    static public function url(string $endpoint = ''): string {
+    public static function url(string $endpoint = ''): string {
        return self::env('APP_URL', '') . $endpoint;
    }

-    static public function env(string $key, $default_value) {
+    public static function env(string $key, $default_value) {
        return $_ENV[$key] ?? $default_value;
    }

    /**
     * Returns absolute path for view
     */
-    static public function getView(string $template): string {
+    public static function getView(string $template): string {
        return __DIR__ . "/../../templates/views/{$template}.latte";
    }

    /**
     * Common method for rss feeds
     */
-    static public function rss(string $title) {
+    public static function rss(string $title) {
+        header('Content-Type: application/rss+xml');
        header('Content-Disposition: attachment; filename="' . $title . '.rss' . '"');
    }
 }
@@ -2,29 +2,29 @@
 namespace App\Helpers;

 class UrlBuilder {
-    static public function stream(string $url): string {
+    public static function stream(string $url): string {
        return Misc::url('/stream?url=' . urlencode($url));
    }

-    static public function download(string $url, string $username, string $id, bool $watermark): string {
+    public static function download(string $url, string $username, string $id, bool $watermark): string {
        $down_url = Misc::url('/download?url=' . urlencode($url) . '&id=' . $id . '&user=' . $username);
        if ($watermark) $down_url .= '&watermark=1';
        return $down_url;
    }

-    static public function user(string $username): string {
+    public static function user(string $username): string {
        return Misc::url('/@' . $username);
    }

-    static public function tag(string $tag): string {
+    public static function tag(string $tag): string {
        return Misc::url('/tag/' . $tag);
    }

-    static public function video_internal(string $username, string $id): string {
+    public static function video_internal(string $username, string $id): string {
        return Misc::url('/@' . $username . "/video/" . $id);
    }

-    static public function video_external(string $username, string $id): string {
+    public static function video_external(string $username, string $id): string {
        return "https://www.tiktok.com/@" . $username . "/video/" . $id;
    }
 }
@@ -1,16 +1,18 @@
 <?php
 namespace App\Helpers;

+use App\Cache\ApcuCache;
 use App\Cache\JSONCache;
 use App\Cache\RedisCache;
 use App\Constants\CacheMethods;
+use App\Constants\TextExtras;
 use App\Models\BaseTemplate;

 class Wrappers {
    /**
     * Setup of Latte template engine
     */
-    static public function latte(string $template, BaseTemplate $base) {
+    public static function latte(string $template, BaseTemplate $base) {
        $latte = new \Latte\Engine;
        $cache_path = Misc::env('LATTE_CACHE', __DIR__ . '/../../cache/latte');
        $latte->setTempDirectory($cache_path);
@@ -89,13 +91,41 @@ class Wrappers {
            return UrlBuilder::download($url, $username, $id, $watermark);
        });

+        $latte->addFunction('bool_to_str', function (bool $cond): string {
+            return $cond ? 'yes' : 'no';
+        });
+
+        // Add URLs to video descriptions
+        // TODO: Make it work with unicode characters such as emojis
+        $latte->addFunction('render_desc', function (string $desc, array $textExtras = []): string {
+            $sanitizedDesc = htmlspecialchars($desc);
+            $out = $sanitizedDesc;
+            foreach ($textExtras as $extra) {
+                $url = '';
+                $text = mb_substr($desc, $extra->start, $extra->end - $extra->start, 'UTF-8');
+                switch ($extra->type) {
+                    // User URL
+                    case TextExtras::USER:
+                        $url = UrlBuilder::user(htmlspecialchars($extra->userUniqueId));
+                        break;
+                    // Hashtag URL
+                    case TextExtras::HASHTAG:
+                        $url = UrlBuilder::tag(htmlspecialchars($extra->hashtagName));
+                        break;
+                }
+
+                $out = str_replace($text, "<a href=\"$url\">$text</a>", $out);
+            }
+            return $out;
+        });
+
        $latte->render(Misc::getView($template), $base);
    }

    /**
     * Setup of TikTok Api wrapper
     */
-    static public function api(): \TikScraper\Api {
+    public static function api(): \TikScraper\Api {
        $method = Misc::env('API_SIGNER', '');
        $url = Misc::env('API_SIGNER_URL', '');
        if (!$method) {
@@ -138,6 +168,9 @@ class Wrappers {
                case CacheMethods::JSON:
                    $cacheEngine = new JSONCache();
                    break;
+                case CacheMethods::APCU:
+                    $cacheEngine = new ApcuCache();
+                    break;
                case CacheMethods::REDIS:
                    if (!(isset($_ENV['REDIS_URL']) || isset($_ENV['REDIS_HOST'], $_ENV['REDIS_PORT']))) {
                        throw new \Exception('You need to set REDIS_URL or REDIS_HOST and REDIS_PORT to use Redis Cache!');
@@ -158,6 +191,12 @@ class Wrappers {
            }
        }

+        $customUa = Misc::env("USER_AGENT", '');
+
+        if ($customUa) {
+            $options['user_agent'] = $customUa;
+        }
+
        return new \TikScraper\Api($options, $cacheEngine);
    }
 }
@@ -0,0 +1,13 @@
+<?php
+namespace App\Models;
+
+use TikScraper\Models\Discover;
+
+class DiscoverTemplate extends BaseTemplate {
+    public Discover $data;
+
+    function __construct(Discover $data) {
+        parent::__construct("Discover");
+        $this->data = $data;
+    }
+}
@@ -1,16 +1,16 @@
 <?php
 namespace App\Models;

+use TikScraper\Models\Feed;
+
 /**
 * Base for templates with a feed
 */
 class FeedTemplate extends BaseTemplate {
-    public object $data;
+    public Feed $feed;

-    function __construct(string $title, object $feed) {
+    function __construct(string $title, Feed $feed) {
        parent::__construct($title);
-        $this->data = (object) [
-            'feed' => $feed
-        ];
+        $this->feed = $feed;
    }
 }
@@ -1,7 +1,7 @@
 {
    "name": "pablouser1/proxitok",
    "description": "An alternative frontend for TikTok",
-    "version": "2.4.4.1",
+    "version": "2.4.9.2",
    "license": "AGPL-3.0-or-later",
    "type": "project",
    "authors": [
@@ -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": "f9cec7d0ed07b8f1d6db885ceefd3226",
+    "content-hash": "92c34c828c921f4e49b6dc6ab9bf3d8b",
    "packages": [
        {
            "name": "bramus/router",
@@ -57,18 +57,58 @@
            },
            "time": "2021-11-18T19:24:07+00:00"
        },
+        {
+            "name": "deemon47/user-agent-generator",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Deemon47/user-agent-generator.git",
+                "reference": "5af13fd2e905c5441eb4d61aad3a71bd1e801709"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Deemon47/user-agent-generator/zipball/5af13fd2e905c5441eb4d61aad3a71bd1e801709",
+                "reference": "5af13fd2e905c5441eb4d61aad3a71bd1e801709",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Deemon47\\": "./"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "phpfail",
+                    "email": "phpfail@gihub.com"
+                },
+                {
+                    "name": "Dee",
+                    "email": "deemon47@gmail.com"
+                }
+            ],
+            "description": "Generate random User-Agent http header with parameters",
+            "support": {
+                "source": "https://github.com/Deemon47/user-agent-generator/tree/v1.0.1"
+            },
+            "time": "2020-04-11T12:05:34+00:00"
+        },
        {
            "name": "josegonzalez/dotenv",
            "version": "dev-master",
            "source": {
                "type": "git",
                "url": "https://github.com/josegonzalez/php-dotenv.git",
-                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c"
+                "reference": "e97dbd3db53508dcd536e73ec787a7f11458d41d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/josegonzalez/php-dotenv/zipball/f6d2fb63610f98b7ae859031566228dbade1a79c",
-                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c",
+                "url": "https://api.github.com/repos/josegonzalez/php-dotenv/zipball/e97dbd3db53508dcd536e73ec787a7f11458d41d",
+                "reference": "e97dbd3db53508dcd536e73ec787a7f11458d41d",
                "shasum": ""
            },
            "require": {
@@ -76,9 +116,9 @@
                "php": ">=5.5.0"
            },
            "require-dev": {
-                "php-mock/php-mock-phpunit": "^1.1",
-                "satooshi/php-coveralls": "1.*",
-                "squizlabs/php_codesniffer": "2.*"
+                "php-coveralls/php-coveralls": "~2.0",
+                "php-mock/php-mock-phpunit": "~1.1||~2.0",
+                "squizlabs/php_codesniffer": "~2.9||~3.7"
            },
            "default-branch": true,
            "type": "library",
@@ -111,9 +151,9 @@
            ],
            "support": {
                "issues": "https://github.com/josegonzalez/php-dotenv/issues",
-                "source": "https://github.com/josegonzalez/php-dotenv/tree/master"
+                "source": "https://github.com/josegonzalez/php-dotenv/tree/4.0.0"
            },
-            "time": "2019-07-07T21:21:39+00:00"
+            "time": "2023-05-29T22:49:26+00:00"
        },
        {
            "name": "latte/latte",
@@ -263,19 +303,20 @@
        },
        {
            "name": "pablouser1/tikscraper",
-            "version": "v2.3.3.3",
+            "version": "v2.3.6.4",
            "source": {
                "type": "git",
                "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "a870b234fbb10f2bafea2130510f463b03069dd8"
+                "reference": "b26764777121dbc4408f84140b802869a77b575e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/a870b234fbb10f2bafea2130510f463b03069dd8",
-                "reference": "a870b234fbb10f2bafea2130510f463b03069dd8",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/b26764777121dbc4408f84140b802869a77b575e",
+                "reference": "b26764777121dbc4408f84140b802869a77b575e",
                "shasum": ""
            },
            "require": {
+                "deemon47/user-agent-generator": "^1.0",
                "ext-curl": "*",
                "ext-json": "*",
                "ext-xml": "*",
@@ -305,43 +346,44 @@
            "description": "Get data from TikTok API",
            "support": {
                "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.3.3"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.6.4"
            },
-            "time": "2023-01-25T14:15:59+00:00"
+            "time": "2023-04-05T15:08:06+00:00"
        },
        {
            "name": "php-webdriver/webdriver",
-            "version": "1.13.1",
+            "version": "1.14.0",
            "source": {
                "type": "git",
                "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c"
+                "reference": "3ea4f924afb43056bf9c630509e657d951608563"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/6dfe5f814b796c1b5748850aa19f781b9274c36c",
-                "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/3ea4f924afb43056bf9c630509e657d951608563",
+                "reference": "3ea4f924afb43056bf9c630509e657d951608563",
                "shasum": ""
            },
            "require": {
                "ext-curl": "*",
                "ext-json": "*",
                "ext-zip": "*",
-                "php": "^5.6 || ~7.0 || ^8.0",
+                "php": "^7.3 || ^8.0",
                "symfony/polyfill-mbstring": "^1.12",
-                "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/process": "^5.0 || ^6.0"
            },
            "replace": {
                "facebook/webdriver": "*"
            },
            "require-dev": {
-                "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
+                "ergebnis/composer-normalize": "^2.20.0",
+                "ondram/ci-detector": "^4.0",
                "php-coveralls/php-coveralls": "^2.4",
-                "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
+                "php-mock/php-mock-phpunit": "^2.0",
                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9",
+                "phpunit/phpunit": "^9.3",
                "squizlabs/php_codesniffer": "^3.5",
-                "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/var-dumper": "^5.0 || ^6.0"
            },
            "suggest": {
                "ext-SimpleXML": "For Firefox profile creation"
@@ -370,9 +412,9 @@
            ],
            "support": {
                "issues": "https://github.com/php-webdriver/php-webdriver/issues",
-                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.13.1"
+                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.14.0"
            },
-            "time": "2022-10-11T11:49:44+00:00"
+            "time": "2023-02-09T12:12:19+00:00"
        },
        {
            "name": "sapistudio/seleniumstealth",
@@ -572,16 +614,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v5.4.19",
+            "version": "v5.4.24",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "c5ba874c9b636dbccf761e22ce750e88ec3f55e1"
+                "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c5ba874c9b636dbccf761e22ce750e88ec3f55e1",
-                "reference": "c5ba874c9b636dbccf761e22ce750e88ec3f55e1",
+                "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64",
+                "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64",
                "shasum": ""
            },
            "require": {
@@ -614,7 +656,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.19"
+                "source": "https://github.com/symfony/process/tree/v5.4.24"
            },
            "funding": [
                {
@@ -630,7 +672,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-01T08:32:19+00:00"
+            "time": "2023-05-17T11:26:05+00:00"
        }
    ],
    "packages-dev": [],
@@ -18,13 +18,47 @@ services:
    depends_on:
      - redis
      - signer
+    networks:
+      - proxitok
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    cap_add:
+      - CHOWN
+      - SETGID
+      - SETUID
+
  redis:
    container_name: proxitok-redis
    image: redis:7-alpine
    command: redis-server --save 60 1 --loglevel warning
    restart: unless-stopped
+    networks:
+      - proxitok
+    user: nobody
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    tmpfs:
+      - /data:size=10M,mode=0770,uid=65534,gid=65534,noexec,nosuid,nodev
+    cap_drop:
+      - ALL
+
  signer:
    container_name: proxitok-signer
    image: ghcr.io/pablouser1/signtok:master
+    networks:
+      - proxitok
+    user: nobody
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+
 volumes:
  proxitok-cache:
+
+networks:
+  proxitok:
@@ -15,6 +15,7 @@
@import "./node_modules/css.gg/icons/scss/comment.scss";
@import "./node_modules/css.gg/icons/scss/share.scss";
@import "./node_modules/css.gg/icons/scss/software-download.scss";
+@import "./node_modules/css.gg/icons/scss/check-o.scss";

@import "./node_modules/css.gg/icons/scss/lock.scss";
@import "./node_modules/css.gg/icons/scss/lock-unlock.scss";
@@ -0,0 +1,68 @@
+/*
+CREDITS:
+	CSS Taken from: https://levelup.gitconnected.com/how-to-make-a-fully-accessible-css-only-carousel-40e8bd62032b
+	Author: Jennifer Wjertzoch (https://wjertzochjennifer.medium.com)
+	CodePen: https://codepen.io/jwjertzoch/pen/JjyGeRy
+*/
+
+.carousel {
+  margin: 0 auto;
+  overflow: hidden;
+  text-align: center;
+}
+
+.slides {
+  width: 100%;
+  display: flex;
+  overflow-x: scroll;
+  scrollbar-width: none;
+  scroll-snap-type: x mandatory;
+  scroll-behavior: smooth;
+}
+
+.slides::-webkit-scrollbar {
+  display: none;
+}
+
+.slides-item {
+	max-height: 75vh;
+  align-items: center;
+  display: flex;
+  flex-shrink: 0;
+  justify-content: center;
+  margin: 0 1rem;
+  position: relative;
+  scroll-snap-align: start;
+  transform: scale(1);
+  transform-origin: center center;
+  transition: transform .5s;
+  width: 100%;
+}
+
+.slides-item img {
+	max-height: 75vh;
+}
+
+.carousel__nav {
+  padding: 1.25rem .5rem;
+}
+
+.slider-nav {
+  align-items: center;
+  background-color: #ddd;
+  border-radius: 50%;
+  color: #000;
+  display: inline-flex;
+  height: 1.5rem;
+  justify-content: center;
+  padding: .5rem;
+  position: relative;
+  text-decoration: none;
+  width: 1.5rem;
+}
+
+.slider-nav:hover,
+.slider-nav:active {
+  background-color: #000;
+  color: #fff;
+}
@@ -0,0 +1,3 @@
+.new-line {
+	white-space: pre-wrap;
+}
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../misc/scss/node_modules/css.gg/icons/scss/home.scss","../../misc/scss/node_modules/css.gg/icons/scss/options.scss","../../misc/scss/node_modules/css.gg/icons/scss/info.scss","../../misc/scss/node_modules/css.gg/icons/scss/code-slash.scss","../../misc/scss/node_modules/css.gg/icons/scss/search.scss","../../misc/scss/node_modules/css.gg/icons/scss/feed.scss","../../misc/scss/node_modules/css.gg/icons/scss/eye.scss","../../misc/scss/node_modules/css.gg/icons/scss/heart.scss","../../misc/scss/node_modules/css.gg/icons/scss/comment.scss","../../misc/scss/node_modules/css.gg/icons/scss/share.scss","../../misc/scss/node_modules/css.gg/icons/scss/software-download.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock-unlock.scss","../../misc/scss/node_modules/css.gg/icons/scss/music.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,YACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,qCAEA,mBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBACA,SACA,UAGF,mBACE,YACA,WCnCN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBAEA,iCACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,wBACA,SAGF,gBACE,WACA,WAGF,iBACE,WACA,QC5BN,eACI,cACA,kBACA,sBACA,6CACA,UACA,YACA,wBAEA,sBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBAGF,uBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBACA,sBACA,qBACA,UACA,QAGF,sBACE,uBACA,wBACA,WACA,QCrCN,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,WCrCN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,4BACA,2BACA,4BACA,iBAEA,gBACE,WACA,cACA,sBACA,kBACA,WACA,YACA,kBACA,+BACA,qBACA,UACA,QCxBN,gBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,8BACA,6BACA,4BACA,iBACA,iBAEA,+CACE,WACA,cACA,sBACA,kBAGF,uBACE,+BACA,qBACA,WACA,YACA,kBACA,UACA,SAGF,wBACE,UACA,WACA,wBACA,UACA,QCpCN,UACI,cACA,sBACA,iBAQA,2BACA,4BACA,gBACA,gBACA,kBACA,6CACA,WACA,YAbA,mCACE,cACA,sBACA,iBAYF,mCACE,WACA,kBACA,UACA,WACA,QACA,UACA,uBACA,mBAGF,iBACE","file":"cssgg.min.css"}
+{"version":3,"sourceRoot":"","sources":["../../misc/scss/node_modules/css.gg/icons/scss/home.scss","../../misc/scss/node_modules/css.gg/icons/scss/options.scss","../../misc/scss/node_modules/css.gg/icons/scss/info.scss","../../misc/scss/node_modules/css.gg/icons/scss/code-slash.scss","../../misc/scss/node_modules/css.gg/icons/scss/search.scss","../../misc/scss/node_modules/css.gg/icons/scss/feed.scss","../../misc/scss/node_modules/css.gg/icons/scss/eye.scss","../../misc/scss/node_modules/css.gg/icons/scss/heart.scss","../../misc/scss/node_modules/css.gg/icons/scss/comment.scss","../../misc/scss/node_modules/css.gg/icons/scss/share.scss","../../misc/scss/node_modules/css.gg/icons/scss/software-download.scss","../../misc/scss/node_modules/css.gg/icons/scss/check-o.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock-unlock.scss","../../misc/scss/node_modules/css.gg/icons/scss/music.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,YACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,qCAEA,mBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBACA,SACA,UAGF,mBACE,YACA,WCnCN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBAEA,iCACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,wBACA,SAGF,gBACE,WACA,WAGF,iBACE,WACA,QC5BN,eACI,cACA,kBACA,sBACA,6CACA,UACA,YACA,wBAEA,sBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBAGF,uBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBACA,sBACA,qBACA,UACA,QAGF,sBACE,uBACA,wBACA,WACA,QCrCN,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,WCrCN,YACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,oBAEA,mBACE,WACA,cACA,sBACA,kBACA,SACA,SACA,UACA,YACA,0BACA,yBACA,mBACA,6BACA,wBCvBN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,4BACA,2BACA,4BACA,iBAEA,gBACE,WACA,cACA,sBACA,kBACA,WACA,YACA,kBACA,+BACA,qBACA,UACA,QCxBN,gBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,8BACA,6BACA,4BACA,iBACA,iBAEA,+CACE,WACA,cACA,sBACA,kBAGF,uBACE,+BACA,qBACA,WACA,YACA,kBACA,UACA,SAGF,wBACE,UACA,WACA,wBACA,UACA,QCpCN,UACI,cACA,sBACA,iBAQA,2BACA,4BACA,gBACA,gBACA,kBACA,6CACA,WACA,YAbA,mCACE,cACA,sBACA,iBAYF,mCACE,WACA,kBACA,UACA,WACA,QACA,UACA,uBACA,mBAGF,iBACE","file":"cssgg.min.css"}
@@ -0,0 +1,4 @@
+<details>
+	<summary>{$title}</summary>
+	{block content}{/block}
+</details>
@@ -31,5 +31,7 @@
 	{/if}
 	<link rel="stylesheet" href="{static('css', 'cssgg.min.css', true)}">
 	<link rel="stylesheet" href="{static('css', 'bulma.min.css', true)}">
+	<link rel="stylesheet" href="{static('css', 'misc.css')}">
+	<link rel="stylesheet" href="{static('css', 'carousel.css')}">
 	<title>{$title} - ProxiTok</title>
 </head>
@@ -0,0 +1,27 @@
+{if !isset($item->imagePost)}
+<video controls n:attr="autoplay => $isAutoplay" poster="{url_stream($item->video->originCover)}" preload="none">
+	<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
+</video>
+{else}
+{if isset($isSimple)}
+	{foreach $item->imagePost->images as $i => $image}
+		<img src="{url_stream($image->imageURL->urlList[0])}" />
+	{/foreach}
+{else}
+	<section class="carousel" aria-label="carousel" Tabindex="0">
+	  <div class="slides">
+			{foreach $item->imagePost->images as $i => $image}
+			<div class="slides-item" id="{$item->id}-image{$i + 1}" tabindex="0">
+				<img src="{url_stream($image->imageURL->urlList[0])}" />
+			</div>
+			{/foreach}
+	  </div>
+	  <div class="carousel__nav">
+			{for $i = 0; $i < count($item->imagePost->images); $i++}
+			<a class="slider-nav" href="#{$item->id}-image{$i + 1}">{$i + 1}</a>
+			{/for}
+	  </div>
+	  <div class="carousel__skip-message" id="skip-link" tabindex="0"></div>
+	</section>
+	{/if}
+{/if}
@@ -1,4 +1,4 @@
-<div n:ifset="$info" class="buttons">
+<div class="buttons">
 	{* is_numeric is used to avoid having a back button with ttwid cursors *}
 	{if isset($_GET['cursor']) && is_numeric($_GET['cursor']) && $_GET['cursor'] != 0}
    <a class="button is-danger" href="?cursor=0">First</a>
@@ -1,22 +1,8 @@
-{embed '../../form.latte', path: '/redirect/download', method: 'GET'}
-	{block fields}
-		<div class="field has-addons has-addons-centered">
-			<div class="control">
-				<div class="select">
-					<select name="watermark">
-						<option value="yes">WM</option>
-						<option value="no">No WM</option>
-					</select>
-				</div>
-			</div>
-			<div class="control">
-				<button type="submit" class="button is-success">
-					{include '../../icon.latte', icon: 'software-download', text: 'Download'}
-				</a>
-			</div>
-		</div>
-		<input type="hidden" name="playAddr" value="{$playAddr}" />
-		<input type="hidden" name="videoId" value="{$id}" />
-		<input type="hidden" name="authorUsername" value="{$uniqueId}" />
-	{/block}
-{/embed}
+<div class="field is-grouped is-grouped-centered">
+  <p class="control">
+		<a target="_blank" href="{url_download($playAddr, $uniqueId, $id, true)}" class="button is-info">Watermark</a>
+  </p>
+  <p class="control">
+		<a target="_blank" href="{url_download(url_video_external($uniqueId, $id), $uniqueId, $id, false)}" class="button is-success">No watermark</a>
+  </p>
+</div>
@@ -1,14 +1,12 @@
-<nav class="breadcrumb is-centered" aria-label="breadcrumbs">
-  <ul>
-    <li>
-			<a class="has-text-success" href="{url_video_internal($uniqueId, $id)}">
-				{include '../../icon.latte', icon: 'lock', text: 'Instance link'}
-			</a>
-		</li>
-    <li>
-			<a class="has-text-warning" href="{url_video_external($uniqueId, $id)}">
-				{include '../../icon.latte', icon: 'lock-unlock', text: 'Original Link'}
-			</a>
-		</li>
-  </ul>
-</nav>
+<div class="field is-grouped is-grouped-centered">
+  <p class="control">
+		<a class="button is-success" href="{url_video_internal($uniqueId, $id)}">
+			{include '../../icon.latte', icon: 'lock', text: 'Instance'}
+		</a>
+  </p>
+  <p class="control">
+		<a class="button is-warning" href="{url_video_external($uniqueId, $id)}">
+			{include '../../icon.latte', icon: 'lock-unlock', text: 'Original'}
+		</a>
+  </p>
+</div>
@@ -1,5 +1,5 @@
 <div class="tags">
 	{foreach $challenges as $challenge}
-		<a class="tag is-rounded" href="{path('/tag/' . $challenge->title)}">#{$challenge->title}</a>
+		<a class="tag is-primary is-rounded" href="{path('/tag/' . $challenge->title)}">#{$challenge->title}</a>
 	{/foreach}
 </div>
@@ -17,16 +17,28 @@
 			{if !empty($item->challenges)}
 			<p>{include './common/tags.latte', challenges: $item->challenges}</p>
 			{/if}
-			<p n:ifcontent>{$item->desc}</p>
+			<p n:ifcontent>{render_desc($item->desc, $item->textExtra ?? [])|noescape}</p>
+			<p>Song: {$item->music->title}</p>
+			<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 			{include './common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 			<div class="has-text-centered">
-				<video width="{$item->video->width}" height="{$item->video->height}" controls preload="none" poster="{url_stream($item->video->originCover)}">
-					<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
-				</video>
+				{include './common/content.latte', item: $item, isAutoplay: false, isBig: false}
 			</div>
+			{if isset($item->video->playAddr) && $item->video->playAddr !== ""}
+			<!-- Download links, not shown if item is a gallery -->
+			<p class="has-text-centered"><b>Download video</b></p>
+			{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
+			{/if}
+			<p class="has-text-centered"><b>Share link</b></p>
+			{include './common/share.latte', uniqueId: $item->author->uniqueId, id: $item->id}
 			<div class="has-text-centered">
-				{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
-				<div class="mt-2">{include './common/share.latte', uniqueId: $item->author->uniqueId, id: $item->id}</div>
+				{embed '../details.latte', title: "Details"}
+				{block content}
+				<p>Can duet: {bool_to_str($item->duetEnabled)}</p>
+				<p>Can stitch (add this video to other ones): {bool_to_str($item->stitchEnabled)}</p>
+				<p>Can be shared: {bool_to_str($item->shareEnabled)}
+				{/block}
+				{/embed}
 			</div>
  	</div>
 	</article>
@@ -5,7 +5,7 @@
 {/block}

 {block content}
-	{foreach $data->feed->items as $type => $items}
+	{foreach $data->items as $type => $items}
 		<p class="title">{$type|firstUpper}</p>
 		<div class="columns is-multiline is-vcentered">
 			{foreach $items as $item}
@@ -1,4 +1,3 @@
-{contentType application/rss+xml}
 <?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
@@ -9,7 +8,7 @@
 		{foreach $items as $item}
 			<item>
 				<title>{$item->desc}</title>
-				<description><![CDATA[<p>{$item->desc}</p><video controls="controls" preload="auto" src="{url_stream($item->video->playAddr)}"></video>]]></description>
+				<description><![CDATA[<p n:ifcontent>{render_desc($item->desc, $item->textExtra ?? [])|noescape}</p>{include '../components/themes/common/content.latte', item: $item, isAutoplay: false, isSimple: true}]]></description>
 				<link>{url_video_internal($item->author->uniqueId, $item->id)}</link>
 				<pubDate>{date('r', $item->createTime)}</pubDate>
 				<guid isPermaLink="false">{$item->id}</guid>
@@ -14,7 +14,12 @@
 	{/if}
 	<p class="title">{$info->detail->title}</p>
 	<p class="subtitle">{include '../components/rss.latte'}</p>
-	<p>Videos: {number($info->stats->videoCount)} / Views: {number($info->stats->viewCount)}</p>
+	<p>Views: {number($info->stats->viewCount)}</p>
+	{embed '../components/details.latte', title: 'Details'}
+	{block content}
+	<p>Is commerce: {bool_to_str($info->detail->isCommerce)}</p>
+	{/block}
+	{/embed}
 {/block}

 {block content}
@@ -10,11 +10,33 @@
 	<figure class="image is-inline-block is-128x128">
 		<img class="is-rounded" src="{url_stream($info->detail->avatarLarger)}" />
 	</figure>
-	<p class="title">{$info->detail->uniqueId}</p>
+	<p class="title">
+		{if $info->detail->verified}
+		{include '../components/icon.latte', icon: 'check-o', text: $info->detail->uniqueId}
+		{else}
+		{$info->detail->uniqueId}
+		{/if}
+	</p>
 	<p class="subtitle">{include '../components/rss.latte'}</p>
-	<p>{$info->detail->signature}</p>
+	{if $info->detail->privateAccount}
+	<p><strong>Private account</strong></p>
+	{/if}
+	<b>Description</b>
+	<p class="new-line">{$info->detail->signature}</p>
+	{if isset($info->detail->bioLink)}
+	<p>Link: <a href="{$info->detail->bioLink->link}">{$info->detail->bioLink->link}</a></p>
+	{/if}
+	<b>Stats</b>
 	<p>Following: {number($info->stats->followingCount)} / Followers: {number($info->stats->followerCount)}</p>
 	<p>Hearts: {number($info->stats->heartCount)} / Videos: {$info->stats->videoCount}</p>
+	{embed '../components/details.latte', title: "Details"}
+	{block content}
+	<p>Region: {$info->detail->region}</p>
+	{if $info->detail->commerceUserInfo->commerceUser}
+	<p>Category: {$info->detail->commerceUserInfo->category}</p>
+	{/if}
+	{/block}
+	{/embed}
 {/block}

 {block content}
@@ -4,12 +4,14 @@
 {var $og_content = $item->video->originCover}
 {var $og_url = url_video_internal($info->detail->uniqueId, $item->id)}

+{if !empty($item->desc)}
+	{var $title = trim($item->desc)}
+{/if}
+
 {block content}
-	<div class="columns is-centered is-vcentered is-gapless">
+	<div class="columns is-centered is-vcentered">
 		<div class="column has-text-centered">
-			<video controls autoplay poster="{url_stream($item->video->originCover)}">
-				<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
-			</video>
+			{include '../components/themes/common/content.latte', item: $item, isAutoplay: true, isBig: true}
 		</div>
 		<div class="column">
 			<div class="box">
@@ -31,16 +33,49 @@
 						<p>{include '../components/themes/common/tags.latte', challenges: $item->challenges}</p>
 						{/if}
 						<div class="content">
-							<p n:ifcontent>{$item->desc}</p>
+							<p n:ifcontent>{render_desc($item->desc, $item->textExtra ?? [])|noescape}</p>
+							<p>Song: {$item->music->title}</p>
+							<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 							{include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 							<div class="has-text-centered">
 								{include '../components/themes/common/share.latte', uniqueId: $info->detail->uniqueId, id: $item->id}
+								{if isset($item->video->playAddr) && $item->video->playAddr !== ""}
+								<!-- Download links, not shown if item is a gallery -->
 								{include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $info->detail->uniqueId}
+								{/if}
 							</div>
 						</div>
  				</div>
 				</article>
 			</div>
+			{if !empty($item->comments)}
+			<div class="box">
+				<p class="is-size-5 has-text-centered">Comments</p>
+				{foreach $item->comments as $comment}
+				<article class="media">
+				  <figure class="media-left">
+				    <p class="image is-64x64">
+				      <img src="{url_stream($comment->user->avatar_thumb->url_list[0])}" />
+				    </p>
+				  </figure>
+				  <div class="media-content">
+				    <div class="content">
+				      <p>
+				        <strong>{$comment->user->unique_id}</strong>
+								<small>
+									<a href="{url_user($comment->user->unique_id)}">@{$comment->user->nickname}</a>
+								</small>
+								<small title="{date('M d, Y H:i:s e', $comment->create_time)}">{date('M d, Y', $comment->create_time)}</small>
+				        <br>
+								{$comment->text}
+				      </p>
+				    </div>
+						<p>{include '../components/icon.latte', icon: 'heart', text: number($comment->digg_count)}</p>
+				  </div>
+				</article>
+				{/foreach}
+			</div>
+			{/if}
 		</div>
 	</div>
 {/block}
Author	SHA1	Message	Date
Pablo Ferreiro	8c769d89d4	Fixed isAd crash	2023-06-12 15:08:02 +02:00
Pablo Ferreiro	19a2066fc2	changed keyword order	2023-04-27 20:23:23 +02:00
Pablo Ferreiro	e43580f3f9	RSS TextExtra and Gallery support	2023-04-27 20:22:55 +02:00
Pablo Ferreiro	b5d034437f	fix multiple carousel in one page	2023-04-08 12:03:33 +02:00
Pablo Ferreiro	4e191922fe	accept both desktop and mobile user agents scraper	2023-04-05 17:09:22 +02:00
Pablo Ferreiro	d09830cc89	bump scraper	2023-04-03 16:24:51 +02:00
Pablo Ferreiro	3556fef036	commerce fix	2023-04-03 14:37:04 +02:00
Pablo Ferreiro	7e65da7fe9	fixes to ttag	2023-04-02 20:37:36 +02:00
Pablo Ferreiro	3bd6c553f4	bump	2023-04-02 20:18:10 +02:00
Pablo Ferreiro	aadfeccab1	Added some details	2023-04-02 20:14:48 +02:00
Pablo Ferreiro	4188fcf064	Initial URLify of vid desc and profile	2023-04-02 19:55:04 +02:00
Pablo Ferreiro	9364a2e212	hotfix	2023-04-01 18:45:10 +02:00
Pablo Ferreiro	e5d416f696	pictures using carousel	2023-04-01 17:09:12 +02:00
Pablo Ferreiro	98a9ec2b65	hotfix	2023-04-01 16:35:17 +02:00
Pablo Ferreiro	33c723d786	Pictures support	2023-04-01 15:48:27 +02:00
Pablo Ferreiro	faee8d58f2	bump	2023-03-29 11:23:14 +02:00
Pablo Ferreiro	75e13bc7d2	Merge pull request #140 from NoPlagiarism/www_shortened Fix https:// + www in redirections (fixes #139)	2023-03-29 09:05:36 +00:00
Pablo Ferreiro	08145ee90b	Merge pull request #135 from kuanhulio/master harden docker-compose	2023-03-29 09:04:10 +00:00
NoPlagiarism	6194324452	Fix https:// + www in redirections (#139 )	2023-03-29 07:39:36 +05:00
Nullnet Services Administrator	48eccbc5ec	harden docker-compose	2023-03-18 21:10:24 -05:00
Pablo Ferreiro	cac97ff05e	Initial comments support	2023-03-06 21:20:14 +01:00
Pablo Ferreiro	eeaa8cdf1c	Random User Agent generator	2023-03-05 13:18:34 +01:00
Pablo Ferreiro	ecba96eaf4	Merge pull request #131 from chrisnovakovic/video-title Set page title to video description in video view	2023-02-28 11:40:30 +00:00
Chris Novakovic	013feeb679	Set page title to video description in video view If the upstream video has a description set, use it as the page title in place of "Video" in the video view. This helps to disambiguate video pages in the browser history.	2023-02-27 23:11:36 +00:00
Pablo Ferreiro	bf86e0d36a	Merge pull request #125 from samip5/configureable_user_agent Ability to pass custom user agent to the scraper and ignore .git on Docker	2023-02-19 11:08:22 +00:00
Skyler Mäntysaari	72ea5d43fd	Addressing PR comments about not using hardcoded string.	2023-02-17 22:32:36 +02:00
Skyler Mäntysaari	288f87504c	Add .git to dockerignore Otherwise bad things end up in container.	2023-02-16 02:26:25 +02:00
Skyler Mäntysaari	3d5890d821	Ability to pass own user agent to the scraper.	2023-02-08 12:59:17 +02:00
Pablo Ferreiro	5dea2468f8	Better handling of private accounts	2023-02-01 15:22:53 +01:00
Pablo Ferreiro	e8ec0ab293	bump	2023-01-28 17:32:07 +01:00
Pablo Ferreiro	78fe44070c	Fixed Trending and normalized Discover	2023-01-26 19:21:14 +01:00
Pablo Ferreiro	7d2f6e8fd6	bump scraper	2023-01-26 17:20:38 +01:00
Pablo Ferreiro	32d49954f9	hotfix	2023-01-25 21:10:47 +01:00
Pablo Ferreiro	5c770def41	better ui	2023-01-25 21:06:59 +01:00
Pablo Ferreiro	d273b35e53	Added apcu caching method and bump	2023-01-25 15:56:23 +01:00