From 9115ec5f0deb71111d53a1eda0c1de7c4d8c6c53 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 30 Dec 2022 21:20:28 +0000 Subject: [PATCH] Adjust class references to the new location --- src/Console/Relocate.php | 2 +- src/Model/Item.php | 2 +- src/Model/Mail.php | 2 +- src/Model/User.php | 2 +- src/Module/Api/Friendica/Events/Create.php | 2 +- src/Module/Calendar/Event/API.php | 2 +- src/Module/FriendSuggest.php | 2 +- src/Module/Post/Tag/Add.php | 2 +- src/Module/Settings/Account.php | 2 +- src/Module/User/Import.php | 2 +- src/Protocol/ActivityPub/Delivery.php | 16 +++++------ src/Protocol/ActivityPub/Processor.php | 2 +- src/Protocol/Delivery.php | 4 +-- src/Protocol/Diaspora.php | 2 +- src/Worker/Delivery.php | 32 ++++++++++++++++++++++ src/Worker/Notifier.php | 1 + src/Worker/ProfileUpdate.php | 1 + update.php | 2 +- 18 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 src/Worker/Delivery.php diff --git a/src/Console/Relocate.php b/src/Console/Relocate.php index a90802d81e..3eaf2f06b7 100644 --- a/src/Console/Relocate.php +++ b/src/Console/Relocate.php @@ -24,8 +24,8 @@ namespace Friendica\Console; use Asika\SimpleConsole\Console; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Worker; +use Friendica\Protocol\Delivery; use Friendica\Util\Strings; -use Friendica\Worker\Delivery; class Relocate extends Console { diff --git a/src/Model/Item.php b/src/Model/Item.php index 112c36a9c8..bb4400a860 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -33,6 +33,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; +use Friendica\Protocol\Delivery; use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; @@ -40,7 +41,6 @@ use Friendica\Util\Network; use Friendica\Util\Proxy; use Friendica\Util\Strings; use Friendica\Util\Temporal; -use Friendica\Worker\Delivery; use GuzzleHttp\Psr7\Uri; use LanguageDetection\Language; diff --git a/src/Model/Mail.php b/src/Model/Mail.php index 9469483d9a..2e1503dcf2 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -28,8 +28,8 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Protocol\Activity; +use Friendica\Protocol\Delivery; use Friendica\Util\DateTimeFormat; -use Friendica\Worker\Delivery; /** * Class to handle private messages diff --git a/src/Model/User.php b/src/Model/User.php index 916844251e..ac61385349 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -39,13 +39,13 @@ use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Security\TwoFactor\Model\AppSpecificPassword; use Friendica\Network\HTTPException; use Friendica\Object\Image; +use Friendica\Protocol\Delivery; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Images; use Friendica\Util\Network; use Friendica\Util\Proxy; use Friendica\Util\Strings; -use Friendica\Worker\Delivery; use ImagickException; use LightOpenID; diff --git a/src/Module/Api/Friendica/Events/Create.php b/src/Module/Api/Friendica/Events/Create.php index 8c6ec8f635..795c833f52 100644 --- a/src/Module/Api/Friendica/Events/Create.php +++ b/src/Module/Api/Friendica/Events/Create.php @@ -30,8 +30,8 @@ use Friendica\Model\Conversation; use Friendica\Model\Item; use Friendica\Module\BaseApi; use Friendica\Network\HTTPException; +use Friendica\Protocol\Delivery; use Friendica\Util\DateTimeFormat; -use Friendica\Worker\Delivery; /** * API endpoint: /api/friendica/event_create diff --git a/src/Module/Calendar/Event/API.php b/src/Module/Calendar/Event/API.php index ab9a5b5772..afb693bb09 100644 --- a/src/Module/Calendar/Event/API.php +++ b/src/Module/Calendar/Event/API.php @@ -39,11 +39,11 @@ use Friendica\Module\Response; use Friendica\Navigation\SystemMessages; use Friendica\Network\HTTPException\BadRequestException; use Friendica\Network\HTTPException\UnauthorizedException; +use Friendica\Protocol\Delivery; use Friendica\Util\ACLFormatter; use Friendica\Util\DateTimeFormat; use Friendica\Util\Profiler; use Friendica\Util\Strings; -use Friendica\Worker\Delivery; use Psr\Log\LoggerInterface; /** diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php index 71d373000f..69b72d5e56 100644 --- a/src/Module/FriendSuggest.php +++ b/src/Module/FriendSuggest.php @@ -32,9 +32,9 @@ use Friendica\DI; use Friendica\Model\Contact as ContactModel; use Friendica\Network\HTTPException\ForbiddenException; use Friendica\Network\HTTPException\NotFoundException; +use Friendica\Protocol\Delivery; use Friendica\Util\Profiler; use Friendica\Util\Strings; -use Friendica\Worker\Delivery; use Psr\Log\LoggerInterface; /** diff --git a/src/Module/Post/Tag/Add.php b/src/Module/Post/Tag/Add.php index adc8463782..ba291a561f 100644 --- a/src/Module/Post/Tag/Add.php +++ b/src/Module/Post/Tag/Add.php @@ -33,9 +33,9 @@ use Friendica\Model\Post; use Friendica\Model\Tag; use Friendica\Module\Response; use Friendica\Protocol\Activity; +use Friendica\Protocol\Delivery; use Friendica\Util\Profiler; use Friendica\Util\XML; -use Friendica\Worker\Delivery; use Psr\Log\LoggerInterface; /** diff --git a/src/Module/Settings/Account.php b/src/Module/Settings/Account.php index 8768115ec3..c143c4b10f 100644 --- a/src/Module/Settings/Account.php +++ b/src/Module/Settings/Account.php @@ -38,9 +38,9 @@ use Friendica\Model\Verb; use Friendica\Module\BaseSettings; use Friendica\Network\HTTPException; use Friendica\Protocol\Activity; +use Friendica\Protocol\Delivery; use Friendica\Util\Network; use Friendica\Util\Temporal; -use Friendica\Worker\Delivery; class Account extends BaseSettings { diff --git a/src/Module/User/Import.php b/src/Module/User/Import.php index 50831115e8..406e050269 100644 --- a/src/Module/User/Import.php +++ b/src/Module/User/Import.php @@ -38,10 +38,10 @@ use Friendica\Module\Response; use Friendica\Navigation\SystemMessages; use Friendica\Network\HTTPException; use Friendica\Object\Image; +use Friendica\Protocol\Delivery; use Friendica\Security\PermissionSet\Repository\PermissionSet; use Friendica\Util\Profiler; use Friendica\Util\Strings; -use Friendica\Worker\Delivery; use Psr\Log\LoggerInterface; class Import extends \Friendica\BaseModule diff --git a/src/Protocol/ActivityPub/Delivery.php b/src/Protocol/ActivityPub/Delivery.php index 0e014c7035..785c626ce7 100644 --- a/src/Protocol/ActivityPub/Delivery.php +++ b/src/Protocol/ActivityPub/Delivery.php @@ -30,8 +30,8 @@ use Friendica\Model\GServer; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Protocol\ActivityPub; +use Friendica\Protocol\Delivery as ProtocolDelivery; use Friendica\Util\HTTPSignature; -use Friendica\Worker\Delivery as WorkerDelivery; class Delivery { @@ -101,18 +101,18 @@ class Delivery $serverfail = false; $drop = false; - if ($cmd == WorkerDelivery::MAIL) { + if ($cmd == ProtocolDelivery::MAIL) { $data = ActivityPub\Transmitter::createActivityFromMail($item_id); if (!empty($data)) { $success = HTTPSignature::transmit($data, $inbox, $uid); } - } elseif ($cmd == WorkerDelivery::SUGGESTION) { + } elseif ($cmd == ProtocolDelivery::SUGGESTION) { $success = ActivityPub\Transmitter::sendContactSuggestion($uid, $inbox, $item_id); - } elseif ($cmd == WorkerDelivery::RELOCATION) { + } elseif ($cmd == ProtocolDelivery::RELOCATION) { // @todo Implementation pending - } elseif ($cmd == WorkerDelivery::REMOVAL) { + } elseif ($cmd == ProtocolDelivery::REMOVAL) { $success = ActivityPub\Transmitter::sendProfileDeletion($uid, $inbox); - } elseif ($cmd == WorkerDelivery::PROFILEUPDATE) { + } elseif ($cmd == ProtocolDelivery::PROFILEUPDATE) { $success = ActivityPub\Transmitter::sendProfileUpdate($uid, $inbox); } else { $data = ActivityPub\Transmitter::createCachedActivityFromItem($item_id); @@ -149,7 +149,7 @@ class Delivery if (!empty($actor)) { $drop = !ActivityPub\Transmitter::sendRelayFollow($actor); Logger::notice('Resubscribed to relay', ['url' => $actor, 'success' => !$drop]); - } elseif ($cmd = WorkerDelivery::DELETION) { + } elseif ($cmd = ProtocolDelivery::DELETION) { // Remote systems not always accept our deletion requests, so we drop them if rejected. // Situation is: In Friendica we allow the thread owner to delete foreign comments to their thread. // Most AP systems don't allow this, so they will reject the deletion request. @@ -176,7 +176,7 @@ class Delivery Logger::debug('Delivered', ['uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox, 'success' => $success, 'serverfailure' => $serverfail, 'drop' => $drop]); - if (($success || $drop) && in_array($cmd, [WorkerDelivery::POST])) { + if (($success || $drop) && in_array($cmd, [ProtocolDelivery::POST])) { Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB); } diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index fdf35ff868..f9957da8af 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -44,13 +44,13 @@ use Friendica\Model\User; use Friendica\Model\Post; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; +use Friendica\Protocol\Delivery; use Friendica\Protocol\Relay; use Friendica\Util\DateTimeFormat; use Friendica\Util\HTTPSignature; use Friendica\Util\JsonLD; use Friendica\Util\Network; use Friendica\Util\Strings; -use Friendica\Worker\Delivery; /** * ActivityPub Processor Protocol class diff --git a/src/Protocol/Delivery.php b/src/Protocol/Delivery.php index 59b4ea6c30..e38e1f5f41 100644 --- a/src/Protocol/Delivery.php +++ b/src/Protocol/Delivery.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Worker; +namespace Friendica\Protocol; use Friendica\Contact\FriendSuggest\Collection\FriendSuggests; use Friendica\Contact\FriendSuggest\Exception\FriendSuggestNotFoundException; @@ -50,7 +50,7 @@ class Delivery const REMOVAL = 'removeme'; const PROFILEUPDATE = 'profileupdate'; - public static function execute(string $cmd, int $post_uriid, int $contact_id, int $sender_uid = 0) + public static function deliver(string $cmd, int $post_uriid, int $contact_id, int $sender_uid = 0) { Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]); diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 0cb2a66cf1..c0fd4fd329 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -43,13 +43,13 @@ use Friendica\Model\User; use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Network\HTTPException; use Friendica\Network\Probe; +use Friendica\Protocol\Delivery; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; use Friendica\Util\Network; use Friendica\Util\Strings; use Friendica\Util\XML; -use Friendica\Worker\Delivery; use GuzzleHttp\Psr7\Uri; use SimpleXMLElement; diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php new file mode 100644 index 0000000000..9e09cf078d --- /dev/null +++ b/src/Worker/Delivery.php @@ -0,0 +1,32 @@ +. + * + */ + +namespace Friendica\Worker; + +use Friendica\Protocol\Delivery as ProtocolDelivery; + +class Delivery +{ + public static function execute(string $cmd, int $post_uriid, int $contact_id, int $sender_uid = 0) + { + ProtocolDelivery::deliver($cmd, $post_uriid, $contact_id, $sender_uid); + } +} diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 7bf3696a53..18ac579ccd 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -39,6 +39,7 @@ use Friendica\Model\User; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Diaspora; +use Friendica\Protocol\Delivery; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; use Friendica\Util\Network; diff --git a/src/Worker/ProfileUpdate.php b/src/Worker/ProfileUpdate.php index e26abf7e20..e368650b4f 100644 --- a/src/Worker/ProfileUpdate.php +++ b/src/Worker/ProfileUpdate.php @@ -24,6 +24,7 @@ namespace Friendica\Worker; use Friendica\Core\Logger; use Friendica\Core\Worker; use Friendica\DI; +use Friendica\Protocol\Delivery; use Friendica\Protocol\Diaspora; use Friendica\Protocol\ActivityPub; diff --git a/update.php b/update.php index 82f4fba58b..d963546e4b 100644 --- a/update.php +++ b/update.php @@ -59,8 +59,8 @@ use Friendica\Model\Photo; use Friendica\Model\Post; use Friendica\Model\Profile; use Friendica\Model\User; +use Friendica\Protocol\Delivery; use Friendica\Security\PermissionSet\Repository\PermissionSet; -use Friendica\Worker\Delivery; // Post-update script of PR 5751 function update_1298()