Some anti-crash fixes

Add video to the feed content

.dockerignore

@@ -0,0 +1,8 @@
+node_modules
+/.env
+/.vscode
+/vendor
+/cache/latte/*
+!/cache/latte/.gitkeep
+/cache/api/*
+!/cache/api/.gitkeep

.env.example

@@ -1,19 +1,12 @@
-# APP_URL="http://localhost:8000" # Full url path, PLEASE REPLACE TO YOUR OWN ONE
+# APP_URL="http://localhost:8000" # Absolute path to proxitok instance
 # LATTE_CACHE=/tmp/proxitok_api # Path for Latte cache, leave commented for ./cache/latte
 
 # API CONFIG
-# API_FORCE_LEGACY=1 # Force legacy mode for wrapper
 # API_SIGNER_URL="https://example.com" # External signing service
 # API_BROWSER_URL="http://localhost:4444" # chromedriver url
-# API_TEST_ENDPOINTS=1 # Discomment for usage of testing TikTok endpoints, may help sometimes
+# API_TEST_ENDPOINTS=true # Uncomment for usage of testing TikTok endpoints, may help sometimes
 # API_CACHE=redis
 
-# Proxy Config, will be used to make TikTok requests, useful if having VERIFY_CODE issues
-# PROXY_HOST=HOSTNAME
-# PROXY_PORT=8080
-# PROXY_USERNAME=USERNAME
-# PROXY_PASSWORD=PASSWORD
-
 # Redis cache, used on Helpers\CacheEngines\RedisCache (CHOOSE ONE)
 # REDIS_HOST=localhost # Host or path to unix socket
 # REDIS_PORT=6379 # Set to -1 to use unix socket

.github/workflows/docker-publish.yml

@@ -0,0 +1,102 @@
+name: Docker
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:
+  push:
+    branches: [ master ]
+    # Publish semver tags as releases.
+    tags: [ 'v*.*.*' ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v2
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@main
+        with:
+          cosign-release: 'v1.9.0'
+
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Set some variables for the image
+        run: |
+          echo "IMAGE_VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: |
+            ghcr.io/${{ env.IMAGE_NAME }}:latest
+            ghcr.io/${{ env.IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+      - name: Sign the published Docker image
+        if: ${{ github.event_name != 'pull_request' }}
+        env:
+          COSIGN_EXPERIMENTAL: "true"
+        # This step uses the identity token to provision an ephemeral certificate
+        # against the sigstore community Fulcio instance.
+        run: cosign sign ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

Dockerfile

@@ -0,0 +1,25 @@
+FROM php:8-apache
+WORKDIR /var/www/html
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+RUN apt update -y && apt upgrade -y \
+    && apt install -y --no-install-recommends libzip-dev \
+    && pecl install redis zip \
+    && docker-php-ext-enable redis zip \
+    && a2enmod rewrite headers \
+    && mkdir /cache \
+    && chown -R www-data:www-data /cache \
+    && rm -rf /var/www/html/*
+
+# Copy project to /var/www/html
+COPY . .
+
+# Run composer and clean
+RUN composer update --no-cache \
+    && composer install --no-interaction --optimize-autoloader --no-dev --no-cache \
+    && apt autoclean -y \
+    && apt autoremove -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /usr/bin/composer
+
+EXPOSE 80
+CMD apachectl -D FOREGROUND

Procfile

@@ -1 +1 @@
-web: vendor/bin/heroku-php-nginx -C setup/nginx_heroku.conf
+web: vendor/bin/heroku-php-nginx -C setup/heroku/nginx.conf

README.md

@@ -4,12 +4,18 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
 ## Features
 * Privacy: All requests made to TikTok are server-side, so you will never connect to their servers
 * See user's feed
-* See trending
+* See trending and discovery tab
 * See tags
 * See video by id
-* Discovery
+* Themes
 * RSS Feed for user, trending and tag (just add /rss to the url)
 
+## Self-hosting
+Please check [this](https://github.com/pablouser1/ProxiTok/wiki/Self-hosting) wiki article for info on how to self-host your own instance
+
+## Public instances
+[This](https://github.com/pablouser1/ProxiTok/wiki/Public-instances) wiki article contains a list with all the known public instances.
+
 ## Extensions
 If you want to automatically redirect Tiktok links to ProxiTok you can use:
 * [Libredirect](https://github.com/libredirect/libredirect)
@@ -26,50 +32,17 @@ Pattern type: Regular Expression
 Apply to: Main window (address bar)
 ```
 
-## Installation
-Clone the repository and fetch the requiered external packages with:
-```bash
-composer install
-```
-Move the .env.example file to .env and modify it.
-
-Then you can run it using for example the PHP Development Server with:
-```bash
-php -S localhost:8080
-```
-
-## Configuration
-### Cache engines
-Available cache engines:
-* redis: Writes response to Redis
-* json: Writes response to JSON file
-
-### Apache
-You don't have to do anything more
-
-### Nginx
-```
-location / {
-    try_files $uri $uri/ /index.php?$query_string;
-}
-
-location /.env {
-    deny all;
-    return 404;
-}
-```
-
 ## TODO / Known issues
-* Docker
-* Full installation instructions
-* Add a NoJS version / Make the whole program without required JS
 * Make video on /video fit screen and don't overflow
-* i18n
+* Fix embed styling
+* Fix crash when invalid vm.tiktok.com/CODE or www.tiktok.com/t/CODE is provided
+* Add custom amount of videos per page
 
 ## Credits
+[@TheFrenchGhosty](https://github.com/TheFrenchGhosty): Initial Dockerfile and fixes to a usable state. You can check his Docker image [here](https://github.com/PussTheCat-org/docker-proxitok-quay) on Github or [here](https://quay.io/repository/pussthecatorg/proxitok) on Quay
+### External libraries
 * [TikScraperPHP](https://github.com/pablouser1/TikScraperPHP)
 * [Latte](https://github.com/nette/latte)
 * [bramus/router](https://github.com/bramus/router)
 * [PHP dotenv](https://github.com/vlucas/phpdotenv)
 * [Bulma](https://github.com/jgthms/bulma) and [Bulmaswatch](https://github.com/jenil/bulmaswatch)
-* [FeedWriter](https://github.com/mibe/FeedWriter)

app.json

@@ -0,0 +1,39 @@
+{
+    "name": "ProxiTok",
+    "description": "Open source alternative frontend for TikTok",
+    "keywords": [
+        "php",
+        "tiktok",
+        "alternative-frontends"
+    ],
+    "website": "https://github.com/pablouser1/ProxiTok",
+    "repository": "https://github.com/pablouser1/ProxiTok",
+    "env": {
+        "APP_URL": {
+            "description": "Your instance url (example: https://proxitok.herokuapp.com)"
+        },
+        "API_CACHE": {
+            "description": "Cache system in use",
+            "value": "redis"
+        },
+        "LATTE_CACHE": {
+            "description": "Latte cache path",
+            "value": "/tmp/latte"
+        },
+        "API_SIGNER_URL": {
+            "description": "Remote signer url",
+            "value": "https://signtok.vercel.app/api"
+        }
+    },
+    "addons": [
+        {
+            "plan": "heroku-redis:hobby-dev",
+            "as": "REDIS"
+        }
+    ],
+    "buildpacks": [
+        {
+            "url": "heroku/php"
+        }
+    ]
+}

app/Controllers/DiscoverController.php

@@ -3,14 +3,15 @@ namespace App\Controllers;
 
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
+use App\Helpers\Wrappers;
 use App\Models\FeedTemplate;
 
 class DiscoverController {
     static public function get() {
-        $api = Misc::api();
-        $feed = $api->getDiscover();
+        $api = Wrappers::api();
+        $feed = $api->discover();
         if ($feed->meta->success) {
-            $latte = Misc::latte();
+            $latte = Wrappers::latte();
             $latte->render(Misc::getView('discover'), new FeedTemplate('Discover', $feed));
         } else {
             ErrorHandler::show($feed->meta);

app/Controllers/EmbedController.php

@@ -0,0 +1,20 @@
+<?php
+namespace App\Controllers;
+
+use App\Helpers\ErrorHandler;
+use App\Helpers\Misc;
+use App\Helpers\Wrappers;
+use App\Models\VideoTemplate;
+
+class EmbedController {
+    static public function v2(int $id) {
+        $api = Wrappers::api();
+        $feed = $api->getVideoByID($id);
+        if ($feed->meta->success) {
+            $latte = Wrappers::latte();
+            $latte->render(Misc::getView('video'), new VideoTemplate($feed->items[0], $feed->info->detail, true));
+        } else {
+            ErrorHandler::show($feed->meta);
+        }
+    }
+}

app/Controllers/MusicController.php

@@ -3,19 +3,22 @@ namespace App\Controllers;
 
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
-use App\Models\FeedTemplate;
+use App\Helpers\Wrappers;
+use App\Models\FullTemplate;
 
 class MusicController {
     static public function get(string $music_id) {
         $cursor = Misc::getCursor();
 
-        $api = Misc::api();
-        $feed = $api->getMusicFeed($music_id, $cursor);
-        if ($feed->meta->success) {
-            $latte = Misc::latte();
-            $latte->render(Misc::getView('music'), new FeedTemplate('Music', $feed));
+        $api = Wrappers::api();
+        $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));
         } else {
-            ErrorHandler::show($feed->meta);
+            ErrorHandler::show($music->error());
         }
     }
 }

app/Controllers/RedirectController.php

@@ -7,17 +7,33 @@ use App\Helpers\Misc;
  */
 class RedirectController {
     static public function redirect() {
-        $endpoint = '';
-        if (isset($_GET['user'])) {
-            $endpoint = '/@' . $_GET['user'];
-        } else if (isset($_GET['tag'])) {
-            $endpoint = '/tag/' . $_GET['tag'];
-        } else if (isset($_GET['music'])) {
-            $endpoint = '/music/' . $_GET['music'];
-        } else if (isset($_GET['video'])) {
-            // The @username part is not used, but
-            // it is the schema that TikTok follows
-            $endpoint = '/@placeholder/video/' . $_GET['video'];
+        $endpoint = '/';
+        if (isset($_GET['type'], $_GET['term'])) {
+            $term = trim($_GET['term']);
+            switch ($_GET['type']) {
+                case 'user':
+                    // Remove @ if sent
+                    if ($term[0] === '@') {
+                        $term = substr($term, 1);
+                    }
+                    $endpoint = '/@' . $term;
+                    break;
+                case 'tag':
+                    // Remove # if sent
+                    if ($term[0] === '#') {
+                        $term = substr($term, 1);
+                    }
+                    $endpoint = '/tag/' . $term;
+                    break;
+                case 'music':
+                    $endpoint = '/music/' . $term;
+                    break;
+                case 'video':
+                    // The @username part is not used, but
+                    // it is the schema that TikTok follows
+                    $endpoint = '/@placeholder/video/' . $term;
+                    break;
+                }
         }
 
         $url = Misc::url($endpoint);

app/Controllers/SettingsController.php

@@ -3,34 +3,33 @@ namespace App\Controllers;
 
 use App\Helpers\Misc;
 use App\Helpers\Cookies;
-use App\Models\SettingsTemplate;
+use App\Helpers\Wrappers;
+use App\Models\BaseTemplate;
 
 class SettingsController {
     static public function index() {
-        $latte = Misc::latte();
-        $latte->render(Misc::getView('settings'), new SettingsTemplate);
+        $latte = Wrappers::latte();
+        $latte->render(Misc::getView('settings'), new BaseTemplate('Settings'));
+    }
+
+    static public function general() {
+        if (isset($_POST['theme'])) {
+            $theme = $_POST['theme'];
+            Cookies::set('theme', $theme);
+        }
+        self::redirect();
+    }
+    static public function api() {
+        // TODO, ADD COUNT
+        if (isset($_POST['api-test_endpoints'])) {
+            $test_endpoints = $_POST['api-test_endpoints'];
+            Cookies::set('api-test_endpoints', $test_endpoints);
+        }
+        self::redirect();
     }
 
     static private function redirect() {
         $url = Misc::url('/settings');
         header("Location: {$url}");
     }
-
-    static public function proxy() {
-        if (in_array(Cookies::PROXY, $_POST)) {
-            foreach (Cookies::PROXY as $proxy_element) {
-                Cookies::set($proxy_element, $_POST[$proxy_element]);
-            }
-        }
-        self::redirect();
-    }
-
-    static public function api() {
-        $legacy = 'off';
-        if (isset($_POST['api-legacy'])) {
-            $legacy = 'on';
-        }
-        Cookies::set('api-legacy', $legacy);
-        self::redirect();
-    }
 }

app/Controllers/TagController.php

@@ -3,30 +3,33 @@ namespace App\Controllers;
 
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
-use App\Helpers\RSS;
-use App\Models\FeedTemplate;
+use App\Helpers\Wrappers;
+use App\Models\FullTemplate;
+use App\Models\RSSTemplate;
 
 class TagController {
     static public function get(string $name) {
         $cursor = Misc::getCursor();
-        $api = Misc::api();
-        $feed = $api->getHashtagFeed($name, $cursor);
-        if ($feed->meta->success) {
-            $latte = Misc::latte();
-            $latte->render(Misc::getView('tag'), new FeedTemplate('Tag', $feed));
+        $api = Wrappers::api();
+        $hashtag = $api->hashtag($name);
+        $hashtag->feed($cursor);
+        if ($hashtag->ok()) {
+            $data = $hashtag->getFull();
+            $latte = Wrappers::latte();
+            $latte->render(Misc::getView('tag'), new FullTemplate('Tag', $data));
         } else {
-            ErrorHandler::show($feed->meta);
+            ErrorHandler::show($hashtag->error());
         }
     }
 
     static public function rss(string $name) {
-        $api = Misc::api();
-        $feed = $api->getHashtagFeed($name);
-        if ($feed->meta->success) {
-            $feed = RSS::build("/tag/{$name}", "{$name} Tag", $feed->info->detail->desc, $feed->items);
-            // Setup headers
-            RSS::setHeaders('tag.rss');
-            echo $feed;
+        $api = Wrappers::api();
+        $hashtag = $api->hashtag($name);
+        $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));
         }
     }
 }

app/Controllers/TrendingController.php

@@ -4,36 +4,35 @@ namespace App\Controllers;
 use App\Helpers\Misc;
 use App\Models\FeedTemplate;
 use App\Helpers\ErrorHandler;
-use App\Helpers\RSS;
+use App\Helpers\Wrappers;
+use App\Models\RSSTemplate;
 
 class TrendingController {
     static public function get() {
+        $api = Wrappers::api();
         $cursor = Misc::getTtwid();
-        $api = Misc::api();
 
-        // Ttwid if normal, cursor if legacy
-        if ($api::class === 'TikScraper\Api') {
-            $cursor = Misc::getTtwid();
-        } else {
-            $cursor = Misc::getCursor();
-        }
-        $feed = $api->getTrending($cursor);
-        if ($feed->meta->success) {
-            $latte = Misc::latte();
+        $trending = $api->trending();
+        $trending->feed($cursor);
+
+        $feed = $trending->getFeed();
+        if ($feed && $feed->meta->success) {
+            $latte = Wrappers::latte();
             $latte->render(Misc::getView('trending'), new FeedTemplate('Trending', $feed));
         } else {
-            ErrorHandler::show($feed->meta);
+            ErrorHandler::show($trending->error());
         }
     }
 
     static public function rss() {
-        $api = Misc::api();
-        $feed = $api->getTrending();
-        if ($feed->meta->success) {
-            $feed = RSS::build('/trending', 'Trending', 'Tiktok trending', $feed->items);
-            // Setup headers
-            RSS::setHeaders('trending.rss');
-            echo $feed;
+        $api = Wrappers::api();
+        $trending = $api->trending();
+        $trending->feed();
+
+        $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));
         }
     }
 }

app/Controllers/UserController.php

@@ -3,46 +3,52 @@ namespace App\Controllers;
 
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
-use App\Helpers\RSS;
-use App\Models\FeedTemplate;
+use App\Helpers\Wrappers;
+use App\Models\FullTemplate;
+use App\Models\RSSTemplate;
+use App\Models\VideoTemplate;
 
 class UserController {
     static public function get(string $username) {
         $cursor = Misc::getCursor();
-        $api = Misc::api();
-        $feed = $api->getUserFeed($username, $cursor);
-        if ($feed->meta->success) {
-            if ($feed->info->detail->privateAccount) {
+        $api = Wrappers::api();
+        $user = $api->user($username);
+        $user->feed($cursor);
+        if ($user->ok()) {
+            $data = $user->getFull();
+            if ($data->info->detail->privateAccount) {
                 http_response_code(403);
                 echo 'Private account detected! Not supported';
                 exit;
             }
-            $latte = Misc::latte();
-            $latte->render(Misc::getView('user'), new FeedTemplate($feed->info->detail->nickname, $feed));
+            $latte = Wrappers::latte();
+            $latte->render(Misc::getView('user'), new FullTemplate($data->info->detail->nickname, $data));
         } else {
-            ErrorHandler::show($feed->meta);
+            ErrorHandler::show($user->error());
         }
     }
 
     static public function video(string $username, string $video_id) {
-        $api = Misc::api();
-        $feed = $api->getVideoByID($video_id);
-        if ($feed->meta->success) {
-            $latte = Misc::latte();
-            $latte->render(Misc::getView('video'), new FeedTemplate('Video', $feed));
+        $api = Wrappers::api();
+        $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));
         } else {
-            ErrorHandler::show($feed->meta);
+            ErrorHandler::show($video->error());
         }
     }
 
     static public function rss(string $username) {
-        $api = Misc::api();
-        $feed = $api->getUserFeed($username);
-        if ($feed->meta->success) {
-            $feed = RSS::build('/@'.$username, $feed->info->detail->nickname, $feed->info->detail->signature, $feed->items);
-            // Setup headers
-            RSS::setHeaders('user.rss');
-            echo $feed;
+        $api = Wrappers::api();
+        $user = $api->user($username);
+        $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));
         }
     }
 }

