Using new wrapper

.env.example

@@ -1,9 +1,9 @@
 # APP_URL="http://localhost:8000" # Full url path, PLEASE REPLACE TO YOUR OWN ONE
-
+# SIGNER_URL="https://tiktok-sign.herokuapp.com/signature" # External signing service
 # LATTE_CACHE=/tmp/proxitok_api # Path for Latte cache, leave commented for ./cache/latte
 # API_CACHE=redis # Cache engine for TikTok Api, (more info on README)
 
-# Redis cache, used on Helpers\CacheEngines\RedisCache (CHOOSE ONE)
+# Redis cache, used on Helpers\CacheEngines\RedisCache
 # REDIS_HOST=localhost # Host or path to unix socket
 # REDIS_PORT=6379 # Set to -1 to use unix socket
 # REDIS_PASSWORD=example # Leave commented for no password

README.md

@@ -60,7 +60,7 @@ location /proxitok/.env {
 * i18n
 
 ## Credits
-* [TikTok-API-PHP](https://github.com/ssovit/TikTok-API-PHP) (Currently using my personal fork)
+* [TikScraper](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)

app/Cache/JSONCache.php

@@ -1,33 +1,31 @@
 <?php
 namespace App\Cache;
 
+use App\Helpers\Misc;
+
 class JSONCache {
-    private string $cache_path = __DIR__ . '/../../cache/api';
+    private string $cache_path = '';
 
     function __construct() {
-        if (isset($_ENV['API_CACHE_JSON']) && !empty($_ENV['API_CACHE_JSON'])) {
+        $this->cache_path = Misc::env('API_CACHE_JSON', __DIR__ . '/../../cache/api');
-            $this->cache_path = $_ENV['API_CACHE_JSON'];
-        }
-    }
-    public function get(string $cache_key): object|false {
-        $filename = $this->cache_path . '/' . $cache_key . '.json';
-        if (is_file($filename)) {
-            $time = time();
-            $json_string = file_get_contents($filename);
-            $element = json_decode($json_string);
-            if ($time < $element->expires) {
-                return $element->data;
-            }
-            // Remove file if expired
-            unlink($filename);
-        }
-        return false;
     }
 
-    public function set(string $cache_key, mixed $data, $timeout = 3600) {
+    public function get(string $cache_key): ?object {
-        file_put_contents($this->cache_path . '/' . $cache_key . '.json', json_encode([
+        $filename = $this->cache_path . '/' . $cache_key . '.json';
-            'data' => $data,
+        if (is_file($filename)) {
-            'expires' => time() + $timeout
+            $json_string = file_get_contents($filename);
-        ]));
+            $element = json_decode($json_string);
+            return $element;
+        }
+        return null;
+    }
+
+    public function exists(string $cache_key): bool  {
+        $filename = $this->cache_path . '/' . $cache_key . '.json';
+        return is_file($filename);
+    }
+
+    public function set(string $cache_key, string $data, $timeout = 3600) {
+        file_put_contents($this->cache_path . '/' . $cache_key . '.json', $data);
     }
 }

app/Cache/RedisCache.php

@@ -27,6 +27,10 @@ class RedisCache {
         return null;
     }
 
+    public function exists(string $cache_key): bool {
+        return $this->client->exists($cache_key);
+    }
+
     public function set(string $cache_key, array $data, $timeout = 3600) {
         $this->client->set($cache_key, json_encode($data), $timeout);
     }

app/Controllers/DiscoverController.php

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

app/Controllers/ProxyController.php

@@ -40,25 +40,24 @@ class ProxyController {
 
     static public function stream() {
         if (isset($_GET['download'])) {
+            $downloader = new \TikScraper\Download();
             $watermark = isset($_GET['watermark']);
             if ($watermark) {
                 self::checkUrl();
                 $filename = self::getFileName();
-                $downloader = new \Sovit\TikTok\Download();
                 $downloader->url($_GET['url'], $filename, true);
             } else {
                 if (!isset($_GET['id'])) {
                     die('You need to send an ID!');
                 }
                 $filename = self::getFileName();
-                $downloader = new \Sovit\TikTok\Download();
                 $downloader->url($_GET['id'], $filename, false);
             }
         } else {
             self::checkUrl();
             $url = $_GET['url'];
-            $streamer = new \Sovit\TikTok\Stream();
+            $streamer = new \TikScraper\Stream();
-            $streamer->stream($url);
+            $streamer->url($url);
         }
     }
 }

app/Controllers/TagController.php

@@ -10,7 +10,7 @@ class TagController {
     static public function get(string $name) {
         $cursor = Misc::getCursor();
         $api = Misc::api();
-        $feed = $api->getChallengeFeed($name, $cursor);
+        $feed = $api->getHashtagFeed($name, $cursor);
         if ($feed->meta->success) {
             $latte = Misc::latte();
             $latte->render(Misc::getView('tag'), new FeedTemplate('Tag', $feed));
@@ -21,9 +21,9 @@ class TagController {
 
     static public function rss(string $name) {
         $api = Misc::api();
-        $feed = $api->getChallengeFeed($name);
+        $feed = $api->getHashtagFeed($name);
         if ($feed->meta->success) {
-            $feed = RSS::build("/tag/{$name}", "{$name} Tag", $feed->info->detail->challenge->desc, $feed->items);
+            $feed = RSS::build("/tag/{$name}", "{$name} Tag", $feed->info->detail->desc, $feed->items);
             // Setup headers
             RSS::setHeaders('tag.rss');
             echo $feed;

app/Controllers/TrendingController.php

@@ -9,8 +9,9 @@ use App\Helpers\RSS;
 class TrendingController {
     static public function get() {
         $cursor = Misc::getCursor();
+        $page = $_GET['page'] ?? 0;
         $api = Misc::api();
-        $feed = $api->getTrendingFeed($cursor);
+        $feed = $api->getTrending($cursor, $page);
         if ($feed->meta->success) {
             $latte = Misc::latte();
             $latte->render(Misc::getView('trending'), new FeedTemplate('Trending', $feed));
@@ -21,7 +22,7 @@ class TrendingController {
 
     static public function rss() {
         $api = Misc::api();
-        $feed = $api->getTrendingFeed();
+        $feed = $api->getTrending();
         if ($feed->meta->success) {
             $feed = RSS::build('/trending', 'Trending', 'Tiktok trending', $feed->items);
             // Setup headers

app/Controllers/UserController.php

@@ -12,12 +12,12 @@ class UserController {
         $api = Misc::api();
         $feed = $api->getUserFeed($username, $cursor);
         if ($feed->meta->success) {
-            if ($feed->info->detail->user->privateAccount) {
+            if ($feed->info->detail->privateAccount) {
                 http_response_code(400);
                 echo 'Private account detected! Not supported';
             }
             $latte = Misc::latte();
-            $latte->render(Misc::getView('user'), new FeedTemplate($feed->info->detail->user->nickname, $feed));
+            $latte->render(Misc::getView('user'), new FeedTemplate($feed->info->detail->nickname, $feed));
         } else {
             ErrorHandler::show($feed->meta);
         }
@@ -27,7 +27,7 @@ class UserController {
         $api = Misc::api();
         $feed = $api->getUserFeed($username);
         if ($feed->meta->success) {
-            $feed = RSS::build('/@'.$username, $feed->info->detail->user->nickname, $feed->info->detail->user->signature, $feed->items);
+            $feed = RSS::build('/@'.$username, $feed->info->detail->nickname, $feed->info->detail->signature, $feed->items);
             // Setup headers
             RSS::setHeaders('user.rss');
             echo $feed;

app/Controllers/VideoController.php

@@ -3,7 +3,7 @@ namespace App\Controllers;
 
 use App\Helpers\ErrorHandler;
 use App\Helpers\Misc;
-use App\Models\ItemTemplate;
+use App\Models\FeedTemplate;
 
 class VideoController {
     static public function get(string $video_id) {
@@ -11,7 +11,7 @@ class VideoController {
         $item = $api->getVideoByID($video_id);
         if ($item->meta->success) {
             $latte = Misc::latte();
-            $latte->render(Misc::getView('video'), new ItemTemplate($item->info->detail->user->nickname, $item));
+            $latte->render(Misc::getView('video'), new FeedTemplate($item->info->detail->nickname, $item));
         } else {
             ErrorHandler::show($item->meta);
         }

app/Helpers/Misc.php

@@ -27,8 +27,10 @@ class Misc {
     /**
      * Setup of TikTok Api wrapper
      */
-    static public function api(): \Sovit\TikTok\Api {
+    static public function api(): \TikScraper\Api {
-        $options = [];
+        $options = [
+            'remote_signer' => self::env('SIGNER_URL', 'http://localhost:8080/signature')
+        ];
         $cacheEngine = false;
         // Proxy config
         foreach(Cookies::PROXY as $proxy_element) {
@@ -55,13 +57,13 @@ class Misc {
                     } else {
                         $host = $_ENV['REDIS_HOST'];
                         $port = (int) $_ENV['REDIS_PORT'];
-                        $password = isset($_ENV['REDIS_PASSWORD']) ? $_ENV['REDIS_PASSWORD'] : null;
+                        $password = $_ENV['REDIS_PASSWORD'] ?? null;
                     }
                     $cacheEngine = new RedisCache($host, $port, $password);
                     break;
             }
         }
-        $api = new \Sovit\TikTok\Api($options, $cacheEngine);
+        $api = new \TikScraper\Api($options, $cacheEngine);
         return $api;
     }
 

app/Models/DiscoverTemplate.php

@@ -0,0 +1,16 @@
+<?php
+namespace App\Models;
+
+use TikScraper\Models\Discover;
+
+/**
+* Base for templates with a feed
+*/
+class DiscoverTemplate extends BaseTemplate {
+    public Discover $feed;
+
+    function __construct(Discover $feed) {
+        parent::__construct('Discover');
+        $this->feed = $feed;
+    }
+}

app/Models/FeedTemplate.php

@@ -1,13 +1,15 @@
 <?php
 namespace App\Models;
 
+use TikScraper\Models\Feed;
+
 /**
 * Base for templates with a feed
 */
 class FeedTemplate extends BaseTemplate {
-    public object $feed;
+    public Feed $feed;
 
-    function __construct(string $title, object $feed) {
+    function __construct(string $title, Feed $feed) {
         parent::__construct($title);
         $this->feed = $feed;
     }

app/Models/ItemTemplate.php

@@ -1,14 +0,0 @@
-<?php
-namespace App\Models;
-
-/**
-* Base for templates with item (only /video at the time)
-*/
-class ItemTemplate extends BaseTemplate {
-    public object $item;
-
-    function __construct(string $title, object $item) {
-        parent::__construct($title);
-        $this->item = $item;
-    }
-}

components/feed.latte

@@ -17,7 +17,7 @@
     </div>
     {/foreach}
   </div>
-	<div n:ifset="$feed->info" class="buttons">
+	<div 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>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pablouser1/proxitok",
     "description": "An alternative frontend for TikTok",
-    "version": "1.4.1.4",
+    "version": "1.5.0",
     "license": "AGPL-3.0-or-later",
     "type": "project",
     "homepage": "https://github.com/pablouser1/ProxiTok",
@@ -11,16 +11,10 @@
             "homepage": "https://github.com/pablouser1"
         }
     ],
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/pablouser1/TikTok-API-PHP"
-        }
-    ],
     "require": {
         "ext-redis": "^5.3.2",
         "ext-mbstring": "*",
-        "ssovit/tiktok-api": "dev-rework",
+        "pablouser1/tikscraper": "^1.0",
         "latte/latte": "^2.10",
         "vlucas/phpdotenv": "^5.4",
         "bramus/router": "^1.6",

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": "e829a003ddc8a31048406dfd3ec20815",
+    "content-hash": "f5e451a254a58bf7d512421237641801",
     "packages": [
         {
             "name": "bramus/router",
@@ -304,6 +304,45 @@
             },
             "time": "2016-11-19T20:47:44+00:00"
         },
+        {
+            "name": "pablouser1/tikscraper",
+            "version": "v1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pablouser1/TikScraperPHP.git",
+                "reference": "2022b2c2d661383d09c4727091df7fae345844a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/2022b2c2d661383d09c4727091df7fae345844a5",
+                "reference": "2022b2c2d661383d09c4727091df7fae345844a5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "TikScraper\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Pablo Ferreiro"
+                }
+            ],
+            "description": "Get data from TikTok API",
+            "support": {
+                "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v1.2.1"
+            },
+            "time": "2022-02-13T20:28:38+00:00"
+        },
         {
             "name": "phpoption/phpoption",
             "version": "1.8.1",
@@ -375,58 +414,6 @@
             ],
             "time": "2021-12-04T23:24:31+00:00"
         },
-        {
-            "name": "ssovit/tiktok-api",
-            "version": "dev-rework",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pablouser1/TikTok-API-PHP.git",
-                "reference": "60c00cfd321888b80eba93b6214c8c4003e98e57"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikTok-API-PHP/zipball/60c00cfd321888b80eba93b6214c8c4003e98e57",
-                "reference": "60c00cfd321888b80eba93b6214c8c4003e98e57",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Sovit\\": "lib"
-                }
-            },
-            "archive": {
-                "exclude": [
-                    "/example",
-                    "/.github",
-                    "/.editorconfig"
-                ]
-            },
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Sovit Tamrakar",
-                    "email": "sovit.tamrakar@gmail.com",
-                    "homepage": "https://github.com/ssovit/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Unofficial TikTok API for PHP",
-            "homepage": "https://github.com/ssovit/TikTok-API-PHP",
-            "keywords": [
-                "tiktok",
-                "tiktok-api",
-                "tiktok-scraper"
-            ],
-            "support": {
-                "source": "https://github.com/ssovit/TikTok-API-PHP",
-                "issues": "https://github.com/ssovit/TikTok-API-PHP/issues",
-                "email": "sovit.tamrakar@gmail.com"
-            },
-            "time": "2022-02-07T22:43:53+00:00"
-        },
         {
             "name": "symfony/polyfill-ctype",
             "version": "v1.24.0",
@@ -543,12 +530,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -759,9 +746,7 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
+    "stability-flags": [],
-        "ssovit/tiktok-api": 20
-    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

views/about.latte

@@ -20,7 +20,7 @@
 	<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">TikScraper</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>

views/music.latte

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

views/tag.latte

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

views/user.latte

@@ -2,13 +2,13 @@
 
 {block header}
 	<figure class="figure is-96x96">
-		<img src="{path('/stream?url=' . urlencode($feed->info->detail->user->avatarThumb))}" />
+		<img src="{path('/stream?url=' . urlencode($feed->info->detail->avatarThumb))}" />
 	</figure>
-	<p class="title">{$feed->info->detail->user->uniqueId}'s profile</p>
+	<p class="title">{$feed->info->detail->uniqueId}'s profile</p>
-	<p class="subtitle">{$feed->info->detail->user->signature}</p>
+	<p class="subtitle">{$feed->info->detail->signature}</p>
-	<p>Following: {number($feed->info->detail->stats->followingCount)} / Followers: {number($feed->info->detail->stats->followerCount)}</p>
+	<p>Following: {number($feed->info->stats->followingCount)} / Followers: {number($feed->info->stats->followerCount)}</p>
-	<p>Hearts: {number($feed->info->detail->stats->heartCount)} / Videos: {$feed->info->detail->stats->videoCount}</p>
+	<p>Hearts: {number($feed->info->stats->heartCount)} / Videos: {$feed->info->stats->videoCount}</p>
-	<a href="{path('/@' . $feed->info->detail->user->uniqueId . '/rss')}">RSS</a>
+	<a href="{path('/@' . $feed->info->detail->uniqueId . '/rss')}">RSS</a>
 {/block}
 
 {block content}

views/video.latte

@@ -3,20 +3,20 @@
 {block content}
 	<div class="columns is-centered is-vcentered">
 		<div class="column">
-			<video controls poster="{path('/stream?url=' . urlencode($item->items[0]->video->originCover))}">
+			<video controls poster="{path('/stream?url=' . urlencode($feed->items[0]->video->originCover))}">
-				<source src="{path('/stream?url=' . urlencode($item->items[0]->video->playAddr))}" type="video/mp4" />
+				<source src="{path('/stream?url=' . urlencode($feed->items[0]->video->playAddr))}" type="video/mp4" />
 			</video>
 		</div>
 		<div class="column has-text-centered">
 			<div class="box">
-				<p class="title">Video by <a href="{path('/@'.$item->info->detail->user->uniqueId)}">{$item->info->detail->user->uniqueId}</a></p>
+				<p class="title">Video by <a href="{path('/@'.$feed->info->detail->uniqueId)}">{$feed->info->detail->uniqueId}</a></p>
-				<p class="subtitle">{$item->items[0]->desc}</p>
+				<p class="subtitle">{$feed->items[0]->desc}</p>
-				<p>Played {number($item->info->detail->stats->playCount)} times</p>
+				<p>Played {number($feed->info->stats->playCount)} times</p>
-				<p>Shared {number($item->info->detail->stats->shareCount)} times / {number($item->info->detail->stats->commentCount)} comments</p>
+				<p>Shared {number($feed->info->stats->shareCount)} times / {number($feed->info->stats->commentCount)} comments</p>
 				<hr />
-				<a href="{path('/stream?url=' . urlencode($item->items[0]->video->playAddr) . '&download=1')}" class="button is-info">Download video</a>
+				<a href="{path('/stream?url=' . urlencode($feed->items[0]->video->playAddr) . '&download=1')}" class="button is-info">Download video</a>
-      	<p>{$item->items[0]->music->title}</p>
+      	<p>{$feed->items[0]->music->title}</p>
-      	<audio src="{path('/stream?url=' . urlencode($item->items[0]->music->playUrl))}" controls preload="none"></audio>
+      	<audio src="{path('/stream?url=' . urlencode($feed->items[0]->music->playUrl))}" controls preload="none"></audio>
 			</div>
 		</div>
 	</div>