From 842a4bb90470672b17f0e632caea25865c98cccc Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Oct 2022 12:40:22 +0000 Subject: [PATCH] Changed function name --- src/Protocol/Diaspora.php | 8 ++++---- src/Worker/Delivery.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index b3108c8ff..389bbc55d 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -3171,15 +3171,15 @@ class Diaspora } /** - * Checks a message body if it is a reshare + * Fetch reshare details * * @param array $item The message body that is to be check * - * @return array Reshare details or "false" if no reshare + * @return array Reshare details (empty if the item is no reshare) * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function isReshare(array $item): array + public static function getReshareDetails(array $item): array { $reshared = Item::getShareArray($item); if (empty($reshared)) { @@ -3298,7 +3298,7 @@ class Diaspora $edited = DateTimeFormat::utc($item['edited'] ?? $item['created'], DateTimeFormat::ATOM); // Detect a share element and do a reshare - if (($item['private'] != Item::PRIVATE) && ($ret = self::isReshare($item))) { + if (($item['private'] != Item::PRIVATE) && ($ret = self::getReshareDetails($item))) { $message = [ 'author' => $myaddr, 'guid' => $item['guid'], diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index f51f5f205..d90b80e6f 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -274,7 +274,7 @@ class Delivery private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol = null) { // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora - if (Diaspora::isReshare($target_item ?? []) && !empty(FContact::getByURL($contact['addr'], false))) { + if (Diaspora::getReshareDetails($target_item ?? []) && !empty(FContact::getByURL($contact['addr'], false))) { Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]); self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return;