mirror of
https://github.com/flarum/core.git
synced 2025-10-20 03:06:07 +02:00
Add user activity system
This commit is contained in:
47
src/Api/Actions/Activity/IndexAction.php
Normal file
47
src/Api/Actions/Activity/IndexAction.php
Normal file
@@ -0,0 +1,47 @@
|
||||
<?php namespace Flarum\Api\Actions\Activity;
|
||||
|
||||
use Flarum\Core\Repositories\UserRepositoryInterface;
|
||||
use Flarum\Core\Repositories\ActivityRepositoryInterface;
|
||||
use Flarum\Core\Support\Actor;
|
||||
use Flarum\Api\Actions\BaseAction;
|
||||
use Flarum\Api\Actions\ApiParams;
|
||||
use Flarum\Api\Serializers\ActivitySerializer;
|
||||
|
||||
class IndexAction extends BaseAction
|
||||
{
|
||||
/**
|
||||
* Instantiate the action.
|
||||
*
|
||||
* @param \Flarum\Core\Search\Discussions\UserSearcher $searcher
|
||||
*/
|
||||
public function __construct(Actor $actor, UserRepositoryInterface $users, ActivityRepositoryInterface $activity)
|
||||
{
|
||||
$this->actor = $actor;
|
||||
$this->users = $users;
|
||||
$this->activity = $activity;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show a user's activity feed.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
protected function run(ApiParams $params)
|
||||
{
|
||||
$start = $params->start();
|
||||
$count = $params->count(20, 50);
|
||||
$type = $params->get('type');
|
||||
$id = $params->get('users');
|
||||
|
||||
$user = $this->users->findOrFail($id, $this->actor->getUser());
|
||||
|
||||
$activity = $this->activity->findByUser($user->id, $this->actor->getUser(), $count, $start, $type);
|
||||
|
||||
// Finally, we can set up the activity serializer and use it to create
|
||||
// a collection of activity results.
|
||||
$serializer = new ActivitySerializer(['sender', 'post', 'post.discussion', 'post.user', 'post.discussion.startUser', 'post.discussion.lastUser'], ['user']);
|
||||
$document = $this->document()->setPrimaryElement($serializer->collection($activity));
|
||||
|
||||
return $this->respondWithDocument($document);
|
||||
}
|
||||
}
|
@@ -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;
|
||||
|
@@ -3,23 +3,23 @@
|
||||
use Flarum\Core\Models\User;
|
||||
use Flarum\Api\Actions\ApiParams;
|
||||
|
||||
trait GetsPostsForDiscussion
|
||||
trait GetsPosts
|
||||
{
|
||||
protected function getPostsForDiscussion(ApiParams $params, $discussionId)
|
||||
protected function getPosts(ApiParams $params, $where)
|
||||
{
|
||||
$sort = $params->sort(['time']);
|
||||
$count = $params->count(20, 50);
|
||||
$user = $this->actor->getUser();
|
||||
|
||||
if (($near = $params->get('near')) > 1) {
|
||||
$start = $this->posts->getIndexForNumber($discussionId, $near, $user);
|
||||
if (isset($where['discussion_id']) && ($near = $params->get('near')) > 1) {
|
||||
$start = $this->posts->getIndexForNumber($where['discussion_id'], $near, $user);
|
||||
$start = max(0, $start - $count / 2);
|
||||
} else {
|
||||
$start = 0;
|
||||
}
|
||||
|
||||
return $this->posts->findByDiscussion(
|
||||
$discussionId,
|
||||
return $this->posts->findWhere(
|
||||
$where,
|
||||
$user,
|
||||
$sort['field'],
|
||||
$sort['order'] ?: 'asc',
|
@@ -9,7 +9,7 @@ use Flarum\Api\Serializers\PostSerializer;
|
||||
|
||||
class IndexAction extends BaseAction
|
||||
{
|
||||
use GetsPostsForDiscussion;
|
||||
use GetsPosts;
|
||||
|
||||
/**
|
||||
* The post repository.
|
||||
@@ -37,14 +37,19 @@ class IndexAction extends BaseAction
|
||||
protected function run(ApiParams $params)
|
||||
{
|
||||
$postIds = (array) $params->get('ids');
|
||||
$include = ['user', 'user.groups', 'editUser', 'hideUser'];
|
||||
$include = ['user', 'user.groups', 'editUser', 'hideUser', 'discussion'];
|
||||
$user = $this->actor->getUser();
|
||||
|
||||
if (count($postIds)) {
|
||||
$posts = $this->posts->findByIds($postIds, $user);
|
||||
} else {
|
||||
$discussionId = $params->get('discussions');
|
||||
$posts = $this->getPostsForDiscussion($params, $discussionId, $user);
|
||||
if ($discussionId = $params->get('discussions')) {
|
||||
$where['discussion_id'] = $discussionId;
|
||||
}
|
||||
if ($userId = $params->get('users')) {
|
||||
$where['user_id'] = $userId;
|
||||
}
|
||||
$posts = $this->getPosts($params, $where, $user);
|
||||
}
|
||||
|
||||
if (! count($posts)) {
|
||||
|
Reference in New Issue
Block a user