Adjust class references to the new location

diff --git a/src/Console/Relocate.php b/src/Console/Relocate.php
index a90802d81e22f46429c9d53931e66d7fda67d528..3eaf2f06b7a175b0263f9fe31f4ef841da9f06da 100644 (file)
--- 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 112c36a9c836bc67b4ff21657552d12d046f6c8a..bb4400a860e98f4552f606dada56646d15d95e3e 100644 (file)
--- 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 9469483d9a9749e39d131db34eef27aedb9c9873..2e1503dcf29ffc98cddd76b6ac3890370130d038 100644 (file)
--- 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 916844251e5c69710faa69890c52f826d0ef56f4..ac613853493ebd91ec142d75ffd615b5957a1b39 100644 (file)
--- 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 8c6ec8f63583cdc900a6630b8b06324f918bebfa..795c833f52770b1ec3706c30d3cf7810f576b629 100644 (file)
--- 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 ab9a5b5772e9c414a9ac81c0ed7d044f819df3d6..afb693bb09dd0736edd25e6e077931dc4ec65a46 100644 (file)
--- 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 71d373000ff1e9a8bc25ac4ace64afcb2bdf1644..69b72d5e56d16a1465525ed6d63136055b62035d 100644 (file)
--- 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 adc8463782c807f27e947d0753a03fde08fcb817..ba291a561f70833a9f6b769098563a06fdd4bf3d 100644 (file)
--- 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 8768115ec326becd1d5195568f2b28a24e1c55a1..c143c4b10fd73e8ae25aafb8b1ad6af0ade0e215 100644 (file)
--- 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 50831115e8b4f283b83b7f7e82d9acc875aae86b..406e05026995e3bb36da523383ba34b89264d779 100644 (file)
--- 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 0e014c703563818c90d3cba0ecbbe278ac92a015..785c626ce7fd6b69f2f1b46827480f9bcbe51727 100644 (file)
--- 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 fdf35ff8685092973e99876c6a911bb9fdbdee18..f9957da8af3026611c0b135c6b6d2fff5844d4c5 100644 (file)
--- 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 59b4ea6c300947199c32b45cebed9b417d169b70..e38e1f5f415e7f581caa48475c888483f0531b25 100644 (file)
--- 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 0cb2a66cf17f528ec1735db03ae385cfa6527720..c0fd4fd3291360710855235a7d93ea8e45745223 100644 (file)
--- 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 (file)
index 0000000..9e09cf0
--- /dev/null
+++ b/src/Worker/Delivery.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+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 7bf3696a538c59b4a2c1b546b42fa503af608fad..18ac579ccdeb84520d405682f60290847db398cf 100644 (file)
--- 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 e26abf7e20e445fa36ddfa7ab69578dbb55a8857..e368650b4fe3e84f428402ab1df3d2c34b6cc928 100644 (file)
--- 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 82f4fba58bc847c106cd72f6a9a5f03434aedfc7..d963546e4b06218972a1f8bdd4d9960667794cd9 100644 (file)
--- 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()