TWS/proxitok
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merged with new-api

Browse source
This commit is contained in:
Pablo Ferreiro 2022-03-11 22:59:16 +01:00
parent f1de8e979b 1eb6626153
commit a4a4b0497c
No known key found for this signature in database
GPG key ID: 41FBCE65B779FA24
21 changed files with 145 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env.example
View file

@ -1,5 +1,4 @@
# APP_URL="http://localhost:8000" # Full url path, PLEASE REPLACE TO YOUR OWN ONE # APP_URL="http://localhost:8000" # Full url path, PLEASE REPLACE TO YOUR OWN ONE
# LATTE_CACHE=/tmp/proxitok_api # Path for Latte cache, leave commented for ./cache/latte
# API CONFIG # API CONFIG
# USE_TEST_ENDPOINTS=1 # Discomment for usage of testing TikTok endpoints, may help sometimes # USE_TEST_ENDPOINTS=1 # Discomment for usage of testing TikTok endpoints, may help sometimes
@ -11,9 +10,10 @@
# PROXY_PORT=8080 # PROXY_PORT=8080
# PROXY_USERNAME=USERNAME # PROXY_USERNAME=USERNAME
# PROXY_PASSWORD=PASSWORD # PROXY_PASSWORD=PASSWORD
# 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) # API_CACHE=redis # Cache engine for TikTok Api, (more info on README)
# Redis cache, used on Helpers\CacheEngines\RedisCache # Redis cache, used on Helpers\CacheEngines\RedisCache (CHOOSE ONE)
# REDIS_HOST=localhost # Host or path to unix socket # REDIS_HOST=localhost # Host or path to unix socket
# REDIS_PORT=6379 # Set to -1 to use unix socket # REDIS_PORT=6379 # Set to -1 to use unix socket
# REDIS_PASSWORD=example # Leave commented for no password # REDIS_PASSWORD=example # Leave commented for no password

19
README.md
View file

