From 6d087ee4559af08d5d727973a95993004a4425b3 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 30 Dec 2022 21:19:55 +0000 Subject: [PATCH 1/5] Move delivery functionality to a new class --- src/{Worker => Protocol}/Delivery.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{Worker => Protocol}/Delivery.php (100%) diff --git a/src/Worker/Delivery.php b/src/Protocol/Delivery.php similarity index 100% rename from src/Worker/Delivery.php rename to src/Protocol/Delivery.php From 9115ec5f0deb71111d53a1eda0c1de7c4d8c6c53 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 30 Dec 2022 21:20:28 +0000 Subject: [PATCH 2/5] 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() From dd4aeba5a1357bfcf0e77d09f8ea0abb011b514e Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 30 Dec 2022 21:31:00 +0000 Subject: [PATCH 3/5] Updated messages.po --- view/lang/C/messages.po | 124 ++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 9c17846db5..b8748488f2 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.03-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-28 00:37-0500\n" +"POT-Creation-Date: 2022-12-30 21:30+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1539,31 +1539,31 @@ msgstr "" msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:387 src/Model/Contact.php:1198 +#: src/Content/Item.php:387 src/Model/Contact.php:1200 msgid "View Status" msgstr "" -#: src/Content/Item.php:388 src/Content/Item.php:406 src/Model/Contact.php:1142 -#: src/Model/Contact.php:1190 src/Model/Contact.php:1199 +#: src/Content/Item.php:388 src/Content/Item.php:406 src/Model/Contact.php:1144 +#: src/Model/Contact.php:1192 src/Model/Contact.php:1201 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:234 msgid "View Profile" msgstr "" -#: src/Content/Item.php:389 src/Model/Contact.php:1200 +#: src/Content/Item.php:389 src/Model/Contact.php:1202 msgid "View Photos" msgstr "" -#: src/Content/Item.php:390 src/Model/Contact.php:1191 -#: src/Model/Contact.php:1201 +#: src/Content/Item.php:390 src/Model/Contact.php:1193 +#: src/Model/Contact.php:1203 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:391 src/Model/Contact.php:1192 -#: src/Model/Contact.php:1202 +#: src/Content/Item.php:391 src/Model/Contact.php:1194 +#: src/Model/Contact.php:1204 msgid "View Contact" msgstr "" -#: src/Content/Item.php:392 src/Model/Contact.php:1203 +#: src/Content/Item.php:392 src/Model/Contact.php:1205 msgid "Send PM" msgstr "" @@ -1588,7 +1588,7 @@ msgid "Languages" msgstr "" #: src/Content/Item.php:403 src/Content/Widget.php:80 -#: src/Model/Contact.php:1193 src/Model/Contact.php:1204 +#: src/Model/Contact.php:1195 src/Model/Contact.php:1206 #: src/Module/Contact/Follow.php:166 view/theme/vier/theme.php:196 msgid "Connect/Follow" msgstr "" @@ -2081,7 +2081,7 @@ msgstr "" msgid "Organisations" msgstr "" -#: src/Content/Widget.php:523 src/Model/Contact.php:1644 +#: src/Content/Widget.php:523 src/Model/Contact.php:1648 msgid "News" msgstr "" @@ -2162,8 +2162,8 @@ msgstr "" msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1194 -#: src/Model/Contact.php:1205 src/Model/Profile.php:465 +#: src/Content/Widget/VCard.php:111 src/Model/Contact.php:1196 +#: src/Model/Contact.php:1207 src/Model/Profile.php:465 #: src/Module/Contact/Profile.php:419 msgid "Unfollow" msgstr "" @@ -2866,77 +2866,77 @@ msgstr "" msgid "Legacy module file not found: %s" msgstr "" -#: src/Model/Contact.php:1211 src/Module/Moderation/Users/Pending.php:102 +#: src/Model/Contact.php:1213 src/Module/Moderation/Users/Pending.php:102 #: src/Module/Notifications/Introductions.php:132 #: src/Module/Notifications/Introductions.php:204 msgid "Approve" msgstr "" -#: src/Model/Contact.php:1640 +#: src/Model/Contact.php:1644 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1648 +#: src/Model/Contact.php:1652 msgid "Forum" msgstr "" -#: src/Model/Contact.php:2877 +#: src/Model/Contact.php:2919 msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2882 src/Module/Friendica.php:82 +#: src/Model/Contact.php:2924 src/Module/Friendica.php:82 msgid "Blocked domain" msgstr "" -#: src/Model/Contact.php:2887 +#: src/Model/Contact.php:2929 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:2896 +#: src/Model/Contact.php:2938 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:2931 +#: src/Model/Contact.php:2973 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:2933 +#: src/Model/Contact.php:2975 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:2936 +#: src/Model/Contact.php:2978 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:2939 +#: src/Model/Contact.php:2981 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:2942 +#: src/Model/Contact.php:2984 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:2943 +#: src/Model/Contact.php:2985 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:2949 +#: src/Model/Contact.php:2991 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:2954 +#: src/Model/Contact.php:2996 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:3019 +#: src/Model/Contact.php:3061 msgid "Unable to retrieve contact information." msgstr "" @@ -2963,22 +2963,22 @@ msgid "Sept" msgstr "" #: src/Model/Event.php:464 src/Module/Calendar/Show.php:128 -#: src/Util/Temporal.php:339 +#: src/Util/Temporal.php:343 msgid "today" msgstr "" #: src/Model/Event.php:465 src/Module/Calendar/Show.php:129 -#: src/Module/Settings/Display.php:235 src/Util/Temporal.php:349 +#: src/Module/Settings/Display.php:235 src/Util/Temporal.php:353 msgid "month" msgstr "" #: src/Model/Event.php:466 src/Module/Calendar/Show.php:130 -#: src/Module/Settings/Display.php:236 src/Util/Temporal.php:350 +#: src/Module/Settings/Display.php:236 src/Util/Temporal.php:354 msgid "week" msgstr "" #: src/Model/Event.php:467 src/Module/Calendar/Show.php:131 -#: src/Module/Settings/Display.php:237 src/Util/Temporal.php:351 +#: src/Module/Settings/Display.php:237 src/Util/Temporal.php:355 msgid "day" msgstr "" @@ -8231,17 +8231,17 @@ msgstr "" msgid "j F" msgstr "" -#: src/Module/Profile/Profile.php:187 src/Util/Temporal.php:166 +#: src/Module/Profile/Profile.php:187 src/Util/Temporal.php:168 msgid "Birthday:" msgstr "" #: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:254 -#: src/Util/Temporal.php:168 +#: src/Util/Temporal.php:170 msgid "Age: " msgstr "" #: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:254 -#: src/Util/Temporal.php:168 +#: src/Util/Temporal.php:170 #, php-format msgid "%d year old" msgid_plural "%d years old" @@ -9763,8 +9763,8 @@ msgstr "" msgid "Location" msgstr "" -#: src/Module/Settings/Profile/Index.php:239 src/Util/Temporal.php:95 -#: src/Util/Temporal.php:97 +#: src/Module/Settings/Profile/Index.php:239 src/Util/Temporal.php:97 +#: src/Util/Temporal.php:99 msgid "Miscellaneous" msgstr "" @@ -11242,6 +11242,10 @@ msgstr "" msgid "Show fewer" msgstr "" +#: src/Protocol/Delivery.php:535 +msgid "(no subject)" +msgstr "" + #: src/Protocol/OStatus.php:1470 #, php-format msgid "%s is now following %s." @@ -11305,79 +11309,75 @@ msgstr "" msgid "thanks" msgstr "" -#: src/Util/Temporal.php:170 +#: src/Util/Temporal.php:172 msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: src/Util/Temporal.php:278 +#: src/Util/Temporal.php:280 #, php-format msgid "Time zone: %s Change in Settings" msgstr "" -#: src/Util/Temporal.php:318 src/Util/Temporal.php:325 +#: src/Util/Temporal.php:320 src/Util/Temporal.php:329 msgid "never" msgstr "" -#: src/Util/Temporal.php:339 +#: src/Util/Temporal.php:343 msgid "less than a second ago" msgstr "" -#: src/Util/Temporal.php:348 +#: src/Util/Temporal.php:352 msgid "year" msgstr "" -#: src/Util/Temporal.php:348 +#: src/Util/Temporal.php:352 msgid "years" msgstr "" -#: src/Util/Temporal.php:349 +#: src/Util/Temporal.php:353 msgid "months" msgstr "" -#: src/Util/Temporal.php:350 +#: src/Util/Temporal.php:354 msgid "weeks" msgstr "" -#: src/Util/Temporal.php:351 +#: src/Util/Temporal.php:355 msgid "days" msgstr "" -#: src/Util/Temporal.php:352 +#: src/Util/Temporal.php:356 msgid "hour" msgstr "" -#: src/Util/Temporal.php:352 +#: src/Util/Temporal.php:356 msgid "hours" msgstr "" -#: src/Util/Temporal.php:353 +#: src/Util/Temporal.php:357 msgid "minute" msgstr "" -#: src/Util/Temporal.php:353 +#: src/Util/Temporal.php:357 msgid "minutes" msgstr "" -#: src/Util/Temporal.php:354 +#: src/Util/Temporal.php:358 msgid "second" msgstr "" -#: src/Util/Temporal.php:354 +#: src/Util/Temporal.php:358 msgid "seconds" msgstr "" -#: src/Util/Temporal.php:364 -#, php-format -msgid "in %1$d %2$s" -msgstr "" - #: src/Util/Temporal.php:367 #, php-format -msgid "%1$d %2$s ago" +msgid "in %1$d %2$s" msgstr "" -#: src/Worker/Delivery.php:535 -msgid "(no subject)" +#: src/Util/Temporal.php:370 +#, php-format +msgid "%1$d %2$s ago" msgstr "" #: src/Worker/PushSubscription.php:110 From e4c5d9f62dd617200002dfa985bd0df870501e96 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 30 Dec 2022 21:37:09 +0000 Subject: [PATCH 4/5] Fix code standards --- src/Protocol/Delivery.php | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/Protocol/Delivery.php b/src/Protocol/Delivery.php index e38e1f5f41..eece5401bf 100644 --- a/src/Protocol/Delivery.php +++ b/src/Protocol/Delivery.php @@ -33,11 +33,6 @@ use Friendica\Model\GServer; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Model\User; -use Friendica\Protocol\Activity; -use Friendica\Protocol\DFRN; -use Friendica\Protocol\Diaspora; -use Friendica\Protocol\Email; -use Friendica\Protocol\Relay; use Friendica\Util\Network; class Delivery @@ -54,8 +49,8 @@ class Delivery { Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]); - $top_level = false; - $followup = false; + $top_level = false; + $followup = false; $public_message = false; $items = []; @@ -74,7 +69,7 @@ class Delivery } $uid = $target_item['uid']; } elseif ($cmd == self::RELOCATION) { - $uid = $post_uriid; + $uid = $post_uriid; $target_item = []; } else { $item = Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]); @@ -86,8 +81,8 @@ class Delivery $parent_id = intval($item['parent']); $condition = ['id' => [$target_id, $parent_id], 'visible' => true]; - $params = ['order' => ['id']]; - $itemdata = Post::select(Item::DELIVER_FIELDLIST, $condition, $params); + $params = ['order' => ['id']]; + $itemdata = Post::select(Item::DELIVER_FIELDLIST, $condition, $params); while ($item = Post::fetch($itemdata)) { if ($item['verb'] == Activity::ANNOUNCE) { @@ -288,9 +283,9 @@ class Delivery Logger::info('Deliver ' . ($target_item_id ?? 'relocation') . ' via DFRN to ' . ($contact['addr'] ?? '' ?: $contact['url'])); if ($cmd == self::MAIL) { - $item = $target_item; + $item = $target_item; $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); - $atom = DFRN::mail($item, $owner); + $atom = DFRN::mail($item, $owner); } elseif ($cmd == self::SUGGESTION) { $item = $target_item; $atom = DFRN::fsuggest($item, $owner); @@ -299,7 +294,7 @@ class Delivery $atom = DFRN::relocate($owner, $owner['uid']); } elseif ($followup) { $msgitems = [$target_item]; - $atom = DFRN::entries($msgitems, $owner); + $atom = DFRN::entries($msgitems, $owner); } else { if ($target_item['deleted']) { $msgitems = [$target_item]; @@ -309,8 +304,8 @@ class Delivery // Only add the parent when we don't delete other items. if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) { $item['entry:comment-allow'] = true; - $item['entry:cid'] = ($top_level ? $contact['id'] : 0); - $msgitems[] = $item; + $item['entry:cid'] = ($top_level ? $contact['id'] : 0); + $msgitems[] = $item; } } } @@ -538,14 +533,14 @@ class Delivery if (($contact['rel'] == Contact::FRIEND) && !$contact['blocked']) { if ($reply_to) { - $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n"; + $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n"; $headers .= 'Sender: ' . $local_user['email'] . "\n"; } else { - $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n"; + $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n"; } } else { - $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname()); - $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n"; + $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname()); + $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n"; } $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n"; @@ -562,13 +557,13 @@ class Delivery if (empty($target_item['title'])) { $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = Post::selectFirst(['title'], $condition); + $title = Post::selectFirst(['title'], $condition); if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title']; } else { $condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = Post::selectFirst(['title'], $condition); + $title = Post::selectFirst(['title'], $condition); if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title']; From ce6845f44f4dabe1023683be37b4a8d6886db9c3 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 30 Dec 2022 21:44:12 +0000 Subject: [PATCH 5/5] Code standards --- src/Protocol/Delivery.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Protocol/Delivery.php b/src/Protocol/Delivery.php index eece5401bf..79297e2282 100644 --- a/src/Protocol/Delivery.php +++ b/src/Protocol/Delivery.php @@ -120,7 +120,7 @@ class Delivery return; } - $condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']]; + $condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']]; $thr_parent = Post::selectFirst(['network', 'object'], $condition); if (!DBA::isResult($thr_parent)) { // Shouldn't happen. But when this does, we just take the parent as thread parent. @@ -527,7 +527,7 @@ class Delivery $reply_to = $mailacct['reply_to']; } - $subject = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : DI::l10n()->t("\x28no subject\x29")); + $subject = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : DI::l10n()->t("\x28no subject\x29")); // only expose our real email address to true friends