Some anti-crash fixes

User now can use test endpoints
enclosure removed
2024-12-06 19:27:30 +01:00 · 2022-07-03 18:19:10 +02:00 · 2022-06-28 20:41:51 +02:00 · 2022-06-28 18:54:03 +02:00 · 2022-06-28 18:45:53 +02:00 · 2022-06-21 20:18:07 +02:00
41 changed files with 362 additions and 160 deletions
@@ -1,11 +1,10 @@
-# APP_PATH="/proxitok" # Relative path, PLEASE LEAVE EMPTY IF /
+# 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=true # Force legacy mode for wrapper
 # API_SIGNER_URL="https://example.com" # External signing service
 # API_BROWSER_URL="http://localhost:4444" # chromedriver url
-# API_TEST_ENDPOINTS=true # 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

 # Redis cache, used on Helpers\CacheEngines\RedisCache (CHOOSE ONE)
@@ -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 }}
@@ -22,3 +22,4 @@ RUN composer update --no-cache \
    && rm -rf /usr/bin/composer

 EXPOSE 80
+CMD apachectl -D FOREGROUND
@@ -1 +1 @@
-web: vendor/bin/heroku-php-nginx -C setup/nginx_heroku.conf
+web: vendor/bin/heroku-php-nginx -C setup/heroku/nginx.conf
@@ -35,6 +35,8 @@ Apply to: Main window (address bar)
 ## TODO / Known issues
 * Make video on /video fit screen and don't overflow
 * 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
