- {Button.component({
- className: 'Button Button--primary',
- icon: 'fas fa-plus',
- onclick: () => app.modal.show(BanIPModal),
- }, app.translator.trans('fof-ban-ips.admin.page.create_button'))}
+ {Button.component(
+ {
+ className: 'Button Button--primary',
+ icon: 'fas fa-plus',
+ onclick: () => app.modal.show(BanIPModal),
+ },
+ app.translator.trans('fof-ban-ips.admin.page.create_button')
+ )}
diff --git a/js/src/admin/components/SettingsPageItem.js b/js/src/admin/components/SettingsPageItem.js
index 4b3d25e..3fb5234 100644
--- a/js/src/admin/components/SettingsPageItem.js
+++ b/js/src/admin/components/SettingsPageItem.js
@@ -1,6 +1,6 @@
-import Component from 'flarum/Component';
-import Button from 'flarum/components/Button';
-import username from 'flarum/helpers/username';
+import Component from 'flarum/common/Component';
+import Button from 'flarum/common/components/Button';
+import username from 'flarum/common/helpers/username';
import UnbanIPModal from '../../common/components/UnbanIPModal';
import ChangeReasonModal from './ChangeReasonModal';
diff --git a/js/src/admin/index.js b/js/src/admin/index.js
index 869a55c..1d7006d 100644
--- a/js/src/admin/index.js
+++ b/js/src/admin/index.js
@@ -1,5 +1,5 @@
-import app from 'flarum/app';
-import Model from 'flarum/Model';
+import app from 'flarum/admin/app';
+import Model from 'flarum/common/Model';
import BannedIP from '../common/models/BannedIP';
import SettingsPage from './components/SettingsPage';
@@ -9,18 +9,25 @@ app.initializers.add('fof/ban-ips', () => {
app.store.models.users.prototype.bannedIPs = Model.hasMany('banned_ips');
- app.extensionData.for('fof-ban-ips')
- .registerPermission({
- icon: 'fas fa-gavel',
- label: app.translator.trans('fof-ban-ips.admin.permissions.view_banned_ip_list_label'),
- permission: 'fof.ban-ips.viewBannedIPList',
- }, 'moderate')
- .registerPermission({
- icon: 'fas fa-gavel',
- label: app.translator.trans('fof-ban-ips.admin.permissions.ban_ip_label'),
- permission: 'fof.ban-ips.banIP',
- }, 'moderate')
- .registerPage(SettingsPage);
+ app.extensionData
+ .for('fof-ban-ips')
+ .registerPermission(
+ {
+ icon: 'fas fa-gavel',
+ label: app.translator.trans('fof-ban-ips.admin.permissions.view_banned_ip_list_label'),
+ permission: 'fof.ban-ips.viewBannedIPList',
+ },
+ 'moderate'
+ )
+ .registerPermission(
+ {
+ icon: 'fas fa-gavel',
+ label: app.translator.trans('fof-ban-ips.admin.permissions.ban_ip_label'),
+ permission: 'fof.ban-ips.banIP',
+ },
+ 'moderate'
+ )
+ .registerPage(SettingsPage);
});
// Expose compat API
diff --git a/js/src/common/components/BanIPModal.js b/js/src/common/components/BanIPModal.js
index ee77804..c5f062e 100644
--- a/js/src/common/components/BanIPModal.js
+++ b/js/src/common/components/BanIPModal.js
@@ -1,8 +1,8 @@
-import Modal from 'flarum/components/Modal';
-import Button from 'flarum/components/Button';
-import Alert from 'flarum/components/Alert';
-import Stream from 'flarum/utils/Stream';
-import punctuateSeries from 'flarum/helpers/punctuateSeries';
+import Modal from 'flarum/common/components/Modal';
+import Button from 'flarum/common/components/Button';
+import Alert from 'flarum/common/components/Alert';
+import Stream from 'flarum/common/utils/Stream';
+import punctuateSeries from 'flarum/common/helpers/punctuateSeries';
export default class BanIPModal extends Modal {
oninit(vnode) {
@@ -76,15 +76,21 @@ export default class BanIPModal extends Modal {
{otherUsersBanned
? otherUsersBanned.length
- ? Alert.component({
- dismissible: false,
- }, app.translator.transChoice('fof-ban-ips.lib.modal.ban_ip_users', usernames.length, {
- users: punctuateSeries(usernames),
- }))
- : Alert.component({
- dismissible: false,
- type: 'success',
- }, app.translator.trans('fof-ban-ips.forum.modal.ban_ip_no_users'))
+ ? Alert.component(
+ {
+ dismissible: false,
+ },
+ app.translator.transChoice('fof-ban-ips.lib.modal.ban_ip_users', usernames.length, {
+ users: punctuateSeries(usernames),
+ })
+ )
+ : Alert.component(
+ {
+ dismissible: false,
+ type: 'success',
+ },
+ app.translator.trans('fof-ban-ips.forum.modal.ban_ip_no_users')
+ )
: ''}
{otherUsersBanned &&
}
@@ -129,7 +135,7 @@ export default class BanIPModal extends Modal {
})
.then((res) => app.store.pushPayload(res).forEach(this.done.bind(this)))
.then(this.hide.bind(this))
- .catch(() => { })
+ .catch(() => {})
.then(this.loaded.bind(this));
}
}
@@ -149,7 +155,7 @@ export default class BanIPModal extends Modal {
this.otherUsers[this.banOption()] = res.data.map((e) => app.store.pushObject(e)).filter((e) => e.bannedIPs().length === 0);
this.loading = false;
})
- .catch(() => { })
+ .catch(() => {})
.then(this.loaded.bind(this));
}
diff --git a/js/src/common/components/UnbanIPModal.js b/js/src/common/components/UnbanIPModal.js
index e8e97b0..9318093 100644
--- a/js/src/common/components/UnbanIPModal.js
+++ b/js/src/common/components/UnbanIPModal.js
@@ -1,7 +1,7 @@
-import Button from 'flarum/components/Button';
-import Alert from 'flarum/components/Alert';
-import punctuateSeries from 'flarum/helpers/punctuateSeries';
-import username from 'flarum/helpers/username';
+import Button from 'flarum/common/components/Button';
+import Alert from 'flarum/common/components/Alert';
+import punctuateSeries from 'flarum/common/helpers/punctuateSeries';
+import username from 'flarum/common/helpers/username';
import BanIPModal from './BanIPModal';
@@ -17,10 +17,13 @@ export default class UnbanIPModal extends BanIPModal {
if (this.bannedIPs) {
return (
- {Alert.component({
- dismissible: false,
- type: 'success',
- }, app.translator.trans('fof-ban-ips.lib.modal.unbanned_ips', { ips: punctuateSeries(this.bannedIPs) }))}
+ {Alert.component(
+ {
+ dismissible: false,
+ type: 'success',
+ },
+ app.translator.trans('fof-ban-ips.lib.modal.unbanned_ips', { ips: punctuateSeries(this.bannedIPs) })
+ )}
);
}
@@ -52,15 +55,21 @@ export default class UnbanIPModal extends BanIPModal {
{otherUsers
? otherUsers.length
- ? Alert.component({
- dismissible: false,
- }, app.translator.transChoice('fof-ban-ips.lib.modal.unban_ip_users', usernames.length, {
- users: punctuateSeries(usernames),
- }))
- : Alert.component({
- dismissible: false,
- type: 'success',
- }, app.translator.trans('fof-ban-ips.lib.modal.unban_ip_no_users'))
+ ? Alert.component(
+ {
+ dismissible: false,
+ },
+ app.translator.transChoice('fof-ban-ips.lib.modal.unban_ip_users', usernames.length, {
+ users: punctuateSeries(usernames),
+ })
+ )
+ : Alert.component(
+ {
+ dismissible: false,
+ type: 'success',
+ },
+ app.translator.trans('fof-ban-ips.lib.modal.unban_ip_no_users')
+ )
: ''}
{otherUsers &&
}
@@ -134,7 +143,7 @@ export default class UnbanIPModal extends BanIPModal {
m.redraw();
})
- .catch(() => { })
+ .catch(() => {})
.then(this.loaded.bind(this));
}
diff --git a/js/src/common/models/BannedIP.js b/js/src/common/models/BannedIP.js
index 3f3ff0c..5a6e055 100644
--- a/js/src/common/models/BannedIP.js
+++ b/js/src/common/models/BannedIP.js
@@ -1,5 +1,5 @@
-import Model from 'flarum/Model';
-import mixin from 'flarum/utils/mixin';
+import Model from 'flarum/common/Model';
+import mixin from 'flarum/common/utils/mixin';
export default class BannedIP extends mixin(Model, {
creator: Model.hasOne('creator'),
diff --git a/js/src/forum/addBanIPControl.js b/js/src/forum/addBanIPControl.js
index 62be145..c1f0ddb 100644
--- a/js/src/forum/addBanIPControl.js
+++ b/js/src/forum/addBanIPControl.js
@@ -1,7 +1,7 @@
-import { extend } from 'flarum/extend';
-import PostControls from 'flarum/utils/PostControls';
-import UserControls from 'flarum/utils/UserControls';
-import Button from 'flarum/components/Button';
+import { extend } from 'flarum/common/extend';
+import PostControls from 'flarum/forum/utils/PostControls';
+import UserControls from 'flarum/forum/utils/UserControls';
+import Button from 'flarum/common/components/Button';
import BanIPModal from '../common/components/BanIPModal';
import UnbanIPModal from '../common/components/UnbanIPModal';
@@ -18,10 +18,13 @@ export default () => {
items.add(
`${prefix}ban`,
- Button.component({
- icon: 'fas fa-gavel',
- onclick: () => app.modal.show(isBanned ? UnbanIPModal : BanIPModal, { post }),
- }, app.translator.trans(`fof-ban-ips.forum.${prefix}ban_ip_button`))
+ Button.component(
+ {
+ icon: 'fas fa-gavel',
+ onclick: () => app.modal.show(isBanned ? UnbanIPModal : BanIPModal, { post }),
+ },
+ app.translator.trans(`fof-ban-ips.forum.${prefix}ban_ip_button`)
+ )
);
});
@@ -33,10 +36,13 @@ export default () => {
items.add(
`${prefix}ban`,
- Button.component({
- icon: 'fas fa-gavel',
- onclick: () => app.modal.show(isBanned ? UnbanIPModal : BanIPModal, { post }),
- }, app.translator.trans(`fof-ban-ips.forum.user_controls.${prefix}ban_button`))
+ Button.component(
+ {
+ icon: 'fas fa-gavel',
+ onclick: () => app.modal.show(isBanned ? UnbanIPModal : BanIPModal, { post }),
+ },
+ app.translator.trans(`fof-ban-ips.forum.user_controls.${prefix}ban_button`)
+ )
);
});
};
diff --git a/js/src/forum/addBannedBadge.js b/js/src/forum/addBannedBadge.js
index ec1f072..9bde549 100644
--- a/js/src/forum/addBannedBadge.js
+++ b/js/src/forum/addBannedBadge.js
@@ -1,6 +1,6 @@
-import { extend } from 'flarum/extend';
-import User from 'flarum/models/User';
-import Badge from 'flarum/components/Badge';
+import { extend } from 'flarum/common/extend';
+import User from 'flarum/common/models/User';
+import Badge from 'flarum/common/components/Badge';
export default () => {
extend(User.prototype, 'badges', function (items) {
diff --git a/js/src/forum/index.js b/js/src/forum/index.js
index ad06421..87add0c 100644
--- a/js/src/forum/index.js
+++ b/js/src/forum/index.js
@@ -1,5 +1,5 @@
-import Model from 'flarum/Model';
-
+import app from 'flarum/common/app';
+import Model from 'flarum/common/Model';
import addBanIPControl from './addBanIPControl';
import BannedIP from '../common/models/BannedIP';
import addBannedBadge from './addBannedBadge';
diff --git a/src/Api/Controllers/BanUserController.php b/src/Api/Controllers/BanUserController.php
index 8848e3c..8cb68da 100644
--- a/src/Api/Controllers/BanUserController.php
+++ b/src/Api/Controllers/BanUserController.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Api\Controllers;
use Flarum\Api\Controller\AbstractListController;
+use Flarum\Http\RequestUtil;
use FoF\BanIPs\Api\Serializers\BannedIPSerializer;
use FoF\BanIPs\Commands\BanUser;
use Illuminate\Contracts\Bus\Dispatcher;
@@ -50,7 +51,7 @@ public function __construct(Dispatcher $bus)
protected function data(ServerRequestInterface $request, Document $document)
{
return $this->bus->dispatch(
- new BanUser($request->getAttribute('actor'), Arr::get($request->getQueryParams(), 'id'), Arr::get($request->getParsedBody(), 'data'))
+ new BanUser(RequestUtil::getActor($request), Arr::get($request->getQueryParams(), 'id'), Arr::get($request->getParsedBody(), 'data'))
);
}
}
diff --git a/src/Api/Controllers/CheckIPsController.php b/src/Api/Controllers/CheckIPsController.php
index defafc4..353b2b6 100644
--- a/src/Api/Controllers/CheckIPsController.php
+++ b/src/Api/Controllers/CheckIPsController.php
@@ -15,6 +15,7 @@
use Flarum\Api\Serializer\UserSerializer;
use Flarum\Foundation\ValidationException;
use Flarum\Http\Exception\RouteNotFoundException;
+use Flarum\Http\RequestUtil;
use Flarum\User\User;
use FoF\BanIPs\Repositories\BannedIPRepository;
use FoF\BanIPs\Validators\BannedIPValidator;
@@ -67,7 +68,7 @@ protected function data(ServerRequestInterface $request, Document $document)
/**
* @var User
*/
- $actor = $request->getAttribute('actor');
+ $actor = RequestUtil::getActor($request);
$params = $request->getQueryParams();
$actor->assertCan('banIP');
@@ -93,7 +94,7 @@ protected function data(ServerRequestInterface $request, Document $document)
if (empty($ips)) {
throw new ValidationException([
- app('translator')->trans('fof-ban-ips.error.no_ips_found_message'),
+ resolve('translator')->trans('fof-ban-ips.error.no_ips_found_message'),
]);
}
diff --git a/src/Api/Controllers/CreateBannedIPController.php b/src/Api/Controllers/CreateBannedIPController.php
index 46e6f44..56362d6 100644
--- a/src/Api/Controllers/CreateBannedIPController.php
+++ b/src/Api/Controllers/CreateBannedIPController.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Api\Controllers;
use Flarum\Api\Controller\AbstractCreateController;
+use Flarum\Http\RequestUtil;
use FoF\BanIPs\Api\Serializers\BannedIPSerializer;
use FoF\BanIPs\Commands\CreateBannedIP;
use Illuminate\Contracts\Bus\Dispatcher;
@@ -55,7 +56,7 @@ public function __construct(Dispatcher $bus)
protected function data(ServerRequestInterface $request, Document $document)
{
return $this->bus->dispatch(
- new CreateBannedIP($request->getAttribute('actor'), Arr::get($request->getParsedBody(), 'data', []))
+ new CreateBannedIP(RequestUtil::getActor($request), Arr::get($request->getParsedBody(), 'data', []))
);
}
}
diff --git a/src/Api/Controllers/DeleteBannedIPController.php b/src/Api/Controllers/DeleteBannedIPController.php
index 987f7a3..c3d2545 100644
--- a/src/Api/Controllers/DeleteBannedIPController.php
+++ b/src/Api/Controllers/DeleteBannedIPController.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Api\Controllers;
use Flarum\Api\Controller\AbstractDeleteController;
+use Flarum\Http\RequestUtil;
use FoF\BanIPs\Commands\DeleteBannedIP;
use Illuminate\Contracts\Bus\Dispatcher;
use Illuminate\Support\Arr;
@@ -38,7 +39,7 @@ public function __construct(Dispatcher $bus)
protected function delete(ServerRequestInterface $request)
{
$this->bus->dispatch(
- new DeleteBannedIP($request->getAttribute('actor'), Arr::get($request->getQueryParams(), 'id'))
+ new DeleteBannedIP(RequestUtil::getActor($request), Arr::get($request->getQueryParams(), 'id'))
);
}
}
diff --git a/src/Api/Controllers/ListBannedIPsController.php b/src/Api/Controllers/ListBannedIPsController.php
index cd4ce6c..164ad54 100644
--- a/src/Api/Controllers/ListBannedIPsController.php
+++ b/src/Api/Controllers/ListBannedIPsController.php
@@ -12,13 +12,13 @@
namespace FoF\BanIPs\Api\Controllers;
use Flarum\Api\Controller\AbstractListController;
+use Flarum\Http\RequestUtil;
use Flarum\Http\UrlGenerator;
-use Flarum\Search\SearchCriteria;
+use Flarum\Query\QueryCriteria;
use Flarum\User\User;
use FoF\BanIPs\Api\Serializers\BannedIPSerializer;
+use FoF\BanIPs\Search\BannedIPFilterer;
use FoF\BanIPs\Search\BannedIPSearcher;
-use FoF\Pages\Search\Page\PageSearcher;
-use Illuminate\Support\Arr;
use Psr\Http\Message\ServerRequestInterface;
use Tobscure\JsonApi\Document;
@@ -35,10 +35,15 @@ class ListBannedIPsController extends AbstractListController
public $include = ['user', 'creator'];
/**
- * @var PageSearcher
+ * @var BannedIPSearcher
*/
protected $searcher;
+ /**
+ * @var BannedIPFilterer
+ */
+ protected $filterer;
+
/**
* @var UrlGenerator
*/
@@ -46,11 +51,13 @@ class ListBannedIPsController extends AbstractListController
/**
* @param BannedIPSearcher $searcher
+ * @param BannedIPFilterer $filterer
* @param UrlGenerator $url
*/
- public function __construct(BannedIPSearcher $searcher, UrlGenerator $url)
+ public function __construct(BannedIPSearcher $searcher, BannedIPFilterer $filterer, UrlGenerator $url)
{
$this->searcher = $searcher;
+ $this->filterer = $filterer;
$this->url = $url;
}
@@ -62,17 +69,23 @@ protected function data(ServerRequestInterface $request, Document $document)
/**
* @var User
*/
- $actor = $request->getAttribute('actor');
+ $actor = RequestUtil::getActor($request);
$actor->assertCan('fof.banips.viewBannedIPList');
- $query = Arr::get($this->extractFilter($request), 'q');
+ $filters = $this->extractFilter($request);
$sort = $this->extractSort($request);
- $criteria = new SearchCriteria($actor, $query, $sort);
$limit = $this->extractLimit($request);
$offset = $this->extractOffset($request);
- $results = $this->searcher->search($criteria, $limit, $offset);
+ $include = $this->extractInclude($request);
+
+ $criteria = new QueryCriteria($actor, $filters, $sort);
+ if (array_key_exists('q', $filters)) {
+ $results = $this->searcher->search($criteria, $limit, $offset);
+ } else {
+ $results = $this->filterer->filter($criteria, $limit, $offset);
+ }
$document->addPaginationLinks(
$this->url->to('api')->route('fof.ban-ips.index'),
@@ -82,8 +95,6 @@ protected function data(ServerRequestInterface $request, Document $document)
$results->areMoreResults() ? null : 0
);
- return $results->getResults();
-
-// return BannedIP::all();
+ return $results->getResults()->load($include);
}
}
diff --git a/src/Api/Controllers/ListUserBannedIPsController.php b/src/Api/Controllers/ListUserBannedIPsController.php
index a4ae0e2..3a83320 100644
--- a/src/Api/Controllers/ListUserBannedIPsController.php
+++ b/src/Api/Controllers/ListUserBannedIPsController.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Api\Controllers;
use Flarum\Api\Controller\AbstractListController;
+use Flarum\Http\RequestUtil;
use Flarum\User\User;
use FoF\BanIPs\Api\Serializers\BannedIPSerializer;
use FoF\BanIPs\Repositories\BannedIPRepository;
@@ -54,7 +55,7 @@ protected function data(ServerRequestInterface $request, Document $document)
/**
* @var User
*/
- $actor = $request->getAttribute('actor');
+ $actor = RequestUtil::getActor($request);
$actor->assertCan('fof.banips.viewBannedIPList');
diff --git a/src/Api/Controllers/UnbanUserController.php b/src/Api/Controllers/UnbanUserController.php
index 7878068..7a73b60 100644
--- a/src/Api/Controllers/UnbanUserController.php
+++ b/src/Api/Controllers/UnbanUserController.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Api\Controllers;
use Flarum\Api\Controller\AbstractListController;
+use Flarum\Http\RequestUtil;
use FoF\BanIPs\Api\Serializers\BannedIPSerializer;
use FoF\BanIPs\Commands\UnbanUser;
use Illuminate\Contracts\Bus\Dispatcher;
@@ -50,7 +51,7 @@ public function __construct(Dispatcher $bus)
protected function data(ServerRequestInterface $request, Document $document)
{
return $this->bus->dispatch(
- new UnbanUser($request->getAttribute('actor'), Arr::get($request->getQueryParams(), 'id'))
+ new UnbanUser(RequestUtil::getActor($request), Arr::get($request->getQueryParams(), 'id'))
);
}
}
diff --git a/src/Api/Controllers/UpdateBannedIPController.php b/src/Api/Controllers/UpdateBannedIPController.php
index cc50ed2..2221a0a 100644
--- a/src/Api/Controllers/UpdateBannedIPController.php
+++ b/src/Api/Controllers/UpdateBannedIPController.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Api\Controllers;
use Flarum\Api\Controller\AbstractShowController;
+use Flarum\Http\RequestUtil;
use FoF\BanIPs\Api\Serializers\BannedIPSerializer;
use FoF\BanIPs\Commands\EditBannedIP;
use Illuminate\Contracts\Bus\Dispatcher;
@@ -45,7 +46,7 @@ public function __construct(Dispatcher $bus)
protected function data(ServerRequestInterface $request, Document $document)
{
return $this->bus->dispatch(
- new EditBannedIP($request->getAttribute('actor'), Arr::get($request->getQueryParams(), 'id'), Arr::get($request->getParsedBody(), 'data', []))
+ new EditBannedIP(RequestUtil::getActor($request), Arr::get($request->getQueryParams(), 'id'), Arr::get($request->getParsedBody(), 'data', []))
);
}
}
diff --git a/src/Commands/UnbanUserHandler.php b/src/Commands/UnbanUserHandler.php
index d847539..bf35742 100644
--- a/src/Commands/UnbanUserHandler.php
+++ b/src/Commands/UnbanUserHandler.php
@@ -73,6 +73,7 @@ public function handle(UnbanUser $command)
$bannedIPs = $this->bannedIPs->getUserBannedIPs($user)->get();
foreach ($bannedIPs as $bannedIP) {
+ /** @var \FoF\BanIPs\BannedIP $bannedIP */
$bannedIP->delete();
$this->events->dispatch(
diff --git a/src/Listeners/BannedIPData.php b/src/Listeners/BannedIPData.php
index 4019b1b..5fbc4c0 100644
--- a/src/Listeners/BannedIPData.php
+++ b/src/Listeners/BannedIPData.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Listeners;
use Flarum\Api\Controller\AbstractSerializeController;
+use Flarum\Http\RequestUtil;
use FoF\BanIPs\Repositories\BannedIPRepository;
use Psr\Http\Message\ServerRequestInterface;
@@ -29,7 +30,7 @@ public function __construct(BannedIPRepository $bannedIPs)
public function __invoke(AbstractSerializeController $controller, &$data, ServerRequestInterface $request)
{
- $canView = $request->getAttribute('actor')->can('fof.ban-ips.viewBannedIPList');
+ $canView = RequestUtil::getActor($request)->can('fof.ban-ips.viewBannedIPList');
$data['banned_ips'] = $canView ? $this->bannedIPs->getUserBannedIPs($data)->get() : [];
diff --git a/src/Listeners/BannedIPsData.php b/src/Listeners/BannedIPsData.php
index 2714a4f..95aa4f0 100644
--- a/src/Listeners/BannedIPsData.php
+++ b/src/Listeners/BannedIPsData.php
@@ -12,6 +12,7 @@
namespace FoF\BanIPs\Listeners;
use Flarum\Api\Controller\AbstractListController;
+use Flarum\Http\RequestUtil;
use FoF\BanIPs\Repositories\BannedIPRepository;
use Psr\Http\Message\ServerRequestInterface;
@@ -29,7 +30,7 @@ public function __construct(BannedIPRepository $bannedIPs)
public function __invoke(AbstractListController $controller, &$data, ServerRequestInterface $request)
{
- $canView = $request->getAttribute('actor')->can('fof.ban-ips.viewBannedIPList');
+ $canView = RequestUtil::getActor($request)->can('fof.ban-ips.viewBannedIPList');
foreach ($data as $d) {
$d['banned_ips'] = $canView ? $this->bannedIPs->getUserBannedIPs($d)->get() : [];
diff --git a/src/Middleware/RegisterMiddleware.php b/src/Middleware/RegisterMiddleware.php
index 3c7b949..451cdfc 100644
--- a/src/Middleware/RegisterMiddleware.php
+++ b/src/Middleware/RegisterMiddleware.php
@@ -14,6 +14,7 @@
use Flarum\Foundation\ErrorHandling\JsonApiFormatter;
use Flarum\Foundation\ErrorHandling\Registry;
use Flarum\Foundation\ValidationException;
+use Flarum\Http\RequestUtil;
use Flarum\User\UserRepository;
use FoF\BanIPs\Repositories\BannedIPRepository;
use Illuminate\Support\Arr;
@@ -54,10 +55,10 @@ public function __construct(BannedIPRepository $bannedIPs, UserRepository $users
*/
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
{
- $registerUri = app('flarum.forum.routes')->getPath('register');
- $loginUri = app('flarum.forum.routes')->getPath('login');
- $logoutUri = app('flarum.forum.routes')->getPath('logout');
- $actor = $request->getAttribute('actor');
+ $registerUri = resolve('flarum.forum.routes')->getPath('register');
+ $loginUri = resolve('flarum.forum.routes')->getPath('login');
+ $logoutUri = resolve('flarum.forum.routes')->getPath('logout');
+ $actor = RequestUtil::getActor($request);
$requestUri = $request->getUri()->getPath();
if ($requestUri === $registerUri || $requestUri === $loginUri) {
@@ -75,9 +76,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
return (new JsonApiFormatter())
->format(
- app(Registry::class)
+ resolve(Registry::class)
->handle(new ValidationException([
- 'ip' => app('translator')->trans('fof-ban-ips.error.banned_ip_message'),
+ 'ip' => resolve('translator')->trans('fof-ban-ips.error.banned_ip_message'),
])),
$request
);
diff --git a/src/Search/BannedIPFilterer.php b/src/Search/BannedIPFilterer.php
new file mode 100644
index 0000000..5d2eefd
--- /dev/null
+++ b/src/Search/BannedIPFilterer.php
@@ -0,0 +1,34 @@
+bannedIPs = $bannedIPs;
+ }
+
+ protected function getQuery(User $actor): Builder
+ {
+ return $this->bannedIPs->query();
+ }
+}
diff --git a/src/Search/BannedIPSearch.php b/src/Search/BannedIPSearch.php
deleted file mode 100644
index 5ca5629..0000000
--- a/src/Search/BannedIPSearch.php
+++ /dev/null
@@ -1,22 +0,0 @@
- 'desc'];
-}
diff --git a/src/Search/BannedIPSearcher.php b/src/Search/BannedIPSearcher.php
index f9c9964..63ece0a 100644
--- a/src/Search/BannedIPSearcher.php
+++ b/src/Search/BannedIPSearcher.php
@@ -11,21 +11,14 @@
namespace FoF\BanIPs\Search;
-use Flarum\Search\ApplySearchParametersTrait;
+use Flarum\Search\AbstractSearcher;
use Flarum\Search\GambitManager;
-use Flarum\Search\SearchCriteria;
-use Flarum\Search\SearchResults;
+use Flarum\User\User;
use FoF\BanIPs\Repositories\BannedIPRepository;
+use Illuminate\Database\Eloquent\Builder;
-class BannedIPSearcher
+class BannedIPSearcher extends AbstractSearcher
{
- use ApplySearchParametersTrait;
-
- /**
- * @var GambitManager
- */
- protected $gambits;
-
/**
* @var BannedIPRepository
*/
@@ -35,43 +28,15 @@ class BannedIPSearcher
* @param GambitManager $gambits
* @param BannedIPRepository $bannedIPs
*/
- public function __construct(GambitManager $gambits, BannedIPRepository $bannedIPs)
+ public function __construct(BannedIPRepository $bannedIPs, GambitManager $gambits, array $searchMutators)
{
- $this->gambits = $gambits;
+ parent::__construct($gambits, $searchMutators);
+
$this->bannedIPs = $bannedIPs;
}
- /**
- * @param SearchCriteria $criteria
- * @param int|null $limit
- * @param int $offset
- *
- * @return SearchResults
- */
- public function search(SearchCriteria $criteria, $limit = null, $offset = 0)
+ public function getQuery(User $actor): Builder
{
- $actor = $criteria->actor;
-
- $query = $this->bannedIPs->query();
-
- if ($actor !== null && !$actor->isAdmin()) {
- $query->whereIsHidden(0);
- }
-
- $search = new BannedIPSearch($query->getQuery(), $actor);
-
- $this->gambits->apply($search, $criteria->query);
-
- $this->applySort($search, $criteria->sort);
- $this->applyOffset($search, $offset);
- $this->applyLimit($search, $limit + 1);
-
- $bannedIPs = $query->get();
-
- if ($areMoreResults = ($limit > 0 && $bannedIPs->count() > $limit)) {
- $bannedIPs->pop();
- }
-
- return new SearchResults($bannedIPs, $areMoreResults);
+ return $this->bannedIPs->query();
}
}
diff --git a/src/Search/NxGambit.php b/src/Search/NxGambit.php
new file mode 100644
index 0000000..98a7d65
--- /dev/null
+++ b/src/Search/NxGambit.php
@@ -0,0 +1,39 @@
+