aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update nav and Bouncer

Browse Source
pull/4389/head
Daniel Supernault 2 years ago
parent d1880ee6b8
commit 053b30bca0
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
2 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File

7
app/Util/Sentiment/Bouncer.php
Unescape Escape View File

@ -10,6 +10,7 @@ use App\Services\NotificationService;
use App\Services\StatusService;
use App\Jobs\ReportPipeline\AutospamNotifyAdminViaEmail;
use App\Notification;
use App\Services\AutospamService;
class Bouncer {
@ -65,6 +66,12 @@ class Bouncer {
return (new self)->handle($status);
}
if(AutospamService::active()) {
if(AutospamService::check($status->caption)) {
return (new self)->handle($status);
}
}
$recentKey = 'pf:bouncer_v0:recent_by_pid:' . $status->profile_id;
$recentTtl = now()->addHours(28);

79
resources/views/admin/partial/sidenav.blade.php
Unescape Escape View File

@ -15,6 +15,13 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*autospam*')?'active':''}}" href="{{route('admin.autospam')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Autospam <span class="badge badge-primary ml-1">NEW</span></span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*messages*')?'active':''}}" href="{{route('admin.messages')}}">
<i class="ni ni-bold-right text-primary"></i>
@ -36,13 +43,6 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*stories*')?'active':''}}" href="{{route('admin.stories')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Stories <span class="badge badge-primary ml-1">NEW</span></span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*users*')?'active':''}}" href="{{route('admin.users')}}">
<i class="ni ni-bold-right text-primary"></i>
@ -60,75 +60,87 @@
<hr class="my-3">
<ul class="navbar-nav mb-md-3">
<li class="nav-item">
<a class="nav-link {{request()->is('*directory*')?'active':''}}" href="{{route('admin.directory')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Directory <span class="badge badge-primary ml-1">NEW</span></span>
</a>
</li>
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link {{request()->is('*custom-emoji*')?'active':''}}" href="{{route('admin.custom-emoji')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Custom Emoji <span class="badge badge-primary ml-1">NEW</span></span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*apps*')?'active':''}}" href="{{route('admin.apps')}}">
<a class="nav-link {{request()->is('*hashtags*')?'active':''}}" href="{{route('admin.hashtags')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Apps</span>
<span class="nav-link-text">Hashtags</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*custom-emoji*')?'active':''}}" href="{{route('admin.custom-emoji')}}">
<a class="nav-link {{request()->is('*instances*')?'active':''}}" href="{{route('admin.instances')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Custom Emoji <span class="badge badge-primary ml-1">NEW</span></span>
<span class="nav-link-text">Instances</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*diagnostics*')?'active':''}}" href="{{route('admin.diagnostics')}}">
<a class="nav-link {{request()->is('*media*')?'active':''}}" href="{{route('admin.media')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Diagnostics <span class="badge badge-primary ml-1">NEW</span></span>
<span class="nav-link-text">Media</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*hashtags*')?'active':''}}" href="{{route('admin.hashtags')}}">
<a class="nav-link {{request()->is('*profiles*')?'active':''}}" href="/i/admin/profiles">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Hashtags</span>
<span class="nav-link-text">Profiles</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/horizon">
<a class="nav-link {{request()->is('*stories*')?'active':''}}" href="{{route('admin.stories')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Horizon</span>
<span class="nav-link-text">Stories <span class="badge badge-primary ml-1">NEW</span></span>
</a>
</li>
</ul>
<hr class="my-3">
<ul class="navbar-nav mb-md-3">
<li class="nav-item">
<a class="nav-link {{request()->is('*instances*')?'active':''}}" href="{{route('admin.instances')}}">
<a class="nav-link {{request()->is('*apps*')?'active':''}}" href="{{route('admin.apps')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Instances</span>
<span class="nav-link-text">Apps</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*media*')?'active':''}}" href="{{route('admin.media')}}">
<a class="nav-link {{request()->is('*diagnostics*')?'active':''}}" href="{{route('admin.diagnostics')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Media</span>
<span class="nav-link-text">Diagnostics <span class="badge badge-primary ml-1">NEW</span></span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*directory*')?'active':''}}" href="{{route('admin.directory')}}">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Directory <span class="badge badge-primary ml-1">NEW</span></span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*site-news*')?'active':''}}" href="/i/admin/site-news">
<a class="nav-link" href="/horizon">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Newsroom</span>
<span class="nav-link-text">Horizon</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link {{request()->is('*profiles*')?'active':''}}" href="/i/admin/profiles">
<a class="nav-link {{request()->is('*site-news*')?'active':''}}" href="/i/admin/site-news">
<i class="ni ni-bold-right text-primary"></i>
<span class="nav-link-text">Profiles</span>
<span class="nav-link-text">Newsroom</span>
</a>
</li>
@ -152,7 +164,6 @@
<span class="nav-link-text">System</span>
</a>
</li>
</ul>
</div>
</div>

Write Preview
Loading…
Cancel
Save