@@ -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"
+        }
+    ]
+}
@@ -9,7 +9,7 @@ use App\Models\FeedTemplate;
 class DiscoverController {
    static public function get() {
        $api = Wrappers::api();
-        $feed = $api->getDiscover();
+        $feed = $api->discover();
        if ($feed->meta->success) {
            $latte = Wrappers::latte();
            $latte->render(Misc::getView('discover'), new FeedTemplate('Discover', $feed));
@@ -4,19 +4,21 @@ namespace App\Controllers;
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
 use App\Helpers\Wrappers;
-use App\Models\FeedTemplate;
+use App\Models\FullTemplate;

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

        $api = Wrappers::api();
-        $feed = $api->getMusicFeed($music_id, $cursor);
-        if ($feed->meta->success) {
+        $music = $api->music($music_id);
+        $music->feed($cursor);
+        if ($music->ok()) {
+            $data = $music->getFull();
            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('music'), new FeedTemplate('Music', $feed));
+            $latte->render(Misc::getView('music'), new FullTemplate('Music', $data));
        } else {
-            ErrorHandler::show($feed->meta);
+            ErrorHandler::show($music->error());
        }
    }
 }
@@ -12,11 +12,6 @@ class SettingsController {
        $latte->render(Misc::getView('settings'), new BaseTemplate('Settings'));
    }

-    static private function redirect() {
-        $url = Misc::url('/settings');
-        header("Location: {$url}");
-    }
-
    static public function general() {
        if (isset($_POST['theme'])) {
            $theme = $_POST['theme'];
@@ -25,10 +20,16 @@ class SettingsController {
        self::redirect();
    }
    static public function api() {
-        if (isset($_POST['api-legacy'])) {
-            $legacy = $_POST['api-legacy'];
+        // TODO, ADD COUNT
+        if (isset($_POST['api-test_endpoints'])) {
+            $test_endpoints = $_POST['api-test_endpoints'];
+            Cookies::set('api-test_endpoints', $test_endpoints);
        }
-        Cookies::set('api-legacy', $legacy);
        self::redirect();
    }
+
+    static private function redirect() {
+        $url = Misc::url('/settings');
+        header("Location: {$url}");
+    }
 }
@@ -4,28 +4,32 @@ namespace App\Controllers;
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
 use App\Helpers\Wrappers;
-use App\Models\FeedTemplate;
+use App\Models\FullTemplate;
 use App\Models\RSSTemplate;

 class TagController {
    static public function get(string $name) {
        $cursor = Misc::getCursor();
        $api = Wrappers::api();
-        $feed = $api->getHashtagFeed($name, $cursor);
-        if ($feed->meta->success) {
+        $hashtag = $api->hashtag($name);
+        $hashtag->feed($cursor);
+        if ($hashtag->ok()) {
+            $data = $hashtag->getFull();
            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('tag'), new FeedTemplate('Tag', $feed));
+            $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 = Wrappers::api();
-        $feed = $api->getHashtagFeed($name);
-        if ($feed->meta->success) {
+        $hashtag = $api->hashtag($name);
+        $hashtag->feed();
+        if ($hashtag->ok()) {
+            $data = $hashtag->getFull();
            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('rss'), new RSSTemplate($name, $feed->info->detail->desc, "/tag/{$name}", $feed->items));
+            $latte->render(Misc::getView('rss'), new RSSTemplate($name, $data->info->detail->desc, "/tag/{$name}", $data->feed->items));
        }
    }
 }
@@ -10,26 +10,27 @@ use App\Models\RSSTemplate;
 class TrendingController {
    static public function get() {
        $api = Wrappers::api();
+        $cursor = Misc::getTtwid();

-        // Ttwid if standard, cursor if legacy
-        if ($api::MODE === 'STANDARD') {
-            $cursor = Misc::getTtwid();
-        } else {
-            $cursor = Misc::getCursor();
-        }
-        $feed = $api->getTrending($cursor);
-        if ($feed->meta->success) {
+        $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 = Wrappers::api();
-        $feed = $api->getTrending();
-        if ($feed->meta->success) {
+        $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));
        }
@@ -4,7 +4,7 @@ namespace App\Controllers;
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
 use App\Helpers\Wrappers;
-use App\Models\FeedTemplate;
+use App\Models\FullTemplate;
 use App\Models\RSSTemplate;
 use App\Models\VideoTemplate;

@@ -12,37 +12,43 @@ class UserController {
    static public function get(string $username) {
        $cursor = Misc::getCursor();
        $api = Wrappers::api();
-        $feed = $api->getUserFeed($username, $cursor);
-        if ($feed->meta->success) {
-            if ($feed->info->detail->privateAccount) {
+        $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 = Wrappers::latte();
-            $latte->render(Misc::getView('user'), new FeedTemplate($feed->info->detail->nickname, $feed));
+            $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 = Wrappers::api();
-        $feed = $api->getVideoByID($video_id);
-        if ($feed->meta->success) {
+        $video = $api->video($video_id);
+        $video->feed();
+        if ($video->ok()) {
+            $data = $video->getFull();
            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('video'), new VideoTemplate($feed->items[0], $feed->info->detail));
+            $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 = Wrappers::api();
-        $feed = $api->getUserFeed($username);
-        if ($feed->meta->success) {
+        $user = $api->user($username);
+        $user->feed();
+        if ($user->ok()) {
+            $data = $user->getFull();
            $latte = Wrappers::latte();
-            $latte->render(Misc::getView('rss'), new RSSTemplate($username, $feed->info->detail->signature, '/@' . $username, $feed->items));
+            $latte->render(Misc::getView('rss'), new RSSTemplate($username, $data->info->detail->signature, '/@' . $username, $data->feed->items));
        }
    }
 }
@@ -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);
@@ -23,6 +23,10 @@ class Cookies {
        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);
    }
@@ -2,9 +2,10 @@
 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 = Wrappers::latte();
        $latte->render(Misc::getView('error'), new ErrorTemplate($meta));
@@ -7,7 +7,7 @@ class Misc {
    }

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

    static public function url(string $endpoint = ''): string {
@@ -19,9 +19,12 @@ class Wrappers {
            return Misc::url($endpoint);
        });
        // Version being used
-        $latte->addFunction('version', function (): string {
+        $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();
        });
@@ -42,13 +45,12 @@ class Wrappers {
        return $latte;
    }

-        /**
+    /**
     * Setup of TikTok Api wrapper
-     * @return \TikScraper\Api|\TikScraper\Legacy
     */
-    static public function api() {
+    static public function api(): \TikScraper\Api {
        $options = [
-            'use_test_endpoints' => Misc::env('API_TEST_ENDPOINTS', false),
+            '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', ''),
@@ -82,9 +84,6 @@ class Wrappers {
            }
        }

-        // Legacy mode
-        $legacy = Misc::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);
+        return new \TikScraper\Api($options, $cacheEngine);
    }
 }
@@ -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');
@@ -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
+        ];
    }
 }
@@ -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;
+    }
+}
@@ -5,6 +5,9 @@
 	<meta property="og:title" content="ProxiTok" />
 	<meta property="og:description" content="Alternative frontend for TikTok" />
 	<meta property="og:type" content="website" />
+	{if isset($has_rss)}
+		<link rel="alternate" type="application/rss+xml" title="{$title}" href="{$_SERVER['REQUEST_URI'] . '/rss'}" />
+	{/if}
 	<link rel="stylesheet" href="{path('/styles/vendor/cssgg.min.css')}">
 	<link rel="stylesheet" href="{path('/styles/vendor/bulma.min.css')}">
 	<title>{$title} - ProxiTok</title>
