From bd1306d020ab2519213127ed0de66039e91d3a01 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 24 Nov 2021 23:20:42 +0000 Subject: [PATCH] Removed whitespace --- .../Api/Friendica/Notification/Seen.php | 2 +- src/Module/Api/Twitter/Favorites.php | 20 ++++++++--------- .../Api/Twitter/Statuses/HomeTimeline.php | 20 ++++++++--------- src/Module/Api/Twitter/Statuses/Mentions.php | 22 +++++++++---------- .../Statuses/NetworkPublicTimeline.php | 18 +++++++-------- .../Api/Twitter/Statuses/PublicTimeline.php | 22 +++++++++---------- .../Api/Twitter/Statuses/UserTimeline.php | 22 +++++++++---------- src/Module/Api/Twitter/Users/Show.php | 4 ++-- 8 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php index 7584be9bbe..bb6c5b7385 100644 --- a/src/Module/Api/Friendica/Notification/Seen.php +++ b/src/Module/Api/Friendica/Notification/Seen.php @@ -68,7 +68,7 @@ class Seen extends BaseApi $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); // we found the item, return it to the user - $ret = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()]; + $ret = [DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray()]; $data = ['status' => $ret]; DI::apiResponse()->exit('statuses', $data, $this->parameters['extension'] ?? null); } diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php index 62b86c21e8..0f78d527f4 100644 --- a/src/Module/Api/Twitter/Favorites.php +++ b/src/Module/Api/Twitter/Favorites.php @@ -39,39 +39,39 @@ class Favorites extends BaseApi { BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - + // in friendica starred item are private // return favorites only for self Logger::info(API_LOG_PREFIX . 'for {self}', ['module' => 'api', 'action' => 'favorites']); - + // params $since_id = $_REQUEST['since_id'] ?? 0; $max_id = $_REQUEST['max_id'] ?? 0; $count = $_GET['count'] ?? 20; $page = $_REQUEST['page'] ?? 1; - + $start = max(0, ($page - 1) * $count); - + $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `starred`", $uid, GRAVITY_PARENT, GRAVITY_COMMENT, $since_id]; - + $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - + if ($max_id > 0) { $condition[0] .= " AND `id` <= ?"; $condition[] = $max_id; } - + $statuses = Post::selectForUser($uid, [], $condition, $params); - + $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); - + $ret = []; while ($status = DBA::fetch($statuses)) { $ret[] = DI::twitterStatus()->createFromUriId($status['uri-id'], $status['uid'], $include_entities)->toArray(); } DBA::close($statuses); - + DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } } diff --git a/src/Module/Api/Twitter/Statuses/HomeTimeline.php b/src/Module/Api/Twitter/Statuses/HomeTimeline.php index b4f56e536c..2191b661f5 100644 --- a/src/Module/Api/Twitter/Statuses/HomeTimeline.php +++ b/src/Module/Api/Twitter/Statuses/HomeTimeline.php @@ -39,9 +39,9 @@ class HomeTimeline extends BaseApi { BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - + // get last network messages - + // params $count = $_REQUEST['count'] ?? 20; $page = $_REQUEST['page']?? 0; @@ -49,12 +49,12 @@ class HomeTimeline extends BaseApi $max_id = $_REQUEST['max_id'] ?? 0; $exclude_replies = !empty($_REQUEST['exclude_replies']); $conversation_id = $_REQUEST['conversation_id'] ?? 0; - + $start = max(0, ($page - 1) * $count); - + $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ?", $uid, GRAVITY_PARENT, GRAVITY_COMMENT, $since_id]; - + if ($max_id > 0) { $condition[0] .= " AND `id` <= ?"; $condition[] = $max_id; @@ -67,12 +67,12 @@ class HomeTimeline extends BaseApi $condition[0] .= " AND `parent` = ?"; $condition[] = $conversation_id; } - + $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $statuses = Post::selectForUser($uid, [], $condition, $params); - + $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); - + $ret = []; $idarray = []; while ($status = DBA::fetch($statuses)) { @@ -80,14 +80,14 @@ class HomeTimeline extends BaseApi $idarray[] = intval($status['id']); } DBA::close($statuses); - + if (!empty($idarray)) { $unseen = Post::exists(['unseen' => true, 'id' => $idarray]); if ($unseen) { Item::update(['unseen' => false], ['unseen' => true, 'id' => $idarray]); } } - + DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } } diff --git a/src/Module/Api/Twitter/Statuses/Mentions.php b/src/Module/Api/Twitter/Statuses/Mentions.php index dd3caa70b0..f041c4587e 100644 --- a/src/Module/Api/Twitter/Statuses/Mentions.php +++ b/src/Module/Api/Twitter/Statuses/Mentions.php @@ -38,21 +38,21 @@ class Mentions extends BaseApi { BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - + // get last network messages - + // params $since_id = intval($_REQUEST['since_id'] ?? 0); $max_id = intval($_REQUEST['max_id'] ?? 0); $count = intval($_REQUEST['count'] ?? 20); $page = intval($_REQUEST['page'] ?? 1); - + $start = max(0, ($page - 1) * $count); - + $query = "`gravity` IN (?, ?) AND `uri-id` IN (SELECT `uri-id` FROM `post-user-notification` WHERE `uid` = ? AND `notification-type` & ? != 0 ORDER BY `uri-id`) AND (`uid` = 0 OR (`uid` = ? AND NOT `global`)) AND `id` > ?"; - + $condition = [ GRAVITY_PARENT, GRAVITY_COMMENT, $uid, @@ -61,25 +61,25 @@ class Mentions extends BaseApi Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT, $uid, $since_id, ]; - + if ($max_id > 0) { $query .= " AND `id` <= ?"; $condition[] = $max_id; } - + array_unshift($condition, $query); - + $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $statuses = Post::selectForUser($uid, [], $condition, $params); - + $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); - + $ret = []; while ($status = DBA::fetch($statuses)) { $ret[] = DI::twitterStatus()->createFromUriId($status['uri-id'], $status['uid'], $include_entities)->toArray(); } DBA::close($statuses); - + DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } } diff --git a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php index 6b88c32501..f1da6d2f60 100644 --- a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php +++ b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php @@ -37,35 +37,35 @@ class NetworkPublicTimeline extends BaseApi { BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - + $since_id = $_REQUEST['since_id'] ?? 0; $max_id = $_REQUEST['max_id'] ?? 0; - + // pagination $count = $_REQUEST['count'] ?? 20; $page = $_REQUEST['page'] ?? 1; - + $start = max(0, ($page - 1) * $count); - + $condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `id` > ? AND `private` = ?", GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC]; - + if ($max_id > 0) { $condition[0] .= " AND `id` <= ?"; $condition[] = $max_id; } - + $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $statuses = Post::selectForUser($uid, Item::DISPLAY_FIELDLIST, $condition, $params); - + $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); - + $ret = []; while ($status = DBA::fetch($statuses)) { $ret[] = DI::twitterStatus()->createFromUriId($status['uri-id'], $status['uid'], $include_entities)->toArray(); } DBA::close($statuses); - + DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } } diff --git a/src/Module/Api/Twitter/Statuses/PublicTimeline.php b/src/Module/Api/Twitter/Statuses/PublicTimeline.php index 3b9a6aa5a4..715be18502 100644 --- a/src/Module/Api/Twitter/Statuses/PublicTimeline.php +++ b/src/Module/Api/Twitter/Statuses/PublicTimeline.php @@ -37,9 +37,9 @@ class PublicTimeline extends BaseApi { BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - + // get last network messages - + // params $count = $_REQUEST['count'] ?? 20; $page = $_REQUEST['page'] ?? 1; @@ -47,24 +47,24 @@ class PublicTimeline extends BaseApi $max_id = $_REQUEST['max_id'] ?? 0; $exclude_replies = (!empty($_REQUEST['exclude_replies']) ? 1 : 0); $conversation_id = $_REQUEST['conversation_id'] ?? 0; - + $start = max(0, ($page - 1) * $count); - + if ($exclude_replies && !$conversation_id) { $condition = ["`gravity` = ? AND `id` > ? AND `private` = ? AND `wall` AND NOT `author-hidden`", GRAVITY_PARENT, $since_id, Item::PUBLIC]; - + if ($max_id > 0) { $condition[0] .= " AND `id` <= ?"; $condition[] = $max_id; } - + $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`", GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC]; - + if ($max_id > 0) { $condition[0] .= " AND `id` <= ?"; $condition[] = $max_id; @@ -73,19 +73,19 @@ class PublicTimeline extends BaseApi $condition[0] .= " AND `parent` = ?"; $condition[] = $conversation_id; } - + $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $statuses = Post::selectForUser($uid, [], $condition, $params); } - + $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); - + $ret = []; while ($status = DBA::fetch($statuses)) { $ret[] = DI::twitterStatus()->createFromUriId($status['uri-id'], $status['uid'], $include_entities)->toArray(); } DBA::close($statuses); - + DI::apiResponse()->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } } diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php index bf58fcd55e..997cc839d4 100644 --- a/src/Module/Api/Twitter/Statuses/UserTimeline.php +++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php @@ -39,49 +39,49 @@ class UserTimeline extends BaseApi { BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - + Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $_REQUEST]); - + $cid = BaseApi::getContactIDForSearchterm($_REQUEST['screen_name'] ?? '', $_REQUEST['user_id'] ?? 0, $uid); $since_id = $_REQUEST['since_id'] ?? 0; $max_id = $_REQUEST['max_id'] ?? 0; $exclude_replies = !empty($_REQUEST['exclude_replies']); $conversation_id = $_REQUEST['conversation_id'] ?? 0; - + // pagination $count = $_REQUEST['count'] ?? 20; $page = $_REQUEST['page'] ?? 1; - + $start = max(0, ($page - 1) * $count); - + $condition = ["(`uid` = ? OR (`uid` = ? AND NOT `global`)) AND `gravity` IN (?, ?) AND `id` > ? AND `author-id` = ?", 0, $uid, GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $cid]; - + if ($exclude_replies) { $condition[0] .= ' AND `gravity` = ?'; $condition[] = GRAVITY_PARENT; } - + if ($conversation_id > 0) { $condition[0] .= " AND `parent` = ?"; $condition[] = $conversation_id; } - + if ($max_id > 0) { $condition[0] .= " AND `id` <= ?"; $condition[] = $max_id; } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $statuses = Post::selectForUser($uid, [], $condition, $params); - + $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true'); - + $ret = []; while ($status = DBA::fetch($statuses)) { $ret[] = DI::twitterStatus()->createFromUriId($status['uri-id'], $status['uid'], $include_entities)->toArray(); } DBA::close($statuses); - + DI::apiResponse()->exit('user', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } } diff --git a/src/Module/Api/Twitter/Users/Show.php b/src/Module/Api/Twitter/Users/Show.php index 17baf70092..101c9ce738 100644 --- a/src/Module/Api/Twitter/Users/Show.php +++ b/src/Module/Api/Twitter/Users/Show.php @@ -39,10 +39,10 @@ class Show extends BaseApi $cid = BaseApi::getContactIDForSearchterm($_REQUEST['screen_name'] ?? '', $_REQUEST['user_id'] ?? 0, $uid); $user_info = DI::twitterUser()->createFromContactId($cid, $uid)->toArray(); - + // "uid" is only needed for some internal stuff, so remove it from here unset($user_info['uid']); - + DI::apiResponse()->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null); } }