UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-26 08:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2691 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-03-01 02:21:02 -07:00 committed by GitHub
commit d2ff146526
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Util/Sentiment/Bouncer.php
View file

@ -15,6 +15,10 @@ class Bouncer {
return; return;
} }
if($status->profile->user->is_admin == true) {
return;
}
$exemptionKey = 'pf:bouncer_v0:exemption_by_pid:' . $status->profile_id; $exemptionKey = 'pf:bouncer_v0:exemption_by_pid:' . $status->profile_id;
$exemptionTtl = now()->addDays(12); $exemptionTtl = now()->addDays(12);
@ -50,6 +54,14 @@ class Bouncer {
return; return;
} }
if( $status->profile->created_at->gt(now()->subMonths(6)) &&
$status->profile->status_count < 2 &&
$status->profile->bio &&
$status->profile->website
) {
return (new self)->handle($status);
}
$recentKey = 'pf:bouncer_v0:recent_by_pid:' . $status->profile_id; $recentKey = 'pf:bouncer_v0:recent_by_pid:' . $status->profile_id;
$recentTtl = now()->addHours(28); $recentTtl = now()->addHours(28);
@ -86,10 +98,6 @@ class Bouncer {
return; return;
} }
if($status->profile->user->is_admin == true) {
return;
}
return (new self)->handle($status); return (new self)->handle($status);
} }