mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-26 11:10:41 +02:00
Code Issues Releases Wiki Activity

Clean up discussion API

Browse Source
This commit is contained in:
Toby Zerner
2015-01-07 17:25:23 +10:30
parent 569b9ab27e
commit c142965483
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Flarum/Api/Actions/Discussions/Index.php
View File

@@ -37,7 +37,7 @@ class Index extends Base
$key = $this->input('key'); $key = $this->input('key');
$start = $this->start(); $start = $this->start();
$include = $this->included(['startPost', 'lastPost', 'relevantPosts']); $include = $this->included(['startPost', 'lastPost', 'relevantPosts']);
$count = $this->count($include ? 20 : 50, 50); $count = $this->count($include ? 20 : 50, 30);
$sort = $this->sort(['', 'lastPost', 'replies', 'created']); $sort = $this->sort(['', 'lastPost', 'replies', 'created']);
$relations = array_merge(['startUser', 'lastUser'], $include); $relations = array_merge(['startUser', 'lastUser'], $include);

6
src/Flarum/Api/Serializers/DiscussionSerializer.php
View File

@@ -33,11 +33,7 @@ class DiscussionSerializer extends DiscussionBasicSerializer
'lastTime' => $discussion->last_time ? $discussion->last_time->toRFC3339String() : null, 'lastTime' => $discussion->last_time ? $discussion->last_time->toRFC3339String() : null,
'lastPostNumber' => $discussion->last_post_number, 'lastPostNumber' => $discussion->last_post_number,
'canEdit' => $discussion->permission('edit'), 'canEdit' => $discussion->permission('edit'),
'canDelete' => $discussion->permission('delete'), 'canDelete' => $discussion->permission('delete')
// temp
'sticky' => $discussion->sticky,
'category' => $discussion->category
]; ];
if ($state = $discussion->state) { if ($state = $discussion->state) {