From 556bcfe78fc1ceba1e34802e545e2191999db421 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 24 Nov 2021 23:28:06 +0000 Subject: [PATCH] Some more standards --- src/Module/Api/Twitter/Favorites.php | 6 +++--- src/Module/Api/Twitter/Statuses/HomeTimeline.php | 8 ++++---- .../Api/Twitter/Statuses/NetworkPublicTimeline.php | 4 ++-- src/Module/Api/Twitter/Statuses/PublicTimeline.php | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php index b90d78e5b..6a901574e 100644 --- a/src/Module/Api/Twitter/Favorites.php +++ b/src/Module/Api/Twitter/Favorites.php @@ -46,9 +46,9 @@ class Favorites extends BaseApi // params $since_id = $_REQUEST['since_id'] ?? 0; - $max_id = $_REQUEST['max_id'] ?? 0; - $count = $_GET['count'] ?? 20; - $page = $_REQUEST['page'] ?? 1; + $max_id = $_REQUEST['max_id'] ?? 0; + $count = $_GET['count'] ?? 20; + $page = $_REQUEST['page'] ?? 1; $start = max(0, ($page - 1) * $count); diff --git a/src/Module/Api/Twitter/Statuses/HomeTimeline.php b/src/Module/Api/Twitter/Statuses/HomeTimeline.php index b6fef00fa..f17a0cd5d 100644 --- a/src/Module/Api/Twitter/Statuses/HomeTimeline.php +++ b/src/Module/Api/Twitter/Statuses/HomeTimeline.php @@ -43,10 +43,10 @@ class HomeTimeline extends BaseApi // get last network messages // params - $count = $_REQUEST['count'] ?? 20; - $page = $_REQUEST['page']?? 0; + $count = $_REQUEST['count'] ?? 20; + $page = $_REQUEST['page'] ?? 0; $since_id = $_REQUEST['since_id'] ?? 0; - $max_id = $_REQUEST['max_id'] ?? 0; + $max_id = $_REQUEST['max_id'] ?? 0; $exclude_replies = !empty($_REQUEST['exclude_replies']); $conversation_id = $_REQUEST['conversation_id'] ?? 0; @@ -68,7 +68,7 @@ class HomeTimeline extends BaseApi $condition[] = $conversation_id; } - $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; + $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $statuses = Post::selectForUser($uid, [], $condition, $params); $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); diff --git a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php index f1da6d2f6..6250659ba 100644 --- a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php +++ b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php @@ -39,11 +39,11 @@ class NetworkPublicTimeline extends BaseApi $uid = BaseApi::getCurrentUserID(); $since_id = $_REQUEST['since_id'] ?? 0; - $max_id = $_REQUEST['max_id'] ?? 0; + $max_id = $_REQUEST['max_id'] ?? 0; // pagination $count = $_REQUEST['count'] ?? 20; - $page = $_REQUEST['page'] ?? 1; + $page = $_REQUEST['page'] ?? 1; $start = max(0, ($page - 1) * $count); diff --git a/src/Module/Api/Twitter/Statuses/PublicTimeline.php b/src/Module/Api/Twitter/Statuses/PublicTimeline.php index 715be1850..e530d57d6 100644 --- a/src/Module/Api/Twitter/Statuses/PublicTimeline.php +++ b/src/Module/Api/Twitter/Statuses/PublicTimeline.php @@ -41,10 +41,10 @@ class PublicTimeline extends BaseApi // get last network messages // params - $count = $_REQUEST['count'] ?? 20; - $page = $_REQUEST['page'] ?? 1; - $since_id = $_REQUEST['since_id'] ?? 0; - $max_id = $_REQUEST['max_id'] ?? 0; + $count = $_REQUEST['count'] ?? 20; + $page = $_REQUEST['page'] ?? 1; + $since_id = $_REQUEST['since_id'] ?? 0; + $max_id = $_REQUEST['max_id'] ?? 0; $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0); $conversation_id = $_REQUEST['conversation_id'] ?? 0; @@ -59,7 +59,7 @@ class PublicTimeline extends BaseApi $condition[] = $max_id; } - $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; + $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $statuses = Post::selectForUser($uid, [], $condition, $params); } else { $condition = ["`gravity` IN (?, ?) AND `id` > ? AND `private` = ? AND `wall` AND `origin` AND NOT `author-hidden`",