Updated main translation file after adding strings

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 4aa4b21e29199e4a0c339cb884d94b251f2062fd..1913a73c8f981ba1e0cbdd80cbc9b44846cf6399 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1733,18 +1733,18 @@ function api_statuses_public_timeline($type)
        $start = max(0, ($page - 1) * $count);
 
        if ($exclude_replies && !$conversation_id) {
-               $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND `private` = ? AND `wall` AND NOT `author`.`hidden`",
+               $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND `private` = ? AND `wall` AND NOT `author-hidden`",
                        GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC];
 
                if ($max_id > 0) {
-                       $condition[0] .= " AND `thread`.`iid` <= ?";
+                       $condition[0] .= " AND `iid` <= ?";
                        $condition[] = $max_id;
                }
 
                $params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
-               $statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
+               $statuses = Post::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
 
-               $r = Item::toArray($statuses);
+               $r = Post::toArray($statuses);
        } else {
                $condition = ["`gravity` IN (?, ?) AND `id` > ? AND `private` = ? AND `wall` AND `origin` AND NOT `author-hidden`",
                        GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC];
@@ -1812,18 +1812,18 @@ function api_statuses_networkpublic_timeline($type)
 
        $start = max(0, ($page - 1) * $count);
 
-       $condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `thread`.`iid` > ? AND `private` = ?",
+       $condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `iid` > ? AND `private` = ?",
                GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC];
 
        if ($max_id > 0) {
-               $condition[0] .= " AND `thread`.`iid` <= ?";
+               $condition[0] .= " AND `iid` <= ?";
                $condition[] = $max_id;
        }
 
        $params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
-       $statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
+       $statuses = Post::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
 
-       $ret = api_format_items(Item::toArray($statuses), $user_info, false, $type);
+       $ret = api_format_items(Post::toArray($statuses), $user_info, false, $type);
 
        bindComments($ret);
 
@@ -3297,8 +3297,10 @@ function api_lists_statuses($type)
 
        $start = max(0, ($page - 1) * $count);
 
-       $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `group-id` = ?",
-               api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $_REQUEST['list_id']];
+       $groups = DBA::selectToArray('group_member', ['contact-id'], ['gid' => 1]);
+       $gids = array_column($groups, 'contact-id');
+       $condition = ['uid' => api_user(), 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'group-id' => $gids];
+       $condition = DBA::mergeConditions($condition, ["`id` > ?", $since_id]);
 
        if ($max_id > 0) {
                $condition[0] .= " AND `id` <= ?";