mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
Code Issues Releases Wiki Activity

Fix conflicts with other extension visibility scoping (#26)

Browse Source 
Wrapping all `wheres` in an `orWhere` ensures that there's no conflict.

See https://github.com/flarum/core/issues/2798, https://github.com/flarum/docs/pull/200
This commit is contained in:
Alexander Skvortsov
2021-04-20 14:51:01 -04:00
committed by GitHub
parent dbccc396b0
commit 3b3cbdc82f
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/approval/src/Access/ScopePrivateDiscussionVisibility.php
View File

@@ -20,18 +20,23 @@ class ScopePrivateDiscussionVisibility
*/ */
public function __invoke(User $actor, Builder $query) public function __invoke(User $actor, Builder $query)
{ {
// Show empty/private discussions if they require approval and they are // All statements need to be wrapped in an orWhere, since we're adding a
// authored by the current user, or the current user has permission to // subset of private discussions that should be visible, not restricting the visible
// approve posts. // set.
$query->where('discussions.is_approved', 0); $query->orWhere(function ($query) use ($actor) {
// Show empty/private discussions if they require approval and they are
// authored by the current user, or the current user has permission to
// approve posts.
$query->where('discussions.is_approved', 0);
if (! $actor->hasPermission('discussion.approvePosts')) { if (! $actor->hasPermission('discussion.approvePosts')) {
$query->where(function (Builder $query) use ($actor) { $query->where(function (Builder $query) use ($actor) {
$query->where('discussions.user_id', $actor->id) $query->where('discussions.user_id', $actor->id)
->orWhere(function ($query) use ($actor) { ->orWhere(function ($query) use ($actor) {
$query->whereVisibleTo($actor, 'approvePosts'); $query->whereVisibleTo($actor, 'approvePosts');
}); });
}); });
} }
});
} }
} }

25
extensions/approval/src/Access/ScopePrivatePostVisibility.php
View File

@@ -21,17 +21,22 @@ class ScopePrivatePostVisibility
*/ */
public function __invoke(User $actor, Builder $query) public function __invoke(User $actor, Builder $query)
{ {
// Show private posts if they require approval and they are // All statements need to be wrapped in an orWhere, since we're adding a
// authored by the current user, or the current user has permission to // subset of private posts that should be visible, not restricting the visible
// approve posts. // set.
$query->where('posts.is_approved', 0); $query->orWhere(function ($query) use ($actor) {
// Show private posts if they require approval and they are
// authored by the current user, or the current user has permission to
// approve posts.
$query->where('posts.is_approved', 0);
if (! $actor->hasPermission('discussion.approvePosts')) { if (! $actor->hasPermission('discussion.approvePosts')) {
$query->where(function (Builder $query) use ($actor) { $query->where(function (Builder $query) use ($actor) {
$query->where('posts.user_id', $actor->id) $query->where('posts.user_id', $actor->id)
->orWhereExists($this->discussionWhereCanApprovePosts($actor)); ->orWhereExists($this->discussionWhereCanApprovePosts($actor));
}); });
} }
});
} }
private function discussionWhereCanApprovePosts(User $actor) private function discussionWhereCanApprovePosts(User $actor)