Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Model Visibility Scoping Extender and Tests #2460

Merged
merged 18 commits into from
Dec 8, 2020
Merged

Model Visibility Scoping Extender and Tests #2460

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
357a6ef
Get rid of events for visibility scoping
askvortsov1 Nov 21, 2020
e82bb6d
Run integration tests in isolated processes to mitigate duplicate cal…
askvortsov1 Nov 21, 2020
fb3ae1b
Remove redundant argument from `registerVisibilityScoper`
askvortsov1 Nov 21, 2020
7734f4d
Use `whereVisibleTo` for visibility scoping that includes an ability
askvortsov1 Nov 21, 2020
35a6e96
Default scopers should run on EVERY scoping request
askvortsov1 Nov 21, 2020
a328e5d
dd ModelVisibility extender, integration tests
askvortsov1 Nov 21, 2020
df5cc81
Deprecate old visibility scoping system
askvortsov1 Nov 21, 2020
d10d44b
Apply fixes from StyleCI
askvortsov1 Nov 21, 2020
db81184
Remove unnecessary trailing comma
askvortsov1 Nov 21, 2020
898f7d8
Ensure that notification subject models being scoped CAN be scoped.
askvortsov1 Nov 25, 2020
f9c8803
Use strict equality for null check
askvortsov1 Dec 2, 2020
7e0d211
Remove composer.json changes
askvortsov1 Dec 2, 2020
402f5cd
Make default lowercase
askvortsov1 Dec 4, 2020
991057d
Merge branch 'master' into as/scope-model-visibility
askvortsov1 Dec 7, 2020
a3908c2
Hardcode '*' as default
askvortsov1 Dec 8, 2020
7265227
Rename `default` scopers to `scopeAll`
askvortsov1 Dec 8, 2020
d740347
Merge branch 'as/scope-model-visibility' of github.com:flarum/core in…
askvortsov1 Dec 8, 2020
158c360
Fix old method naming
askvortsov1 Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use whereVisibleTo for visibility scoping that includes an ability
  • Loading branch information
@askvortsov1
askvortsov1 committed Dec 2, 2020
commit 7734f4d18367457fad34d3b4505aaa1fe5e778b9
6 changes: 3 additions & 3 deletions src/Discussion/Access/ScopeDiscussionVisibility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function __invoke(User $actor, $query)
$query->where(function ($query) use ($actor) {
$query->where('discussions.is_private', false)
->orWhere(function ($query) use ($actor) {
$query->whereVisibleWithAbility($actor, 'viewPrivate');
$query->whereVisibleTo($actor, 'viewPrivate');
});
});

Expand All @@ -41,7 +41,7 @@ public function __invoke(User $actor, $query)
$query->whereNull('discussions.hidden_at')
->orWhere('discussions.user_id', $actor->id)
->orWhere(function ($query) use ($actor) {
$query->whereVisibleWithAbility($actor, 'hide');
$query->whereVisibleTo($actor, 'hide');
});
});
}
Expand All @@ -53,7 +53,7 @@ public function __invoke(User $actor, $query)
$query->where('discussions.comment_count', '>', 0)
->orWhere('discussions.user_id', $actor->id)
->orWhere(function ($query) use ($actor) {
$query->whereVisibleWithAbility($actor, 'editPosts');
$query->whereVisibleTo($actor, 'editPosts');
});
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/Post/Access/ScopePostVisibility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __invoke(User $actor, $query)
$query->where(function ($query) use ($actor) {
$query->where('posts.is_private', false)
->orWhere(function ($query) use ($actor) {
$query->whereVisibleWithAbility($actor, 'viewPrivate');
$query->whereVisibleTo($actor, 'viewPrivate');
});
});

Expand All @@ -52,7 +52,7 @@ public function __invoke(User $actor, $query)
$query
->whereRaw('1=0')
->orWhere(function ($query) use ($actor) {
Discussion::query()->setQuery($query)->whereVisibleWithAbility($actor, 'hidePosts');
Discussion::query()->setQuery($query)->whereVisibleTo($actor, 'hidePosts');
});
});
});
Expand Down