Reenable Twitter/Statuses tests

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

diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index bf58fcd55ef937394a4a8d7903d6f2718bd76eb9..ba713c7651c88a3556e70299162e5d3ff452dbe7 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -35,53 +35,53 @@ use Friendica\Model\Post;
  */
 class UserTimeline extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                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);
+
+               $cid             = BaseApi::getContactIDForSearchterm($_REQUEST['screen_name'] ?? '', $_REQUEST['profileurl'] ?? '', $_REQUEST['user_id'] ?? 0, $uid);
                $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;
-       
+
                // pagination
                $count = $_REQUEST['count'] ?? 20;
-               $page  = $_REQUEST['page'] ?? 1;
-       
+               $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]];
+               $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));
+
+               $this->response->exit('user', ['status' => $ret], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid));
        }
 }