From c142965483ac3865ad5453fab66990d06a728605 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 7 Jan 2015 17:25:23 +1030 Subject: [PATCH] Clean up discussion API --- src/Flarum/Api/Actions/Discussions/Index.php | 2 +- src/Flarum/Api/Serializers/DiscussionSerializer.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Flarum/Api/Actions/Discussions/Index.php b/src/Flarum/Api/Actions/Discussions/Index.php index a953bce4e..e21db4a39 100644 --- a/src/Flarum/Api/Actions/Discussions/Index.php +++ b/src/Flarum/Api/Actions/Discussions/Index.php @@ -37,7 +37,7 @@ class Index extends Base $key = $this->input('key'); $start = $this->start(); $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']); $relations = array_merge(['startUser', 'lastUser'], $include); diff --git a/src/Flarum/Api/Serializers/DiscussionSerializer.php b/src/Flarum/Api/Serializers/DiscussionSerializer.php index 038e26d2f..208056299 100644 --- a/src/Flarum/Api/Serializers/DiscussionSerializer.php +++ b/src/Flarum/Api/Serializers/DiscussionSerializer.php @@ -33,11 +33,7 @@ class DiscussionSerializer extends DiscussionBasicSerializer 'lastTime' => $discussion->last_time ? $discussion->last_time->toRFC3339String() : null, 'lastPostNumber' => $discussion->last_post_number, 'canEdit' => $discussion->permission('edit'), - 'canDelete' => $discussion->permission('delete'), - - // temp - 'sticky' => $discussion->sticky, - 'category' => $discussion->category + 'canDelete' => $discussion->permission('delete') ]; if ($state = $discussion->state) {