From 19a2066fc2aa33f423b66c0b65c89ddfe1dc3234 Mon Sep 17 00:00:00 2001
From: Pablo Ferreiro <me@pabloferreiro.es>
Date: Thu, 27 Apr 2023 20:23:23 +0200
Subject: [PATCH] changed keyword order

---
 app/Controllers/DiscoverController.php |  2 +-
 app/Controllers/EmbedController.php    |  2 +-
 app/Controllers/MusicController.php    |  2 +-
 app/Controllers/ProxyController.php    |  4 ++--
 app/Controllers/RedirectController.php |  4 ++--
 app/Controllers/SettingsController.php |  6 +++---
 app/Controllers/TagController.php      |  4 ++--
 app/Controllers/TrendingController.php |  4 ++--
 app/Controllers/UserController.php     |  6 +++---
 app/Controllers/VideoController.php    |  2 +-
 app/Helpers/Cookies.php                | 12 ++++++------
 app/Helpers/ErrorHandler.php           |  4 ++--
 app/Helpers/Misc.php                   | 13 +++++++------
 app/Helpers/UrlBuilder.php             | 12 ++++++------
 app/Helpers/Wrappers.php               |  4 ++--
 15 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/app/Controllers/DiscoverController.php b/app/Controllers/DiscoverController.php
