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

Add user activity system

Browse Source
This commit is contained in:
Toby Zerner
2015-03-17 17:06:12 +10:30
parent 5055377eb1
commit 3880ce70f0
27 changed files with 508 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Api/Actions/Discussions/ShowAction.php
View File

@@ -5,12 +5,12 @@ use Flarum\Core\Repositories\DiscussionRepositoryInterface as DiscussionReposito
use Flarum\Core\Repositories\PostRepositoryInterface as PostRepository;
use Flarum\Api\Actions\BaseAction;
use Flarum\Api\Actions\ApiParams;
use Flarum\Api\Actions\Posts\GetsPostsForDiscussion;
use Flarum\Api\Actions\Posts\GetsPosts;
use Flarum\Api\Serializers\DiscussionSerializer;
class ShowAction extends BaseAction
{
use GetsPostsForDiscussion;
use GetsPosts;
/**
* The discussion repository.
@@ -51,7 +51,7 @@ class ShowAction extends BaseAction
if (in_array('posts', $include)) {
$relations = ['user', 'user.groups', 'editUser', 'hideUser'];
$discussion->posts = $this->getPostsForDiscussion($params, $discussion->id)->load($relations);
$discussion->posts = $this->getPosts($params, ['discussion_id' => $discussion->id])->load($relations);
$include = array_merge($include, array_map(function ($relation) {
return 'posts.'.$relation;