mirror of
https://github.com/flarum/core.git
synced 2025-10-10 22:44:25 +02:00
Upgrade to JSON-API RC3 + latest version of tobscure/json-api
Note: npm source for ember-json-api changed to a fork, but I still had to apply a custom change to get polymorphic relationships to work (see https://github.com/kurko/ember-json-api/pull/71#issuecomment-85257281)
This commit is contained in:
@@ -1,12 +1,10 @@
|
||||
<?php namespace Flarum\Api\Serializers;
|
||||
|
||||
use Flarum\Core\Models\Discussion;
|
||||
use Flarum\Core\Models\DiscussionState;
|
||||
|
||||
class DiscussionSerializer extends DiscussionBasicSerializer
|
||||
{
|
||||
/**
|
||||
* Default relations to include.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $include = ['startUser', 'lastUser'];
|
||||
@@ -17,7 +15,7 @@ class DiscussionSerializer extends DiscussionBasicSerializer
|
||||
* @param Discussion $discussion The Discussion model to serialize.
|
||||
* @return array
|
||||
*/
|
||||
protected function attributes(Discussion $discussion)
|
||||
protected function attributes($discussion)
|
||||
{
|
||||
$attributes = parent::attributes($discussion);
|
||||
|
||||
@@ -37,109 +35,6 @@ class DiscussionSerializer extends DiscussionBasicSerializer
|
||||
'readNumber' => $state ? (int) $state->read_number : 0
|
||||
];
|
||||
|
||||
$this->attributesEvent($discussion, $attributes);
|
||||
|
||||
return $attributes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a collection containing a discussion's viewable post IDs.
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @return Tobscure\JsonApi\Collection
|
||||
*/
|
||||
public function linkPosts(Discussion $discussion)
|
||||
{
|
||||
$user = static::$actor->getUser();
|
||||
|
||||
return (new PostBasicSerializer)->collection($discussion->posts()->whereCan($user, 'view')->orderBy('time', 'asc')->ids());
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a collection containing a discussion's viewable posts. Assumes that
|
||||
* the discussion model's posts attributes has been filled.
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @param array $relations
|
||||
* @return Tobscure\JsonApi\Collection
|
||||
*/
|
||||
public function includePosts(Discussion $discussion, $relations)
|
||||
{
|
||||
return (new PostSerializer($relations))->collection($discussion->posts);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a collection containing a discussion's relevant posts. Assumes that
|
||||
* the discussion model's relevantPosts attributes has been filled (this
|
||||
* happens in the DiscussionFinder.)
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @param array $relations
|
||||
* @return Tobscure\JsonApi\Collection
|
||||
*/
|
||||
public function includeRelevantPosts(Discussion $discussion, $relations)
|
||||
{
|
||||
return (new PostBasicSerializer($relations))->collection($discussion->relevantPosts);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a resource containing a discussion's start user.
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @param array $relations
|
||||
* @return Tobscure\JsonApi\Resource
|
||||
*/
|
||||
public function includeStartUser(Discussion $discussion, $relations)
|
||||
{
|
||||
return (new UserBasicSerializer($relations))->resource($discussion->startUser);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a resource containing a discussion's starting post.
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @param array $relations
|
||||
* @return Tobscure\JsonApi\Resource
|
||||
*/
|
||||
public function includeStartPost(Discussion $discussion, $relations)
|
||||
{
|
||||
return (new PostBasicSerializer($relations))->resource($discussion->startPost);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a resource containing a discussion's last user.
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @param array $relations
|
||||
* @return Tobscure\JsonApi\Resource
|
||||
*/
|
||||
public function includeLastUser(Discussion $discussion, $relations)
|
||||
{
|
||||
return (new UserBasicSerializer($relations))->resource($discussion->lastUser);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a resource containing a discussion's last post.
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @param array $relations
|
||||
* @return Tobscure\JsonApi\Resource
|
||||
*/
|
||||
public function includeLastPost(Discussion $discussion, $relations)
|
||||
{
|
||||
return (new PostBasicSerializer($relations))->resource($discussion->lastPost);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a resource containing a discussion's list of posts that have been
|
||||
* added during this request.
|
||||
*
|
||||
* @param Discussion $discussion
|
||||
* @param array $relations
|
||||
* @return Tobscure\JsonApi\Collection
|
||||
*/
|
||||
public function includeAddedPosts(Discussion $discussion, $relations)
|
||||
{
|
||||
return (new PostBasicSerializer($relations))->collection($discussion->getAddedPosts());
|
||||
return $this->extendAttributes($discussion, $attributes);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user