Merge remote-tracking branch 'upstream/develop' into new-acitivities

This commit is contained in:
Michael 2022-04-04 16:05:02 +00:00
commit e6caed7b5f
5 changed files with 128 additions and 55 deletions

View file

@ -39,6 +39,7 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Util\HTTPSignature;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
use Friendica\Util\Network;
use Friendica\Util\Strings;
/**
@ -1667,6 +1668,10 @@ class Receiver
}
}
if (!empty($object_data['alternate-url']) && !Network::isValidHttpUrl($object_data['alternate-url'])) {
$object_data['alternate-url'] = null;
}
if (in_array($object_data['object_type'], ['as:Audio', 'as:Video'])) {
$object_data['alternate-url'] = self::extractAlternateUrl($object['as:url'] ?? []) ?: $object_data['alternate-url'];
$object_data['attachments'] = array_merge($object_data['attachments'], self::processAttachmentUrls($object['as:url'] ?? []));