app/Controllers/VideoController.php

@@ -1,9 +1,6 @@
 <?php
 namespace App\Controllers;
 
-/**
- * @deprecated Please use UserController::video instead
- */
 class VideoController {
     static public function get(string $video_id) {
         UserController::video('placeholder', $video_id);

app/Helpers/Cookies.php

@@ -2,19 +2,31 @@
 namespace App\Helpers;
 
 class Cookies {
-    const PROXY = ['host', 'port', 'user', 'password'];
+    const ALLOWED_THEMES = ['default', 'card'];
 
-    static public function get(string $name): ?string {
+    static public function get(string $name, string $default_value = ''): string {
         if (isset($_COOKIE[$name]) && !empty($_COOKIE[$name])) {
             return $_COOKIE[$name];
         }
-        return null;
+        return $default_value;
+    }
+
+    static public function theme(): string {
+        $theme = self::get('theme');
+        if ($theme && in_array($theme, self::ALLOWED_THEMES)) {
+            return $theme;
+        }
+        return 'default';
     }
 
     static public function exists(string $name): bool {
         return isset($_COOKIE[$name]);
     }
 
+    static public function check(string $name, string $value): bool {
+        return self::exists($name) && $_COOKIE[$name] === $value;
+    }
+
     static public function set(string $name, string $value) {
         setcookie($name, $value, time()+60*60*24*30, '/', '', isset($_SERVER['HTTPS']), true);
     }

app/Helpers/ErrorHandler.php

@@ -2,11 +2,12 @@
 namespace App\Helpers;
 
 use App\Models\ErrorTemplate;
+use TikScraper\Models\Meta;
 
 class ErrorHandler {
-    static public function show(object $meta) {
+    static public function show(Meta $meta) {
         http_response_code($meta->http_code);
-        $latte = Misc::latte();
+        $latte = Wrappers::latte();
         $latte->render(Misc::getView('error'), new ErrorTemplate($meta));
     }
 }

app/Helpers/Misc.php

@@ -1,19 +1,16 @@
 <?php
 namespace App\Helpers;
 
-use App\Cache\JSONCache;
-use App\Cache\RedisCache;
-
 class Misc {
     static public function getCursor(): int {
         return isset($_GET['cursor']) && is_numeric($_GET['cursor']) ? (int) $_GET['cursor'] : 0;
     }
 
     static public function getTtwid(): string {
-        return $_GET['cursor'] ?? '';
+        return isset($_GET['cursor']) ? $_GET['cursor'] : '';
     }
 
-    static public function url(string $endpoint = '') {
+    static public function url(string $endpoint = ''): string {
         return self::env('APP_URL', '') . $endpoint;
     }
 
@@ -27,97 +24,4 @@ class Misc {
     static public function getView(string $template): string {
         return __DIR__ . "/../../views/{$template}.latte";
     }
-
-    /**
-     * Setup of TikTok Api wrapper
-     * @return \TikScraper\Api|\TikScraper\Legacy
-     */
-    static public function api() {
-        $options = [
-            'use_test_endpoints' => self::env('API_TEST_ENDPOINTS', false),
-            // Instance level proxy config
-            'proxy' => [
-                'host' => self::env('PROXY_HOST', null),
-                'port' => self::env('PROXY_PORT', null),
-                'user' => self::env('PROXY_USER', null),
-                'password' => self::env('PROXY_PASSWORD', null)
-            ],
-            'signer' => [
-                'remote_url' => self::env('API_SIGNER_URL', ''),
-                'browser_url' => self::env('API_BROWSER_URL', ''),
-                'close_when_done' => false
-            ]
-        ];
-        // User level proxy config, will overwrite instance config
-        foreach(Cookies::PROXY as $proxy_element) {
-            if (isset($_COOKIE[$proxy_element])) {
-                $options['proxy'][$proxy_element] = $_COOKIE[$proxy_element];
-            }
-        }
-        // Cache config
-        $cacheEngine = false;
-        if (isset($_ENV['API_CACHE'])) {
-            switch ($_ENV['API_CACHE']) {
-                case 'json':
-                    $cacheEngine = new JSONCache();
-                    break;
-                case '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!');
-                    }
-
-                    if (isset($_ENV['REDIS_URL'])) {
-                        $url = parse_url($_ENV['REDIS_URL']);
-                        $host = $url['host'];
-                        $port = $url['port'];
-                        $password = $url['pass'] ?? null;
-                    } else {
-                        $host = $_ENV['REDIS_HOST'];
-                        $port = (int) $_ENV['REDIS_PORT'];
-                        $password = isset($_ENV['REDIS_PASSWORD']) ? $_ENV['REDIS_PASSWORD'] : null;
-                    }
-                    $cacheEngine = new RedisCache($host, $port, $password);
-                    break;
-            }
-        }
-
-        // Legacy mode
-        $legacy = self::env('API_FORCE_LEGACY', false) || isset($_COOKIE['api-legacy']) && $_COOKIE['api-legacy'] === 'on';
-
-        return $legacy === false ? new \TikScraper\Api($options, $cacheEngine) : new \TikScraper\Legacy($options, $cacheEngine);
-    }
-
-    /**
-     * Setup of Latte template engine
-     */
-    static public function latte(): \Latte\Engine {
-        $latte = new \Latte\Engine;
-        $cache_path = self::env('LATTE_CACHE', __DIR__ . '/../../cache/latte');
-        $latte->setTempDirectory($cache_path);
-
-        // -- CUSTOM FUNCTIONS -- //
-        // Get URL with optional endpoint
-        $latte->addFunction('path', function (string $endpoint = ''): string {
-            return self::url($endpoint);
-        });
-        // Version being used
-        $latte->addFunction('version', function (): string {
-            return \Composer\InstalledVersions::getVersion('pablouser1/proxitok');
-        });
-        // 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;
-    }
 }

app/Helpers/RSS.php

@@ -1,34 +0,0 @@
-<?php
-namespace App\Helpers;
-
-use \FeedWriter\RSS2;
-use \TikScraper\Download;
-
-class RSS {
-    static public function build(string $endpoint, string $title, string $description, array $items): string {
-        $url = Misc::env('APP_URL', '');
-        $download = new Download();
-        $rss = new RSS2();
-        $rss->setTitle($title);
-        $rss->setDescription($description);
-        $rss->setLink($url . $endpoint);
-        $rss->setSelfLink($url . $endpoint . '/rss');
-        foreach ($items as $item) {
-            $item_rss = $rss->createNewItem();
-            $video = $item->video->playAddr;
-            $item_rss->setTitle($item->desc);
-            $item_rss->setDescription($item->desc);
-            $item_rss->setLink($url . '/video/' . $item->id);
-            $item_rss->setDate((int) $item->createTime);
-            $item_rss->setId($item->id, false);
-            $item_rss->addEnclosure($url . '/stream?url=' . urlencode($video), $download->file_size($video), 'video/mp4');
-            $rss->addItem($item_rss);
-        }
-        return $rss->generateFeed();
-    }
-
-    static public function setHeaders (string $filename) {
-        header('Content-Type: application/rss+xml');
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
-    }
-}

app/Helpers/Wrappers.php

@@ -0,0 +1,89 @@
+<?php
+namespace App\Helpers;
+
+use App\Cache\JSONCache;
+use App\Cache\RedisCache;
+
+class Wrappers {
+    /**
+     * Setup of Latte template engine
+     */
+    static public function latte(): \Latte\Engine {
+        $latte = new \Latte\Engine;
+        $cache_path = Misc::env('LATTE_CACHE', __DIR__ . '/../../cache/latte');
+        $latte->setTempDirectory($cache_path);
+
+        // -- CUSTOM FUNCTIONS -- //
+        // Get URL with optional endpoint
+        $latte->addFunction('path', function (string $endpoint = ''): string {
+            return Misc::url($endpoint);
+        });
+        // Version being used
+        $latte->addFunction('version_frontend', function (): string {
+            return \Composer\InstalledVersions::getVersion('pablouser1/proxitok');
+        });
+        $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;
+        });
+        return $latte;
+    }
+
+    /**
+     * Setup of TikTok Api wrapper
+     */
+    static public function api(): \TikScraper\Api {
+        $options = [
+            'use_test_endpoints' => Misc::env('API_TEST_ENDPOINTS', false) || isset($_COOKIE['api-test_endpoints']) && $_COOKIE['api-test_endpoints'] === 'yes',
+            'signer' => [
+                'remote_url' => Misc::env('API_SIGNER_URL', ''),
+                'browser_url' => Misc::env('API_BROWSER_URL', ''),
+                'close_when_done' => false
+            ]
+        ];
+        // Cache config
+        $cacheEngine = false;
+        if (isset($_ENV['API_CACHE'])) {
+            switch ($_ENV['API_CACHE']) {
+                case 'json':
+                    $cacheEngine = new JSONCache();
+                    break;
+                case '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!');
+                    }
+
+                    if (isset($_ENV['REDIS_URL'])) {
+                        $url = parse_url($_ENV['REDIS_URL']);
+                        $host = $url['host'];
+                        $port = $url['port'];
+                        $password = $url['pass'] ?? null;
+                    } else {
+                        $host = $_ENV['REDIS_HOST'];
+                        $port = (int) $_ENV['REDIS_PORT'];
+                        $password = isset($_ENV['REDIS_PASSWORD']) ? $_ENV['REDIS_PASSWORD'] : null;
+                    }
+                    $cacheEngine = new RedisCache($host, $port, $password);
+                    break;
+            }
+        }
+
+        return new \TikScraper\Api($options, $cacheEngine);
+    }
+}

app/Models/ErrorTemplate.php

@@ -1,8 +1,10 @@
 <?php
 namespace App\Models;
 
+use TikScraper\Models\Meta;
+
 class ErrorTemplate extends BaseTemplate {
-    public object $error;
+    public Meta $error;
 
     function __construct(object $error) {
         parent::__construct('Error');

app/Models/FeedTemplate.php

@@ -5,10 +5,12 @@ namespace App\Models;
 * Base for templates with a feed
 */
 class FeedTemplate extends BaseTemplate {
-    public object $feed;
+    public object $data;
 
     function __construct(string $title, object $feed) {
         parent::__construct($title);
-        $this->feed = $feed;
+        $this->data = (object) [
+            'feed' => $feed
+        ];
     }
 }

app/Models/FullTemplate.php

@@ -0,0 +1,16 @@
+<?php
+namespace App\Models;
+
+use TikScraper\Models\Full;
+
+/**
+* Base for templates with both info and feed
+*/
+class FullTemplate extends BaseTemplate {
+    public Full $data;
+
+    function __construct(string $title, Full $data) {
+        parent::__construct($title);
+        $this->data = $data;
+    }
+}

app/Models/HomeTemplate.php

@@ -1,34 +0,0 @@
-<?php
-namespace App\Models;
-
-/**
-* Exclusive for /
-*/
-class HomeTemplate extends BaseTemplate {
-    public array $forms = [
-        [
-            'title' => 'Search by user',
-            'input' => 'user',
-            'placeholder' => 'Type username'
-        ],
-        [
-            'title' => 'Search by video ID',
-            'input' => 'video',
-            'placeholder' => 'Type video ID'
-        ],
-        [
-            'title' => 'Search by tag',
-            'input' => 'tag',
-            'placeholder' => 'Type tag'
-        ],
-        [
-            'title' => 'Search by music ID',
-            'input' => 'music',
-            'placeholder' => 'Type music'
-        ]
-    ];
-
-    function __construct() {
-        parent::__construct('Home');
-    }
-}

app/Models/RSSTemplate.php

@@ -0,0 +1,19 @@
+<?php
+namespace App\Models;
+
+/**
+* Base for templates with a feed
+*/
+class RSSTemplate {
+    public string $title;
+    public string $desc;
+    public string $link;
+    public array $items;
+
+    function __construct(string $title, string $desc, string $link, array $items) {
+        $this->title = $title;
+        $this->desc = $desc;
+        $this->link = $link;
+        $this->items = $items;
+    }
+}

app/Models/SettingsTemplate.php

@@ -1,16 +0,0 @@
-<?php
-namespace App\Models;
-
-use App\Helpers\Cookies;
-
-/**
-* Exclusive for /settings
-*/
-class SettingsTemplate extends BaseTemplate {
-    public array $proxy_elements = [];
-
-    function __construct() {
-        parent::__construct('Settings');
-        $this->proxy_elements = Cookies::PROXY;
-    }
-}

app/Models/VideoTemplate.php

@@ -0,0 +1,22 @@
+<?php
+namespace App\Models;
+
+/**
+* Base for templates with a feed
+*/
+class VideoTemplate extends BaseTemplate {
+    public object $item;
+    public object $detail;
+    public string $layout = 'hero';
+
+    function __construct(object $item, object $detail, bool $isEmbed = false) {
+        parent::__construct('Video');
+        $this->item = $item;
+        $this->detail = $detail;
+        if ($isEmbed) {
+            $this->layout = 'embed';
+        } else {
+            $this->layout = 'hero';
+        }
+    }
+}

components/feed.latte

@@ -1,71 +1 @@
-<link rel="stylesheet" href="{path('/styles/feed.css')}">
-<noscript>JavaScript is required for this section to work!</noscript>
-<section class="section">
-  <div class="columns is-multiline is-vcentered">
-		{foreach $feed->items as $item}
-		{do $share_url = 'https://tiktok.com/@' . $item->author->uniqueId . '/video/' . $item->id}
-    <div class="column is-one-quarter clickable-img" id="{$item->id}" onclick="openVideo(this.id)"
-			data-video_url="{path('/stream?url=' . urlencode($item->video->playAddr))}"
-			data-video_download_watermark="{path('/download?url=' . urlencode($item->video->playAddr) . '&id=' . $item->id . '&user=' . $item->author->uniqueId) . '&watermark='}"
-			data-video_download_nowatermark="{path('/download?id=' . $item->id . '&user=' . $item->author->uniqueId)}"
-			data-video_share_url="{$share_url}"
-			data-desc="{$item->desc}"
-      data-music_title="{$item->music->title}"
-      data-music_url="{path('/stream?url=' . urlencode($item->music->playUrl))}">
-      <img loading="lazy" src="{path('/stream?url=' . urlencode($item->video->originCover))}" />
-			<img class="hidden" loading="lazy" data-src="{path('/stream?url=' . urlencode($item->video->dynamicCover))}" />
-    </div>
-    {/foreach}
-  </div>
-	<div n:ifset="$feed->info" class="buttons">
-		{if isset($_GET['cursor']) && $_GET['cursor'] != 0 }
-    	<a class="button is-danger" href="?">First</a>
-			<button class="button is-danger" onclick="history.back()">Back</button>
-		{/if}
-    <a n:attr="disabled => !$feed->hasMore" class="button is-success" href="?cursor={$feed->maxCursor}">Next</a>
-	</div>
-</section>
-
-<!-- MODAL -->
-<div id="modal" class="modal">
-	<div id="modal-background" class="modal-background"></div>
-	<div class="modal-card">
-		<header class="modal-card-head">
-			<button id="modal-close" class="delete" aria-label="close"></button>
-			<p class="modal-card-title" id="item_title"></p>
-		</header>
-		<section class="modal-card-body has-text-centered" style="overflow: hidden;">
-			<video id="video" autoplay controls></video>
-    </section>
-		<footer class="modal-card-foot has-text-centered">
-			<div class="container">
-				<div class="field has-addons has-addons-centered">
-					<div class="control">
-						<input id="share_input" class="input" readonly />
-					</div>
-					<div class="control">
-						<button class="button is-primary" onclick="copyShare()">Copy</button>
-					</div>
-				</div>
-				<div id="download_dropdown" class="dropdown is-hoverable">
-					<div class="dropdown-trigger">
-						<button id="download_button" class="button" aria-haspopup="true" aria-controls="dropdown-menu">Download</button>
-					</div>
-					<div class="dropdown-menu" role="menu">
-						<div class="dropdown-content">
-							<a id="download_watermark" target="_blank" class="dropdown-item">With watermark</a>
-							<a id="download_nowatermark" target="_blank" class="dropdown-item">Without watermark</a>
-						</div>
-					</div>
-				</div>
-        <p id="audio_title"></p>
-        <audio id="audio" controls preload="none"></audio>
-        <div class="buttons is-centered">
-					<button id="back-button" class="button is-danger">Back</button>
-          <button id="next-button" class="button is-success">Next</button>
-        </div>
-      </div>
-    </footer>
-  </div>
-</div>
-<script src="{path('/scripts/feed.js')}"></script>
+{include './themes/' . theme() . '.latte'}

components/footer.latte

@@ -1,8 +0,0 @@
-<footer class="footer">
-  <div class="content has-text-centered">
-    <p>
-      Made with <span style="color: #e25555;">&#9829;</span> in <a href="https://github.com/pablouser1/ProxiTok">Github</a>
-    </p>
-		<p>Version: {version()}</p>
-  </div>
-</footer>

components/form.latte

@@ -0,0 +1,10 @@
+<form action="{path($path)}" method="{$method}">
+	{block fields}{/block}
+	{ifset $submit}
+  	<div class="field">
+    	<div class="control">
+      	<button class="button is-success" type="submit">Submit</button>
+    	</div>
+  	</div>
+	{/ifset}
+</form>

components/head.latte

@@ -5,7 +5,10 @@
 	<meta property="og:title" content="ProxiTok" />
 	<meta property="og:description" content="Alternative frontend for TikTok" />
 	<meta property="og:type" content="website" />
-	<!-- <link rel="stylesheet" href="{path('/styles/vendor/fontawesome.min.css')}"> -->
+	{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>

components/icon.latte

@@ -0,0 +1,14 @@
+{define icon_common, $icon}
+<span class="icon">
+	<i class="gg-{$icon}"></i>
+</span>
+{/define}
+
+{if isset($text)}
+<span class="icon-text">
+	{include icon_common, icon: $icon}
+	<span>{$text}</span>
+</span>
+{else}
+{include icon_common, icon: $icon}
+{/if}

components/navbar.latte

@@ -9,9 +9,13 @@
 
   <div id="navbar-menu" class="navbar-menu">
     <div class="navbar-start">
-      <a href="{path('/')}" class="navbar-item">Home</a>
+      <a href="{path('/')}" class="navbar-item">
+				{include './icon.latte', icon: 'home', text: 'Home'}
+			</a>
       <a href="{path('/settings')}" class="navbar-item">Settings</a>
-      <a href="{path('/about')}" class="navbar-item">About</a>
+      <a href="{path('/about')}" class="navbar-item">
+				{include './icon.latte', icon: 'info', text: 'About'}
+			</a>
     </div>
   </div>
 </nav>

components/rss.latte

@@ -0,0 +1,3 @@
+<a href="{$_SERVER['REQUEST_URI'] . '/rss'}">
+	{include './icon.latte', icon: 'feed', text: 'RSS Feed'}
+</a>

components/settings/api.latte

@@ -1,14 +1,19 @@
-<form action="{path('/settings/api')}" method="POST">
+{embed '../form.latte', path: '/settings/api', method: 'POST', submit: true}
+{block fields}
+	{var $use_endpoints = \App\Helpers\Cookies::check('api-test_endpoints', 'yes')}
 	<div class="field">
-		<label class="checkbox">
-			<input name="api-legacy" type="checkbox"
-				checked="{isset($_COOKIE['api-legacy']) && $_COOKIE['api-legacy'] === 'on' ? 'true' : 'false'}"
-				value="{isset($_COOKIE['api-legacy']) ? $_COOKIE['api-legacy'] : 'off'}">Enable legacy mode
-		</label>
+		<label class="label">Use test endpoints</label>
+		<div class="control">
+			<label class="radio">
+    		<input type="radio" name="api-test_endpoints" value="yes" n:attr="checked => $use_endpoints" />
+				<span>Yes</span>
+			</label>
+			<label class="radio">
+    		<input type="radio" name="api-test_endpoints" value="no" n:attr="checked => !$use_endpoints" />
+				<span>No</span>
+			</label>
+		</div>
+		<p class="help">This <i>may</i> help bypass rate limits</p>
   </div>
-  <div class="field">
-    <div class="control">
-      <button class="button is-success" type="submit">Submit</button>
-    </div>
-  </div>
-</form>
+{/block}
+{/embed}

components/settings/general.latte

@@ -0,0 +1,14 @@
+{embed '../form.latte', path: '/settings/general', method: 'POST', submit: true}
+{block fields}
+	<div class="field">
+		<label class="label">Theme</label>
+		<div class="select">
+			<select name="theme">
+				<option hidden disabled selected value> -- Select an option -- </option>
+				<option value="default">Default</option>
+				<option value="card">Card</option>
+			</select>
+		</div>
+  </div>
+{/block}
+{/embed}

components/settings/proxy.latte

@@ -1,15 +0,0 @@
-<form action="{path('/settings/proxy')}" method="POST">
-	{foreach $proxy_elements as $proxy_element}
-	<div class="field">
-		<label class="label">{$proxy_element|firstUpper}</label>
-		<div class="control">
-      <input name="{$proxy_element}" class="input" value="{isset($_COOKIE[$proxy_element]) ? $_COOKIE[$proxy_element] : ''}" required />
-    </div>
-  </div>
-  {/foreach}
-  <div class="field">
-    <div class="control">
-      <button class="button is-success" type="submit">Submit</button>
-    </div>
-  </div>
-</form>

components/themes/card.latte

@@ -0,0 +1,70 @@
+<link rel="stylesheet" href="{path('/styles/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}
+		{do $share_url = 'https://tiktok.com/@' . $item->author->uniqueId . '/video/' . $item->id}
+    <div class="column is-one-quarter clickable-img" id="{$item->id}" onclick="openVideo(this.id)"
+			data-video_url="{path('/stream?url=' . urlencode($item->video->playAddr))}"
+			data-video_download_watermark="{path('/download?url=' . urlencode($item->video->playAddr) . '&id=' . $item->id . '&user=' . $item->author->uniqueId) . '&watermark='}"
+			data-video_download_nowatermark="{path('/download?id=' . $item->id . '&user=' . $item->author->uniqueId)}"
+			data-video_share_url="{$share_url}"
+			data-desc="{$item->desc}"
+			data-createtime="{$item->createTime}"
+      data-music_title="{$item->music->title}"
+      data-music_url="{path('/stream?url=' . urlencode($item->music->playUrl))}">
+      <img loading="lazy" src="{path('/stream?url=' . urlencode($item->video->originCover))}" />
+			<img class="hidden" loading="lazy" data-src="{path('/stream?url=' . urlencode($item->video->dynamicCover))}" />
+    </div>
+    {/foreach}
+		{if empty($data->feed->items)}
+		<p class="title">No items sent by TikTok!</p>
+		{/if}
+  </div>
+	{include './common/controls.latte'}
+</section>
+
+<!-- MODAL -->
+<div id="modal" class="modal">
+	<div id="modal-background" class="modal-background"></div>
+	<div class="modal-card">
+		<header class="modal-card-head">
+			<button id="modal-close" class="delete" aria-label="close"></button>
+			<p class="modal-card-title" id="item_title"></p>
+		</header>
+		<section class="modal-card-body has-text-centered" style="overflow: hidden;">
+			<video id="video" autoplay controls></video>
+    </section>
+		<footer class="modal-card-foot has-text-centered">
+			<div class="container">
+				<p id="item_date"></p>
+				<div class="field has-addons has-addons-centered">
+					<div class="control">
+						<input id="share_input" class="input" readonly />
+					</div>
+					<div class="control">
+						<button class="button is-primary" onclick="copyShare()">Copy</button>
+					</div>
+				</div>
+				<div id="download_dropdown" class="dropdown is-hoverable">
+					<div class="dropdown-trigger">
+						<button id="download_button" class="button" aria-haspopup="true" aria-controls="dropdown-menu">Download</button>
+					</div>
+					<div class="dropdown-menu" role="menu">
+						<div class="dropdown-content">
+							<a id="download_watermark" target="_blank" class="dropdown-item">With watermark</a>
+							<a id="download_nowatermark" target="_blank" class="dropdown-item">Without watermark</a>
+						</div>
+					</div>
+				</div>
+        <p id="audio_title"></p>
+        <audio id="audio" controls preload="none"></audio>
+        <div class="buttons is-centered">
+					<button id="back-button" class="button is-danger">Back</button>
+          <button id="next-button" class="button is-success">Next</button>
+        </div>
+      </div>
+    </footer>
+  </div>
+</div>
+<script src="{path('/scripts/themes/card.js')}"></script>

components/themes/common/controls.latte

@@ -0,0 +1,7 @@
+<div n:ifset="$data->info" 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>
+	{/if}
+  <a n:attr="disabled => !$data->feed->hasMore" class="button is-success" href="?cursor={$data->feed->maxCursor}">Next</a>
+</div>

components/themes/common/download.latte

@@ -0,0 +1,13 @@
+<div class="dropdown is-hoverable">
+	<div class="dropdown-trigger">
+		<button class="button" 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="{path('/download?url=' . urlencode($playAddr) . '&id=' . $id . '&user=' . $uniqueId) . '&watermark=1'}" class="dropdown-item">Watermark</a>
+			<a target="_blank" href="{path('/download?id=' . $id . '&user=' . $uniqueId)}" class="dropdown-item">No watermark</a>
+		</div>
+	</div>
+</div>

components/themes/common/share.latte

@@ -0,0 +1,5 @@
+{do $endpoint = '/@' . $uniqueId . '/video/' . $id}
+<div class="buttons is-centered">
+	<a class="button is-success is-small" href="{path($endpoint)}">Instance Link</a>
+	<a class="button is-danger is-small" href="https://www.tiktok.com{$endpoint}">Original Link</a>
+</div>

components/themes/common/stats.latte

@@ -0,0 +1,6 @@
+<p>
+	{include '../../icon.latte', icon: 'eye', text: number($playCount)}
+	{include '../../icon.latte', icon: 'heart', text: number($diggCount)}
+	{include '../../icon.latte', icon: 'comment', text: number($commentCount)}
+	{include '../../icon.latte', icon: 'share', text: number($shareCount)}
+</p>

components/themes/common/tags.latte

@@ -0,0 +1,5 @@
+<div class="tags">
+	{foreach $challenges as $challenge}
+		<a class="tag is-rounded is-info" href="{path('/tag/' . $challenge->title)}">{$challenge->title}</a>
+	{/foreach}
+</div>

components/themes/default.latte

@@ -0,0 +1,40 @@
+<div class="container">
+	{foreach $data->feed->items as $item}
+	<article class="media">
+  	<figure class="media-left">
+    	<p class="image is-64x64">
+      	<img src="{path('/stream?url=' . urlencode($item->author->avatarThumb))}" />
+    	</p>
+  	</figure>
+  	<div class="media-content">
+    	<div class="content">
+      	<p>
+        	<strong>{$item->author->nickname}</strong>
+					<small>
+						<a href="{path('/@' . $item->author->uniqueId)}">@{$item->author->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 './common/tags.latte', challenges: $item->challenges}</p>
+				{/if}
+				<p n:ifcontent>{$item->desc}</p>
+				{include './common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
+    	</div>
+			<div class="has-text-centered">
+				<video width="{$item->video->width}" height="{$item->video->height}" controls preload="none" poster="{path('/stream?url=' . urlencode($item->video->originCover))}">
+					<source src="{path('/stream?url=' . $item->video->playAddr)}" type="video/mp4" />
+				</video>
+			</div>
+			<div class="has-text-centered">
+				{include './common/share.latte', uniqueId: $item->author->uniqueId, id: $item->id}
+				{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
+			</div>
+  	</div>
+	</article>
+	{/foreach}
+	{if empty($data->feed->items)}
+		<p class="title">No items sent by TikTok!</p>
+	{/if}
+</div>
+{include './common/controls.latte'}

composer.json

@@ -1,24 +1,30 @@
 {
     "name": "pablouser1/proxitok",
     "description": "An alternative frontend for TikTok",
-    "version": "2.1.0.1",
+    "version": "2.3.2.1",
     "license": "AGPL-3.0-or-later",
     "type": "project",
-    "homepage": "https://github.com/pablouser1/ProxiTok",
     "authors": [
         {
             "name": "Pablo Ferreiro",
             "homepage": "https://github.com/pablouser1"
         }
     ],
+    "homepage": "https://github.com/pablouser1/ProxiTok",
+	"config": {
+		"optimize-autoloader": true,
+		"platform": {
+			"php": "7.4"
+		}
+	},
     "require": {
+        "php": ">=7.4|^8.0",
         "ext-redis": "^5.3.2",
         "ext-mbstring": "*",
-        "latte/latte": "^2.10",
-        "vlucas/phpdotenv": "^5.4",
+        "latte/latte": "^2.11",
         "bramus/router": "^1.6",
-        "mibe/feedwriter": "^1.1",
-        "pablouser1/tikscraper": "^1.3"
+        "josegonzalez/dotenv": "dev-master",
+        "pablouser1/tikscraper": "^2.1"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -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": "f6b066c447574f88ad9255a88892659e",
+    "content-hash": "15ff00ea59afbf0d6d064d4cbefb05fb",
     "packages": [
         {
             "name": "bramus/router",
@@ -58,30 +58,36 @@
             "time": "2021-11-18T19:24:07+00:00"
         },
         {
-            "name": "graham-campbell/result-type",
-            "version": "v1.0.4",
+            "name": "josegonzalez/dotenv",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca"
+                "url": "https://github.com/josegonzalez/php-dotenv.git",
+                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca",
+                "url": "https://api.github.com/repos/josegonzalez/php-dotenv/zipball/f6d2fb63610f98b7ae859031566228dbade1a79c",
+                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0",
-                "phpoption/phpoption": "^1.8"
+                "m1/env": "2.*",
+                "php": ">=5.5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+                "php-mock/php-mock-phpunit": "^1.1",
+                "satooshi/php-coveralls": "1.*",
+                "squizlabs/php_codesniffer": "2.*"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "GrahamCampbell\\ResultType\\": "src/"
+                "psr-0": {
+                    "josegonzalez\\Dotenv": [
+                        "src",
+                        "tests"
+                    ]
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -90,47 +96,37 @@
             ],
             "authors": [
                 {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
+                    "name": "Jose Diaz-Gonzalez",
+                    "email": "dotenv@josegonzalez.com",
+                    "homepage": "http://josediazgonzalez.com",
+                    "role": "Maintainer"
                 }
             ],
-            "description": "An Implementation Of The Result Type",
+            "description": "dotenv file parsing for PHP",
+            "homepage": "https://github.com/josegonzalez/php-dotenv",
             "keywords": [
-                "Graham Campbell",
-                "GrahamCampbell",
-                "Result Type",
-                "Result-Type",
-                "result"
+                "configuration",
+                "dotenv",
+                "php"
             ],
             "support": {
-                "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4"
+                "issues": "https://github.com/josegonzalez/php-dotenv/issues",
+                "source": "https://github.com/josegonzalez/php-dotenv/tree/master"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-11-21T21:41:47+00:00"
+            "time": "2019-07-07T21:21:39+00:00"
         },
         {
             "name": "latte/latte",
-            "version": "v2.11.0",
+            "version": "v2.11.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/latte.git",
-                "reference": "a815687bfadaf3af51ae99f92edb4ea310c43426"
+                "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/a815687bfadaf3af51ae99f92edb4ea310c43426",
-                "reference": "a815687bfadaf3af51ae99f92edb4ea310c43426",
+                "url": "https://api.github.com/repos/nette/latte/zipball/89e647e51213af8a270fe9903b8735a2f6c83ad1",
+                "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1",
                 "shasum": ""
             },
             "require": {
@@ -143,9 +139,9 @@
             },
             "require-dev": {
                 "nette/php-generator": "^3.3.4",
-                "nette/tester": "~2.0",
+                "nette/tester": "^2.0",
                 "nette/utils": "^3.0",
-                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan": "^1",
                 "tracy/tracy": "^2.3"
             },
             "suggest": {
@@ -199,130 +195,97 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/latte/issues",
-                "source": "https://github.com/nette/latte/tree/v2.11.0"
+                "source": "https://github.com/nette/latte/tree/v2.11.5"
             },
-            "time": "2022-02-22T18:39:58+00:00"
+            "time": "2022-06-26T10:12:18+00:00"
         },
         {
-            "name": "mibe/feedwriter",
-            "version": "v1.1.1",
+            "name": "m1/env",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/mibe/FeedWriter.git",
-                "reference": "f4cc748ad8700e36663f08cfeebe7fd39b00eea2"
+                "url": "https://github.com/m1/Env.git",
+                "reference": "5c296e3e13450a207e12b343f3af1d7ab569f6f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mibe/FeedWriter/zipball/f4cc748ad8700e36663f08cfeebe7fd39b00eea2",
-                "reference": "f4cc748ad8700e36663f08cfeebe7fd39b00eea2",
+                "url": "https://api.github.com/repos/m1/Env/zipball/5c296e3e13450a207e12b343f3af1d7ab569f6f3",
+                "reference": "5c296e3e13450a207e12b343f3af1d7ab569f6f3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
+            "require-dev": {
+                "phpunit/phpunit": "4.*",
+                "scrutinizer/ocular": "~1.1",
+                "squizlabs/php_codesniffer": "^2.3"
             },
+            "suggest": {
+                "josegonzalez/dotenv": "For loading of .env",
+                "m1/vars": "For loading of configs"
+            },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "FeedWriter\\": ""
+                    "M1\\Env\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "GPL-3.0"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Michael Bemmerl",
-                    "email": "mail@mx-server.de"
-                },
-                {
-                    "name": "Phil Freo"
-                },
-                {
-                    "name": "Paul Ferrett"
-                },
-                {
-                    "name": "Brennen Bearnes"
-                },
-                {
-                    "name": "Michael Robinson",
-                    "email": "mike@pagesofinterest.net"
-                },
-                {
-                    "name": "Baptiste Fontaine"
-                },
-                {
-                    "name": "Kristián Valentín"
-                },
-                {
-                    "name": "Brandtley McMinn"
-                },
-                {
-                    "name": "Julian Bogdani"
-                },
-                {
-                    "name": "Anis Uddin Ahmad",
-                    "email": "anis.programmer@gmail.com"
-                },
-                {
-                    "name": "Cedric Gampert"
-                },
-                {
-                    "name": "Yamek"
-                },
-                {
-                    "name": "thielj"
-                },
-                {
-                    "name": "Pavel Khakhlou"
-                },
-                {
-                    "name": "Daniel"
-                },
-                {
-                    "name": "Tino Goratsch"
+                    "name": "Miles Croxford",
+                    "email": "hello@milescroxford.com",
+                    "homepage": "http://milescroxford.com",
+                    "role": "Developer"
                 }
             ],
-            "description": "Generate feeds in either RSS 1.0, RSS 2.0 or ATOM formats",
-            "homepage": "https://github.com/mibe/FeedWriter",
+            "description": "Env is a lightweight library bringing .env file parser compatibility to PHP. In short - it enables you to read .env files with PHP.",
+            "homepage": "https://github.com/m1/Env",
             "keywords": [
-                "RSS 1.0",
-                "atom",
-                "feed",
-                "rss",
-                "rss 2.0",
-                "rss2"
+                ".env",
+                "config",
+                "dotenv",
+                "env",
+                "loader",
+                "m1",
+                "parser",
+                "support"
             ],
             "support": {
-                "issues": "https://github.com/mibe/FeedWriter/issues",
-                "source": "https://github.com/mibe/FeedWriter/tree/master"
+                "issues": "https://github.com/m1/Env/issues",
+                "source": "https://github.com/m1/Env/tree/2.2.0"
             },
-            "time": "2016-11-19T20:47:44+00:00"
+            "time": "2020-02-19T09:02:13+00:00"
         },
         {
             "name": "pablouser1/tikscraper",
-            "version": "v1.3.0.3",
+            "version": "v2.1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "793dde26e17362af304b9f50890c7fc178387629"
+                "reference": "4aa97bbcb54f1d1677830acd2fae5b6c8f22c699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/793dde26e17362af304b9f50890c7fc178387629",
-                "reference": "793dde26e17362af304b9f50890c7fc178387629",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/4aa97bbcb54f1d1677830acd2fae5b6c8f22c699",
+                "reference": "4aa97bbcb54f1d1677830acd2fae5b6c8f22c699",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3|^8.0",
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-xml": "*",
+                "php": ">=7.4|^8.0",
                 "php-webdriver/webdriver": "^1.12",
                 "sapistudio/seleniumstealth": "^1.0"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -341,22 +304,22 @@
             "description": "Get data from TikTok API",
             "support": {
                 "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v1.3.0.3"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.1.1.0"
             },
-            "time": "2022-03-13T20:53:27+00:00"
+            "time": "2022-07-03T16:07:00+00:00"
         },
         {
             "name": "php-webdriver/webdriver",
-            "version": "1.12.0",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb"
+                "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
-                "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
+                "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
                 "shasum": ""
             },
             "require": {
@@ -406,80 +369,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-webdriver/php-webdriver/issues",
-                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.0"
+                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.1"
             },
-            "time": "2021-10-14T09:30:02+00:00"
-        },
-        {
-            "name": "phpoption/phpoption",
-            "version": "1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpOption\\": "src/PhpOption/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh"
-                },
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                }
-            ],
-            "description": "Option Type for PHP",
-            "keywords": [
-                "language",
-                "option",
-                "php",
-                "type"
-            ],
-            "support": {
-                "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.8.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-12-04T23:24:31+00:00"
+            "time": "2022-05-03T12:16:34+00:00"
         },
         {
             "name": "sapistudio/seleniumstealth",
@@ -511,100 +403,18 @@
             },
             "time": "2022-01-10T20:04:41+00:00"
         },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.25.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-10-20T20:35:02+00:00"
-        },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
                 "shasum": ""
             },
             "require": {
@@ -619,7 +429,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -658,7 +468,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -674,20 +484,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.25.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
-                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
                 "shasum": ""
             },
             "require": {
@@ -696,7 +506,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -741,7 +551,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
             },
             "funding": [
                 {
@@ -757,24 +567,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-04T08:16:47+00:00"
+            "time": "2022-05-10T07:21:04+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.0.5",
+            "version": "v5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1"
+                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/1ccceccc6497e96f4f646218f04b97ae7d9fa7a1",
-                "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1",
+                "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
+                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0.2"
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -802,7 +613,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.0.5"
+                "source": "https://github.com/symfony/process/tree/v5.4.8"
             },
             "funding": [
                 {
@@ -818,99 +629,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-30T18:19:12+00:00"
-        },
-        {
-            "name": "vlucas/phpdotenv",
-            "version": "v5.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f",
-                "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.0.2",
-                "php": "^7.1.3 || ^8.0",
-                "phpoption/phpoption": "^1.8",
-                "symfony/polyfill-ctype": "^1.23",
-                "symfony/polyfill-mbstring": "^1.23.1",
-                "symfony/polyfill-php80": "^1.23.1"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "ext-filter": "*",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10"
-            },
-            "suggest": {
-                "ext-filter": "Required to use the boolean validator."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dotenv\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "hello@gjcampbell.co.uk",
-                    "homepage": "https://github.com/GrahamCampbell"
-                },
-                {
-                    "name": "Vance Lucas",
-                    "email": "vance@vancelucas.com",
-                    "homepage": "https://github.com/vlucas"
-                }
-            ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-            "keywords": [
-                "dotenv",
-                "env",
-                "environment"
-            ],
-            "support": {
-                "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-12-12T23:22:04+00:00"
+            "time": "2022-04-08T05:07:18+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "josegonzalez/dotenv": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
+        "php": ">=7.4|^8.0",
         "ext-redis": "^5.3.2",
         "ext-mbstring": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "platform-overrides": {
+        "php": "7.4"
+    },
+    "plugin-api-version": "2.3.0"
 }

docker-compose.yml

@@ -0,0 +1,29 @@
+version: '3'
+
+services:
+  web:
+    container_name: proxitok-web
+    image: ghcr.io/pablouser1/proxitok:master
+    ports:
+      - 8080:80
+    environment:
+      - LATTE_CACHE=/cache
+      - API_CACHE=redis
+      - REDIS_HOST=proxitok-redis
+      - REDIS_PORT=6379
+      - API_SIGNER_URL=http://proxitok-signer:8080/signature
+    volumes:
+      - proxitok-cache:/cache
+    depends_on:
+      - redis
+      - signer
+  redis:
+    container_name: proxitok-redis
+    image: redis:7-alpine
+    command: redis-server --save 60 1 --loglevel warning
+    restart: unless-stopped
+  signer:
+    container_name: proxitok-signer
+    image: ghcr.io/pablouser1/signtok:master
+volumes:
+  proxitok-cache:

embed.js

@@ -0,0 +1,15 @@
+// Workaround to allow TikTok embed
+
+const blockquotes = document.getElementsByClassName('tiktok-embed')
+for (let i = 0; i < blockquotes.length; i++) {
+  const blockquote = blockquotes[i]
+  if (blockquote.children.length > 0 && blockquote.children[0].tagName !== 'iframe') {
+    const iframe = document.createElement('iframe')
+    iframe.style = 'width: 100%; height: 710px; display: block; visibility: unset; max-height: 710px;'
+    iframe.src = 'https://www.tiktok.com/embed/v2/' + blockquote.dataset.videoId // This url will get redirected
+    // Remove placeholder section
+    blockquote.children[0].remove()
+    // Add iframe
+    blockquote.appendChild(iframe)
+  }
+}

index.php

@@ -1,9 +1,12 @@
 <?php
 require __DIR__ . "/vendor/autoload.php";
 
-// LOAD DOTENV
-$dotenv = Dotenv\Dotenv::createImmutable(__DIR__);
-$dotenv->safeLoad();
+$dotenv = new josegonzalez\Dotenv\Loader(__DIR__ . '/.env');
+$dotenv->raiseExceptions(false);
+$result = $dotenv->parse();
+if ($result !== false) {
+    $dotenv->toEnv();
+}
 
 // ROUTER
 $router = new Bramus\Router\Router();

layouts/default.latte

@@ -15,7 +15,6 @@
   <section class="section">
 		{block content}{/block}
   </section>
-  {include '../components/footer.latte'}
 	{block extra}{/block}
 </body>
 </html>

layouts/embed.latte

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+
+{include '../components/head.latte'}
+
+<body>
+	{block content}{/block}
+	{block extra}{/block}
+</body>
+</html>

layouts/hero.latte

@@ -12,9 +12,6 @@
 			<div class="container has-text-centered">
 				{block content}{/block}
 			</div>
-    </div>
-    <div class="hero-foot">
-			{include '../components/footer.latte'}
     </div>
 	</section>
 	{block extra}{/block}

robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

routes.php

@@ -1,21 +1,21 @@
 <?php
 /** @var \Bramus\Router\Router $router */
 use App\Helpers\Misc;
+use App\Helpers\Wrappers;
 use App\Models\BaseTemplate;
-use App\Models\HomeTemplate;
 
 $router->get('/', function () {
-    $latte = Misc::latte();
-    $latte->render(Misc::getView('home'), new HomeTemplate);
+    $latte = Wrappers::latte();
+    $latte->render(Misc::getView('home'), new BaseTemplate('Home'));
 });
 
 $router->get('/about', function () {
-    $latte = Misc::latte();
+    $latte = Wrappers::latte();
     $latte->render(Misc::getView('about'), new BaseTemplate('About'));
 });
 
 $router->get('/verify', function () {
-    $latte = Misc::latte();
+    $latte = Wrappers::latte();
     $latte->render(Misc::getView('verify'), new BaseTemplate('Verify'));
 });
 
@@ -34,13 +34,13 @@ $router->mount('/@([^/]+)', function () use ($router) {
     $router->get('/rss', 'UserController@rss');
 });
 
-/**
- * @deprecated Please use /@username/video/id instead
- */
+// Deprecated, please use /@USERNAME/video/VIDEO_ID instead
 $router->get('/video/(\w+)', 'VideoController@get');
+// Workaround that allows /t endpoints
+$router->get('/t/([^/]+)', 'VideoController@get');
 
-$router->mount('/tag', function () use ($router) {
-    $router->get('/([^/]+)', 'TagController@get');
+$router->mount('/tag/([^/]+)', function () use ($router) {
+    $router->get('/', 'TagController@get');
     $router->get('/rss', 'TagController@rss');
 });
 
@@ -49,8 +49,11 @@ $router->get('/music/([^/]+)', 'MusicController@get');
 // -- Settings -- //
 $router->mount('/settings', function () use ($router) {
     $router->get('/', 'SettingsController@index');
-    $router->post('/proxy', 'SettingsController@proxy');
+    $router->post('/general', 'SettingsController@general');
     $router->post('/api', 'SettingsController@api');
 });
 
 $router->get('/discover', 'DiscoverController@get');
+
+// -- EMBED -- //
+$router->get('/embed/v2/(\d+)', 'EmbedController@v2');

scripts/themes/card.js

@@ -2,6 +2,7 @@ var opened_video_id = null
 
 const video = document.getElementById('video')
 const item_title = document.getElementById('item_title')
+const item_date = document.getElementById('item_date')
 const audio = document.getElementById('audio')
 const audio_title = document.getElementById('audio_title')
 const modal = document.getElementById('modal')
@@ -15,7 +16,7 @@ const getVideoDataById = id => {
     opened_video_id = id
     return el.dataset
   }
-  return false
+  return null
 }
 
 const isModalActive = () => modal.classList.contains('is-active')
@@ -23,9 +24,10 @@ const isModalActive = () => modal.classList.contains('is-active')
 const toggleButton = (id, force) => document.getElementById(id).toggleAttribute('disabled', force)
 
 // -- MODAL -- //
-const swapData = ({ video_url, desc, video_download_watermark, video_download_nowatermark, video_share_url, music_title, music_url }) => {
+const swapData = ({ video_url, desc, createtime, video_download_watermark, video_download_nowatermark, video_share_url, music_title, music_url }) => {
   video.src = video_url
   item_title.innerText = desc
+  item_date.innerText = new Date(createtime * 1000).toLocaleString()
   download_watermark.href = video_download_watermark
   download_nowatermark.href = video_download_nowatermark
   share_input.value = video_share_url

scss/README.md

@@ -1,11 +1,11 @@
-This facilities making the bulma.min.css and fontawesome.min.css files, install all dependencies using:
+This facilities making the compressed bulma.min.css and cssgg.min.css files, install all dependencies using:
 ```
 yarn install
 ```
 
 And then use:
 ```
-yarn bulma && yarn fa
+yarn bulma && yarn cssgg
 ```
 
-This compiles bulma.scss and fontawesome.scss to a css file and helps lowering the size of the css that will be sent to the user.
+This compiles bulma.scss and cssgg.scss to a css file and helps lowering the size of the css that will be sent to the user.

scss/bulma.scss

@@ -11,8 +11,9 @@ $bulmaswatch-import-font: false;
 
 // Elements
 @import "./node_modules/bulma/sass/elements/button.sass";
-@import "./node_modules/bulma/sass/elements/box.sass";
 @import "./node_modules/bulma/sass/elements/container.sass";
+@import "./node_modules/bulma/sass/elements/icon.sass";
+@import "./node_modules/bulma/sass/elements/image.sass";
 @import "./node_modules/bulma/sass/elements/other.sass";
 @import "./node_modules/bulma/sass/elements/tag.sass";
 @import "./node_modules/bulma/sass/elements/title.sass";
@@ -21,14 +22,15 @@ $bulmaswatch-import-font: false;
 @import "./node_modules/bulma/sass/form/shared.sass";
 @import "./node_modules/bulma/sass/form/input-textarea.sass";
 @import "./node_modules/bulma/sass/form/checkbox-radio.sass";
+@import "./node_modules/bulma/sass/form/select.sass";
 @import "./node_modules/bulma/sass/form/tools.sass";
 
 // Components
 @import "./node_modules/bulma/sass/components/card.sass";
 @import "./node_modules/bulma/sass/components/dropdown.sass";
+@import "./node_modules/bulma/sass/components/media.sass";
 @import "./node_modules/bulma/sass/components/modal.sass";
 @import "./node_modules/bulma/sass/components/navbar.sass";
-@import "./node_modules/bulma/sass/components/media.sass";
 
 // Grids
 @import "./node_modules/bulma/sass/grid/columns.sass";

scss/cssgg.scss

@@ -0,0 +1,15 @@
+@charset "utf-8";
+// Common
+@import "./node_modules/css.gg/icons/scss/home.scss";
+@import "./node_modules/css.gg/icons/scss/info.scss";
+
+// Home
+@import "./node_modules/css.gg/icons/scss/search.scss";
+
+// Feed
+@import "./node_modules/css.gg/icons/scss/feed.scss";
+@import "./node_modules/css.gg/icons/scss/eye.scss";
+@import "./node_modules/css.gg/icons/scss/heart.scss";
+@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";

scss/fontawesome.scss

@@ -1,2 +0,0 @@
-@import "./node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
-@import "./node_modules/@fortawesome/fontawesome-free/scss/solid.scss";

scss/package.json

@@ -2,13 +2,13 @@
   "name": "proxitok-scss",
   "private": true,
   "scripts": {
-    "bulma": "sass --style=compressed bulma.scss ./styles/vendor/bulma.min.css",
-    "fa": "sass --style=compressed fontawesome.scss ./styles/vendor/fontawesome.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": {
-    "@fortawesome/fontawesome-free": "^6.0.0",
     "bulma": "^0.9.3",
     "bulmaswatch": "^0.8.1",
+    "css.gg": "^2.0.0",
     "sass": "^1.46.0"
   }
 }

scss/yarn.lock

@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@fortawesome/fontawesome-free@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0.tgz#6f3bd8e42997c7d536a1246877ed8bcd4f005a54"
-  integrity sha512-6LB4PYBST1Rx40klypw1SmSDArjFOcfBf2LeX9Zg5EKJT2eXiyiJq+CyBYKeXyK0sXS2FsCJWSPr/luyhuvh0Q==
-
 anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
@@ -28,9 +23,9 @@ braces@~3.0.2:
     fill-range "^7.0.1"
 
 bulma@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.3.tgz#ddccb7436ebe3e21bf47afe01d3c43a296b70243"
-  integrity sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.4.tgz#0ca8aeb1847a34264768dba26a064c8be72674a1"
+  integrity sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==
 
 bulmaswatch@^0.8.1:
   version "0.8.1"
@@ -52,6 +47,11 @@ bulmaswatch@^0.8.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+css.gg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/css.gg/-/css.gg-2.0.0.tgz#1ba891092ceac58a2550540171c2d469a86b27b2"
+  integrity sha512-8qO59kSXLbewo7xaUM4eC8328MTdGmb8atpmw6PRzeDGsZrCkAVjJzKeFDIntagl1/aCee+NG1OQtIvWAjgG/A==
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -72,9 +72,9 @@ glob-parent@~5.1.2:
     is-glob "^4.0.1"
 
 immutable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
-  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
 
 is-binary-path@~2.1.0:
   version "2.1.0"
@@ -86,7 +86,7 @@ is-binary-path@~2.1.0:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.3"
@@ -118,9 +118,9 @@ readdirp@~3.6.0:
     picomatch "^2.2.1"
 
 sass@^1.46.0:
-  version "1.49.9"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.9.tgz#b15a189ecb0ca9e24634bae5d1ebc191809712f9"
-  integrity sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
+  version "1.53.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.53.0.tgz#eab73a7baac045cc57ddc1d1ff501ad2659952eb"
+  integrity sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

styles/vendor/cssgg.min.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../scss/node_modules/css.gg/icons/scss/home.scss","../../scss/node_modules/css.gg/icons/scss/info.scss","../../scss/node_modules/css.gg/icons/scss/search.scss","../../scss/node_modules/css.gg/icons/scss/feed.scss","../../scss/node_modules/css.gg/icons/scss/eye.scss","../../scss/node_modules/css.gg/icons/scss/heart.scss","../../scss/node_modules/css.gg/icons/scss/comment.scss","../../scss/node_modules/css.gg/icons/scss/share.scss","../../scss/node_modules/css.gg/icons/scss/software-download.scss"],"names":[],"mappings":"AAAA,SACE,yLACA,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,aACA,gBACA,4BACA,2BACA,6BACA,4BACA,mBAEA,gBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,cACA,sBACA,kBACA,qBACA,sBACA,2BACA,wBACA,SACA,kBACA,WACA,YACA,OAGF,gBACE,UACA,YACA,iBACA,oBACA,4BACA,6BACA,gBACA,SACA,SCjDJ,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBAEA,iCACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,wBACA,SAGF,gBACE,WACA,WAGF,iBACE,WACA,QC5BN,WACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBACA,iBACA,gBAEA,kBACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,WACA,wBACA,yBACA,SACA,UCvBN,SACI,cACA,sBACA,wBACA,sBASA,iBACA,gBACA,kBACA,+BACA,UACA,WACA,kBAbA,iCACE,cACA,sBACA,wBACA,sBAWF,iCACE,WACA,kBACA,kBACA,WACA,WACA,QACA,SACA,WAGF,gBACE,UACA,QACA,WCnCN,QACI,kBACA,cACA,+BACA,WACA,YACA,iCACA,gCACA,gBACA,sBAEA,+BACE,WACA,cACA,oBACA,kBACA,sBAGF,eACE,QACA,8CACA,WACA,YAGF,gBACE,UACA,WACA,iBACA,WACA,SC/BN,UACI,iBACA,6BACA,8BACA,WACA,WACA,gBAeA,sBACA,kBACA,gHACA,cAhBA,iBACE,iBACA,6BACA,8BACA,WACA,WACA,gBACA,WACA,cACA,sBACA,kBAQF,kBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,wBACA,QAGF,kBACE,WACA,YACA,sBACA,wBACA,UACA,QC7CN,YACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,gBACA,0CAEA,mBACE,WACA,cACA,sBACA,kBACA,UAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,iBACA,+BACA,+BACA,UACA,YACA,WAGF,mBACE,WACA,wBACA,qBACA,SACA,QCtCN,UACI,sBACA,kBACA,cACA,+BACA,UACA,WACA,wBACA,oBACA,kCAEA,iBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SAGF,kBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SACA,MACA,yBAGF,iBACE,SACA,wBCvCN,sBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,aACA,8BACA,+BACA,eAEA,6BACE,WACA,cACA,sBACA,kBACA,UACA,WACA,sBACA,wBACA,yBACA,SACA,WAGF,8BACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,YACA,wBACA,SACA","file":"cssgg.min.css"}

views/about.latte

@@ -1,14 +1,16 @@
 {layout '../layouts/default.latte'}
 
 {block header}
-	<p class="title">Welcome to Proxitok!</p>
-	<p class="subtitle">An alternative frontend for TikTok</p>
+	<p class="title">Welcome to ProxiTok!</p>
+	<p class="subtitle">
+    Made with <span style="color: #e25555;">&#9829;</span> in <a href="https://github.com/pablouser1/ProxiTok">Github</a>
+	</p>
 {/block}
 
 {block content}
 	<p class="title">About this instance</p>
-	<p>Forcing Legacy mode: {isset($_ENV['API_FORCE_LEGACY']) ? 'yes' : 'no'}</p>
-	<p>Instance-level Proxy: {isset($_ENV['PROXY_HOST']) ? 'yes' : 'no'}</p>
+	<p>Frontend version: {version_frontend()}</p>
+	<p>Scraper version: {version_scraper()}</p>
 	<hr />
 	<p class="title">Why would I want to use ProxiTok?</p>
 	<p>
@@ -24,12 +26,11 @@
 	<p>
 		This project wouldn't be possible without the help of the following projects:
 		<ul>
-			<li><a rel="nofollow" href="https://github.com/ssovit/TikTok-API-PHP">TikTok-API-PHP</a></li>
+			<li><a rel="nofollow" href="https://github.com/pablouser1/TikScraperPHP">TikScraperPHP</a></li>
 			<li><a rel="nofollow" href="https://github.com/nette/latte">Latte</a></li>
 			<li><a rel="nofollow" href="https://github.com/bramus/router">bramus/router</a></li>
-			<li><a rel="nofollow" href="https://github.com/vlucas/phpdotenv">PHP dotenv</a></li>
+			<li><a rel="nofollow" href="https://github.com/josegonzalez/php-dotenv">php-dotenv</a></li>
 			<li><a rel="nofollow" href="https://github.com/jgthms/bulma">Bulma</a> and <a href="https://github.com/jenil/bulmaswatch">Bulmaswatch</a></li>
-			<li><a rel="nofollow" href="https://github.com/mibe/FeedWriter">FeedWriter</a></li>
 		</ul>
 	</p>
 {/block}

views/discover.latte

@@ -5,7 +5,7 @@
 {/block}
 
 {block content}
-	{foreach $feed->items as $type => $items}
+	{foreach $data->feed->items as $type => $items}
 		<p class="title">{$type|firstUpper}</p>
 		<div class="columns is-multiline is-vcentered">
 			{foreach $items as $item}
@@ -17,7 +17,7 @@
 								{if !empty($item->cardItem->cover)}
 									<div class="media-left">
 										<figure class="image is-96x96">
-											<img width="96" height="96" src="{path('/stream?url=' . urlencode($item->cardItem->cover))}" />
+											<img loading="lazy" width="96" height="96" src="{path('/stream?url=' . urlencode($item->cardItem->cover))}" />
 										</figure>
 									</div>
 								{/if}

views/home.latte

@@ -3,28 +3,30 @@
 {block content}
 	<p class="title">Welcome to ProxiTok!</p>
 	<p class="subtitle">An alternative open source frontend for TikTok</p>
-	<!-- Create forms from App\Models\HomeTemplate -->
-	<div class="columns is-centered is-vcentered is-multiline">
-		{foreach $forms as $form}
-			<div class="column is-narrow">
-				{embed '../components/card.latte'}
-					{block title}{$form['title']}{/block}
-					{block content}
-						<form action="{path('/redirect')}">
-							<div class="field has-addons has-addons-centered">
-								<div class="control">
-									<input name="{$form['input']}" class="input" type="text" placeholder="{$form['placeholder']}" required />
-								</div>
-	    					<div class="control">
-      						<button class="button is-success" type="submit">Search</button>
-    						</div>
-							</div>
-						</form>
-					{/block}
-				{/embed}
+	{embed '../components/form.latte', path: '/redirect', method: 'GET'}
+		{block fields}
+			<div class="field has-addons has-addons-centered">
+				<div class="control">
+					<input class="input" name="term" placeholder="Search" required>
+				</div>
+				<div class="control">
+					<div class="select">
+						<select name="type">
+							<option value="user">Username</option>
+							<option value="tag">Tag</option>
+							<option value="music">Music ID</option>
+							<option value="video">Video ID</option>
+						</select>
+					</div>
+				</div>
+				<div class="control">
+					<button type="submit" class="button is-success">
+						{include '../components/icon.latte', icon: 'search', text: 'Search'}
+					</a>
+				</div>
 			</div>
-		{/foreach}
-	</div>
+		{/block}
+	{/embed}
 	<div class="columns is-centered is-mobile">
 		<div class="column is-narrow">
 			<p>Discover</p>

views/music.latte

@@ -1,9 +1,9 @@
 {layout '../layouts/default.latte'}
 
 {block header}
-	<p class="title">{$feed->info->detail->title}</p>
-	<p class="subtitle">{$feed->info->detail->desc}</p>
-	<p>Videos: {number($feed->info->stats->videoCount)}</p>
+	<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}

views/rss.latte

@@ -0,0 +1,21 @@
+{contentType application/rss+xml}
+{do header('Content-Disposition: attachment; filename="' . $title . '.rss' . '"')}
+{do $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>
+		{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>
+				<pubDate>{date('r', $item->createTime)}</pubDate>
+				<guid isPermaLink="false">{$item->id}</guid>
+			</item>
+		{/foreach}
+	</channel>
+</rss>

views/settings.latte

@@ -5,9 +5,8 @@
 {/block}
 
 {block content}
-	<!-- Proxy settings -->
-	<p class="title">Proxy</p>
-	{include '../components/settings/proxy.latte'}
+	<p class="title">General</p>
+	{include '../components/settings/general.latte'}
 	<hr />
 	<p class="title">Api</p>
 	{include '../components/settings/api.latte'}

views/tag.latte

@@ -1,10 +1,16 @@
 {layout '../layouts/default.latte'}
 
+{var $has_rss = true}
+
 {block header}
-	<p class="title">{$feed->info->detail->title}</p>
-	<p class="subtitle">{$feed->info->detail->desc}</p>
-	<p>Videos: {number($feed->info->stats->videoCount)} / Views: {number($feed->info->stats->viewCount)}</p>
-	<a href="{path('/tag/' . $feed->info->detail->title . '/rss')}">RSS</a>
+	{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}

views/trending.latte

@@ -1,8 +1,10 @@
 {layout '../layouts/default.latte'}
 
+{var $has_rss = true}
+
 {block header}
 	<p class="title">Trending</p>
-	<a href="{path('/trending/rss')}">RSS</a>
+	<p class="subtitle">{include '../components/rss.latte'}</p>
 {/block}
 
 {block content}

views/user.latte

@@ -1,14 +1,16 @@
 {layout '../layouts/default.latte'}
 
+{var $has_rss = true}
+
 {block header}
 	<figure class="figure is-96x96">
-		<img src="{path('/stream?url=' . urlencode($feed->info->detail->avatarThumb))}" />
+		<img src="{path('/stream?url=' . urlencode($data->info->detail->avatarThumb))}" />
 	</figure>
-	<p class="title">{$feed->info->detail->uniqueId}'s profile</p>
-	<p class="subtitle">{$feed->info->detail->signature}</p>
-	<p>Following: {number($feed->info->stats->followingCount)} / Followers: {number($feed->info->stats->followerCount)}</p>
-	<p>Hearts: {number($feed->info->stats->heartCount)} / Videos: {$feed->info->stats->videoCount}</p>
-	<a href="{path('/@' . $feed->info->detail->uniqueId . '/rss')}">RSS</a>
+	<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}

views/video.latte

@@ -1,31 +1,20 @@
-{layout '../layouts/hero.latte'}
+{layout "../layouts/{$layout}.latte"}
 
 {block content}
-	{do $item = $feed->items[0]}
-	<div class="columns is-centered is-vcentered">
-		<div class="column">
-			<video controls poster="{path('/stream?url=' . urlencode($item->video->originCover))}">
+	<div class="columns is-centered is-vcentered is-gapless">
+		<div class="column is-three-quarters">
+			<video controls autoplay playsinline poster="{path('/stream?url=' . urlencode($item->video->originCover))}">
 				<source src="{path('/stream?url=' . urlencode($item->video->playAddr))}" type="video/mp4" />
 			</video>
 		</div>
 		<div class="column has-text-centered">
 			<div class="box">
-				<p class="title">Video by <a href="{path('/@'.$feed->info->detail->uniqueId)}">{$feed->info->detail->uniqueId}</a></p>
+				<p class="title">Video by <a href="{path('/@'.$detail->uniqueId)}">{$detail->uniqueId}</a></p>
 				<p class="subtitle">{$item->desc}</p>
-				<p>Played {number($feed->info->stats->playCount)} times</p>
-				<p>Shared {number($feed->info->stats->shareCount)} times / {number($feed->info->stats->commentCount)} comments</p>
+				{include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 				<hr />
-				<div class="dropdown is-hoverable">
-					<div class="dropdown-trigger">
-						<button class="button" aria-haspopup="true" aria-controls="dropdown-menu">Download</button>
-					</div>
-					<div class="dropdown-menu" role="menu">
-						<div class="dropdown-content">
-					<a href="{path('/download?url=' . urlencode($item->video->playAddr) . '&id=' . $item->id . '&user=' . $item->author->uniqueId) . '&watermark='}" class="dropdown-item">Watermark</a>
-					<a href="{path('/download?id=' . $item->id . '&user=' . $feed->info->detail->uniqueId)}" class="dropdown-item">No watermark</a>
-						</div>
-					</div>
-				</div>
+				{include '../components/themes/common/share.latte', uniqueId: $detail->uniqueId, id: $item->id}
+				{include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $detail->uniqueId}
       	<p>{$item->music->title}</p>
       	<audio src="{path('/stream?url=' . urlencode($item->music->playUrl))}" controls preload="none"></audio>
 			</div>