github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-11 09:33:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1938 from flarum/ds/1255-throttling-bypass-permission

Browse Source 
Add permission to bypass throttling
This commit is contained in:
Franz Liedke 2020-02-07 15:34:25 +01:00 committed by GitHub
commit 969bd18001
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/js/src/admin/components/PermissionGrid.js
View File

@ -210,6 +210,12 @@ export default class PermissionGrid extends Component {
permission: 'discussion.delete' permission: 'discussion.delete'
}, 80); }, 80);
items.add('postWithoutThrottle', {
icon: 'fas fa-swimmer',
label: app.translator.trans('core.admin.permissions.post_without_throttle_label'),
permission: 'postWithoutThrottle'
}, 70);
items.add('editPosts', { items.add('editPosts', {
icon: 'fas fa-pencil-alt', icon: 'fas fa-pencil-alt',
label: app.translator.trans('core.admin.permissions.edit_posts_label'), label: app.translator.trans('core.admin.permissions.edit_posts_label'),
@ -233,7 +239,7 @@ export default class PermissionGrid extends Component {
label: app.translator.trans('core.admin.permissions.edit_users_label'), label: app.translator.trans('core.admin.permissions.edit_users_label'),
permission: 'user.edit' permission: 'user.edit'
}, 60); }, 60);
return items; return items;
} }

4
framework/core/src/Post/Floodgate.php
View File

@ -33,6 +33,10 @@ class Floodgate
*/ */
public function assertNotFlooding(User $actor) public function assertNotFlooding(User $actor)
{ {
if ($actor->can('postWithoutThrottle')) {
return;
}
if ($this->isFlooding($actor)) { if ($this->isFlooding($actor)) {
throw new FloodingException; throw new FloodingException;
} }