@@ -1,14 +1,19 @@
 {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="label">Legacy mode</label>
-		<div class="select">
-			<select name="api-legacy">
-				<option hidden disabled selected value> -- Select an option -- </option>
-				<option value="on">On</option>
-				<option value="off">Off</option>
-			</select>
+		<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>
 {/block}
 {/embed}
@@ -2,7 +2,7 @@
 <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}
+		{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))}"
@@ -10,13 +10,14 @@
 			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($feed->items)}
+		{if empty($data->feed->items)}
 		<p class="title">No items sent by TikTok!</p>
 		{/if}
  </div>
@@ -36,6 +37,7 @@
    </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 />
@@ -1,8 +1,7 @@
-<div n:ifset="$feed->info" class="buttons">
+<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 }
+	{if isset($_GET['cursor']) && is_numeric($_GET['cursor']) && $_GET['cursor'] != 0}
    <a class="button is-danger" href="?cursor=0">First</a>
-		<a class="button is-danger" href="?cursor={$feed->minCursor}">Back</a>
 	{/if}
-  <a n:attr="disabled => !$feed->hasMore" class="button is-success" href="?cursor={$feed->maxCursor}">Next</a>
+  <a n:attr="disabled => !$data->feed->hasMore" class="button is-success" href="?cursor={$data->feed->maxCursor}">Next</a>
 </div>
@@ -1,5 +1,5 @@
 <div class="container">
-	{foreach $feed->items as $item}
+	{foreach $data->feed->items as $item}
 	<article class="media">
  	<figure class="media-left">
    	<p class="image is-64x64">
@@ -9,7 +9,11 @@
  	<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>
+        	<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>
@@ -29,7 +33,7 @@
  	</div>
 	</article>
 	{/foreach}
-	{if empty($feed->items)}
+	{if empty($data->feed->items)}
 		<p class="title">No items sent by TikTok!</p>
 	{/if}
 </div>
