Properly implemented OG

Revert "Added better og support"
This reverts commit fa3f1e0a7c.
2024-12-06 19:27:30 +01:00 · 2022-11-26 23:51:45 +01:00 · 2022-11-26 23:36:20 +01:00 · 2022-11-26 23:28:59 +01:00 · 2022-11-26 22:25:48 +01:00 · 2022-11-22 20:45:53 +01:00
74 changed files with 372 additions and 275 deletions
@@ -44,7 +44,7 @@ jobs:
        if: github.event_name != 'pull_request'
        uses: sigstore/cosign-installer@main
        with:
-          cosign-release: 'v1.9.0'
+          cosign-release: 'v1.13.1'


      # Workaround: https://github.com/docker/build-push-action/issues/461
@@ -1 +1 @@
-web: vendor/bin/heroku-php-nginx -C setup/heroku/nginx.conf
+web: vendor/bin/heroku-php-nginx -C misc/setup/heroku/nginx.conf
@@ -20,6 +20,10 @@
            "description": "Latte cache path",
            "value": "/tmp/latte"
        },
+        "API_SIGNER": {
+            "description": "Signer method",
+            "value": "remote"
+        },
        "API_SIGNER_URL": {
            "description": "Remote signer url",
            "value": "https://signtok.vercel.app/api"
@@ -1,7 +1,7 @@
 <?php
 namespace App\Constants;

-class CacheMethods {
+abstract class CacheMethods {
    const JSON = 'json';
    const REDIS = 'redis';
 }
@@ -2,7 +2,6 @@
 namespace App\Controllers;

 use App\Helpers\ErrorHandler;
-use App\Helpers\Misc;
 use App\Helpers\Wrappers;
 use App\Models\FeedTemplate;

@@ -11,8 +10,7 @@ class DiscoverController {
        $api = Wrappers::api();
        $feed = $api->discover();
        if ($feed->meta->success) {
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('discover'), new FeedTemplate('Discover', $feed));
+            Wrappers::latte('discover', new FeedTemplate('Discover', $feed));
        } else {
            ErrorHandler::showMeta($feed->meta);
        }
@@ -2,7 +2,6 @@
 namespace App\Controllers;

 use App\Helpers\ErrorHandler;
-use App\Helpers\Misc;
 use App\Helpers\Wrappers;
 use App\Models\VideoTemplate;

@@ -12,9 +11,9 @@ class EmbedController {
        $video = $api->video($id);
        $video->feed();
        if ($video->ok()) {
-            $data = $video->getFull();
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('video'), new VideoTemplate($data->feed->items[0], $data->info->detail, true));
+            $item = $video->getFeed()->items[0];
+            $info = $video->getInfo();
+            Wrappers::latte('video', new VideoTemplate($item, $info, true));
        } else {
            ErrorHandler::showMeta($video->error());
        }
@@ -14,9 +14,9 @@ class MusicController {
        $music = $api->music($music_id);
        $music->feed($cursor);
        if ($music->ok()) {
-            $data = $music->getFull();
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('music'), new FullTemplate('Music', $data));
+            $info = $music->getInfo();
+            $feed = $music->getFeed();
+            Wrappers::latte('music', new FullTemplate('Music', $info, $feed));
        } else {
            ErrorHandler::showMeta($music->error());
        }
@@ -2,7 +2,6 @@
 namespace App\Controllers;

 use App\Helpers\Cookies;
-use TikScraper\Helpers\Converter;

 class ProxyController {
    const VALID_TIKTOK_DOMAINS = [
@@ -33,8 +32,7 @@ class ProxyController {

    }

-    static private function getFilename(string $url, string $user): string {
-        $id = Converter::urlToId($url);
+    static private function getFilename(string $id, string $user): string {
        $filename = 'tiktok-video-' . $id . '-' . $user;
        return $filename;
    }
@@ -52,12 +50,13 @@ class ProxyController {
        $downloader = new \TikScraper\Download($method);

        // Params
+        $id = $_GET['id'] ?? '';
        $watermark = isset($_GET['watermark']);
        $url = $_GET['url'];
        $user = $_GET['user'] ?? '';
        // Filename
-        $filename = self::getFilename($url, $user);
+        $filename = self::getFilename($id, $user);
        // Running
-        $downloader->url($_GET['url'], $filename, $watermark);
+        $downloader->url($url, $filename, $watermark);
    }
 }
@@ -10,7 +10,7 @@ class RedirectController {
    static public function redirect() {
        $endpoint = '/';
        if (isset($_GET['type'], $_GET['term'])) {
-            $term = urlencode(trim($_GET['term']));
+            $term = trim($_GET['term']);
            switch ($_GET['type']) {
                case 'url':
                    $endpoint = self::to_endpoint($term);
@@ -24,22 +24,22 @@ class RedirectController {
                    if ($term[0] === '@') {
                        $term = substr($term, 1);
                    }
-                    $endpoint = '/@' . $term;
+                    $endpoint = '/@' . urlencode($term);
                    break;
                case 'tag':
                    // Remove # if sent
                    if ($term[0] === '#') {
                        $term = substr($term, 1);
                    }
-                    $endpoint = '/tag/' . $term;
+                    $endpoint = '/tag/' . urlencode($term);
                    break;
                case 'music':
-                    $endpoint = '/music/' . $term;
+                    $endpoint = '/music/' . urlencode($term);
                    break;
                case 'video':
                    // The @username part is not used, but
                    // it is the schema that TikTok follows
-                    $endpoint = '/@placeholder/video/' . $term;
+                    $endpoint = '/@placeholder/video/' . urlencode($term);
                    break;
                }
        }
@@ -60,17 +60,17 @@ class RedirectController {
            if (preg_match('%^(@[A-Za-z0-9_.]+)(?:/|$)(.*)%', $m[1], $u)) {
                if ($u[2] == '') {
                    // User profile URL
-                    return '/' . $u[1];
+                    return '/' . urlencode($u[1]);
                } elseif (preg_match('%^video/(\d+)%', $u[2], $v)) {
                    // Video URL
-                    return '/' . $u[1] . '/video/' . $v[1];
+                    return '/' . urlencode($u[1]) . '/video/' . urlencode($v[1]);
                }
            } elseif (preg_match('%^tag/([^ ]+?)(?:/|$)%', $m[1], $t)) {
                // Tag URL
-                return '/tag/' . $t[1];
+                return '/tag/' . urlencode($t[1]);
            } elseif (preg_match('%^music/([^ ]+?)(?:/|$)%', $m[1], $m)) {
                // Music URL
-                return '/music/' . $m[1];
+                return '/music/' . urlencode($m[1]);
            }
        }

@@ -8,8 +8,7 @@ use App\Models\SettingsTemplate;

 class SettingsController {
    static public function index() {
-        $latte = Wrappers::latte();
-        $latte->render(Misc::getView('settings'), new SettingsTemplate());
+        Wrappers::latte('settings', new SettingsTemplate());
    }

    static public function general() {
@@ -19,6 +18,7 @@ class SettingsController {
        }
        self::redirect();
    }
+
    static public function api() {
        // TODO, ADD COUNT
        if (isset($_POST['api-test_endpoints'])) {
@@ -3,6 +3,7 @@ namespace App\Controllers;

 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
+use App\Helpers\UrlBuilder;
 use App\Helpers\Wrappers;
 use App\Models\FullTemplate;
 use App\Models\RSSTemplate;
@@ -14,9 +15,9 @@ class TagController {
        $hashtag = $api->hashtag($name);
        $hashtag->feed($cursor);
        if ($hashtag->ok()) {
-            $data = $hashtag->getFull();
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('tag'), new FullTemplate($data->info->detail->title, $data));
+            $info = $hashtag->getInfo();
+            $feed = $hashtag->getFeed();
+            Wrappers::latte('tag', new FullTemplate($info->detail->title, $info, $feed));
        } else {
            ErrorHandler::showMeta($hashtag->error());
        }
@@ -28,8 +29,8 @@ class TagController {
        $hashtag->feed();
        if ($hashtag->ok()) {
            $data = $hashtag->getFull();
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('rss'), new RSSTemplate($name, $data->info->detail->desc, "/tag/{$name}", $data->feed->items));
+            Misc::rss($name);
+            Wrappers::latte('rss', new RSSTemplate($name, $data->info->detail->desc, UrlBuilder::tag($name), $data->feed->items));
        }
    }
 }
@@ -17,8 +17,7 @@ class TrendingController {

        $feed = $trending->getFeed();
        if ($feed && $feed->meta->success) {
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('trending'), new FeedTemplate('Trending', $feed));
+            Wrappers::latte('trending', new FeedTemplate('Trending', $feed));
        } else {
            ErrorHandler::showMeta($trending->error());
        }
@@ -31,8 +30,8 @@ class TrendingController {

        $feed = $trending->getFeed();
        if ($feed && $feed->meta->success) {
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('rss'), new RSSTemplate('Trending', 'Trending on TikTok', '/trending', $feed->items));
+            Misc::rss('Trending');
+            Wrappers::latte('rss', new RSSTemplate('Trending', 'Trending on TikTok', Misc::url('/trending'), $feed->items));
        }
    }
 }
@@ -3,6 +3,7 @@ namespace App\Controllers;

 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
+use App\Helpers\UrlBuilder;
 use App\Helpers\Wrappers;
 use App\Models\FullTemplate;
 use App\Models\RSSTemplate;
@@ -15,13 +16,13 @@ class UserController {
        $user = $api->user($username);
        $user->feed($cursor);
        if ($user->ok()) {
-            $data = $user->getFull();
-            if ($data->info->detail->privateAccount) {
+            $info = $user->getInfo();
+            $feed = $user->getFeed();
+            if ($info->detail->privateAccount) {
                ErrorHandler::showText(401, "Private account detected! Not supported");
                return;
            }
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('user'), new FullTemplate($data->info->detail->nickname, $data));
+            Wrappers::latte('user', new FullTemplate($info->detail->nickname, $info, $feed));
        } else {
            ErrorHandler::showMeta($user->error());
        }
@@ -32,9 +33,9 @@ class UserController {
        $video = $api->video($video_id);
        $video->feed();
        if ($video->ok()) {
-            $data = $video->getFull();
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('video'), new VideoTemplate($data->feed->items[0], $data->info->detail));
+            $item = $video->getFeed()->items[0];
+            $info = $video->getInfo();
+            Wrappers::latte('video', new VideoTemplate($item, $info));
        } else {
            ErrorHandler::showMeta($video->error());
        }
@@ -46,8 +47,8 @@ class UserController {
        $user->feed();
        if ($user->ok()) {
            $data = $user->getFull();
-            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('rss'), new RSSTemplate($username, $data->info->detail->signature, '/@' . $username, $data->feed->items));
+            Misc::rss($username);
+            Wrappers::latte('rss', new RSSTemplate($username, $data->info->detail->signature, UrlBuilder::user($username), $data->feed->items));
        }
    }
 }
@@ -7,13 +7,11 @@ use TikScraper\Models\Meta;
 class ErrorHandler {
    static public function showMeta(Meta $meta) {
        http_response_code($meta->http_code);
-        $latte = Wrappers::latte();
-        $latte->render(Misc::getView('error'), new ErrorTemplate($meta->http_code, $meta->tiktok_msg, $meta->tiktok_code));
+        Wrappers::latte('error', new ErrorTemplate($meta->http_code, $meta->tiktok_msg, $meta->tiktok_code));
    }

    static public function showText(int $code, string $msg) {
        http_response_code($code);
-        $latte = Wrappers::latte();
-        $latte->render(Misc::getView('error'), new ErrorTemplate($code, $msg));
+        Wrappers::latte('error', new ErrorTemplate($code, $msg));
    }
 }
@@ -22,6 +22,13 @@ class Misc {
     * Returns absolute path for view
     */
    static public function getView(string $template): string {
-        return __DIR__ . "/../../views/{$template}.latte";
+        return __DIR__ . "/../../templates/views/{$template}.latte";
+    }
+
+    /**
+     * Common method for rss feeds
+     */
+    static public function rss(string $title) {
+        header('Content-Disposition: attachment; filename="' . $title . '.rss' . '"');
    }
 }
@@ -6,9 +6,8 @@ class UrlBuilder {
        return Misc::url('/stream?url=' . urlencode($url));
    }

-    static public function download(string $url, string $username, bool $watermark): string {
-        // {path('/download?url=' . urlencode($playAddr) . '&id=' . $id . '&user=' . $uniqueId) . '&watermark=1'}
-        $down_url = Misc::url('/download?url=' . urlencode($url) . '&user=' . $username);
+    static public 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;
    }
@@ -17,6 +16,10 @@ class UrlBuilder {
        return Misc::url('/@' . $username);
    }

+    static public function tag(string $tag): string {
+        return Misc::url('/tag/' . $tag);
+    }
+
    static public function video_internal(string $username, string $id): string {
        return Misc::url('/@' . $username . "/video/" . $id);
    }
@@ -4,12 +4,13 @@ namespace App\Helpers;
 use App\Cache\JSONCache;
 use App\Cache\RedisCache;
 use App\Constants\CacheMethods;
+use App\Models\BaseTemplate;

 class Wrappers {
    /**
     * Setup of Latte template engine
     */
-    static public function latte(): \Latte\Engine {
+    static public function latte(string $template, BaseTemplate $base) {
        $latte = new \Latte\Engine;
        $cache_path = Misc::env('LATTE_CACHE', __DIR__ . '/../../cache/latte');
        $latte->setTempDirectory($cache_path);
@@ -19,6 +20,32 @@ class Wrappers {
        $latte->addFunction('path', function (string $endpoint = ''): string {
            return Misc::url($endpoint);
        });
+
+        // Static assets
+        $latte->addFunction('static', function (string $type, string $file, bool $isVendor = false): string {
+            $endpoint = '';
+            switch ($type) {
+                case 'js':
+                    $endpoint .= '/scripts';
+                    break;
+                case 'css':
+                    $endpoint .= '/styles';
+                    break;
+                default:
+                    throw new \Exception('Invalid static asset type');
+            }
+
+            if ($isVendor) $endpoint .= '/vendor';
+
+            $endpoint .= '/' . $file;
+
+            return Misc::url($endpoint);
+        });
+
+        $latte->addFunction('theme', function(): string {
+            return Cookies::theme();
+        });
+
        // Version being used
        $latte->addFunction('version_frontend', function (): string {
            return \Composer\InstalledVersions::getVersion('pablouser1/proxitok');
@@ -26,8 +53,20 @@ class Wrappers {
        $latte->addFunction('version_scraper', function (): string {
            return \Composer\InstalledVersions::getVersion('pablouser1/tikscraper');
        });
-        $latte->addFunction('theme', function(): string {
-            return Cookies::theme();
+
+        // https://stackoverflow.com/a/36365553
+        $latte->addFunction('number', function (float $x) {
+            if($x > 1000) {
+                $x_number_format = number_format($x);
+                $x_array = explode(',', $x_number_format);
+                $x_parts = array('K', 'M', 'B', 'T');
+                $x_count_parts = count($x_array) - 1;
+                $x_display = $x;
+                $x_display = $x_array[0] . ((int) $x_array[1][0] !== 0 ? '.' . $x_array[1][0] : '');
+                $x_display .= $x_parts[$x_count_parts - 1];
+                return $x_display;
+            }
+            return $x;
        });

        // UrlBuilder
@@ -43,24 +82,11 @@ class Wrappers {
        $latte->addFunction('url_video_external', function (string $username, string $id): string {
            return UrlBuilder::video_external($username, $id);
        });
-        $latte->addFunction('url_download', function (string $url, string $username, bool $watermark): string {
-            return UrlBuilder::download($url, $username, $watermark);
+        $latte->addFunction('url_download', function (string $url, string $username, string $id, bool $watermark): string {
+            return UrlBuilder::download($url, $username, $id, $watermark);
        });
-        // https://stackoverflow.com/a/36365553
-        $latte->addFunction('number', function (float $x) {
-            if($x > 1000) {
-                $x_number_format = number_format($x);
-                $x_array = explode(',', $x_number_format);
-                $x_parts = array('K', 'M', 'B', 'T');
-                $x_count_parts = count($x_array) - 1;
-                $x_display = $x;
-                $x_display = $x_array[0] . ((int) $x_array[1][0] !== 0 ? '.' . $x_array[1][0] : '');
-                $x_display .= $x_parts[$x_count_parts - 1];
-                return $x_display;
-            }
-            return $x;
-        });
-        return $latte;
+
+        $latte->render(Misc::getView($template), $base);
    }

    /**
@@ -6,7 +6,6 @@ namespace App\Models;
 */
 class BaseTemplate {
    public string $title;
-    public string $version;

    function __construct(string $title) {
        $this->title = $title;
@@ -1,16 +1,19 @@
 <?php
 namespace App\Models;

-use TikScraper\Models\Full;
+use TikScraper\Models\Feed;
+use TikScraper\Models\Info;

 /**
 * Base for templates with both info and feed
 */
 class FullTemplate extends BaseTemplate {
-    public Full $data;
+    public Info $info;
+    public Feed $feed;

-    function __construct(string $title, Full $data) {
+    function __construct(string $title, Info $info, Feed $feed) {
        parent::__construct($title);
-        $this->data = $data;
+        $this->info = $info;
+        $this->feed = $feed;
    }
 }
@@ -1,17 +1,13 @@
 <?php
 namespace App\Models;

-/**
-* Base for templates with a feed
-*/
-class RSSTemplate {
-    public string $title;
+class RSSTemplate extends BaseTemplate {
    public string $desc;
    public string $link;
    public array $items;

    function __construct(string $title, string $desc, string $link, array $items) {
-        $this->title = $title;
+        parent::__construct($title);
        $this->desc = $desc;
        $this->link = $link;
        $this->items = $items;
@@ -6,14 +6,15 @@ use App\Helpers\Cookies;
 use TikScraper\Constants\DownloadMethods;

 /**
-* Base for templates with a feed
-*/
+ * Settings model with all possible config items
+ */
 class SettingsTemplate extends BaseTemplate {
    public array $downloaders = [];
    public array $themes = [];
    public bool $isTestEndpoints = false;
    public string $currentDownloader;
    public string $currentTheme;
+    public bool $isServiceWorker = false;

    function __construct() {
        parent::__construct("Settings");
@@ -27,5 +28,6 @@ class SettingsTemplate extends BaseTemplate {
        $this->isTestEndpoints = Cookies::check('api-test_endpoints', 'yes');
        $this->currentDownloader = Cookies::downloader();
        $this->currentTheme = Cookies::theme();
+        $this->isServiceWorker = Cookies::check('misc-sw', 'yes');
    }
 }
@@ -1,18 +1,20 @@
 <?php
 namespace App\Models;

+use TikScraper\Models\Info;
+
 /**
 * Base for templates with a feed
 */
 class VideoTemplate extends BaseTemplate {
    public object $item;
-    public object $detail;
+    public Info $info;
    public string $layout = 'hero';

-    function __construct(object $item, object $detail, bool $isEmbed = false) {
+    function __construct(object $item, Info $info, bool $isEmbed = false) {
        parent::__construct('Video');
        $this->item = $item;
-        $this->detail = $detail;
+        $this->info = $info;
        if ($isEmbed) {
            $this->layout = 'embed';
        } else {
@@ -1,18 +0,0 @@
-<head>
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="apple-touch-icon" sizes="180x180" href="{path('/apple-touch-icon.png')}">
-	<link rel="icon" type="image/png" sizes="32x32" href="{path('/favicon-32x32.png')}">
-	<link rel="icon" type="image/png" sizes="16x16" href="{path('/favicon-16x16.png')}">
-	<link rel="manifest" href="{path('/site.webmanifest')}">
-	<meta property="og:title" content="ProxiTok" />
-	<meta property="og:description" content="Alternative frontend for TikTok" />
-	<meta property="og:type" content="website" />
-	{if isset($has_rss)}
-		<link rel="alternate" type="application/rss+xml" title="{$title}" href="{$_SERVER['REQUEST_URI'] . '/rss'}" />
-	{/if}
-	<link rel="stylesheet" href="{path('/styles/vendor/cssgg.min.css')}">
-	<link rel="stylesheet" href="{path('/styles/vendor/bulma.min.css')}">
-	<title>{$title} - ProxiTok</title>
-</head>
@@ -1,5 +0,0 @@
-{do $endpoint = '/@' . $uniqueId . '/video/' . $id}
-<div class="buttons is-centered">
-	<a class="button is-success is-small" href="{url_video_internal($uniqueId, $id)}">Instance Link</a>
-	<a class="button is-danger is-small" href="{url_video_external($uniqueId, $id)}">Original Link</a>
-</div>
@@ -1,5 +0,0 @@
-<div class="tags">
-	{foreach $challenges as $challenge}
-		<a class="tag is-rounded is-info" href="{path('/tag/' . $challenge->title)}">{$challenge->title}</a>
-	{/foreach}
-</div>
@@ -1,7 +1,7 @@
 {
    "name": "pablouser1/proxitok",
    "description": "An alternative frontend for TikTok",
-    "version": "2.4.2.3",
+    "version": "2.4.3.5",
    "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": "0b40437551f24ae25f01113a85564867",
+    "content-hash": "5ed78859acc6f451f60b75dca1887104",
    "packages": [
        {
            "name": "bramus/router",
@@ -117,22 +117,22 @@
        },
        {
            "name": "latte/latte",
-            "version": "v2.11.5",
+            "version": "v2.11.6",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/latte.git",
-                "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1"
+                "reference": "af4dbb23a6044b1cf4904830a9b00246318c93d4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/89e647e51213af8a270fe9903b8735a2f6c83ad1",
-                "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1",
+                "url": "https://api.github.com/repos/nette/latte/zipball/af4dbb23a6044b1cf4904830a9b00246318c93d4",
+                "reference": "af4dbb23a6044b1cf4904830a9b00246318c93d4",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "ext-tokenizer": "*",
-                "php": ">=7.1 <8.2"
+                "php": ">=7.1 <8.3"
            },
            "conflict": {
                "nette/application": "<2.4.1"
@@ -195,9 +195,9 @@
            ],
            "support": {
                "issues": "https://github.com/nette/latte/issues",
-                "source": "https://github.com/nette/latte/tree/v2.11.5"
+                "source": "https://github.com/nette/latte/tree/v2.11.6"
            },
-            "time": "2022-06-26T10:12:18+00:00"
+            "time": "2022-11-04T14:53:52+00:00"
        },
        {
            "name": "m1/env",
@@ -263,16 +263,16 @@
        },
        {
            "name": "pablouser1/tikscraper",
-            "version": "v2.3.2.0",
+            "version": "v2.3.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "4b3c5952e1f9e126e2e1c80d006e70e759338c45"
+                "reference": "b62fad1c00a4d62eda3e86811d35f7241cac097e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/4b3c5952e1f9e126e2e1c80d006e70e759338c45",
-                "reference": "4b3c5952e1f9e126e2e1c80d006e70e759338c45",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/b62fad1c00a4d62eda3e86811d35f7241cac097e",
+                "reference": "b62fad1c00a4d62eda3e86811d35f7241cac097e",
                "shasum": ""
            },
            "require": {
@@ -305,9 +305,9 @@
            "description": "Get data from TikTok API",
            "support": {
                "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.2.0"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.3.1"
            },
-            "time": "2022-10-24T18:36:21+00:00"
+            "time": "2022-11-26T22:50:46+00:00"
        },
        {
            "name": "php-webdriver/webdriver",
@@ -406,16 +406,16 @@
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                "shasum": ""
            },
            "require": {
@@ -430,7 +430,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -469,7 +469,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
            },
            "funding": [
                {
@@ -485,20 +485,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
                "shasum": ""
            },
            "require": {
@@ -507,7 +507,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -552,7 +552,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
            },
            "funding": [
                {
@@ -568,7 +568,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-10T07:21:04+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/process",
@@ -16,5 +16,8 @@
@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/lock.scss";
+@import "./node_modules/css.gg/icons/scss/lock-unlock.scss";
+
 // Video
@import "./node_modules/css.gg/icons/scss/music.scss";
@@ -2,8 +2,8 @@
  "name": "proxitok-scss",
  "private": true,
  "scripts": {
-    "bulma": "sass --style=compressed bulma.scss ../styles/vendor/bulma.min.css",
-    "cssgg": "sass --style=compressed cssgg.scss ../styles/vendor/cssgg.min.css"
+    "bulma": "sass --style=compressed bulma.scss ../../styles/vendor/bulma.min.css",
+    "cssgg": "sass --style=compressed cssgg.scss ../../styles/vendor/cssgg.min.css"
  },
  "dependencies": {
    "bulma": "^0.9.3",
@@ -3,9 +3,9 @@


 anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
  dependencies:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"
@@ -118,9 +118,9 @@ readdirp@~3.6.0:
    picomatch "^2.2.1"

 sass@^1.46.0:
-  version "1.55.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c"
-  integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==
+  version "1.56.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.1.tgz#94d3910cd468fd075fa87f5bb17437a0b617d8a7"
+  integrity sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==
  dependencies:
    chokidar ">=3.0.0 <4.0.0"
    immutable "^4.0.0"
@@ -2,7 +2,6 @@
 /** @var \Bramus\Router\Router $router */

 use App\Helpers\ErrorHandler;
-use App\Helpers\Misc;
 use App\Helpers\Wrappers;
 use App\Models\BaseTemplate;

@@ -11,18 +10,15 @@ $router->set404(function () {
 });

 $router->get('/', function () {
-    $latte = Wrappers::latte();
-    $latte->render(Misc::getView('home'), new BaseTemplate('Home'));
+    Wrappers::latte('home', new BaseTemplate('Home'));
 });

 $router->get('/about', function () {
-    $latte = Wrappers::latte();
-    $latte->render(Misc::getView('about'), new BaseTemplate('About'));
+    Wrappers::latte('about', new BaseTemplate('About'));
 });

 $router->get('/verify', function () {
-    $latte = Wrappers::latte();
-    $latte->render(Misc::getView('verify'), new BaseTemplate('Verify'));
+    Wrappers::latte('verify', new BaseTemplate('verify'));
 });

 $router->get('/stream', 'ProxyController@stream');
@@ -57,6 +53,7 @@ $router->mount('/settings', function () use ($router) {
    $router->get('/', 'SettingsController@index');
    $router->post('/general', 'SettingsController@general');
    $router->post('/api', 'SettingsController@api');
+    $router->post('/misc', 'SettingsController@misc');
 });

 $router->get('/discover', 'DiscoverController@get');
@@ -5,12 +5,12 @@
  "orientation": "portrait-primary",
  "icons": [
    {
-      "src": "./android-chrome-192x192.png",
+      "src": "android-chrome-192x192.png",
      "sizes": "192x192",
      "type": "image/png"
    },
    {
-      "src": "./android-chrome-512x512.png",
+      "src": "android-chrome-512x512.png",
      "sizes": "512x512",
      "type": "image/png"
    }
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../scss/node_modules/css.gg/icons/scss/home.scss","../../scss/node_modules/css.gg/icons/scss/options.scss","../../scss/node_modules/css.gg/icons/scss/info.scss","../../scss/node_modules/css.gg/icons/scss/code-slash.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","../../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,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/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"}
@@ -0,0 +1,35 @@
+<head>
+	<meta charset="UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel="apple-touch-icon" sizes="180x180" href="{path('/apple-touch-icon.png')}">
+	<link rel="icon" type="image/png" sizes="32x32" href="{path('/favicon-32x32.png')}">
+	<link rel="icon" type="image/png" sizes="16x16" href="{path('/favicon-16x16.png')}">
+	<link rel="manifest" href="{path('/site.webmanifest')}">
+	{if isset($og, $og_content, $og_url)}
+		<!-- Using TikTok's meta config -->
+		<meta property="og:title" content="{$og->title}" />
+		<meta property="og:description" content="{$og->description}" />
+		<meta property="og:url" content="{$og_url}" />
+		<meta property="og:image" content="{url_stream($og_content)}" />
+		<meta property="twitter:title" content="{$og->title}" />
+		<meta property="twitter:description" content="{$og->description}" />
+		<meta property="twitter:image" content="{url_stream($og_content)}" />
+	{else}
+		<!-- Using predifined ProxiTok config -->
+		<meta property="og:title" content="{$title}" />
+		<meta property="og:description" content="Alternative frontend for TikTok" />
+		<meta property="twitter:title" content="{$title}" />
+		<meta property="twitter:description" content="Alternative frontend for TikTok" />
+	{/if}
+	<meta property="og:site_name" content="ProxiTok" />
+	<meta property="og:type" content="website" />
+	<meta property="twitter:card" content="summary" />
+	<meta property="twitter:site" content="ProxiTok" />
+	{if isset($has_rss)}
+		<link rel="alternate" type="application/rss+xml" title="{$title}" href="{$_SERVER['REQUEST_URI'] . '/rss'}" />
+	{/if}
+	<link rel="stylesheet" href="{static('css', 'cssgg.min.css', true)}">
+	<link rel="stylesheet" href="{static('css', 'bulma.min.css', true)}">
+	<title>{$title} - ProxiTok</title>
+</head>
@@ -26,4 +26,4 @@
 		</div>
  </div>
 </nav>
-<script src="{path('/scripts/navbar.js')}"></script>
+<script src="{static('js', 'navbar.js')}"></script>
@@ -1,13 +1,13 @@
-<link rel="stylesheet" href="{path('/styles/themes/card.css')}">
+<link rel="stylesheet" href="{static('css', 'themes/card.css')}">
 <noscript>JavaScript is required for this section to work!</noscript>
 <section class="section">
  <div class="columns is-multiline is-vcentered">
-		{foreach $data->feed->items as $item}
+		{foreach $feed->items as $item}
 		{do $share_url = url_video_external($item->author->uniqueId, $item->id)}
    <div class="column is-one-quarter clickable-img" id="{$item->id}" onclick="openVideo(this.id)"
 			data-video_url="{url_stream($item->video->playAddr)}"
-			data-video_download_watermark="{url_download($item->video->playAddr, $item->author->uniqueId, true)}"
-			data-video_download_nowatermark="{url_download($item->video->playAddr, $item->author->uniqueId, false)}"
+			data-video_download_watermark="{url_download($item->video->playAddr, $item->author->uniqueId, $item->id, true)}"
+			data-video_download_nowatermark="{url_download(url_video_external($item->author->uniqueId, $item->id), $item->author->uniqueId, $item->id, false)}"
 			data-video_share_url="{$share_url}"
 			data-desc="{$item->desc}"
 			data-createtime="{$item->createTime}"
@@ -17,7 +17,7 @@
 			<img class="hidden" loading="lazy" data-src="{url_stream($item->video->dynamicCover)}" />
    </div>
    {/foreach}
-		{if empty($data->feed->items)}
+		{if empty($feed->items)}
 		<p class="title">No items sent by TikTok!</p>
 		{/if}
  </div>
@@ -67,4 +67,4 @@
    </footer>
  </div>
 </div>
-<script src="{path('/scripts/themes/card.js')}"></script>
+<script src="{static('js', 'themes/card.js')}"></script>
@@ -1,13 +1,13 @@
 <div class="dropdown is-hoverable">
 	<div class="dropdown-trigger">
-		<button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
+		<button class="button is-success" aria-haspopup="true" aria-controls="dropdown-menu">
 			{include '../../icon.latte', icon: 'software-download', text: 'Download'}
 		</button>
 	</div>
 	<div class="dropdown-menu" role="menu">
 		<div class="dropdown-content">
-			<a target="_blank" href="{url_download($playAddr, $uniqueId, true)}" class="dropdown-item">Watermark</a>
-			<a target="_blank" href="{url_download(url_video_external($uniqueId, $id), $uniqueId, false)}" class="dropdown-item">No watermark</a>
+			<a target="_blank" href="{url_download($playAddr, $uniqueId, $id, true)}" class="dropdown-item">Watermark</a>
+			<a target="_blank" href="{url_download(url_video_external($uniqueId, $id), $uniqueId, $id, false)}" class="dropdown-item">No watermark</a>
 		</div>
 	</div>
 </div>
@@ -0,0 +1,17 @@
+<div class="dropdown is-hoverable">
+	<div class="dropdown-trigger">
+		<button class="button is-primary" aria-haspopup="true" aria-controls="dropdown-menu">
+			{include '../../icon.latte', icon: 'share', text: 'Share'}
+		</button>
+	</div>
+	<div class="dropdown-menu" role="menu">
+		<div class="dropdown-content">
+			<a href="{url_video_internal($uniqueId, $id)}" class="dropdown-item has-text-success">
+				{include '../../icon.latte', icon: 'lock', text: 'Instance link'}
+			</a>
+			<a href="{url_video_external($uniqueId, $id)}" class="dropdown-item has-text-warning">
+				{include '../../icon.latte', icon: 'lock-unlock', text: 'Original Link'}
+			</a>
+		</div>
+	</div>
+</div>
@@ -0,0 +1,5 @@
+<div class="tags">
+	{foreach $challenges as $challenge}
+		<a class="tag is-rounded" href="{path('/tag/' . $challenge->title)}">#{$challenge->title}</a>
+	{/foreach}
+</div>
@@ -1,9 +1,9 @@
 <div class="container">
-	{foreach $data->feed->items as $item}
+	{foreach $feed->items as $item}
 	<article class="media">
  	<figure class="media-left">
    	<p class="image is-64x64">
-      	<img src="{url_stream($item->author->avatarThumb)}" />
+      	<img class="is-rounded" src="{url_stream($item->author->avatarThumb)}" />
    	</p>
  	</figure>
  	<div class="media-content">
@@ -31,7 +31,7 @@
  	</div>
 	</article>
 	{/foreach}
-	{if empty($data->feed->items)}
+	{if empty($feed->items)}
 		<p class="title">No items sent by TikTok!</p>
 	{/if}
 </div>
@@ -9,7 +9,7 @@
 			{include '../components/navbar.latte'}
 		</div>
 		<div class="hero-body">
-			<div class="container has-text-centered">
+			<div class="container">
 				{block content}{/block}
 			</div>
    </div>
@@ -1,8 +1,8 @@
 {layout '../layouts/hero.latte'}

 {block content}
-	<p class="title">Welcome to ProxiTok!</p>
-	<p class="subtitle">An alternative open source frontend for TikTok</p>
+	<p class="title has-text-centered">Welcome to ProxiTok!</p>
+	<p class="subtitle has-text-centered">An alternative open source frontend for TikTok</p>
 	{embed '../components/form.latte', path: '/redirect', method: 'GET'}
 		{block fields}
 			<div class="field has-addons has-addons-centered">
@@ -0,0 +1,11 @@
+{layout '../layouts/default.latte'}
+
+{block header}
+	<p class="title">{$info->detail->title}</p>
+	<p class="subtitle">{$info->detail->desc}</p>
+	<p>Videos: {number($info->stats->videoCount)}</p>
+{/block}
+
+{block content}
+	{include '../components/feed.latte'}
+{/block}
@@ -1,18 +1,16 @@
 {contentType application/rss+xml}
-{do header('Content-Disposition: attachment; filename="' . $title . '.rss' . '"')}
-{var $full_link = path($link)}
 <?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
 		<title>{$title}</title>
 		<description><![CDATA[{$desc}]]></description>
-		<link>{$full_link}</link>
-		<atom:link href="{$full_link . '/rss'}" rel="self" type="application/rss+xml"></atom:link>
+		<link>{$link}</link>
+		<atom:link href="{$link . '/rss'}" rel="self" type="application/rss+xml"></atom:link>
 		{foreach $items as $item}
 			<item>
 				<title>{$item->desc}</title>
-				<description><![CDATA[<p>{$item->desc}</p><video controls="controls" preload="auto" src="{path('/stream?url=' . urlencode($item->video->playAddr))}"></video>]]></description>
-				<link>{path('/@' . $item->author->uniqueId . '/video/' . $item->id)}</link>
+				<description><![CDATA[<p>{$item->desc}</p><video controls="controls" preload="auto" src="{url_stream($item->video->playAddr)}"></video>]]></description>
+				<link>{url_video_internal($item->author->uniqueId, $item->id)}</link>
 				<pubDate>{date('r', $item->createTime)}</pubDate>
 				<guid isPermaLink="false">{$item->id}</guid>
 			</item>
@@ -0,0 +1,17 @@
+{layout '../layouts/default.latte'}
+
+{block header}
+	<p class="title">Settings</p>
+{/block}
+
+{block content}
+	<div class="content">
+		<p class="title">General</p>
+		{include '../components/settings/general.latte'}
+	</div>
+	<hr />
+	<div class="content">
+		<p class="title">Api</p>
+		{include '../components/settings/api.latte'}
+	</div>
+{/block}
@@ -0,0 +1,22 @@
+{layout '../layouts/default.latte'}
+
+{var $has_rss = true}
+
+{var $og = $info->meta->og}
+{var $og_content = $info->detail->profileLarger}
+{var $og_url = url_tag($info->detail->title)}
+
+{block header}
+	{if $info->detail->profileLarger !== ''}
+	<figure class="image is-inline-block is-128x128">
+		<img class="is-rounded" src="{url_stream($info->detail->profileLarger)}" />
+	</figure>
+	{/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>
+{/block}
+
+{block content}
+	{include '../components/feed.latte'}
+{/block}
@@ -0,0 +1,22 @@
+{layout '../layouts/default.latte'}
+
+{var $has_rss = true}
+
+{var $og = $info->meta->og}
+{var $og_content = $info->detail->avatarLarger}
+{var $og_url = url_user($info->detail->uniqueId)}
+
+{block header}
+	<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="subtitle">{include '../components/rss.latte'}</p>
+	<p>{$info->detail->signature}</p>
+	<p>Following: {number($info->stats->followingCount)} / Followers: {number($info->stats->followerCount)}</p>
+	<p>Hearts: {number($info->stats->heartCount)} / Videos: {$info->stats->videoCount}</p>
+{/block}
+
+{block content}
+	{include '../components/feed.latte'}
+{/block}
@@ -0,0 +1,46 @@
+{layout "../layouts/{$layout}.latte"}
+
+{var $og = $info->meta->og}
+{var $og_content = $item->video->originCover}
+{var $og_url = url_video_internal($info->detail->uniqueId, $item->id)}
+
+{block content}
+	<div class="columns is-centered is-vcentered is-gapless">
+		<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>
+		</div>
+		<div class="column">
+			<div class="box">
+				<article class="media">
+  				<figure class="media-left">
+  			  	<p class="image is-64x64">
+  			    	<img src="{url_stream($info->detail->avatarThumb)}" />
+  			  	</p>
+  				</figure>
+  				<div class="media-content">
+  			    <p>
+  			    	<strong>{$info->detail->nickname}</strong>
+							<small>
+								<a href="{url_user($info->detail->uniqueId)}">@{$info->detail->uniqueId}</a>
+							</small>
+							<small title="{date('M d, Y H:i:s e', $item->createTime)}">{date('M d, Y', $item->createTime)}</small>
+  			    </p>
+						{if !empty($item->challenges)}
+						<p>{include '../components/themes/common/tags.latte', challenges: $item->challenges}</p>
+						{/if}
+						<div class="content">
+							<p n:ifcontent>{$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}
+							<div class="has-text-centered">
+								{include '../components/themes/common/share.latte', uniqueId: $info->detail->uniqueId, id: $item->id}
+								{include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $info->detail->uniqueId}
+							</div>
+						</div>
+  				</div>
+				</article>
+			</div>
+		</div>
+	</div>
+{/block}
@@ -1,11 +0,0 @@
-{layout '../layouts/default.latte'}
-
-{block header}
-	<p class="title">{$data->info->detail->title}</p>
-	<p class="subtitle">{$data->info->detail->desc}</p>
-	<p>Videos: {number($data->info->stats->videoCount)}</p>
-{/block}
-
-{block content}
-	{include '../components/feed.latte'}
-{/block}
@@ -1,13 +0,0 @@
-{layout '../layouts/default.latte'}
-
-{block header}
-	<p class="title">Settings</p>
-{/block}
-
-{block content}
-	<p class="title">General</p>
-	{include '../components/settings/general.latte'}
-	<hr />
-	<p class="title">Api</p>
-	{include '../components/settings/api.latte'}
-{/block}
@@ -1,18 +0,0 @@
-{layout '../layouts/default.latte'}
-
-{var $has_rss = true}
-
-{block header}
-	{if $data->info->detail->profileThumb !== ''}
-	<figure class="figure is-96x96">
-		<img src="{path('/stream?url=' . urlencode($data->info->detail->profileThumb))}" />
-	</figure>
-	{/if}
-	<p class="title">{$data->info->detail->title}</p>
-	<p class="subtitle">{include '../components/rss.latte'}</p>
-	<p>Videos: {number($data->info->stats->videoCount)} / Views: {number($data->info->stats->viewCount)}</p>
-{/block}
-
-{block content}
-	{include '../components/feed.latte'}
-{/block}
@@ -1,18 +0,0 @@
-{layout '../layouts/default.latte'}
-
-{var $has_rss = true}
-
-{block header}
-	<figure class="figure is-96x96">
-		<img src="{path('/stream?url=' . urlencode($data->info->detail->avatarThumb))}" />
-	</figure>
-	<p class="title">{$data->info->detail->uniqueId}</p>
-	<p class="subtitle">{include '../components/rss.latte'}</p>
-	<p>{$data->info->detail->signature}</p>
-	<p>Following: {number($data->info->stats->followingCount)} / Followers: {number($data->info->stats->followerCount)}</p>
-	<p>Hearts: {number($data->info->stats->heartCount)} / Videos: {$data->info->stats->videoCount}</p>
-{/block}
-
-{block content}
-	{include '../components/feed.latte'}
-{/block}
@@ -1,25 +0,0 @@
-{layout "../layouts/{$layout}.latte"}
-
-{block content}
-	<div class="columns has-text-centered is-centered is-vcentered is-gapless">
-		<div class="column">
-			<video controls autoplay poster="{url_stream($item->video->originCover)}">
-				<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
-			</video>
-		</div>
-		<div class="column">
-			<div class="box">
-				<p class="title">Video by <a href="{url_user($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}
-				<div class="container mt-4">
-					<p>{include '../components/icon.latte', icon: 'music', text: $item->music->title}</p>
-      		<audio src="{url_stream($item->music->playUrl)}" controls preload="none"></audio>
-				</div>
-				<hr />
-				{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}
-			</div>
-		</div>
-	</div>
-{/block}
Author	SHA1	Message	Date
Pablo Ferreiro	215f984fe4	Properly implemented OG	2022-11-26 23:51:45 +01:00
Pablo Ferreiro	ee6e8b0593	Revert "Added better og support" This reverts commit `fa3f1e0a7c`.	2022-11-26 23:36:20 +01:00
Pablo Ferreiro	fa3f1e0a7c	Added better og support	2022-11-26 23:28:59 +01:00
Pablo Ferreiro	ce5c9e016b	Better profile pic resolution	2022-11-26 22:25:48 +01:00
Pablo Ferreiro	49fcc79f15	bump	2022-11-22 20:45:53 +01:00
Pablo Ferreiro	b138f4bccc	misc folder and date on /video	2022-11-18 16:48:51 +01:00
Pablo Ferreiro	94da0e46ac	Internal fixes and cleanup	2022-11-04 20:08:19 +01:00
Pablo Ferreiro	1176bc35fe	web manifest tweaks and .latte structure	2022-11-04 18:02:57 +01:00
Pablo Ferreiro	4bfc4c9434	revert SW	2022-11-04 17:41:22 +01:00
Pablo Ferreiro	de85ba3e44	hotfix	2022-11-04 17:36:18 +01:00
Pablo Ferreiro	79fd699cee	revert auto register sw	2022-11-04 17:25:14 +01:00
Pablo Ferreiro	8f83a27885	autoregister sw	2022-11-04 17:14:21 +01:00
Pablo Ferreiro	cba59e66c7	WIP PWA support	2022-11-04 17:10:51 +01:00
Pablo Ferreiro	c925ca2a41	bump cosign	2022-11-03 11:27:18 +01:00
Pablo Ferreiro	32ea8b6b12	Merge pull request #91 from chrisnovakovic/redirect-selective-urlencode Redirect: URL-encode input term after processing input	2022-11-03 09:08:05 +00:00
Chris Novakovic	7d0df67ded	Redirect: URL-encode input term after processing input In the redirect controller, rather than URL-encoding the entire input term before processing it, only URL-encode (the relevant parts of) it in the URL that the redirect controller generates. This ensures that the original input term can be pattern-matched appropriately. Fixes #90.	2022-10-29 19:35:07 +01:00
Pablo Ferreiro	23583ef7ab	Fixed issue with download filename	2022-10-24 20:53:59 +02:00