friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed function name

pull/12061/head
Michael 2022-10-25 12:40:22 +00:00
parent ebd175872d
commit 842a4bb904
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Protocol/Diaspora.php
View File

@ -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'],

2
src/Worker/Delivery.php
View File

@ -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;