@@ -1,7 +1,7 @@
 {
    "name": "pablouser1/proxitok",
    "description": "An alternative frontend for TikTok",
-    "version": "2.2.2.0",
+    "version": "2.3.2.1",
    "license": "AGPL-3.0-or-later",
    "type": "project",
    "authors": [
@@ -24,7 +24,7 @@
        "latte/latte": "^2.11",
        "bramus/router": "^1.6",
        "josegonzalez/dotenv": "dev-master",
-        "pablouser1/tikscraper": "^1.3"
+        "pablouser1/tikscraper": "^2.1"
    },
    "autoload": {
        "psr-4": {
@@ -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": "f1c0945357108862633ea87a1f6bbdd8",
+    "content-hash": "15ff00ea59afbf0d6d064d4cbefb05fb",
    "packages": [
        {
            "name": "bramus/router",
@@ -117,16 +117,16 @@
        },
        {
            "name": "latte/latte",
-            "version": "v2.11.3",
+            "version": "v2.11.5",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/latte.git",
-                "reference": "f2e16d3ec6968854029740452c20c38a514e6842"
+                "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/f2e16d3ec6968854029740452c20c38a514e6842",
-                "reference": "f2e16d3ec6968854029740452c20c38a514e6842",
+                "url": "https://api.github.com/repos/nette/latte/zipball/89e647e51213af8a270fe9903b8735a2f6c83ad1",
+                "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1",
                "shasum": ""
            },
            "require": {
@@ -195,9 +195,9 @@
            ],
            "support": {
                "issues": "https://github.com/nette/latte/issues",
-                "source": "https://github.com/nette/latte/tree/v2.11.3"
+                "source": "https://github.com/nette/latte/tree/v2.11.5"
            },
-            "time": "2022-05-08T03:22:55+00:00"
+            "time": "2022-06-26T10:12:18+00:00"
        },
        {
            "name": "m1/env",
@@ -263,23 +263,29 @@
        },
        {
            "name": "pablouser1/tikscraper",
-            "version": "v1.3.5.2",
+            "version": "v2.1.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "cb2580e9868cd4f77f3ab93987786fbd57e4efaf"
+                "reference": "4aa97bbcb54f1d1677830acd2fae5b6c8f22c699"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/cb2580e9868cd4f77f3ab93987786fbd57e4efaf",
-                "reference": "cb2580e9868cd4f77f3ab93987786fbd57e4efaf",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/4aa97bbcb54f1d1677830acd2fae5b6c8f22c699",
+                "reference": "4aa97bbcb54f1d1677830acd2fae5b6c8f22c699",
                "shasum": ""
            },
            "require": {
+                "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": {
@@ -298,9 +304,9 @@
            "description": "Get data from TikTok API",
            "support": {
                "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v1.3.5.2"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.1.1.0"
            },
-            "time": "2022-05-22T09:33:26+00:00"
+            "time": "2022-07-03T16:07:00+00:00"
        },
        {
            "name": "php-webdriver/webdriver",
@@ -399,16 +405,16 @@
        },
        {
            "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": {
@@ -423,7 +429,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -462,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": [
                {
@@ -478,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": {
@@ -500,7 +506,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@@ -545,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": [
                {
@@ -561,7 +567,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-04T08:16:47+00:00"
+            "time": "2022-05-10T07:21:04+00:00"
        },
        {
            "name": "symfony/process",
@@ -3,7 +3,7 @@ version: '3'
 services:
  web:
    container_name: proxitok-web
-    build: .
+    image: ghcr.io/pablouser1/proxitok:master
    ports:
      - 8080:80
    environment:
@@ -11,23 +11,19 @@ services:
      - API_CACHE=redis
      - REDIS_HOST=proxitok-redis
      - REDIS_PORT=6379
-      - API_BROWSER_URL=http://proxitok-chrome:9515
+      - API_SIGNER_URL=http://proxitok-signer:8080/signature
    volumes:
      - proxitok-cache:/cache
    depends_on:
      - redis
-      - chrome
+      - signer
  redis:
    container_name: proxitok-redis
-    image: redis:6-alpine
+    image: redis:7-alpine
    command: redis-server --save 60 1 --loglevel warning
    restart: unless-stopped
-
-  chrome:
-    container_name: proxitok-chrome
-    image: zenika/alpine-chrome:with-chromedriver
-    shm_size: 1g
-    ports:
-      - "9515:9515"
+  signer:
+    container_name: proxitok-signer
+    image: ghcr.io/pablouser1/signtok:master
 volumes:
  proxitok-cache:
@@ -2,8 +2,11 @@
 require __DIR__ . "/vendor/autoload.php";

 $dotenv = new josegonzalez\Dotenv\Loader(__DIR__ . '/.env');
-$dotenv->parse();
-$dotenv->toEnv();
+$dotenv->raiseExceptions(false);
+$result = $dotenv->parse();
+if ($result !== false) {
+    $dotenv->toEnv();
+}

 // ROUTER
 $router = new Bramus\Router\Router();
@@ -34,10 +34,10 @@ $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');
@@ -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
@@ -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.
@@ -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.52.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.1.tgz#554693da808543031f9423911d62c60a1acf7889"
-  integrity sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==
+  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"
@@ -1,7 +1,7 @@
 {layout '../layouts/default.latte'}

 {block header}
-	<p class="title">Welcome to Proxitok!</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>
@@ -9,8 +9,8 @@

 {block content}
 	<p class="title">About this instance</p>
-	<p>Version: {version()}</p>
-	<p>Forcing Legacy mode: {isset($_ENV['API_FORCE_LEGACY']) ? 'yes' : 'no'}</p>
+	<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>
@@ -29,7 +29,7 @@
 			<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>
 		</ul>
 	</p>
@@ -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}
@@ -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}
@@ -1,7 +1,6 @@
 {contentType application/rss+xml}
 {do header('Content-Disposition: attachment; filename="' . $title . '.rss' . '"')}
 {do $full_link = path($link)}
-{var $download = new \TikScraper\Download}
 <?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
@@ -12,11 +11,10 @@
 		{foreach $items as $item}
 			<item>
 				<title>{$item->desc}</title>
-				<description><![CDATA[{$item->desc}]]></description>
+				<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>
-				<enclosure length="{$download->file_size($item->video->playAddr)}" type="video/mp4" url="{path('/stream?url=' . urlencode($item->video->playAddr))}"></enclosure>
 			</item>
 		{/foreach}
 	</channel>
@@ -1,14 +1,16 @@
 {layout '../layouts/default.latte'}

+{var $has_rss = true}
+
 {block header}
-	{if $feed->info->detail->profileThumb !== ''}
+	{if $data->info->detail->profileThumb !== ''}
 	<figure class="figure is-96x96">
-		<img src="{path('/stream?url=' . urlencode($feed->info->detail->profileThumb))}" />
+		<img src="{path('/stream?url=' . urlencode($data->info->detail->profileThumb))}" />
 	</figure>
 	{/if}
-	<p class="title">{$feed->info->detail->title}</p>
+	<p class="title">{$data->info->detail->title}</p>
 	<p class="subtitle">{include '../components/rss.latte'}</p>
-	<p>Videos: {number($feed->info->stats->videoCount)} / Views: {number($feed->info->stats->viewCount)}</p>
+	<p>Videos: {number($data->info->stats->videoCount)} / Views: {number($data->info->stats->viewCount)}</p>
 {/block}

 {block content}
@@ -1,5 +1,7 @@
 {layout '../layouts/default.latte'}

+{var $has_rss = true}
+
 {block header}
 	<p class="title">Trending</p>
 	<p class="subtitle">{include '../components/rss.latte'}</p>
@@ -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}</p>
+	<p class="title">{$data->info->detail->uniqueId}</p>
 	<p class="subtitle">{include '../components/rss.latte'}</p>
-	<p>{$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>
+	<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}
Author	SHA1	Message	Date
Pablo Ferreiro	d52dc8687f	Some anti-crash fixes	2022-07-03 18:19:10 +02:00
Pablo Ferreiro	bc3777d74c	User now can use test endpoints	2022-06-28 20:41:51 +02:00
Pablo Ferreiro	9acc40618a	enclosure removed	2022-06-28 18:54:03 +02:00
Pablo Ferreiro	5e33b93031	Merge pull request #56 from konopielko/master Add video to the feed content	2022-06-28 18:45:53 +02:00
konopielko	76bfcbe34a	Add video to the feed content	2022-06-21 20:18:07 +02:00
Pablo Ferreiro	e2282f9dcc	New TODOS	2022-06-16 11:47:42 +02:00
Pablo Ferreiro	cfe3a0c51b	Some anti crash patches	2022-06-16 11:22:43 +02:00
Pablo Ferreiro	3b0ed28ad9	Creation date on both themes	2022-06-12 13:17:56 +02:00
Pablo Ferreiro	9d37bc433d	rss auto discovery	2022-06-12 12:50:41 +02:00
Pablo Ferreiro	26bde1e4a8	/t endpoint	2022-06-12 12:50:16 +02:00
Pablo Ferreiro	59029e48ad	Added Heroku app.json	2022-06-05 17:34:18 +02:00
Pablo Ferreiro	e12d26562d	RIP Legacy Mode	2022-06-04 21:04:43 +02:00
Pablo Ferreiro	bdba336d3c	cosign update, allow docker deploy with Dockerfile	2022-06-04 20:21:42 +02:00
Pablo Ferreiro	578277d251	Added qemu action	2022-06-04 20:03:21 +02:00
Pablo Ferreiro	240b8d7540	Merge pull request #47 from alefvanoon/patch-1 add arm64 build	2022-06-04 19:56:44 +02:00
alefvanoon	08a28ffc3a	add arm64 build	2022-06-04 11:38:23 +00:00
Pablo Ferreiro	e1fbf75281	Fixed Video Cache and updated Latte	2022-06-02 11:18:16 +02:00
Pablo Ferreiro	c041e84967	Fixed video on Safari	2022-05-30 13:48:06 +02:00
Pablo Ferreiro	6c7c0272d4	Added support for non-ascii characters	2022-05-24 16:35:48 +02:00
Pablo Ferreiro	f1728257f2	Fix optional parameters positioning and ttwid	2022-05-24 16:03:43 +02:00
Pablo Ferreiro	0c100d650b	hotfix	2022-05-24 14:17:41 +02:00
Pablo Ferreiro	55e1e9057b	Updated wrapper	2022-05-24 14:10:41 +02:00
Pablo Ferreiro	14a8829087	Using prebuilt image	2022-05-22 13:14:30 +02:00
Pablo Ferreiro	367fe8d9de	Merge pull request #36 from aosus/master Auto build the docker image and push it to ghcr.io	2022-05-22 12:54:43 +02:00
Pablo Ferreiro	abf23450db	Changed chromedriver with SignTok	2022-05-22 12:52:56 +02:00
Pablo Ferreiro	177f290e56	Avoid warning	2022-05-22 12:31:49 +02:00
Pablo Ferreiro	cd524c8da8	fixed dotenv	2022-05-22 12:12:37 +02:00
FarisZR	62a6f6b9dd	Create docker-publish.yml	2022-05-21 22:28:09 +03:00