mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-03 13:44:13 +00:00
Code Issues Releases Wiki Activity

Update Inbox, improve Flag report handling

Browse source
This commit is contained in:
Daniel Supernault 2023-04-25 20:36:53 -06:00
parent 0f1f3b1fd3
commit aaf5b2764e
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Util/ActivityPub/Inbox.php
View file

@ -1153,7 +1153,6 @@ class Inbox
$this->payload['id'], $this->payload['id'],
$this->payload['type'], $this->payload['type'],
$this->payload['actor'], $this->payload['actor'],
$this->payload['content'],
$this->payload['object'] $this->payload['object']
)) { )) {
return; return;
@ -1161,18 +1160,19 @@ class Inbox
$id = $this->payload['id']; $id = $this->payload['id'];
$actor = $this->payload['actor']; $actor = $this->payload['actor'];
$content = Purify::clean($this->payload['content']);
$object = $this->payload['object'];
if(Helpers::validateLocalUrl($id) || parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) { if(Helpers::validateLocalUrl($id) || parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
return; return;
} }
if(!is_array($object) || empty($object)) { $content = isset($this->payload['content']) ? Purify::clean($this->payload['content']) : null;
$object = $this->payload['object'];
if(empty($object) || (!is_array($object) && !is_string($object))) {
return; return;
} }
if(count($object) > 40) { if(is_array($object) && count($object) > 100) {
return; return;
} }
@ -1181,7 +1181,7 @@ class Inbox
foreach($object as $objectUrl) { foreach($object as $objectUrl) {
if(!Helpers::validateLocalUrl($objectUrl)) { if(!Helpers::validateLocalUrl($objectUrl)) {
return; continue;
} }
if(str_contains($objectUrl, '/users/')) { if(str_contains($objectUrl, '/users/')) {
@ -1194,7 +1194,7 @@ class Inbox
$postId = last(explode('/', $objectUrl)); $postId = last(explode('/', $objectUrl));
$objects->push($postId); $objects->push($postId);
} else { } else {
return; continue;
} }
} }