banquise/pelican-panel-banquise
13
0
Fork 0
forked from banquise/pelican-panel-mirror
Code Issues 1 Pull Requests Actions Activity

Use nullsafe operator

Browse Source
This commit is contained in:
Lance Pioch 2024-03-19 16:46:25 -04:00
parent 44b9eb2358
commit c124d403ff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Providers/RouteServiceProvider.php
View File

@ -90,7 +90,7 @@ class RouteServiceProvider extends ServiceProvider
// This means that an authenticated API user cannot use IP switching to get // This means that an authenticated API user cannot use IP switching to get
// around the limits. // around the limits.
RateLimiter::for('api.client', function (Request $request) { RateLimiter::for('api.client', function (Request $request) {
$key = optional($request->user())->uuid ?: $request->ip(); $key = $request->user()?->uuid ?: $request->ip();
return Limit::perMinutes( return Limit::perMinutes(
config('http.rate_limit.client_period'), config('http.rate_limit.client_period'),
@ -99,7 +99,7 @@ class RouteServiceProvider extends ServiceProvider
}); });
RateLimiter::for('api.application', function (Request $request) { RateLimiter::for('api.application', function (Request $request) {
$key = optional($request->user())->uuid ?: $request->ip(); $key = $request->user()?->uuid ?: $request->ip();
return Limit::perMinutes( return Limit::perMinutes(
config('http.rate_limit.application_period'), config('http.rate_limit.application_period'),

4
app/Transformers/Api/Client/ActivityLogTransformer.php
View File

@ -55,7 +55,7 @@ class ActivityLogTransformer extends BaseClientTransformer
$properties = $model->properties $properties = $model->properties
->mapWithKeys(function ($value, $key) use ($model) { ->mapWithKeys(function ($value, $key) use ($model) {
if ($key === 'ip' && !optional($model->actor)->is($this->request->user())) { if ($key === 'ip' && !$model->actor?->is($this->request->user())) {
return [$key => '[hidden]']; return [$key => '[hidden]'];
} }
@ -113,6 +113,6 @@ class ActivityLogTransformer extends BaseClientTransformer
*/ */
protected function canViewIP(Model $actor = null): bool protected function canViewIP(Model $actor = null): bool
{ {
return optional($actor)->is($this->request->user()) || $this->request->user()->root_admin; return $actor?->is($this->request->user()) || $this->request->user()->root_admin;
} }
} }