Reenable Twitter/Statuses tests

[friendica.git] / src / Module / Api / Twitter / Statuses / NetworkPublicTimeline.php

diff --git a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
index 6b88c325013cc93d7bf1bf8819ef84d1f5fc6c6c..1ec00acf25afaaa9921d845fe905ee39b6930065 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
@@ -33,39 +33,39 @@ use Friendica\Model\Post;
  */
 class NetworkPublicTimeline extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $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);
-       
+
                $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]];
+
+               $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));
+
+               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }