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

Using new wrapper

Browse source
This commit is contained in:
Pablo Ferreiro 2022-02-13 22:21:08 +01:00
parent 19e2c32c77
commit a3ebb08d26
No known key found for this signature in database
GPG key ID: 41FBCE65B779FA24
22 changed files with 141 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Controllers/DiscoverController.php
View file

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

7
app/Controllers/ProxyController.php
View file

@ -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->stream($url);
$streamer = new \TikScraper\Stream();
$streamer->url($url);
}
}
}

6
app/Controllers/TagController.php
View file

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

5
app/Controllers/TrendingController.php
View file

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

6
app/Controllers/UserController.php
View file

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

4
app/Controllers/VideoController.php
View file

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