User now can use test endpoints

Add video to the feed content

README.md

@@ -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

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/SettingsController.php

@@ -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'];
@@ -26,6 +21,15 @@ class SettingsController {
     }
     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}");
+    }
 }

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

@@ -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);
     }

app/Helpers/Wrappers.php

@@ -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();
         });
@@ -47,7 +50,7 @@ class Wrappers {
      */
     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', ''),

components/head.latte

@@ -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>

components/settings/api.latte

@@ -1,7 +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">
-		<p>TODO</p>
+		<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}

components/themes/card.latte

@@ -10,6 +10,7 @@
 			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))}" />
@@ -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 />

components/themes/common/controls.latte

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

components/themes/default.latte

@@ -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>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pablouser1/proxitok",
     "description": "An alternative frontend for TikTok",
-    "version": "2.3.1.0",
+    "version": "2.3.2.0",
     "license": "AGPL-3.0-or-later",
     "type": "project",
     "authors": [

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": "387c0d1d767d85d4d08fadad9b583080",
+    "content-hash": "5c6b3247dd4d2f94f65a47d2eb39717a",
     "packages": [
         {
             "name": "bramus/router",
@@ -117,16 +117,16 @@
         },
         {
             "name": "latte/latte",
-            "version": "v2.11.4",
+            "version": "v2.11.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/latte.git",
-                "reference": "3a5ed09d92b3bb2c428814bb919c2f8637bc49b1"
+                "reference": "89e647e51213af8a270fe9903b8735a2f6c83ad1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/latte/zipball/3a5ed09d92b3bb2c428814bb919c2f8637bc49b1",
-                "reference": "3a5ed09d92b3bb2c428814bb919c2f8637bc49b1",
+                "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.4"
+                "source": "https://github.com/nette/latte/tree/v2.11.5"
             },
-            "time": "2022-05-30T13:34:15+00:00"
+            "time": "2022-06-26T10:12:18+00:00"
         },
         {
             "name": "m1/env",
@@ -263,23 +263,27 @@
         },
         {
             "name": "pablouser1/tikscraper",
-            "version": "v2.1.0.1",
+            "version": "v2.1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "443225d18f02073ea154b907f93400acd1fd49a4"
+                "reference": "1d330412c4767e3e4f9131ff54ccde18e60407c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/443225d18f02073ea154b907f93400acd1fd49a4",
-                "reference": "443225d18f02073ea154b907f93400acd1fd49a4",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/1d330412c4767e3e4f9131ff54ccde18e60407c5",
+                "reference": "1d330412c4767e3e4f9131ff54ccde18e60407c5",
                 "shasum": ""
             },
             "require": {
+                "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 +302,9 @@
             "description": "Get data from TikTok API",
             "support": {
                 "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.1.0.1"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.1.0.2"
             },
-            "time": "2022-06-04T18:53:49+00:00"
+            "time": "2022-06-16T09:17:37+00:00"
         },
         {
             "name": "php-webdriver/webdriver",

routes.php

@@ -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');

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/yarn.lock

@@ -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"

views/about.latte

@@ -9,7 +9,8 @@
 
 {block content}
 	<p class="title">About this instance</p>
-	<p>Version: {version()}</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>

views/rss.latte

@@ -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>

views/tag.latte

@@ -1,5 +1,7 @@
 {layout '../layouts/default.latte'}
 
+{var $has_rss = true}
+
 {block header}
 	{if $data->info->detail->profileThumb !== ''}
 	<figure class="figure is-96x96">

views/trending.latte

@@ -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>

views/user.latte

@@ -1,5 +1,7 @@
 {layout '../layouts/default.latte'}
 
+{var $has_rss = true}
+
 {block header}
 	<figure class="figure is-96x96">
 		<img src="{path('/stream?url=' . urlencode($data->info->detail->avatarThumb))}" />