mirror of
https://github.com/friendica/friendica
synced 2025-04-26 13:50:11 +00:00
Merge remote-tracking branch 'upstream/develop' into new-acitivities
This commit is contained in:
commit
e6caed7b5f
5 changed files with 128 additions and 55 deletions
|
@ -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'] ?? []));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue