From 0277589fbd28a7019fe167ec9955e5261bcac212 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 14 Jul 2021 02:59:29 +0000 Subject: [PATCH] Removed experimental code --- src/Model/Item.php | 41 --------------------------------------- src/Protocol/Diaspora.php | 1 - 2 files changed, 42 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 990232fc4b..86b9270fe9 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -38,8 +38,6 @@ use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; -use Friendica\Util\HTTPSignature; -use Friendica\Util\LDSignature; use Friendica\Util\Map; use Friendica\Util\Network; use Friendica\Util\Proxy; @@ -544,30 +542,25 @@ class Item if (!empty($item['author-id']) && Contact::isBlocked($item['author-id'])) { Logger::notice('Author is blocked node-wide', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]); - self::remoteDelete($item); return false; } if (!empty($item['author-link']) && Network::isUrlBlocked($item['author-link'])) { Logger::notice('Author server is blocked', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]); - self::remoteDelete($item); return false; } if (!empty($item['owner-id']) && Contact::isBlocked($item['owner-id'])) { Logger::notice('Owner is blocked node-wide', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]); - self::remoteDelete($item); return false; } if (!empty($item['owner-link']) && Network::isUrlBlocked($item['owner-link'])) { Logger::notice('Owner server is blocked', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]); - self::remoteDelete($item); return false; } if (!empty($item['uid']) && !self::isAllowedByUser($item, $item['uid'])) { - self::remoteDelete($item); return false; } @@ -590,40 +583,6 @@ class Item return true; } - /** - * Try to delete the remote (unwanted) item - * - * @param array $item - */ - private static function remoteDelete(array $item) - { - if ($item['gravity'] == GRAVITY_PARENT) { - return; - } - return; - - $owner = User::getOwnerDataById($item['uid']); - $contact = Contact::getById($item['contact-id']); - - if (FContact::getByURL($contact['addr'], false)) { - Logger::info('Send Diaspora retraction for post', ['addr' => $contact['addr'], 'item' => $item]); - Diaspora::sendRetraction($item, $owner, $contact, in_array($item['private'], [self::UNLISTED, self::PUBLIC])); - } elseif ($profile = APContact::getByURL($contact['url'], false)) { - Logger::info('Send ActivityPub deletion for post', ['url' => $contact['url'], 'item' => $item]); - $data = ['@context' => ActivityPub::CONTEXT, - 'id' => $item['uri'] . '/Delete', - 'type' => 'Delete', - 'actor' => $owner['url'], - 'object' => ['type' => 'Tombstone', 'id' => $item['uri']], - 'to' => [$profile['url']]]; - - $signed = LDSignature::sign($data, $owner); - return HTTPSignature::transmit($signed, $profile['inbox'], $item['uid']); - } else { - Logger::info('Unsupported protocol for deletion', ['network' => $contact['network']]); - } - } - /** * Check if the item array is too old * diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 862bbca999..586b6e9ec2 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -1495,7 +1495,6 @@ class Diaspora $contact = self::allowedContactByHandle($importer, $sender, true); if (!$contact) { - //self::sendRetraction($item, $owner, $contact, in_array($item['private'], [self::UNLISTED, self::PUBLIC])); return false; }