Removed whitespace

diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php
index 7584be9bbe66e3041c95321992a7a736938b5b74..bb6c5b7385df24a07db56d55cce65f481aae7ffe 100644 (file)
--- 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
                                        $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);
                                }
                                        $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 62b86c21e839fa93e58514c052fe2b8bb1b1a19a..0f78d527f44589992a813f81316d7b752f8297c5 100644 (file)
--- 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();
        {
                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']);
                // 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;
                // 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);
                $start = max(0, ($page - 1) * $count);

-       
+

                $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `starred`",
                        $uid, GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
                $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `starred`",
                        $uid, GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];

-       
+

                $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                $params = ['order' => ['id' => true], 'limit' => [$start, $count]];

-       
+

                if ($max_id > 0) {
                        $condition[0] .= " AND `id` <= ?";
                        $condition[] = $max_id;
                }
                if ($max_id > 0) {
                        $condition[0] .= " AND `id` <= ?";
                        $condition[] = $max_id;
                }

-       
+

                $statuses = Post::selectForUser($uid, [], $condition, $params);
                $statuses = Post::selectForUser($uid, [], $condition, $params);

-       
+

                $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
                $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);
                $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));
        }
 }
                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 b4f56e536c47918b180358d3fefb89e66db3cb15..2191b661f532b753a2d10259ba45afbce8d01692 100644 (file)
--- 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();
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

-       
+

                // get last network messages
                // get last network messages

-       
+

                // params
                $count = $_REQUEST['count'] ?? 20;
                $page = $_REQUEST['page']?? 0;
                // 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;
                $max_id = $_REQUEST['max_id'] ?? 0;
                $exclude_replies = !empty($_REQUEST['exclude_replies']);
                $conversation_id = $_REQUEST['conversation_id'] ?? 0;

-       
+

                $start = max(0, ($page - 1) * $count);
                $start = max(0, ($page - 1) * $count);

-       
+

                $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ?",
                        $uid, GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
                $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;
                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;
                }
                        $condition[0] .= " AND `parent` = ?";
                        $condition[] = $conversation_id;
                }

-       
+

                $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                $statuses = Post::selectForUser($uid, [], $condition, $params);
                $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                $statuses = Post::selectForUser($uid, [], $condition, $params);

-       
+

                $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
                $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');

-       
+

                $ret = [];
                $idarray = [];
                while ($status = DBA::fetch($statuses)) {
                $ret = [];
                $idarray = [];
                while ($status = DBA::fetch($statuses)) {


@@ -80,14 +80,14 @@ class HomeTimeline extends BaseApi
                        $idarray[] = intval($status['id']);
                }
                DBA::close($statuses);
                        $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]);
                        }
                }
                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));
        }
 }
                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 dd3caa70b03c3ad3819842bda9e7295bd8d5f73d..f041c4587eef09854096d3f13fe8b2f906c38b18 100644 (file)
--- 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();
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

-       
+

                // get last network messages
                // 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);
                // 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);
                $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` > ?";
                $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,
                $condition = [
                        GRAVITY_PARENT, GRAVITY_COMMENT,
                        $uid,


@@ -61,25 +61,25 @@ class Mentions extends BaseApi
                        Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT,
                        $uid, $since_id,
                ];
                        Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT,
                        $uid, $since_id,
                ];

-       
+

                if ($max_id > 0) {
                        $query .= " AND `id` <= ?";
                        $condition[] = $max_id;
                }
                if ($max_id > 0) {
                        $query .= " AND `id` <= ?";
                        $condition[] = $max_id;
                }

-       
+

                array_unshift($condition, $query);
                array_unshift($condition, $query);

-       
+

                $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                $statuses = Post::selectForUser($uid, [], $condition, $params);
                $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                $statuses = Post::selectForUser($uid, [], $condition, $params);

-       
+

                $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
                $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);
                $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));
        }
 }
                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 6b88c325013cc93d7bf1bf8819ef84d1f5fc6c6c..f1da6d2f6072ccd7e28afc24985796208f0da05a 100644 (file)
--- 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();
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

-       
+

                $since_id = $_REQUEST['since_id'] ?? 0;
                $max_id   = $_REQUEST['max_id'] ?? 0;
                $since_id = $_REQUEST['since_id'] ?? 0;
                $max_id   = $_REQUEST['max_id'] ?? 0;

-       
+

                // pagination
                $count = $_REQUEST['count'] ?? 20;
                $page  = $_REQUEST['page'] ?? 1;
                // pagination
                $count = $_REQUEST['count'] ?? 20;
                $page  = $_REQUEST['page'] ?? 1;

-       
+

                $start = max(0, ($page - 1) * $count);
                $start = max(0, ($page - 1) * $count);

-       
+

                $condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `id` > ? AND `private` = ?",
                        GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC];
                $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;
                }
                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);
                $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                $statuses = Post::selectForUser($uid, Item::DISPLAY_FIELDLIST, $condition, $params);

-       
+

                $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
                $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);
                $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));
        }
 }
                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 3b9a6aa5a4fb161ef5cdfdbaaabf9f776b79630d..715be18502e329814161ea61ce73eea0fd35b807 100644 (file)
--- 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();
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

-       
+

                // get last network messages
                // get last network messages

-       
+

                // params
                $count = $_REQUEST['count'] ?? 20;
                $page = $_REQUEST['page'] ?? 1;
                // 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;
                $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);
                $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 ($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;
                        }
                        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];
                        $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;
                        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;
                        }
                                $condition[0] .= " AND `parent` = ?";
                                $condition[] = $conversation_id;
                        }

-       
+

                        $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                        $statuses = Post::selectForUser($uid, [], $condition, $params);
                }
                        $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
                        $statuses = Post::selectForUser($uid, [], $condition, $params);
                }

-       
+

                $include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
                $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);
                $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));
        }
 }
                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 bf58fcd55ef937394a4a8d7903d6f2718bd76eb9..997cc839d40e35411ac65b23b69b1e174896f728 100644 (file)
--- 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();
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

-       
+

                Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $_REQUEST]);
                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;
                $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;
                // pagination
                $count = $_REQUEST['count'] ?? 20;
                $page  = $_REQUEST['page'] ?? 1;

-       
+

                $start = max(0, ($page - 1) * $count);
                $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];
                $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 ($exclude_replies) {
                        $condition[0] .= ' AND `gravity` = ?';
                        $condition[] = GRAVITY_PARENT;
                }

-       
+

                if ($conversation_id > 0) {
                        $condition[0] .= " AND `parent` = ?";
                        $condition[] = $conversation_id;
                }
                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);
                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');
                $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);
                $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));
        }
 }
                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 17baf7009217bf0dd6f1e499b3b0f49d57a74450..101c9ce738fb2145029eda9327b44fb73b59ce5c 100644 (file)
--- 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();
                $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']);
                // "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);
        }
 }
                DI::apiResponse()->exit('user', ['user' => $user_info], $this->parameters['extension'] ?? null);
        }
 }