chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update AP helpers

This commit is contained in:
Daniel Supernault 2020-05-21 11:52:18 -06:00
parent 1cbf8dcb38
commit 18f32e7bcf
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Util/ActivityPub/Helpers.php
View File

@ -285,7 +285,7 @@ class Helpers {
}
}
if(!self::validateUrl($activity['object']['id']) ||
if(!self::validateUrl($res['id']) ||
!self::validateUrl($activity['object']['attributedTo'])
) {
return;
@ -400,7 +400,10 @@ class Helpers {
return;
}
$domain = parse_url($res['id'], PHP_URL_HOST);
$username = (string) Purify::clean($res['preferredUsername']);
if(!isset($res['preferredUsername']) && !isset($res['nickname'])) {
return;
}
$username = (string) Purify::clean($res['preferredUsername'] ?? $res['nickname']);
if(empty($username)) {
return;
}