@ -8,9 +8,24 @@ Use Tiktok with an alternative frontend, inspired by Nitter.
* See tags * See tags
* See video by id * See video by id
* Discovery * Discovery
* Create a following list, which you can later use to see all the feeds from those users
* RSS Feed for user, trending and tag (just add /rss to the url) * RSS Feed for user, trending and tag (just add /rss to the url)
## Extension
If you want to automatically redirect Tiktok links to ProxiTok you can use:
* [Libredirect](https://github.com/libredirect/libredirect)
* [Redirector](https://github.com/einaregilsson/Redirector)
You can use the following config if you want to use Redirector (you can change https://proxitok.herokuapp.com with whatever instance you want to use):
```
Description: TikTok to ProxiTok
Example URL: https://www.tiktok.com/@tiktok
Include pattern: (.*//.*)(tiktok.com)(.*)
Redirect to: https://proxitok.herokuapp.com$3
Example result: https://proxitok.herokuapp.com/@tiktok
Pattern type: Regular Expression
Apply to: Main window (address bar)
```
## Installation ## Installation
Clone the repository and fetch the requiered external packages with: Clone the repository and fetch the requiered external packages with:
```bash ```bash
@ -60,7 +75,7 @@ location /proxitok/.env {
* i18n * i18n
## Credits ## Credits
* [TikScraper](https://github.com/pablouser1/TikScraperPHP) * [TikTok-API-PHP](https://github.com/ssovit/TikTok-API-PHP) (Currently using my personal fork)
* [Latte](https://github.com/nette/latte) * [Latte](https://github.com/nette/latte)
* [bramus/router](https://github.com/bramus/router) * [bramus/router](https://github.com/bramus/router)
* [PHP dotenv](https://github.com/vlucas/phpdotenv) * [PHP dotenv](https://github.com/vlucas/phpdotenv)

32
app/Cache/JSONCache.php
View file

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

8
app/Cache/RedisCache.php
View file

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

4
app/Controllers/DiscoverController.php
View file

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

6
app/Controllers/TagController.php
View file

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

2
app/Controllers/TrendingController.php
View file

@ -28,7 +28,7 @@ class TrendingController {
static public function rss() { static public function rss() {
$api = Misc::api(); $api = Misc::api();
$feed = $api->getTrending(); $feed = $api->getTrendingFeed();
if ($feed->meta->success) { if ($feed->meta->success) {
$feed = RSS::build('/trending', 'Trending', 'Tiktok trending', $feed->items); $feed = RSS::build('/trending', 'Trending', 'Tiktok trending', $feed->items);
// Setup headers // Setup headers

4
app/Controllers/UserController.php
View file

@ -18,7 +18,7 @@ class UserController {
exit; exit;
} }
$latte = Misc::latte(); $latte = Misc::latte();
$latte->render(Misc::getView('user'), new FeedTemplate($feed->info->detail->nickname, $feed)); $latte->render(Misc::getView('user'), new FeedTemplate($feed->info->detail->user->nickname, $feed));
} else { } else {
ErrorHandler::show($feed->meta); ErrorHandler::show($feed->meta);
} }
@ -28,7 +28,7 @@ class UserController {
$api = Misc::api(); $api = Misc::api();
$feed = $api->getUserFeed($username); $feed = $api->getUserFeed($username);
if ($feed->meta->success) { if ($feed->meta->success) {
$feed = RSS::build('/@'.$username, $feed->info->detail->nickname, $feed->info->detail->signature, $feed->items); $feed = RSS::build('/@'.$username, $feed->info->detail->user->nickname, $feed->info->detail->user->signature, $feed->items);
// Setup headers // Setup headers
RSS::setHeaders('user.rss'); RSS::setHeaders('user.rss');
echo $feed; echo $feed;

4
app/Controllers/VideoController.php
View file

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

6
app/Helpers/Misc.php
View file

@ -9,10 +9,6 @@ class Misc {
return isset($_GET['cursor']) && is_numeric($_GET['cursor']) ? (int) $_GET['cursor'] : 0; return isset($_GET['cursor']) && is_numeric($_GET['cursor']) ? (int) $_GET['cursor'] : 0;
} }
static public function getTtwid(): string {
return $_GET['cursor'] ?? '';
}
static public function url(string $endpoint = '') { static public function url(string $endpoint = '') {
return self::env('APP_URL', '') . $endpoint; return self::env('APP_URL', '') . $endpoint;
} }
@ -70,7 +66,7 @@ class Misc {
} else { } else {
$host = $_ENV['REDIS_HOST']; $host = $_ENV['REDIS_HOST'];
$port = (int) $_ENV['REDIS_PORT']; $port = (int) $_ENV['REDIS_PORT'];
$password = $_ENV['REDIS_PASSWORD'] ?? null; $password = isset($_ENV['REDIS_PASSWORD']) ? $_ENV['REDIS_PASSWORD'] : null;
} }
$cacheEngine = new RedisCache($host, $port, $password); $cacheEngine = new RedisCache($host, $port, $password);
break; break;

2
app/Helpers/RSS.php
View file

@ -2,7 +2,7 @@
namespace App\Helpers; namespace App\Helpers;
use \FeedWriter\RSS2; use \FeedWriter\RSS2;
use TikScraper\Download; use \Sovit\TikTok\Download;
class RSS { class RSS {
static public function build(string $endpoint, string $title, string $description, array $items): string { static public function build(string $endpoint, string $title, string $description, array $items): string {

16
app/Models/DiscoverTemplate.php
View file

@ -1,16 +0,0 @@
<?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;
}
}

6
app/Models/FeedTemplate.php
View file

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

2
components/feed.latte
View file

@ -17,7 +17,7 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
<div class="buttons"> <div n:ifset="$feed->info" class="buttons">
{if isset($_GET['cursor']) && $_GET['cursor'] != 0 } {if isset($_GET['cursor']) && $_GET['cursor'] != 0 }
<a class="button is-danger" href="?">First</a> <a class="button is-danger" href="?">First</a>
<button class="button is-danger" onclick="history.back()">Back</button> <button class="button is-danger" onclick="history.back()">Back</button>

8
composer.json
View file

@ -11,10 +11,16 @@
"homepage": "https://github.com/pablouser1" "homepage": "https://github.com/pablouser1"
} }
], ],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/pablouser1/TikTok-API-PHP"
}
],
"require": { "require": {
"ext-redis": "^5.3.2", "ext-redis": "^5.3.2",
"ext-mbstring": "*", "ext-mbstring": "*",
"pablouser1/tikscraper": "^1.0", "ssovit/tiktok-api": "dev-rework",
"latte/latte": "^2.10", "latte/latte": "^2.10",
"vlucas/phpdotenv": "^5.4", "vlucas/phpdotenv": "^5.4",
"bramus/router": "^1.6", "bramus/router": "^1.6",

56
composer.lock generated
View file

@ -414,6 +414,58 @@
], ],
"time": "2021-12-04T23:24:31+00:00" "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", "name": "symfony/polyfill-ctype",
"version": "v1.25.0", "version": "v1.25.0",
@ -746,7 +798,9 @@
"packages-dev": [], "packages-dev": [],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {
"ssovit/tiktok-api": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {

2
views/about.latte
View file

@ -24,7 +24,7 @@
<p> <p>
This project wouldn't be possible without the help of the following projects: This project wouldn't be possible without the help of the following projects:
<ul> <ul>
<li><a rel="nofollow" href="https://github.com/pablouser1/TikScraperPHP">TikScraper</a></li> <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/nette/latte">Latte</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/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/vlucas/phpdotenv">PHP dotenv</a></li>

6
views/music.latte
View file

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

8
views/tag.latte
View file

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

12
views/user.latte
View file

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

16
views/video.latte
View file

@ -4,12 +4,18 @@
{do $item = $feed->items[0]} {do $item = $feed->items[0]}
<div class="columns is-centered is-vcentered"> <div class="columns is-centered is-vcentered">
<div class="column"> <div class="column">
<<<<<<< HEAD
<video controls poster="{path('/stream?url=' . urlencode($item->video->originCover))}"> <video controls poster="{path('/stream?url=' . urlencode($item->video->originCover))}">
<source src="{path('/stream?url=' . urlencode($item->video->playAddr))}" type="video/mp4" /> <source src="{path('/stream?url=' . urlencode($item->video->playAddr))}" type="video/mp4" />
=======
<video controls poster="{path('/stream?url=' . urlencode($item->items[0]->video->originCover))}">
<source src="{path('/stream?url=' . urlencode($item->items[0]->video->playAddr))}" type="video/mp4" />
>>>>>>> master
</video> </video>
</div> </div>
<div class="column has-text-centered"> <div class="column has-text-centered">
<div class="box"> <div class="box">
<<<<<<< HEAD
<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('/@'.$feed->info->detail->uniqueId)}">{$feed->info->detail->uniqueId}</a></p>
<p class="subtitle">{$item->desc}</p> <p class="subtitle">{$item->desc}</p>
<p>Played {number($feed->info->stats->playCount)} times</p> <p>Played {number($feed->info->stats->playCount)} times</p>
@ -28,6 +34,16 @@
</div> </div>
<p>{$item->music->title}</p> <p>{$item->music->title}</p>
<audio src="{path('/stream?url=' . urlencode($item->music->playUrl))}" controls preload="none"></audio> <audio src="{path('/stream?url=' . urlencode($item->music->playUrl))}" controls preload="none"></audio>
=======
<p class="title">Video by <a href="{path('/@'.$item->info->detail->user->uniqueId)}">{$item->info->detail->user->uniqueId}</a></p>
<p class="subtitle">{$item->items[0]->desc}</p>
<p>Played {number($item->info->detail->stats->playCount)} times</p>
<p>Shared {number($item->info->detail->stats->shareCount)} times / {number($item->info->detail->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>
<p>{$item->items[0]->music->title}</p>
<audio src="{path('/stream?url=' . urlencode($item->items[0]->music->playUrl))}" controls preload="none"></audio>
>>>>>>> master
</div> </div>
</div> </div>
</div> </div>