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

Merge pull request #4391 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-05-17 05:04:22 -06:00 committed by GitHub
commit 92d2533068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -39,6 +39,7 @@
- Update admin autospam apis, remove autospam warning notifications when appropriate ([588ca653](https://github.com/pixelfed/pixelfed/commit/588ca653)) - Update admin autospam apis, remove autospam warning notifications when appropriate ([588ca653](https://github.com/pixelfed/pixelfed/commit/588ca653))
- Update StatusEntityLexer, stop saving entities ([a91a5e48](https://github.com/pixelfed/pixelfed/commit/a91a5e48)) - Update StatusEntityLexer, stop saving entities ([a91a5e48](https://github.com/pixelfed/pixelfed/commit/a91a5e48))
- Update UserCreate command, fix is_admin flag ([ad25ed67](https://github.com/pixelfed/pixelfed/commit/ad25ed67)) - Update UserCreate command, fix is_admin flag ([ad25ed67](https://github.com/pixelfed/pixelfed/commit/ad25ed67))
- Update Bouncer, adjust advanced Autospam logic ([18cddd43](https://github.com/pixelfed/pixelfed/commit/18cddd43))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6) ## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6)

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

@ -66,12 +66,6 @@ class Bouncer {
return (new self)->handle($status); 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; $recentKey = 'pf:bouncer_v0:recent_by_pid:' . $status->profile_id;
$recentTtl = now()->addHours(28); $recentTtl = now()->addHours(28);
@ -95,6 +89,12 @@ class Bouncer {
return; return;
} }
if(AutospamService::active()) {
if(AutospamService::check($status->caption)) {
return (new self)->handle($status);
}
}
if(!Str::contains($status->caption, [ if(!Str::contains($status->caption, [
'https://', 'https://',
'http://', 'http://',