Reenable Twitter/Statuses tests

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

diff --git a/src/Module/Api/Twitter/Statuses/Mentions.php b/src/Module/Api/Twitter/Statuses/Mentions.php
index dd3caa70b03c3ad3819842bda9e7295bd8d5f73d..47a860c7b945760d64d01e0749124fb909420e3f 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Mentions.php
+++ b/src/Module/Api/Twitter/Statuses/Mentions.php
@@ -34,25 +34,25 @@ use Friendica\Model\Post;
  */
 class Mentions extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                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);
-       
+               $since_id = $_REQUEST['since_id'] ?? 0;
+               $max_id   = $_REQUEST['max_id']   ?? 0;
+               $count    = $_REQUEST['count']    ?? 20;
+               $page     = $_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]];
+
+               $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));
+
+               $this->response->exit('statuses', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }