mirror of
https://github.com/flarum/core.git
synced 2025-10-12 23:44:27 +02:00
Massive refactor
- Use contextual namespaces within Flarum\Core - Clean up and docblock everything - Refactor Activity/Notification blueprint stuff - Refactor Formatter stuff - Refactor Search stuff - Upgrade to JSON-API 1.0 - Removed “addedPosts” and “removedPosts” relationships from discussion API. This was used for adding/removing event posts after renaming a discussion etc. Instead we should make an additional request to get all new posts Todo: - Fix Extenders and extensions - Get rid of repository interfaces - Fix other bugs I’ve inevitably introduced
This commit is contained in:
@@ -4,12 +4,22 @@ use Flarum\Api\JsonApiRequest;
|
||||
|
||||
trait GetsPosts
|
||||
{
|
||||
/**
|
||||
* @var \Flarum\Core\Posts\PostRepositoryInterface
|
||||
*/
|
||||
protected $posts;
|
||||
|
||||
/**
|
||||
* @param JsonApiRequest $request
|
||||
* @param array $where
|
||||
* @return \Illuminate\Database\Eloquent\Collection
|
||||
*/
|
||||
protected function getPosts(JsonApiRequest $request, array $where)
|
||||
{
|
||||
$user = $request->actor->getUser();
|
||||
$actor = $request->actor;
|
||||
|
||||
if (isset($where['discussion_id']) && ($near = $request->get('near')) > 1) {
|
||||
$offset = $this->posts->getIndexForNumber($where['discussion_id'], $near, $user);
|
||||
if (isset($where['discussion_id']) && ($near = $request->get('page.near')) > 1) {
|
||||
$offset = $this->posts->getIndexForNumber($where['discussion_id'], $near, $actor);
|
||||
$offset = max(0, $offset - $request->limit / 2);
|
||||
} else {
|
||||
$offset = 0;
|
||||
@@ -17,7 +27,7 @@ trait GetsPosts
|
||||
|
||||
return $this->posts->findWhere(
|
||||
$where,
|
||||
$user,
|
||||
$actor,
|
||||
$request->sort,
|
||||
$request->limit,
|
||||
$offset
|
||||
|
Reference in New Issue
Block a user