index a2d033b..c43f19b 100644
--- a/app/Controllers/DiscoverController.php
+++ b/app/Controllers/DiscoverController.php
@@ -6,7 +6,7 @@ use App\Helpers\Wrappers;
 use App\Models\DiscoverTemplate;
 
 class DiscoverController {
-    static public function get() {
+    public static function get() {
         $api = Wrappers::api();
         $data = $api->discover();
         if ($data->meta->success) {
diff --git a/app/Controllers/EmbedController.php b/app/Controllers/EmbedController.php
index 48e4b73..06c90a2 100644
--- a/app/Controllers/EmbedController.php
+++ b/app/Controllers/EmbedController.php
@@ -6,7 +6,7 @@ use App\Helpers\Wrappers;
 use App\Models\VideoTemplate;
 
 class EmbedController {
-    static public function v2(int $id) {
+    public static function v2(int $id) {
         $api = Wrappers::api();
         $video = $api->video($id);
         $video->feed();
diff --git a/app/Controllers/MusicController.php b/app/Controllers/MusicController.php
index 0ca11fe..215b3d2 100644
--- a/app/Controllers/MusicController.php
+++ b/app/Controllers/MusicController.php
@@ -7,7 +7,7 @@ use App\Helpers\Wrappers;
 use App\Models\FullTemplate;
 
 class MusicController {
-    static public function get(string $music_id) {
+    public static function get(string $music_id) {
         $cursor = Misc::getCursor();
 
         $api = Wrappers::api();
diff --git a/app/Controllers/ProxyController.php b/app/Controllers/ProxyController.php
index 7a3c72e..ff72c23 100644
--- a/app/Controllers/ProxyController.php
+++ b/app/Controllers/ProxyController.php
@@ -10,7 +10,7 @@ class ProxyController {
         "tiktokcdn.com", "tiktokcdn-us.com", "tiktok.com"
     ];
 
-    static public function stream() {
+    public static function stream() {
         self::checkUrl();
         $url = $_GET['url'];
         $config['user_agent'] = Misc::env("USER_AGENT", TikScraperUserAgents::DEFAULT);
@@ -18,7 +18,7 @@ class ProxyController {
         $streamer->url($url);
     }
 
-    static public function download() {
+    public static function download() {
         self::checkUrl();
         $method = Cookies::downloader();
         $downloader = new \TikScraper\Download($method);
diff --git a/app/Controllers/RedirectController.php b/app/Controllers/RedirectController.php
index 42f6d64..763084b 100644
--- a/app/Controllers/RedirectController.php
+++ b/app/Controllers/RedirectController.php
@@ -8,7 +8,7 @@ use App\Helpers\UrlBuilder;
  * Used to be compatible with HTML forms
  */
 class RedirectController {
-    static public function search() {
+    public static function search() {
         $endpoint = '/';
         if (isset($_GET['type'], $_GET['term'])) {
             $term = trim($_GET['term']);
@@ -49,7 +49,7 @@ class RedirectController {
         header("Location: {$url}");
     }
 
-    static public function download() {
+    public static function download() {
         if (!(isset($_GET['videoId'], $_GET['authorUsername'], $_GET['playAddr']))) {
             ErrorHandler::showText(400, 'Request incomplete');
             return;
diff --git a/app/Controllers/SettingsController.php b/app/Controllers/SettingsController.php
index 6c9f8dd..d6c1803 100644
--- a/app/Controllers/SettingsController.php
+++ b/app/Controllers/SettingsController.php
@@ -7,11 +7,11 @@ use App\Helpers\Wrappers;
 use App\Models\SettingsTemplate;
 
 class SettingsController {
-    static public function index() {
+    public static function index() {
         Wrappers::latte('settings', new SettingsTemplate());
     }
 
-    static public function general() {
+    public static function general() {
         if (isset($_POST['theme'])) {
             $theme = $_POST['theme'];
             Cookies::set('theme', $theme);
@@ -19,7 +19,7 @@ class SettingsController {
         self::redirect();
     }
 
-    static public function api() {
+    public static function api() {
         // TODO, ADD COUNT
         if (isset($_POST['api-test_endpoints'])) {
             $test_endpoints = $_POST['api-test_endpoints'];
diff --git a/app/Controllers/TagController.php b/app/Controllers/TagController.php
index a59e061..e501c49 100644
--- a/app/Controllers/TagController.php
+++ b/app/Controllers/TagController.php
@@ -9,7 +9,7 @@ use App\Models\FullTemplate;
 use App\Models\RSSTemplate;
 
 class TagController {
-    static public function get(string $name) {
+    public static function get(string $name) {
         $cursor = Misc::getCursor();
         $api = Wrappers::api();
         $hashtag = $api->hashtag($name);
@@ -23,7 +23,7 @@ class TagController {
         }
     }
 
-    static public function rss(string $name) {
+    public static function rss(string $name) {
         $api = Wrappers::api();
         $hashtag = $api->hashtag($name);
         $hashtag->feed();
diff --git a/app/Controllers/TrendingController.php b/app/Controllers/TrendingController.php
index 6c85207..becc46a 100644
--- a/app/Controllers/TrendingController.php
+++ b/app/Controllers/TrendingController.php
@@ -8,7 +8,7 @@ use App\Helpers\Wrappers;
 use App\Models\RSSTemplate;
 
 class TrendingController {
-    static public function get() {
+    public static function get() {
         $api = Wrappers::api();
         $cursor = Misc::getTtwid();
 
@@ -23,7 +23,7 @@ class TrendingController {
         }
     }
 
-    static public function rss() {
+    public static function rss() {
         $api = Wrappers::api();
         $trending = $api->trending();
         $trending->feed();
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index 4b74dec..6cba1b6 100644
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -10,7 +10,7 @@ use App\Models\RSSTemplate;
 use App\Models\VideoTemplate;
 
 class UserController {
-    static public function get(string $username) {
+    public static function get(string $username) {
         $cursor = Misc::getCursor();
         $api = Wrappers::api();
         $user = $api->user($username);
@@ -24,7 +24,7 @@ class UserController {
         }
     }
 
-    static public function video(string $username, string $video_id) {
+    public static function video(string $username, string $video_id) {
         $api = Wrappers::api();
         $video = $api->video($video_id);
         $video->feed();
@@ -37,7 +37,7 @@ class UserController {
         }
     }
 
-    static public function rss(string $username) {
+    public static function rss(string $username) {
         $api = Wrappers::api();
         $user = $api->user($username);
         $user->feed();
diff --git a/app/Controllers/VideoController.php b/app/Controllers/VideoController.php
index 1336c05..00540ba 100644
--- a/app/Controllers/VideoController.php
+++ b/app/Controllers/VideoController.php
@@ -2,7 +2,7 @@
 namespace App\Controllers;
 
 class VideoController {
-    static public function get(string $video_id) {
+    public static function get(string $video_id) {
         UserController::video('placeholder', $video_id);
     }
 }
diff --git a/app/Helpers/Cookies.php b/app/Helpers/Cookies.php
index a7d42ee..53c91fd 100644
--- a/app/Helpers/Cookies.php
+++ b/app/Helpers/Cookies.php
@@ -4,14 +4,14 @@ namespace App\Helpers;
 use App\Constants\Themes;
 
 class Cookies {
-    static public function get(string $name, string $default_value = ''): string {
+    public static function get(string $name, string $default_value = ''): string {
         if (isset($_COOKIE[$name]) && !empty($_COOKIE[$name])) {
             return $_COOKIE[$name];
         }
         return $default_value;
     }
 
-    static public function theme(): string {
+    public static function theme(): string {
         $theme = self::get('theme');
         $ref = new \ReflectionClass(Themes::class);
         $themes = $ref->getConstants();
@@ -21,20 +21,20 @@ class Cookies {
         return 'default';
     }
 
-    static public function downloader(): string {
+    public static function downloader(): string {
         $downloader = self::get('api-downloader', 'default');
         return $downloader;
     }
 
-    static public function exists(string $name): bool {
+    public static function exists(string $name): bool {
         return isset($_COOKIE[$name]);
     }
 
-    static public function check(string $name, string $value): bool {
+    public static function check(string $name, string $value): bool {
         return self::exists($name) && $_COOKIE[$name] === $value;
     }
 
-    static public function set(string $name, string $value) {
+    public static function set(string $name, string $value) {
         setcookie($name, $value, time()+60*60*24*30, '/', '', isset($_SERVER['HTTPS']), true);
     }
 };
diff --git a/app/Helpers/ErrorHandler.php b/app/Helpers/ErrorHandler.php
index 71eec85..e1a0170 100644
--- a/app/Helpers/ErrorHandler.php
+++ b/app/Helpers/ErrorHandler.php
@@ -5,12 +5,12 @@ use App\Models\ErrorTemplate;
 use TikScraper\Models\Meta;
 
 class ErrorHandler {
-    static public function showMeta(Meta $meta) {
+    public static function showMeta(Meta $meta) {
         http_response_code($meta->http_code);
         Wrappers::latte('error', new ErrorTemplate($meta->http_code, $meta->tiktok_msg, $meta->tiktok_code));
     }
 
-    static public function showText(int $code, string $msg) {
+    public static function showText(int $code, string $msg) {
         http_response_code($code);
         Wrappers::latte('error', new ErrorTemplate($code, $msg));
     }
diff --git a/app/Helpers/Misc.php b/app/Helpers/Misc.php
index 73b500a..91b7dc5 100644
--- a/app/Helpers/Misc.php
+++ b/app/Helpers/Misc.php
@@ -2,33 +2,34 @@
 namespace App\Helpers;
 
 class Misc {
-    static public function getCursor(): int {
+    public static function getCursor(): int {
         return isset($_GET['cursor']) && is_numeric($_GET['cursor']) ? (int) $_GET['cursor'] : 0;
     }
 
-    static public function getTtwid(): string {
+    public static function getTtwid(): string {
         return isset($_GET['cursor']) ? $_GET['cursor'] : '';
     }
 
-    static public function url(string $endpoint = ''): string {
+    public static function url(string $endpoint = ''): string {
         return self::env('APP_URL', '') . $endpoint;
     }
 
-    static public function env(string $key, $default_value) {
+    public static function env(string $key, $default_value) {
         return $_ENV[$key] ?? $default_value;
     }
 
     /**
      * Returns absolute path for view
      */
-    static public function getView(string $template): string {
+    public static function getView(string $template): string {
         return __DIR__ . "/../../templates/views/{$template}.latte";
     }
 
     /**
      * Common method for rss feeds
      */
-    static public function rss(string $title) {
+    public static function rss(string $title) {
+        header('Content-Type: application/rss+xml');
         header('Content-Disposition: attachment; filename="' . $title . '.rss' . '"');
     }
 }
diff --git a/app/Helpers/UrlBuilder.php b/app/Helpers/UrlBuilder.php
index d7a58a8..f677902 100644
--- a/app/Helpers/UrlBuilder.php
+++ b/app/Helpers/UrlBuilder.php
@@ -2,29 +2,29 @@
 namespace App\Helpers;
 
 class UrlBuilder {
-    static public function stream(string $url): string {
+    public static function stream(string $url): string {
         return Misc::url('/stream?url=' . urlencode($url));
     }
 
-    static public function download(string $url, string $username, string $id, bool $watermark): string {
+    public static function download(string $url, string $username, string $id, bool $watermark): string {
         $down_url = Misc::url('/download?url=' . urlencode($url) . '&id=' . $id . '&user=' . $username);
         if ($watermark) $down_url .= '&watermark=1';
         return $down_url;
     }
 
-    static public function user(string $username): string {
+    public static function user(string $username): string {
         return Misc::url('/@' . $username);
     }
 
-    static public function tag(string $tag): string {
+    public static function tag(string $tag): string {
         return Misc::url('/tag/' . $tag);
     }
 
-    static public function video_internal(string $username, string $id): string {
+    public static function video_internal(string $username, string $id): string {
         return Misc::url('/@' . $username . "/video/" . $id);
     }
 
-    static public function video_external(string $username, string $id): string {
+    public static function video_external(string $username, string $id): string {
         return "https://www.tiktok.com/@" . $username . "/video/" . $id;
     }
 }
diff --git a/app/Helpers/Wrappers.php b/app/Helpers/Wrappers.php
index 27aa636..cd9a4e7 100644
--- a/app/Helpers/Wrappers.php
+++ b/app/Helpers/Wrappers.php
@@ -12,7 +12,7 @@ class Wrappers {
     /**
      * Setup of Latte template engine
      */
-    static public function latte(string $template, BaseTemplate $base) {
+    public static function latte(string $template, BaseTemplate $base) {
         $latte = new \Latte\Engine;
         $cache_path = Misc::env('LATTE_CACHE', __DIR__ . '/../../cache/latte');
         $latte->setTempDirectory($cache_path);
@@ -131,7 +131,7 @@ class Wrappers {
     /**
      * Setup of TikTok Api wrapper
      */
-    static public function api(): \TikScraper\Api {
+    public static function api(): \TikScraper\Api {
         $method = Misc::env('API_SIGNER', '');
         $url = Misc::env('API_SIGNER_URL', '');
         if (!$method) {