Reenable Twitter/Statuses tests

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

diff --git a/src/Module/Api/Twitter/Statuses/PublicTimeline.php b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
index 715be18502e329814161ea61ce73eea0fd35b807..334d43dbb24ae19ecbb74b3e3b6434b67640d383 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/PublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
@@ -33,7 +33,7 @@ use Friendica\Model\Post;
  */
 class PublicTimeline extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
@@ -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`",
@@ -74,7 +74,7 @@ class PublicTimeline 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);
                }
 
@@ -86,6 +86,6 @@ class PublicTimeline extends BaseApi
                }
                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));
        }
 }