clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplyfied code

This commit is contained in:
Michael 2023-12-21 05:01:24 +00:00
parent da65f0bea7
commit 1b13c76d2e
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Protocol/ActivityPub/Processor.php
View File

@ -1324,23 +1324,21 @@ class Processor
public static function storeReceivers(int $uriid, array $receivers) public static function storeReceivers(int $uriid, array $receivers)
{ {
foreach (['as:to' => Tag::TO, 'as:cc' => Tag::CC, 'as:bto' => Tag::BTO, 'as:bcc' => Tag::BCC, 'as:audience' => Tag::AUDIENCE, 'as:attributedTo' => Tag::ATTRIBUTED] as $element => $type) { foreach (['as:to' => Tag::TO, 'as:cc' => Tag::CC, 'as:bto' => Tag::BTO, 'as:bcc' => Tag::BCC, 'as:audience' => Tag::AUDIENCE, 'as:attributedTo' => Tag::ATTRIBUTED] as $element => $type) {
if (!empty($receivers[$element])) { foreach ($receivers[$element] ?? [] as $receiver) {
foreach ($receivers[$element] as $receiver) { if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
if ($receiver == ActivityPub::PUBLIC_COLLECTION) { $name = Receiver::PUBLIC_COLLECTION;
$name = Receiver::PUBLIC_COLLECTION; } elseif ($path = parse_url($receiver, PHP_URL_PATH)) {
} elseif ($path = parse_url($receiver, PHP_URL_PATH)) { $name = trim($path, '/');
$name = trim($path, '/'); } elseif ($host = parse_url($receiver, PHP_URL_HOST)) {
} elseif ($host = parse_url($receiver, PHP_URL_HOST)) { $name = $host;
$name = $host; } else {
} else { Logger::warning('Unable to coerce name from receiver', ['element' => $element, 'type' => $type, 'receiver' => $receiver]);
Logger::warning('Unable to coerce name from receiver', ['element' => $element, 'type' => $type, 'receiver' => $receiver]); $name = '';
$name = '';
}
$target = Tag::getTargetType($receiver);
Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]);
Tag::store($uriid, $type, $name, $receiver, $target);
} }
$target = Tag::getTargetType($receiver);
Logger::debug('Got target type', ['type' => $target, 'url' => $receiver]);
Tag::store($uriid, $type, $name, $receiver, $target);
} }
} }
} }
@ -1348,22 +1346,20 @@ class Processor
private static function storeCapabilities(int $uriid, array $capabilities) private static function storeCapabilities(int $uriid, array $capabilities)
{ {
foreach (['pixelfed:canAnnounce' => Tag::CAN_ANNOUNCE, 'pixelfed:canLike' => Tag::CAN_LIKE, 'pixelfed:canReply' => Tag::CAN_REPLY] as $element => $type) { foreach (['pixelfed:canAnnounce' => Tag::CAN_ANNOUNCE, 'pixelfed:canLike' => Tag::CAN_LIKE, 'pixelfed:canReply' => Tag::CAN_REPLY] as $element => $type) {
if (!empty($capabilities[$element])) { foreach ($capabilities[$element] ?? [] as $capability) {
foreach ($capabilities[$element] as $capability) { if ($capability == ActivityPub::PUBLIC_COLLECTION) {
if ($capability == ActivityPub::PUBLIC_COLLECTION) { $name = Receiver::PUBLIC_COLLECTION;
$name = Receiver::PUBLIC_COLLECTION; } elseif (empty($capability) || ($capability == '[]')) {
} elseif (empty($capability) || ($capability == '[]')) { continue;
continue; } elseif ($path = parse_url($capability, PHP_URL_PATH)) {
} elseif ($path = parse_url($capability, PHP_URL_PATH)) { $name = trim($path, '/');
$name = trim($path, '/'); } elseif ($host = parse_url($capability, PHP_URL_HOST)) {
} elseif ($host = parse_url($capability, PHP_URL_HOST)) { $name = $host;
$name = $host; } else {
} else { Logger::warning('Unable to coerce name from capability', ['element' => $element, 'type' => $type, 'capability' => $capability]);
Logger::warning('Unable to coerce name from capability', ['element' => $element, 'type' => $type, 'capability' => $capability]); $name = '';
$name = '';
}
Tag::store($uriid, $type, $name, $capability);
} }
Tag::store($uriid, $type, $name, $capability);
} }
} }
} }