nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed experimental code

Browse source
This commit is contained in:
Michael 2021-07-14 02:59:29 +00:00
parent bbebbb662a
commit 0277589fbd
2 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/Model/Item.php
View file

@ -38,8 +38,6 @@ use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPSignature;
use Friendica\Util\LDSignature;
use Friendica\Util\Map; use Friendica\Util\Map;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Proxy; use Friendica\Util\Proxy;
@ -544,30 +542,25 @@ class Item
if (!empty($item['author-id']) && Contact::isBlocked($item['author-id'])) { 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']]); Logger::notice('Author is blocked node-wide', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
self::remoteDelete($item);
return false; return false;
} }
if (!empty($item['author-link']) && Network::isUrlBlocked($item['author-link'])) { 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']]); Logger::notice('Author server is blocked', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
self::remoteDelete($item);
return false; return false;
} }
if (!empty($item['owner-id']) && Contact::isBlocked($item['owner-id'])) { 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']]); Logger::notice('Owner is blocked node-wide', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
self::remoteDelete($item);
return false; return false;
} }
if (!empty($item['owner-link']) && Network::isUrlBlocked($item['owner-link'])) { 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']]); Logger::notice('Owner server is blocked', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
self::remoteDelete($item);
return false; return false;
} }
if (!empty($item['uid']) && !self::isAllowedByUser($item, $item['uid'])) { if (!empty($item['uid']) && !self::isAllowedByUser($item, $item['uid'])) {
self::remoteDelete($item);
return false; return false;
} }
@ -590,40 +583,6 @@ class Item
return true; 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 * Check if the item array is too old
* *

1
src/Protocol/Diaspora.php
View file

@ -1495,7 +1495,6 @@ class Diaspora
$contact = self::allowedContactByHandle($importer, $sender, true); $contact = self::allowedContactByHandle($importer, $sender, true);
if (!$contact) { if (!$contact) {
//self::sendRetraction($item, $owner, $contact, in_array($item['private'], [self::UNLISTED, self::PUBLIC]));
return false; return false;
} }