keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the id instead of iid

Browse source
This commit is contained in:
Michael 2021-02-04 22:51:33 +00:00
parent 859d026edf
commit 0cd8c78e2d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/api.php
View file

@ -1810,15 +1810,15 @@ function api_statuses_networkpublic_timeline($type)
$start = max(0, ($page - 1) * $count); $start = max(0, ($page - 1) * $count);
$condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `iid` > ? AND `private` = ?", $condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `id` > ? AND `private` = ?",
GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC]; GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC];
if ($max_id > 0) { if ($max_id > 0) {
$condition[0] .= " AND `iid` <= ?"; $condition[0] .= " AND `id` <= ?";
$condition[] = $max_id; $condition[] = $max_id;
} }
$params = ['order' => ['iid' => true], 'limit' => [$start, $count]]; $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $statuses = Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
$ret = api_format_items(Post::toArray($statuses), $user_info, false, $type); $ret = api_format_items(Post::toArray($statuses), $user_info, false, $type);

6
tests/datasets/api.fixture.php
View file

@ -320,6 +320,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/selfcontact', 'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 1, 'wall' => 1,
@ -348,6 +349,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/selfcontact', 'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 1, 'wall' => 1,
@ -372,6 +374,7 @@ return [
'parent-uri' => '3', 'parent-uri' => '3',
'thr-parent-id' => 3, 'thr-parent-id' => 3,
'thr-parent' => '3', 'thr-parent' => '3',
'private' => 0,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -397,6 +400,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -422,6 +426,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -450,6 +455,7 @@ return [
'parent-uri' => '6', 'parent-uri' => '6',
'thr-parent-id' => 6, 'thr-parent-id' => 6,
'thr-parent' => '6', 'thr-parent' => '6',
'private' => 0,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,