clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7752 from kPherox/develop 

Change Model type to `OrderedCollectionPage`
This commit is contained in:
Hypolite Petovan 2019-10-18 06:54:42 -04:00 committed by GitHub
parent 409d9df4af 0da36b839c
commit f8c0f24e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Protocol/ActivityPub/Transmitter.php
View File

@ -71,6 +71,7 @@ class Transmitter
if (empty($page)) { if (empty($page)) {
$data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1'; $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
} else { } else {
$data['type'] = 'OrderedCollectionPage';
$list = []; $list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]); $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
@ -119,6 +120,7 @@ class Transmitter
if (empty($page)) { if (empty($page)) {
$data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1'; $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
} else { } else {
$data['type'] = 'OrderedCollectionPage';
$list = []; $list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]); $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
@ -165,6 +167,7 @@ class Transmitter
if (empty($page)) { if (empty($page)) {
$data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1'; $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
} else { } else {
$data['type'] = 'OrderedCollectionPage';
$list = []; $list = [];
$condition['parent-network'] = Protocol::NATIVE_SUPPORT; $condition['parent-network'] = Protocol::NATIVE_SUPPORT;