From fa375377627accbff58444b1ac3ced193159d0aa Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 23 May 2023 22:19:34 +0200 Subject: [PATCH 001/259] start 2023.09-dev --- CHANGELOG | 7 +++++++ VERSION | 2 +- database.sql | 2 +- src/App.php | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 25db7dfa3..94b2f067a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +Version 2023.09 (unreleased) + Friendica Core + + Friendica Addons + + Closed Issues + Version 2023.05 (2023-05-23) Friendica Core Updates to the translations HU, PL diff --git a/VERSION b/VERSION index e4a82cd8e..c32d7efee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2023.05 +2023.09-dev diff --git a/database.sql b/database.sql index 6377222b0..4e674d63f 100644 --- a/database.sql +++ b/database.sql @@ -1,5 +1,5 @@ -- ------------------------------------------ --- Friendica 2023.05 (Giant Rhubarb) +-- Friendica 2023.09-dev (Giant Rhubarb) -- DB_UPDATE_VERSION 1518 -- ------------------------------------------ diff --git a/src/App.php b/src/App.php index e47054f55..249c9f66a 100644 --- a/src/App.php +++ b/src/App.php @@ -64,7 +64,7 @@ class App { const PLATFORM = 'Friendica'; const CODENAME = 'Giant Rhubarb'; - const VERSION = '2023.05'; + const VERSION = '2023.09-dev'; // Allow themes to control internal parameters // by changing App values in theme.php From ced6680c6a9d662bad7bd2c121b4f8985136e657 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 23 May 2023 22:09:55 -0400 Subject: [PATCH 002/259] Remove direct call to is_string() from templates - Address https://github.com/friendica/friendica/issues/12011#issuecomment-1523913027 --- view/templates/settings/addons/connector.tpl | 2 +- view/templates/settings/addons/panel.tpl | 2 +- view/theme/frio/templates/settings/addons/connector.tpl | 2 +- view/theme/frio/templates/settings/addons/panel.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/templates/settings/addons/connector.tpl b/view/templates/settings/addons/connector.tpl index c06c78195..adf615f9e 100644 --- a/view/templates/settings/addons/connector.tpl +++ b/view/templates/settings/addons/connector.tpl @@ -9,7 +9,7 @@
{{if $submit}}
- {{if $submit|is_string}} + {{if $submit}} {{else}} {{$count = 1}} diff --git a/view/templates/settings/addons/panel.tpl b/view/templates/settings/addons/panel.tpl index f401f0123..77c21ab7f 100644 --- a/view/templates/settings/addons/panel.tpl +++ b/view/templates/settings/addons/panel.tpl @@ -8,7 +8,7 @@ {{$html nofilter}} {{if $submit}}
- {{if $submit|is_string}} + {{if $submit}} {{else}} {{$count = 1}} diff --git a/view/theme/frio/templates/settings/addons/connector.tpl b/view/theme/frio/templates/settings/addons/connector.tpl index aee0e2845..23e796fc5 100644 --- a/view/theme/frio/templates/settings/addons/connector.tpl +++ b/view/theme/frio/templates/settings/addons/connector.tpl @@ -11,7 +11,7 @@
{{if $submit}} - {{if $submit|is_string}} + {{if $submit}} {{else}} {{$count = 1}} diff --git a/view/theme/frio/templates/settings/addons/panel.tpl b/view/theme/frio/templates/settings/addons/panel.tpl index 561d0fc9f..3fdba6e3d 100644 --- a/view/theme/frio/templates/settings/addons/panel.tpl +++ b/view/theme/frio/templates/settings/addons/panel.tpl @@ -11,7 +11,7 @@
{{if $submit}} - {{if $submit|is_string}} + {{if $submit}} {{else}} {{$count = 1}} From 5b23c1c67fe4ccce7cd290704295b25d3e3517a5 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 24 May 2023 05:55:36 +0000 Subject: [PATCH 003/259] Support for Bluesky reshares in the core --- src/Model/Item.php | 6 +++++- src/Object/Post.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 6da214398..8f45b3eb5 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2050,7 +2050,11 @@ class Item } // Glue it together to be able to make a hash from it - $host_id = implode('/', $parsed); + if (!empty($parsed)) { + $host_id = implode('/', $parsed); + } else { + $host_id = $uri; + } // Use a mixture of several hashes to provide some GUID like experience return hash('crc32', $hostPart) . '-' . hash('joaat', $host_id) . '-' . hash('fnv164', $host_id); diff --git a/src/Object/Post.php b/src/Object/Post.php index 9dfd205ec..0f5e98aed 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -206,7 +206,7 @@ class Post $connector = !in_array($item['network'], Protocol::NATIVE_SUPPORT) ? DI::l10n()->t('Connector Message') : false; $shareable = in_array($conv->getProfileOwner(), [0, DI::userSession()->getLocalUserId()]) && $item['private'] != Item::PRIVATE; - $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER, Protocol::TUMBLR]); + $announceable = $shareable && in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER, Protocol::TUMBLR, Protocol::BLUESKY]); $commentable = ($item['network'] != Protocol::TUMBLR); // On Diaspora only toplevel posts can be reshared From cee8dc2a3b9e93b9b26f746a73b32080348e06a5 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 24 May 2023 08:04:34 -0400 Subject: [PATCH 004/259] Add support for reverse proxy to system.force_ssl feature --- src/App.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/App.php b/src/App.php index 249c9f66a..8d253ec76 100644 --- a/src/App.php +++ b/src/App.php @@ -581,6 +581,7 @@ class App // Force SSL redirection if ($this->config->get('system', 'force_ssl') && (empty($server['HTTPS']) || $server['HTTPS'] === 'off') && + (empty($server['HTTP_X_FORWARDED_PROTO']) || $server['HTTP_X_FORWARDED_PROTO'] === 'http') && !empty($server['REQUEST_METHOD']) && $server['REQUEST_METHOD'] === 'GET') { System::externalRedirect($this->baseURL . '/' . $this->args->getQueryString()); From 7e030720829036ab76eef4ab91f695710ce4bb11 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 26 May 2023 07:17:09 +0000 Subject: [PATCH 005/259] "getStyledURL" is now public --- src/Content/Text/BBCode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 89bd80202..eae0bc432 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -517,7 +517,7 @@ class BBCode * @param string $url URL that is about to be reformatted * @return string reformatted link */ - private static function getStyledURL(string $url): string + public static function getStyledURL(string $url): string { $parts = parse_url($url); $scheme = $parts['scheme'] . '://'; From 332b6f21ca2fc6711e88d139deac7ae4addc7d35 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 26 May 2023 07:35:26 +0000 Subject: [PATCH 006/259] Updated messages.po --- view/lang/C/messages.po | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 3abf2cedd..c2a59b1d4 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2023.05-rc\n" +"Project-Id-Version: 2023.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-21 17:30+0000\n" +"POT-Creation-Date: 2023-05-26 07:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1614,7 +1614,7 @@ msgstr "" msgid "show more" msgstr "" -#: src/Content/Item.php:327 src/Model/Item.php:2927 +#: src/Content/Item.php:327 src/Model/Item.php:2931 msgid "event" msgstr "" @@ -1622,7 +1622,7 @@ msgstr "" msgid "status" msgstr "" -#: src/Content/Item.php:336 src/Model/Item.php:2929 +#: src/Content/Item.php:336 src/Model/Item.php:2933 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" @@ -2028,8 +2028,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3645 -#: src/Model/Item.php:3651 src/Model/Item.php:3652 +#: src/Content/Text/BBCode.php:956 src/Model/Item.php:3649 +#: src/Model/Item.php:3655 src/Model/Item.php:3656 msgid "Link to source" msgstr "" @@ -3203,76 +3203,76 @@ msgstr "" msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:2931 +#: src/Model/Item.php:2935 msgid "activity" msgstr "" -#: src/Model/Item.php:2933 +#: src/Model/Item.php:2937 msgid "comment" msgstr "" -#: src/Model/Item.php:2936 src/Module/Post/Tag/Add.php:123 +#: src/Model/Item.php:2940 src/Module/Post/Tag/Add.php:123 msgid "post" msgstr "" -#: src/Model/Item.php:3105 -#, php-format -msgid "%s is blocked" -msgstr "" - -#: src/Model/Item.php:3107 -#, php-format -msgid "%s is ignored" -msgstr "" - #: src/Model/Item.php:3109 #, php-format -msgid "Content from %s is collapsed" +msgid "%s is blocked" +msgstr "" + +#: src/Model/Item.php:3111 +#, php-format +msgid "%s is ignored" msgstr "" #: src/Model/Item.php:3113 #, php-format +msgid "Content from %s is collapsed" +msgstr "" + +#: src/Model/Item.php:3117 +#, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3557 +#: src/Model/Item.php:3561 msgid "bytes" msgstr "" -#: src/Model/Item.php:3588 +#: src/Model/Item.php:3592 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3590 +#: src/Model/Item.php:3594 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3595 +#: src/Model/Item.php:3599 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3597 +#: src/Model/Item.php:3601 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3599 +#: src/Model/Item.php:3603 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3633 src/Model/Item.php:3634 +#: src/Model/Item.php:3637 src/Model/Item.php:3638 msgid "View on separate page" msgstr "" From 5966f0cc6295dca97e40d5539238f34258c1cb55 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 26 May 2023 14:26:55 +0000 Subject: [PATCH 007/259] Function moved to the "Strings" class --- src/Content/Text/BBCode.php | 21 +-------------------- src/Util/Strings.php | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index eae0bc432..0e5ee9d4e 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -508,26 +508,7 @@ class BBCode */ private static function convertUrlForActivityPub(string $url): string { - return sprintf('%s', $url, self::getStyledURL($url)); - } - - /** - * Converts an URL in a nicer format (without the scheme and possibly shortened) - * - * @param string $url URL that is about to be reformatted - * @return string reformatted link - */ - public static function getStyledURL(string $url): string - { - $parts = parse_url($url); - $scheme = $parts['scheme'] . '://'; - $styled_url = str_replace($scheme, '', $url); - - if (strlen($styled_url) > 30) { - $styled_url = substr($styled_url, 0, 30) . "…"; - } - - return $styled_url; + return sprintf('%s', $url, Strings::getStyledURL($url)); } /* diff --git a/src/Util/Strings.php b/src/Util/Strings.php index 1ce1ac8c7..c3b77ab48 100644 --- a/src/Util/Strings.php +++ b/src/Util/Strings.php @@ -561,4 +561,22 @@ class Strings return $shorthand; } + /** + * Converts an URL in a nicer format (without the scheme and possibly shortened) + * + * @param string $url URL that is about to be reformatted + * @return string reformatted link + */ + public static function getStyledURL(string $url): string + { + $parts = parse_url($url); + $scheme = $parts['scheme'] . '://'; + $styled_url = str_replace($scheme, '', $url); + + if (strlen($styled_url) > 30) { + $styled_url = substr($styled_url, 0, 30) . "…"; + } + + return $styled_url; + } } From 18351a4439f628edb22a8696b9e61c8de67eb39e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 May 2023 19:43:07 -0400 Subject: [PATCH 008/259] Replace "Group" with "Circle" in hosted documentation - Replace "Gruppe" with "Circle" in German version --- doc/API-Entities.md | 12 +- doc/API-Friendica.md | 62 +++++---- doc/API-Mastodon.md | 2 +- doc/Accesskeys.md | 2 +- doc/Account-Basics.md | 18 +-- ...-and-Privacy.md => Circles-and-Privacy.md} | 44 +++---- doc/Home.md | 2 +- doc/Making-Friends.md | 22 ++-- doc/Move-Account.md | 4 +- doc/Quick-Start-andfinally.md | 1 - doc/Tags-and-Mentions.md | 8 +- doc/Text_editor.md | 8 +- doc/api.md | 4 +- doc/de/Account-Basics.md | 44 +++---- ...-and-Privacy.md => Circles-and-Privacy.md} | 118 +++++++++--------- doc/de/Home.md | 2 +- doc/de/Tags-and-Mentions.md | 36 +++--- 17 files changed, 198 insertions(+), 191 deletions(-) rename doc/{Groups-and-Privacy.md => Circles-and-Privacy.md} (76%) rename doc/de/{Groups-and-Privacy.md => Circles-and-Privacy.md} (66%) diff --git a/doc/API-Entities.md b/doc/API-Entities.md index 213b2494f..de3eac9b9 100644 --- a/doc/API-Entities.md +++ b/doc/API-Entities.md @@ -454,7 +454,7 @@ Ex: Wed May 23 06:01:13 +0000 2007 allow_gid String (angle-brackets escaped integers) -Optional. List of allowed group ids +Optional. List of allowed circle ids @@ -466,7 +466,7 @@ Ex: Wed May 23 06:01:13 +0000 2007 deny_gid String (angle-brackets escaped integers) -Optional. List of disallowed group ids +Optional. List of disallowed circle ids @@ -583,7 +583,7 @@ Ex: Wed May 23 06:01:13 +0000 2007 friendica_owner - + Contact No @@ -984,7 +984,7 @@ Identical to [the Twitter Media Object](https://developer.twitter.com/en/docs/tw allow_gid String (ACL) -List of contact group ids wrapped in angle brackets allowed to access the photo. +List of contact circle ids wrapped in angle brackets allowed to access the photo. @@ -996,7 +996,7 @@ Identical to [the Twitter Media Object](https://developer.twitter.com/en/docs/tw deny_gid String (ACL) -List of contact group ids wrapped in angle brackets forbidden to access the photo. +List of contact circle ids wrapped in angle brackets forbidden to access the photo. @@ -1541,4 +1541,4 @@ Unused ## User Mention -Unused \ No newline at end of file +Unused diff --git a/doc/API-Friendica.md b/doc/API-Friendica.md index 197a5033e..785cbe41a 100644 --- a/doc/API-Friendica.md +++ b/doc/API-Friendica.md @@ -39,8 +39,8 @@ Create a new event for the current logged in user. - `publish` : (optional) create message for event - `allow_cid` : (optional) ACL-formatted list of allowed contact ids if private event - `allow_gid` : (optional) ACL-formatted list of disallowed contact ids if private event -- `deny_cid` : (optional) ACL-formatted list of allowed group ids if private event -- `deny_gid` : (optional) ACL-formatted list of disallowed group ids if private event +- `deny_cid` : (optional) ACL-formatted list of allowed circle ids if private event +- `deny_gid` : (optional) ACL-formatted list of disallowed circle ids if private event ### POST api/friendica/event_delete @@ -323,33 +323,37 @@ On error: --- -### GET api/friendica/group_show +### GET api/friendica/circle_show -Return all or a specified group of the user with the containing contacts as array. +Alternatively: GET api/friendica/group_show (Backward compatibility) + +Return all or a specified circle of the user with the containing contacts as array. #### Parameters -* `gid`: optional, if not given, API returns all groups of the user +* `gid`: optional, if not given, API returns all circles of the user #### Return values Array of: -* `name`: name of the group -* `gid`: id of the group +* `name`: name of the circle +* `gid`: id of the circle * `user`: array of [Contacts](help/API-Entities#Contact) -### POST api/friendica/group_create +### POST api/friendica/circle_create -Create the group with the posted array of contacts as members. +Alternatively: POST api/friendica/group_create + +Create the circle with the posted array of contacts as members. #### Parameters -* `name`: name of the group to be created +* `name`: name of the circle to be created #### POST data -JSON data as Array like the result of [GET api/friendica/group_show](#GET+api%2Ffriendica%2Fgroup_show): +JSON data as Array like the result of [GET api/friendica/circle_show](#GET+api%2Ffriendica%2Fcircle_show): * `gid` * `name` @@ -360,23 +364,25 @@ JSON data as Array like the result of [GET api/friendica/group_show](#GET+api%2F Array of: * `success`: true if successfully created or reactivated -* `gid`: gid of the created group -* `name`: name of the created group +* `gid`: gid of the created circle +* `name`: name of the created circle * `status`: "missing user" | "reactivated" | "ok" * `wrong users`: array of users, which were not available in the contact table -### POST api/friendica/group_update +### POST api/friendica/circle_update -Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted). +Alternatively: POST api/friendica/group_update + +Update the circle with the posted array of contacts as members (post all members of the circle to the call; function will remove members not posted). #### Parameters -* `gid`: id of the group to be changed -* `name`: name of the group to be changed +* `gid`: id of the circle to be changed +* `name`: name of the circle to be changed #### POST data -JSON data as array like the result of [GET api/friendica/group_show](#GET+api%2Ffriendica%2Fgroup_show): +JSON data as array like the result of [GET api/friendica/circle_show](#GET+api%2Ffriendica%2Fcircle_show): * `gid` * `name` @@ -387,27 +393,29 @@ JSON data as array like the result of [GET api/friendica/group_show](#GET+api%2F Array of: * `success`: true if successfully updated -* `gid`: gid of the changed group -* `name`: name of the changed group +* `gid`: gid of the changed circle +* `name`: name of the changed circle * `status`: "missing user" | "ok" * `wrong users`: array of users, which were not available in the contact table -### POST api/friendica/group_delete +### POST api/friendica/circle_delete -Delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted. +Alternatively: POST api/friendica/group_delete + +Delete the specified circle of contacts; API call need to include the correct gid AND name of the circle to be deleted. #### Parameters -* `gid`: id of the group to be deleted -* `name`: name of the group to be deleted +* `gid`: id of the circle to be deleted +* `name`: name of the circle to be deleted #### Return values Array of: * `success`: true if successfully deleted -* `gid`: gid of the deleted group -* `name`: name of the deleted group +* `gid`: gid of the deleted circle +* `name`: name of the deleted circle * `status`: "deleted" if successfully deleted * `wrong users`: empty array @@ -556,7 +564,7 @@ Alias of [`api/friendica/photo/update`](#POST+api%2Ffriendica%2Fphoto%2Fupdate) Saves data for the scales 0-2 to database (see above for scale description). Call adds non-public entries to items table to enable authenticated contacts to comment/like the photo. -Client should pay attention to the fact that updated access rights are not transferred to the contacts. i.e. public photos remain publicly visible if they have been commented/liked before setting visibility back to a limited group. +Client should pay attention to the fact that updated access rights are not transferred to the contacts. i.e. public photos remain publicly visible if they have been commented/liked before setting visibility back to a limited circle. Currently it is best to inform user that updating rights is not the right way to do this, and offer a solution to add photo as a new photo with the new rights instead. #### Parameters diff --git a/doc/API-Mastodon.md b/doc/API-Mastodon.md index 18a783720..2798446ba 100644 --- a/doc/API-Mastodon.md +++ b/doc/API-Mastodon.md @@ -211,7 +211,7 @@ Example: - `title`: Explicitly sets the title for a post status, ignored if used on a comment status. For post statuses the legacy behavior is to use any "spoiler text" as the title if it is provided. If both the title and spoiler text are provided for a post status then they will each be used for their respective roles. If no title is provided then the legacy behavior will persist. If you want to create a post with no title but spoiler text then explicitly set the title but set it to an empty string `""`. - [`POST /api/v1/statuses`](https://docs.joinmastodon.org/methods/statuses/#create) - Does not support `polls` argument as Friendica does not have polls - - Additionally to the static values `public`, `unlisted` and `private`, the `visibility` parameter can contain a numeric value with a group id. + - Additionally to the static values `public`, `unlisted` and `private`, the `visibility` parameter can contain a numeric value with a circle id. - Additional field `quote_id` for the post that is being quote reshared - Additional fields `friendica` for Friendica specific parameters: - `title`: Explicitly sets the title for a post status, ignored if used on a comment status. For post statuses the legacy behavior is to use any "spoiler text" as the title if it is provided. If both the title and spoiler text are provided for a post status then they will each be used for their respective roles. If no title is provided then the legacy behavior will persist. If you want to create a post with no title but spoiler text then explicitly set the title but set it to an empty string `""`. diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md index a94fd1ea9..9a68c62de 100644 --- a/doc/Accesskeys.md +++ b/doc/Accesskeys.md @@ -48,7 +48,7 @@ General * i - Only show ignored contacts * y - Only show archived contacts * h - Only show hidden contacts -* e - Edit contact groups +* e - Edit contact circles ../contact (single contact view) ------------------------------- diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index a205ea7e5..f03a488b5 100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -41,9 +41,9 @@ This is the only bit of personal information that has to be accurate. ### Nickname A nickname is used to generate web addresses for many of your personal pages, and is also treated like an email address when establishing communications with others. -Due to the way that the nickname is used, it has some limitations. +Due to the way that the nickname is used, it has some limitations. It must contain only US-ASCII text characters and numbers, and must also start with a text character. -It also must be unique on this system. +It also must be unique on this system. This is used in many places to identify your account, and once set it cannot be changed. @@ -53,28 +53,28 @@ The registration form also allows you to choose whether or not to list your acco This is like a "phone book" and you may choose to be unlisted. We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you. If you choose 'No', you will essentially be invisible and have few opportunities for interaction. -Whichever you choose, this can be changed any time from your Settings page after you login. +Whichever you choose, this can be changed any time from your Settings page after you login. ### Register Once you have provided the necessary details, click the 'Register' button. An email will be sent to you providing your account login details. -Please check your email (including spam folders) for your registration details and initial password. +Please check your email (including spam folders) for your registration details and initial password. Login Page --- On the 'Login' page, please enter your login information that was provided during registration. -You may use either your nickname or email address as a Login Name. +You may use either your nickname or email address as a Login Name. If you use your account to manage other accounts and these all have the same email address, please enter the nickname for the account you wish to manage. If your account has been OpenID enabled, you may use your OpenID address as a login name and leave the password blank. -You will be redirected to your OpenID provider to complete your authorisation. +You will be redirected to your OpenID provider to complete your authorisation. Otherwise, enter your password. This will have been initially provided in your registration email message. -Your password is case-sensitive, so please check your 'Caps Lock' key if you are having difficulty logging in. +Your password is case-sensitive, so please check your 'Caps Lock' key if you are having difficulty logging in. Changing Your Password --- @@ -99,9 +99,9 @@ See Also * [Profiles](help/Profiles) -* [Global Directory](help/Making-Friends#The+Directories) +* [Global Directory](help/Making-Friends#The+Directories) -* [Groups and Privacy](help/Groups-and-Privacy) +* [Circles and Privacy](help/Circles-and-Privacy) * [Move Account](help/Move-Account) diff --git a/doc/Groups-and-Privacy.md b/doc/Circles-and-Privacy.md similarity index 76% rename from doc/Groups-and-Privacy.md rename to doc/Circles-and-Privacy.md index d8d5a3d8f..026cebb1f 100644 --- a/doc/Groups-and-Privacy.md +++ b/doc/Circles-and-Privacy.md @@ -1,64 +1,64 @@ -Groups and Privacy +Circles and Privacy ================== * [Home](help) -Groups are merely collections of friends. +Circles are merely collections of friends. But Friendica uses these to unlock some very powerful features. -**Setting Up Groups** +**Setting Up Circles** -To create a group, visit your Friendica "Contacts" page and select "Create a new group". -Give the group a name. +To create a circle, visit your Friendica "Contacts" page and select "Create a new circle". +Give the circle a name. -This brings you to a page where you can select the group members. +This brings you to a page where you can select the circle members. You will have two boxes on this page. -The top box is the roster of current group members. -Below that is another box containing all of your friends who are *not* members of the group. +The top box is the roster of current circle members. +Below that is another box containing all of your friends who are *not* members of the circle. -If you click on a photo of a person who isn't in the group, they will be put into the group. -If you click on a photo of a person who is in the group, they will be removed from it. +If you click on a photo of a person who isn't in the circle, they will be put into the circle. +If you click on a photo of a person who is in the circle, they will be removed from it. **Access Control** -Once you have created a group, you may use it in any access control list. +Once you have created a circle, you may use it in any access control list. This is the little lock icon beneath the status update box on your home page. If you click this you can select who can see and who can *not* see the post you are about to make.. -These can be individual people or groups. +These can be individual people or circles. On your "Network" page you will find posts and conversation from everybody in your network. -You may select an individual group on this page to show conversations pertaining only to members of that group. +You may select an individual circle on this page to show conversations pertaining only to members of that circle. But wait, there's more... -If you look carefully when visiting a group from your Network page, the lock icon under the status update box has an exclamation mark next to it. +If you look carefully when visiting a circle from your Network page, the lock icon under the status update box has an exclamation mark next to it. This is meant to draw attention to that lock. Click the lock. -You will see that since you are only viewing a certain group of people, your status updates while on that screen default to only being seen by that same group of people. +You will see that since you are only viewing a certain circle of people, your status updates while on that screen default to only being seen by that same circle of people. This is how you keep your future employers from seeing what you write to your drinking buddies. You can over-ride this setting, but this makes it easy to separate your conversations into different friend circles. **Default Post Privacy** By default, Friendica assumes that you want all of your posts to be private. -Therefore, when you sign up, Friendica creates a group for you that it will automatically add all of your contacts to. -All of your posts are restricted to that group by default. +Therefore, when you sign up, Friendica creates a circle for you that it will automatically add all of your contacts to. +All of your posts are restricted to that circle by default. Note that this behaviour can be overridden by your site admin, in which case your posts will be "public" (i.e. visible to the entire Internet) by default. If you want your posts to be "public" by default, you can change your default post permissions on your Settings page. -You also have the option there to change which groups you post to by default, or to change which group your new contacts get placed into by default. +You also have the option there to change which circles you post to by default, or to change which circle your new contacts get placed into by default. **Privacy Concerns To Be Aware Of** These private conversations work best when your friends are Friendica members. -We know who else can see the conversations - nobody, *unless* your friends cut and paste the messages and send them to others. +We know who else can see the conversations - nobody, *unless* your friends cut and paste the messages and send them to others. This is a trust issue you need to be aware of. No software in the world can prevent your friends from leaking your confidential and trusted communications. -Only a wise choice of friends. +Only a wise choice of friends. But it isn't as clear cut when dealing with GNU Social and other network providers. If you look at the Contact Edit page for any person, we will tell you whether or not they are members of an insecure network where you should exercise caution. @@ -69,7 +69,7 @@ If you mistakenly created a message and wish you could take it back, the best yo We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed it was initially propagated. In most cases it will be completely wiped from the Internet - in under a minute. Again, this applies to Friendica networks. -Once a message spreads to other networks, it may not be removed quickly and in some cases it may not be removed at all. +Once a message spreads to other networks, it may not be removed quickly and in some cases it may not be removed at all. In case you haven't yet figured this out, we are encouraging you to encourage your friends to use Friendica - because all these privacy features work much better within a privacy-aware network. Many of the other social networks Friendica can connect to have no privacy controls. @@ -102,7 +102,7 @@ When Friendica sends a post to these networks which exceeds the service length l The original is a link back to your Friendica profile. As Friendica cannot prove who they are, it may not be possible for these people to view your post in full. -For people in this situation we would recommend providing a "Twitter-length" summary, with more detail for friends that can see the post in full. +For people in this situation we would recommend providing a "Twitter-length" summary, with more detail for friends that can see the post in full. You can do so by including the BBCode tag *abstract* in your posting. Blocking your profile or entire Friendica site from unknown web visitors also has serious implications for communicating with GNU Social members. diff --git a/doc/Home.md b/doc/Home.md index d343c41cc..760c8bf56 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -14,7 +14,7 @@ Friendica Documentation and Resources * You and other users * [Connectors](help/Connectors) * [Making Friends](help/Making-Friends) - * [Groups and Privacy](help/Groups-and-Privacy) + * [Circles and Privacy](help/Circles-and-Privacy) * [Tags and Mentions](help/Tags-and-Mentions) * [Community Forums](help/Forums) * [Chats](help/Chats) diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index aadf24796..7101df2a8 100644 --- a/doc/Making-Friends.md +++ b/doc/Making-Friends.md @@ -20,7 +20,7 @@ You'll also see a link to a **Global Directory**. There are several global directories across the globe that regularly exchange information with each other. The specific global directory that you see usually depends on where your server is located. If you click through to the global directory, you will be presented with a list of everybody who choses to be listed across all instances of Friendica. -You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages. +You will also see a "Show Community Forums" link, which will direct you to Circles, Forums and Fanpages. You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually. Connect to other Friendica users @@ -31,9 +31,9 @@ Just beneath their profile picture will be the word 'Connect' (we're assuming th Click that 'Connect' button and it will take you to a 'Connect' form. The form is going to ask you for your Identity Address. -This is necessary so that this person's website can find yours. +This is necessary so that this person's website can find yours. -If your Friendica site is called "demo.friendica.com" and your username/nickname on that site is "bob", you would enter "bob@demo.friendica.com" in this form. +If your Friendica site is called "demo.friendica.com" and your username/nickname on that site is "bob", you would enter "bob@demo.friendica.com" in this form. Notice this looks just like an email address. It's meant to be that way. @@ -42,7 +42,7 @@ It's easy for people to remember. You *could* also put in the URL of your "home" page, such as "http://demo.friendica.com/profile/bob" instead of the email-style address. When you've submitted the connection page, it will take you back to your own site where you must then login (if necessary) and verify the connection request on *your* site. -Once you've done this, the two websites can communicate with each other to complete the process (after your new friend has approved the request). +Once you've done this, the two websites can communicate with each other to complete the process (after your new friend has approved the request). If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process. @@ -68,7 +68,7 @@ To connect, enter their contact details in the "connect" box on your "Contacts" ### Email If you have supplied your mailbox connection information on your Settings page, you can enter the email address of anybody that has sent you a message recently and have their email messages show up in your social stream. -You can also reply to them from within Friendica. +You can also reply to them from within Friendica. Create an email contact with for example Alice on Gmail, enter her email in following format "mailto:alice@gmail.no". In order to avoid abuse or spam, you must have an email from Alice with the correct email address in your email inbox. @@ -78,7 +78,7 @@ To subscribe to a mailing list, enter the email in following example format "mai ### Syndication feeds You can "follow" almost anybody or any website that produces a syndication feed (RSS/Atom,etc.). -If we can find an information stream and a name to attach to the contact, we'll try to connect with them. +If we can find an information stream and a name to attach to the contact, we'll try to connect with them. Notification --- @@ -88,24 +88,24 @@ You will usually need to approve this before the friendship is complete. Approval --- Some networks allow people to send you messages without being friends and without your approval. -Friendica does not allow this by default, as it would open a gateway for spam. +Friendica does not allow this by default, as it would open a gateway for spam. Unilateral or bilateral friendships --- When you receive a friendship notification from another Friendica member, you will have the option of allowing them as a "Follower" or as a "Friend". If they are a follower, they can see what you have to say, including private communications that you send to them, but not vice versa. -As a friend, you can both communicate with each other. +As a friend, you can both communicate with each other. -diaspora* uses a different terminology, and you are given the option of allowing them to "share with you", or being full friends. +diaspora* uses a different terminology, and you are given the option of allowing them to "share with you", or being full friends. Ignoring, blocking and deleting contacts --- Once you have become friends, if you find the person constantly sends you spam or worthless information, you can "Ignore" them - without breaking off the friendship or even alerting them to the fact that you aren't interested in anything they are saying. In many ways they are like a "follower" - but they don't know this. -They think they are a friend. +They think they are a friend. You can also "block" a person. This completely blocks communications with that person. -They may still be able to see your public posts, as can anybody in the world, but they cannot communicate with you directly. +They may still be able to see your public posts, as can anybody in the world, but they cannot communicate with you directly. You can also delete a friend no matter what the friendship status - which completely removes everything relating to that person from your website. diff --git a/doc/Move-Account.md b/doc/Move-Account.md index f2b56b982..2983184be 100644 --- a/doc/Move-Account.md +++ b/doc/Move-Account.md @@ -8,7 +8,7 @@ How to move your account between servers * Go to "Settings" -> "[Export personal data](uexport)" * Click on "Export account" to save your account data. -* **Save the file in a secure place!** It contains your details, your contacts, groups, and personal settings. It also contains your secret keys to authenticate yourself to your contacts. +* **Save the file in a secure place!** It contains your details, your contacts, circles, and personal settings. It also contains your secret keys to authenticate yourself to your contacts. * Go to your new server, and open *http://newserver.com/user/import* (there is not a direct link to this page at the moment). Please consider that this is only possible on servers with open registration. On other systems only the administrator can add accounts with an uploaded file. * Do NOT create a new account prior to importing your old settings - user import should be used *instead* of register. * Load your saved account file and click "Import". @@ -17,7 +17,7 @@ How to move your account between servers Friendica contacts --- -Friendica will recreate your account on the new server, with your contacts and groups. +Friendica will recreate your account on the new server, with your contacts and circles. A message is sent to Friendica contacts, to inform them about your move: If your contacts are running on an updated server, your details on their side will be automatically updated. diff --git a/doc/Quick-Start-andfinally.md b/doc/Quick-Start-andfinally.md index 3e7845d10..6151439ce 100644 --- a/doc/Quick-Start-andfinally.md +++ b/doc/Quick-Start-andfinally.md @@ -4,7 +4,6 @@ Here are some more things to help get you started: **Groups** - - Friendica Support - problems? This is the place to ask. **Documentation** diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md index ab87470b6..8d5ba9d8d 100644 --- a/doc/Tags-and-Mentions.md +++ b/doc/Tags-and-Mentions.md @@ -15,7 +15,7 @@ You can tag **persons who are in your social circle** by adding the "@"-sign in * @mike - indicates a known contact in your social circle whose nickname is "mike" * @mike_macgirvin - indicates a known contact in your social circle whose full name is "Mike Macgirvin". Note that spaces cannot be used inside tags. -* @mike+151 - this form is used by the drop-down tag completion tool. It indicates the contact whose nickname is mike and whose contact identifier number is 151. The drop-down tool may be used to resolve people with duplicate nicknames. +* @mike+151 - this form is used by the drop-down tag completion tool. It indicates the contact whose nickname is mike and whose contact identifier number is 151. The drop-down tool may be used to resolve people with duplicate nicknames. You can tag a person on a different network or one that is **not in your social circle** by using the following notation: @@ -37,9 +37,9 @@ If you want to post something exclusively to a forum (e.g. the support forum) pl So !helpers will be an exclusive posting to the support forum if you are connected with the forum. If you select a forum from the ACL a !-mention will be added automatically to your posting. -If you sort your contacts into groups, you cannot @-mention these groups. -But you can select the group in the access control when creating a new posting, to allow (or disallow) a certain group of people to see the posting. -See [Groups and Privacy](help/Groups-and-Privacy) for more details about grouping your contacts. +If you sort your contacts into circles, you cannot @-mention these circles. +But you can select the circle in the access control when creating a new posting, to allow (or disallow) a certain circle of people to see the posting. +See [Circles and Privacy](help/Circles-and-Privacy) for more details about grouping your contacts. **Topical Tags** diff --git a/doc/Text_editor.md b/doc/Text_editor.md index b7d0937aa..c20b9ac64 100644 --- a/doc/Text_editor.md +++ b/doc/Text_editor.md @@ -88,11 +88,11 @@ Click on "show" under contact name to hide the post to everyone but selected. Click on "Visible to everybody" to make the post public again. -If you have defined some groups, you can check "show" for groups also. All contact in that group will see the post. -If you want to hide the post to one contact of a group selected for "show", click "don't show" under contact name. +If you have defined some circles, you can check "show" for circles also. All contact in that circle will see the post. +If you want to hide the post to one contact of a circle selected for "show", click "don't show" under contact name. Click again on "show" or "don't show" to switch it off. -You can search for contacts or groups with the search box. +You can search for contacts or circles with the search box. -See also [Group and Privacy](help/Groups-and-Privacy) +See also [Circles and Privacy](help/Circles-and-Privacy) diff --git a/doc/api.md b/doc/api.md index f3fae8201..a3ca4d244 100644 --- a/doc/api.md +++ b/doc/api.md @@ -68,8 +68,8 @@ xml: The [RSStoFriendika](https://github.com/pafcu/RSStoFriendika) code can be used as an example of how to use the API with python. The lines for posting are located at [line 21](https://github.com/pafcu/RSStoFriendika/blob/master/RSStoFriendika.py#L21) and following. -def tweet(server, message, group_allow=None): +def tweet(server, message, circle_allow=None): url = server + '/api/statuses/update' -urllib2.urlopen(url, urllib.urlencode({'status': message,'group_allow[]':group_allow}, doseq=True)) +urllib2.urlopen(url, urllib.urlencode({'status': message, 'circle_allow[]': circle_allow}, doseq=True)) There is also a [module for python 3](https://bitbucket.org/tobiasd/python-friendica) for using the API. diff --git a/doc/de/Account-Basics.md b/doc/de/Account-Basics.md index 81ce68c04..ef7ca4e63 100644 --- a/doc/de/Account-Basics.md +++ b/doc/de/Account-Basics.md @@ -9,14 +9,14 @@ Account - Basics Viele, aber nicht alle Friendica-Knoten (Server) bieten die Möglichkeit zur Registrierung an. Falls der Friendica-Knoten, den Du besuchst, keine Registrierung anbietet, oder Du glaubst, dass Dir ein anderer Knoten möglicherweise besser gefällt, dann findest Du hier eine [Liste von öffentlichen Friendica-Knoten](https://dir.friendica.social/servers), aus der Du Dir eine netten Knoten heraussuchen kannst. -Auf der Startseite des Knotens wird unter dem Login-Feld ein "Registrieren"-Link angezeigt. -Dieser Link führt dann direkt auf das Registrierungsformular. +Auf der Startseite des Knotens wird unter dem Login-Feld ein "Registrieren"-Link angezeigt. +Dieser Link führt dann direkt auf das Registrierungsformular. ### OpenID Falls du keine [OpenID-Adresse](https://de.wikipedia.org/wiki/OpenID">OpenID-Adresse) hast, kannst du diesen Punkt ignorieren. -Solltest du eine OpenID Adresse haben, kannst Du sie im ersten Feld eintragen und "Registrieren" klicken. +Solltest du eine OpenID Adresse haben, kannst Du sie im ersten Feld eintragen und "Registrieren" klicken. Friendica wird versuchen, so viele Informationen wie möglich von Deinem OpenID-Provider zu übernehmen, um diese in Dein Profil auf dieser Seite einzutragen. @@ -33,55 +33,55 @@ Bitte trage eine richtige Email-Adresse ein. Dies ist die einzige persönliche Information, die korrekt sein muss. Deine Email-Adresse wird **niemals** veröffentlicht. -Wir benötigen diese, um Dir Account-Informationen, das Initialpasswort und die Login-Daten zu schicken. Oder z.B. Dein Passwort zurückzusetzen. +Wir benötigen diese, um Dir Account-Informationen, das Initialpasswort und die Login-Daten zu schicken. Oder z.B. Dein Passwort zurückzusetzen. Du erhältst zudem von Zeit zu Zeit Benachrichtigungen über eingegangene Nachrichten oder Punkte, die Deine Aufmerksamkeit benötigen. Diese Nachrichten sind in den Einstellungen jederzeit an- oder abschaltbar. ### Spitzname/Nickname -Der Spitzname wird benötigt, um eine Webadresse (Profiladresse) für viele Deiner persönlichen Seiten zu erstellen. -Auch wird dieser wie eine Email-Adresse genutzt, wenn eine Verbindung zu anderen Personen hergestellt werden soll. -Durch die Art, wie der Spitzname genutzt wird, gibt es bestimmte Einschränkungen: +Der Spitzname wird benötigt, um eine Webadresse (Profiladresse) für viele Deiner persönlichen Seiten zu erstellen. +Auch wird dieser wie eine Email-Adresse genutzt, wenn eine Verbindung zu anderen Personen hergestellt werden soll. +Durch die Art, wie der Spitzname genutzt wird, gibt es bestimmte Einschränkungen: * **er muss mit einem Buchstaben beginnen** * **er darf nur US-ASCII-Textzeichen und Nummern enthalten** * **er muss einzigartig auf diesem Friendica-Knoten sein** * **er kann später nicht mehr geändert werden** -Dieser Spitzname wird an vielen Stellen genutzt, um Deinen Account zu identifizieren, daher ist es nicht möglich ihn später zu ändern. +Dieser Spitzname wird an vielen Stellen genutzt, um Deinen Account zu identifizieren, daher ist es nicht möglich ihn später zu ändern. ### Verzeichnis-Eintrag -Das Registrierungsformular erlaubt es dir, direkt auszuwählen, ob Du im [Onlineverzeichnis](https://dir.friendica.social/) (Friendica Directory) aufgelistet wirst oder nicht. -Das ist wie ein Telefonbuch und Du entscheidest, ob du darin eingetragen werden möchtest, oder nicht. +Das Registrierungsformular erlaubt es dir, direkt auszuwählen, ob Du im [Onlineverzeichnis](https://dir.friendica.social/) (Friendica Directory) aufgelistet wirst oder nicht. +Das ist wie ein Telefonbuch und Du entscheidest, ob du darin eingetragen werden möchtest, oder nicht. * Wir bitten dich, "Ja" zu wählen, damit Andere Dich finden können, so wie Du sie finden kannst -* Wählst Du "Nein", bist Du für Andere *nicht einfach auffindbar* +* Wählst Du "Nein", bist Du für Andere *nicht einfach auffindbar* Was auch immer Du wählst, kann jederzeit nach dem Login in Deinen Account-Einstellungen geändert werden. ### Registrierung -Sobald Du die nötigen Informationen eingegeben hast, klicke auf "Registrieren". -Eine Email mit den Registrierungsdetails und Deinem Initialpasswort wird an die hinterlegte Email-Adresse geschickt. +Sobald Du die nötigen Informationen eingegeben hast, klicke auf "Registrieren". +Eine Email mit den Registrierungsdetails und Deinem Initialpasswort wird an die hinterlegte Email-Adresse geschickt. Bitte prüfe den Posteingang (inkl. dem Spam-Ordner). ## Login-Seite -Gib auf der "Login"-Seite die Informationen ein, die Du mit der oben genannten Email erhalten hast. +Gib auf der "Login"-Seite die Informationen ein, die Du mit der oben genannten Email erhalten hast. Du kannst entweder Deinen Spitznamen oder die Email-Adresse als Login-Namen nutzen. Wenn Du Deinen Account nutzt, um unterschiedliche '[Seiten](help/Pages)' zu verwalten, die die gleiche Email-Adresse verwenden, dann nutze bitte den Spitznamen des Accounts, der verwaltet werden soll. -*Wenn* Dein Account OpenID nutzt, dann kannst Du Deine OpenID-Adresse als Login-Name nutzen und das Passwort-Feld frei lassen. -Du wirst zu Deinem OpenID-Anbieter weitergeleitet, wo Du Deine Anmeldung abschließt. +*Wenn* Dein Account OpenID nutzt, dann kannst Du Deine OpenID-Adresse als Login-Name nutzen und das Passwort-Feld frei lassen. +Du wirst zu Deinem OpenID-Anbieter weitergeleitet, wo Du Deine Anmeldung abschließt. -Wenn Du OpenID nicht nutzt, dann gib Dein Passwort ein, das Du mit der Registrierungsmail erhalten hast. -Das Passwort muss genau so geschrieben werden, wie es in der Email steht; Groß- und Kleinschreibung wird beachtet. +Wenn Du OpenID nicht nutzt, dann gib Dein Passwort ein, das Du mit der Registrierungsmail erhalten hast. +Das Passwort muss genau so geschrieben werden, wie es in der Email steht; Groß- und Kleinschreibung wird beachtet. Falls Du Schwierigkeiten beim Login hast, prüfe bitte, ob z. B. Deine Feststelltaste aktiv ist. @@ -90,7 +90,7 @@ Falls Du Schwierigkeiten beim Login hast, prüfe bitte, ob z. B. Deine Feststell Besuche nach Deinem ersten Login bitte die Einstellungsseite und wechsle das Passwort in eines, dass Du Dir merken kannst. -## Die ersten Schritte +## Die ersten Schritte ### Persönliche Daten exportieren @@ -98,9 +98,9 @@ Du solltest dir als erstes Deinen neu erstellen [Account exportieren](uexport) u In diesem Export (JSON-Datei) sind enthalten * Deine Identität, die mit kryptographischen Schlüsseln ausgestattet ist -* Deine Kontakte +* Deine Kontakte -Dies ist z.B. dann nützlich wenn du mit deinem Account auf einen anderen Friendica Knoten umziehen willst, oder musst. +Dies ist z.B. dann nützlich wenn du mit deinem Account auf einen anderen Friendica Knoten umziehen willst, oder musst. ### Hilfe für Neulinge @@ -109,7 +109,7 @@ Ein ['Tipp für neue Mitglieder'](newmember)-Link zeigt sich in den ersten beide ## Schau Dir ebenfalls folgende Seiten an -* [Gruppen und Privatssphäre](help/Groups-and-Privacy) +* [Circles und Privatssphäre](help/Circles-and-Privacy) * [Account löschen](help/Remove-Account) diff --git a/doc/de/Groups-and-Privacy.md b/doc/de/Circles-and-Privacy.md similarity index 66% rename from doc/de/Groups-and-Privacy.md rename to doc/de/Circles-and-Privacy.md index 4ce4d28e1..aebaff871 100644 --- a/doc/de/Groups-and-Privacy.md +++ b/doc/de/Circles-and-Privacy.md @@ -1,112 +1,112 @@ -Gruppen und Privatsphäre +Circles und Privatsphäre ================== * [Zur Startseite der Hilfe](help) -Gruppen sind nur eine Ansammlung von Freunden. +Circles sind nur eine Ansammlung von Freunden. Aber Friendica nutzt diese, um sehr mächtige Features zur Verfügung zu stellen. -**Gruppen erstellen** +**Circles erstellen** -Um eine Gruppe zu erstellen, besuche deine "Kontakte"-Seite und wähle "Neue Gruppe erstellen" (je nach Design nur als Pluszeichen angezeigt). -Gib deiner Gruppe einen Namen. +Um eine Circle zu erstellen, besuche deine "Kontakte"-Seite und wähle "Neue Circle erstellen" (je nach Design nur als Pluszeichen angezeigt). +Gib deiner Circle einen Namen. -Das führt dich zu einer Seite, auf der du die Gruppenmitglieder auswählen kannst. +Das führt dich zu einer Seite, auf der du die Gruppenmitglieder auswählen kannst. -Du hast zwei Boxen auf der Seite. -Die obere Box ist die Übersicht der aktuellen Mitglieder. -Die untere beinhaltet alle Freunde, die *nicht* Mitglied dieser Gruppe sind. +Du hast zwei Boxen auf der Seite. +Die obere Box ist die Übersicht der aktuellen Mitglieder. +Die untere beinhaltet alle Freunde, die *nicht* Mitglied dieser Circle sind. -Wenn du auf das Foto einer Person klickst, die nicht in der Gruppe ist, wird diese in die Gruppe verschoben. -Wenn du auf das Foto einer Person klickst, die bereits in der Gruppe ist, dann wird diese Person daraus entfernt. +Wenn du auf das Foto einer Person klickst, die nicht in der Circle ist, wird diese in die Circle verschoben. +Wenn du auf das Foto einer Person klickst, die bereits in der Circle ist, dann wird diese Person daraus entfernt. **Zugriffskontrolle** -Sobald du eine Gruppe erstellt hast, kannst du diese auf jeder Zugriffsrechteliste nutzen. -Damit ist das kleine Schloss neben deinem Statuseditor auf deiner Startseite gemeint. -Wenn du darauf klickst, kannst du auswählen, wer deinen Beitrag sehen kann und wer *nicht*. -Dabei kann es sich um eine einzelne Person oder eine ganze Gruppe handeln. +Sobald du eine Circle erstellt hast, kannst du diese auf jeder Zugriffsrechteliste nutzen. +Damit ist das kleine Schloss neben deinem Statuseditor auf deiner Startseite gemeint. +Wenn du darauf klickst, kannst du auswählen, wer deinen Beitrag sehen kann und wer *nicht*. +Dabei kann es sich um eine einzelne Person oder eine ganze Circle handeln. -Auf deiner "Netzwerk"-Seite ("Unterhaltungen deiner Kontakte") findest du Beiträge und Gespräche aller deiner Kontakte in deinem Netzwerk. -Du kannst aber auch eine einzelne Gruppe auswählen und nur Beiträge dieser Gruppenmitglieder anzeigen lassen. +Auf deiner "Netzwerk"-Seite ("Unterhaltungen deiner Kontakte") findest du Beiträge und Gespräche aller deiner Kontakte in deinem Netzwerk. +Du kannst aber auch eine einzelne Circle auswählen und nur Beiträge dieser Gruppenmitglieder anzeigen lassen. Aber stopp, es gibt noch mehr... -Wenn du auf deiner "Netzwerk"-Seite eine bestimmte Gruppe ausgewählt hast, dann findest du im Statuseditor neben dem Schloss ein Ausrufezeichen. -Dies dient dazu, deine Aufmerksamkeit auf das Schloss zu richten. -Klicke auf das Schloss. -Dort siehst du, dass dein Status-Update in dieser Ansicht standardmäßig nur für diese Gruppe freigegeben ist. -Das hilft dir, deinen zukünftigen Mitarbeitern nicht das Gleiche zu schreiben wie deinen Trinkfreunden. -Du kannst diese Einstellung natürlich auch überschreiben. +Wenn du auf deiner "Netzwerk"-Seite eine bestimmte Circle ausgewählt hast, dann findest du im Statuseditor neben dem Schloss ein Ausrufezeichen. +Dies dient dazu, deine Aufmerksamkeit auf das Schloss zu richten. +Klicke auf das Schloss. +Dort siehst du, dass dein Status-Update in dieser Ansicht standardmäßig nur für diese Circle freigegeben ist. +Das hilft dir, deinen zukünftigen Mitarbeitern nicht das Gleiche zu schreiben wie deinen Trinkfreunden. +Du kannst diese Einstellung natürlich auch überschreiben. **Standardmäßige Zugriffsrechte von Beiträgen** -Standardmäßig geht Friendica davon aus, dass alle deine Beiträge privat sein sollen. -Aus diesem Grund erstellt Friendica nach der Anmeldung eine Gruppe, in die automatisch alle deine Kontakte hinzugefügt werden. -Alle deine Beiträge sind nur auf diese Gruppe beschränkt. +Standardmäßig geht Friendica davon aus, dass alle deine Beiträge privat sein sollen. +Aus diesem Grund erstellt Friendica nach der Anmeldung eine Circle, in die automatisch alle deine Kontakte hinzugefügt werden. +Alle deine Beiträge sind nur auf diese Circle beschränkt. Beachte, dass diese Einstellung von deinem Seiten-Administrator überschrieben werden kann, was bedeutet, dass alle deine Beiträge standardmäßig "öffentlich" sind (bspw. für das gesamte Internet). -Wenn du deine Beiträge standardmäßig "öffentlich" haben willst, dann kannst du deine Standardzugriffsrechte auf deiner Einstellungseite ändern. -Dort kannst du außerdem festlegen, welchen Gruppen standardmäßig deine Beiträge erhalten oder in welche Gruppe deine neuen Kontakte standardmäßig eingeordnet werden. +Wenn du deine Beiträge standardmäßig "öffentlich" haben willst, dann kannst du deine Standardzugriffsrechte auf deiner Einstellungseite ändern. +Dort kannst du außerdem festlegen, welchen Circles standardmäßig deine Beiträge erhalten oder in welche Circle deine neuen Kontakte standardmäßig eingeordnet werden. **Fragen der Privatssphäre, die zu beachten sind** -Diese privaten Gespräche funktionieren am besten, wenn deine Freunde Friendica-Mitglieder sind. +Diese privaten Gespräche funktionieren am besten, wenn deine Freunde Friendica-Mitglieder sind. So wissen wir, wer sonst noch deine Gespräche sehen kann - niemand, *solange* deine Freunde deine Nachrichten nicht kopieren und an andere verschicken. -Dies ist eine Vertrauensfrage, die du beachten musst. -Keine Software der Welt kann deine Freunde davon abhalten, die privaten Unterhaltungen zu veröffentlichen. -Nur eine gute Auswahl deiner Freunde. +Dies ist eine Vertrauensfrage, die du beachten musst. +Keine Software der Welt kann deine Freunde davon abhalten, die privaten Unterhaltungen zu veröffentlichen. +Nur eine gute Auswahl deiner Freunde. -Bei GNu Social und anderen Netzwerk-Anbietern ist es nicht so gesichert. -Du musst **sehr** vorsichtig sein, wenn du Mitglieder anderer Netzwerke in einer deiner Gruppen hast, da es möglich ist, dass deine privaten Nachrichten in einem öffentlichen Stream enden. +Bei GNu Social und anderen Netzwerk-Anbietern ist es nicht so gesichert. +Du musst **sehr** vorsichtig sein, wenn du Mitglieder anderer Netzwerke in einer deiner Circles hast, da es möglich ist, dass deine privaten Nachrichten in einem öffentlichen Stream enden. Wenn du auf die "Kontakt bearbeiten"-Seite einer Person gehst, zeigen wir dir, ob sie Mitglied eines unsicheren Netzwerks ist oder nicht. -Sobald du einen Post erstellt hast, kannst du die Zugriffsrechte nicht mehr ändern. -Innerhalb von Sekunden ist dieser an viele verschiedene Personen verschickt worden - möglicherweise bereits an alle Addressierten. -Wenn du versehentlich eine Nachricht erstellt hast und sie zurücknehmen willst, dann ist es das beste, diese zu löschen. -Wir senden eine Löschmitteilung an jeden, der deine Nachricht erhalten hat - und das sollte die Nachricht genauso schnell löschen, wie sie zunächst erstellt wurde. -In vielen Fällen wird sie in weniger als einer Minute aus dem Internet gelöscht. -Nochmals: das gilt für Friendica-Netzwerke. +Sobald du einen Post erstellt hast, kannst du die Zugriffsrechte nicht mehr ändern. +Innerhalb von Sekunden ist dieser an viele verschiedene Personen verschickt worden - möglicherweise bereits an alle Addressierten. +Wenn du versehentlich eine Nachricht erstellt hast und sie zurücknehmen willst, dann ist es das beste, diese zu löschen. +Wir senden eine Löschmitteilung an jeden, der deine Nachricht erhalten hat - und das sollte die Nachricht genauso schnell löschen, wie sie zunächst erstellt wurde. +In vielen Fällen wird sie in weniger als einer Minute aus dem Internet gelöscht. +Nochmals: das gilt für Friendica-Netzwerke. Sobald eine Nachricht an ein anderes Netzwerk geschickt wurde, kann es nicht mehr so schnell gelöscht werden und in manchen Fällen auch gar nicht mehr. -Wenn du das bisher noch nicht wusstest, dann empfehlen wir dir, deine Freunde dazu zu ermutigen, auch Friendica zu nutzen, da alle diese Privatsphären-Einstellungen innerhalb eines privatsphärenbewussten Netzwerk viel besser funktionieren. +Wenn du das bisher noch nicht wusstest, dann empfehlen wir dir, deine Freunde dazu zu ermutigen, auch Friendica zu nutzen, da alle diese Privatsphären-Einstellungen innerhalb eines privatsphärenbewussten Netzwerk viel besser funktionieren. Viele andere Netzwerke, mit denen sich Friendica verbinden kann, bieten keine Kontrolle über die Privatsphäre. Profile, Fotos und die Privatsphäre ============================= -Die dezentralisierte Natur von Friendica (statt eine Webseite zu haben, die alles kontrolliert, gibt es viele Webseiten, die Information austauschen) hat in der Kommunikation mit anderen Seiten einige Konsequenzen. +Die dezentralisierte Natur von Friendica (statt eine Webseite zu haben, die alles kontrolliert, gibt es viele Webseiten, die Information austauschen) hat in der Kommunikation mit anderen Seiten einige Konsequenzen. Du solltest dir über einige Dinge bewusst sein, um am besten entscheiden zu können, wie du mit deiner Privatsphäre umgehst. **Fotos** -Fotos privat zu verteilen ist ein Problem. -Wir können Fotos nur mit Friendica-Nutzern __privat__ austauschen. -Um mit anderen Leuten Fotos zu teilen, müssen wir erkennen, wer sie sind. -Wir können die Identität von Friendica-Nutzern prüfen, da es hierfür einen Mechanismus gibt. -Deine Freunde anderer Netzwerke werden deine privaten Fotos nicht sehen können, da wir deren Identität nicht überprüfen können. +Fotos privat zu verteilen ist ein Problem. +Wir können Fotos nur mit Friendica-Nutzern __privat__ austauschen. +Um mit anderen Leuten Fotos zu teilen, müssen wir erkennen, wer sie sind. +Wir können die Identität von Friendica-Nutzern prüfen, da es hierfür einen Mechanismus gibt. +Deine Freunde anderer Netzwerke werden deine privaten Fotos nicht sehen können, da wir deren Identität nicht überprüfen können. -Unsere Entwickler arbeiten an einer Lösung, um deinen Freunden den Zugriff zu ermöglichen - unabhängig, zu welchem Netzwerk sie gehören. +Unsere Entwickler arbeiten an einer Lösung, um deinen Freunden den Zugriff zu ermöglichen - unabhängig, zu welchem Netzwerk sie gehören. Wir nehmen hingegen Privatsphäre ernst und agieren nicht wie andere Netzwerke, die __nur so tun__ als ob deine Fotos privat sind, sie aber trotzdem anderen ohne Identitätsprüfung zeigen. **Profile** -Dein Profil und deine "Wall" sollen vielleicht auch von Freunden anderer Netzwerke besucht werden können. -Wenn du diese Seiten allerdings für Webbesucher sperrst, die Friendica nicht kennt, kann das auch Freunde anderer Netzwerke blockieren. +Dein Profil und deine "Wall" sollen vielleicht auch von Freunden anderer Netzwerke besucht werden können. +Wenn du diese Seiten allerdings für Webbesucher sperrst, die Friendica nicht kennt, kann das auch Freunde anderer Netzwerke blockieren. -Das kann möglicherweise ungewollte Ergebnisse produzieren, wenn du lange Statusbeiträge z.B. für Twitter oder Facebook schreibst. -Wenn Friendica einen Beitrag an diese Netzwerke schickt und nur eine bestimmte Nachrichtenlänge erlaubt ist, dann verkürzen wir diesen und erstellen einen Link, der zum Originalbeitrag führt. -Der Originallink führt zurück zu deinem Friendica-Profil. +Das kann möglicherweise ungewollte Ergebnisse produzieren, wenn du lange Statusbeiträge z.B. für Twitter oder Facebook schreibst. +Wenn Friendica einen Beitrag an diese Netzwerke schickt und nur eine bestimmte Nachrichtenlänge erlaubt ist, dann verkürzen wir diesen und erstellen einen Link, der zum Originalbeitrag führt. +Der Originallink führt zurück zu deinem Friendica-Profil. Da Friendica nicht bestätigen kann, um wen es sich handelt, kann es passieren, dass diese Leute den Beitrag nicht komplett lesen können. -Für Leute, die davon betroffen sind, schlagen wir vor, eine Zusammenfassung in Twitter-Länge zu erstellen mit mehr Details für Freunde, die den ganzen Beitrag sehen können. +Für Leute, die davon betroffen sind, schlagen wir vor, eine Zusammenfassung in Twitter-Länge zu erstellen mit mehr Details für Freunde, die den ganzen Beitrag sehen können. -Dein Profil oder deine gesamte Friendica-Seite zu blockieren, hat außerdem ernsthafte Einflüsse auf deine Kommunikation mit GNU Social-Nutzern. -Diese Netzwerke kommunizieren mit anderen über öffentliche Protokolle, die nicht authentifiziert werden. -Um deine Beiträge zu sehen, müssen diese Netzwerke deine Beiträge als "unbekannte Webbesucher" ansehen. -Wenn wir das erlauben, würde es dazu führen, das absolut jeder deine Beiträge sehen. -Und du hast Friendica so eingestellt, das nicht zuzulassen. +Dein Profil oder deine gesamte Friendica-Seite zu blockieren, hat außerdem ernsthafte Einflüsse auf deine Kommunikation mit GNU Social-Nutzern. +Diese Netzwerke kommunizieren mit anderen über öffentliche Protokolle, die nicht authentifiziert werden. +Um deine Beiträge zu sehen, müssen diese Netzwerke deine Beiträge als "unbekannte Webbesucher" ansehen. +Wenn wir das erlauben, würde es dazu führen, das absolut jeder deine Beiträge sehen. +Und du hast Friendica so eingestellt, das nicht zuzulassen. Beachte also, dass das Blockieren von unbekannten Besuchern auch dazu führen kann, dass öffentliche Netzwerke (wie GNU Social) und Newsfeed-Reader auch geblockt werden. diff --git a/doc/de/Home.md b/doc/de/Home.md index 437208bbb..ba32c6eb8 100644 --- a/doc/de/Home.md +++ b/doc/de/Home.md @@ -14,7 +14,7 @@ Friendica - Dokumentation und Ressourcen * Du und andere Nutzer * [Konnektoren (Connectors)](help/Connectors) * [Freunde finden](help/Making-Friends) - * [Gruppen und Privatsphäre](help/Groups-and-Privacy) + * [Circles und Privatsphäre](help/Circles-and-Privacy) * [Tags und Erwähnungen](help/Tags-and-Mentions) * [Community-Foren](help/Forums) * [Chats](help/Chats) diff --git a/doc/de/Tags-and-Mentions.md b/doc/de/Tags-and-Mentions.md index e99d758db..8ab5bb581 100644 --- a/doc/de/Tags-and-Mentions.md +++ b/doc/de/Tags-and-Mentions.md @@ -7,37 +7,37 @@ Wie viele andere soziale Netzwerke benutzt auch Friendica eine spezielle Schreib **Erwähnungen** -Personen werden "getaggt", indem du das "@"-Zeichen vor den Namen schreibst. +Personen werden "getaggt", indem du das "@"-Zeichen vor den Namen schreibst. + +Personen **in deiner Kontaktliste** werden „getaggt“, indem du das “@“-Zeichen vor den Namen schreibst. -Personen **in deiner Kontaktliste** werden „getaggt“, indem du das “@“-Zeichen vor den Namen schreibst. - * @mike - deutet auf eine Person hin, die im Netzwerk den Namen "mike" nutzt * @mike_macgirvin - deutet auf eine Person hin, die sich im Netzwerk "Mike Macgirvin" nennt. Beachte, dass Leerzeichen in Tags nicht genutzt werden können. -* @mike+151 - diese Schreibweise deutet auf eine Person hin, die "mike" heißt und deren Kontakt-Identitäts-Nummer 151 ist. Bei der Eingabe erscheint direkt ein Auswahlmenü, sodass du diese Nummer nicht selbst kennen musst. +* @mike+151 - diese Schreibweise deutet auf eine Person hin, die "mike" heißt und deren Kontakt-Identitäts-Nummer 151 ist. Bei der Eingabe erscheint direkt ein Auswahlmenü, sodass du diese Nummer nicht selbst kennen musst. + +Personen, die in einem anderen Netzwerk sind oder die sich **NICHT in deiner Kontaktliste** befinden, werden wie folgt getaggt: -Personen, die in einem anderen Netzwerk sind oder die sich **NICHT in deiner Kontaktliste** befinden, werden wie folgt getaggt: - * @mike@macgirvin.com - diese Schreibweise wird "Fernerwähnung" (remote mention)genannt und kann nur im Email-Stil geschrieben werden, nicht als Internetadresse/URL. -Wenn das System ungewollte Erwähnungen nicht blockiert, erhält diese Person eine Mitteilung oder nimmt direkt an der Diskussion teil, wenn es sich um einen öffentlichen Beitrag handelt. -Bitte beachte, dass Friendica eingehende "Erwähnungs"-Nachrichten von Personen blockt, die du nicht zu deinem Profil hinzugefügt hast. +Wenn das System ungewollte Erwähnungen nicht blockiert, erhält diese Person eine Mitteilung oder nimmt direkt an der Diskussion teil, wenn es sich um einen öffentlichen Beitrag handelt. +Bitte beachte, dass Friendica eingehende "Erwähnungs"-Nachrichten von Personen blockt, die du nicht zu deinem Profil hinzugefügt hast. Diese Maßnahme dient dazu, Spam zu vermeiden. -"Fernerwähnungen" werden durch das OStatus-Protokoll übermittelt. -Dieses Protokoll wird von Friendica, GNU Social und anderen Systemen genutzt, ist allerdings derzeit nicht in Diaspora eingebaut. +"Fernerwähnungen" werden durch das OStatus-Protokoll übermittelt. +Dieses Protokoll wird von Friendica, GNU Social und anderen Systemen genutzt, ist allerdings derzeit nicht in Diaspora eingebaut. -Friendica unterscheidet bei Tags nicht zwischen Personen und Gruppen (einige andere Netzwerke nutzen "!gruppe", um solche zu markieren). +Friendica unterscheidet bei Tags nicht zwischen Personen und Gruppen (einige andere Netzwerke nutzen "!circle", um solche zu markieren). **Thematische Tags** -Thematische Tags werden durch eine "#" gekennzeichnet. -Dieses Zeichen erstellen einen Link zur allgemeinen Seitensuche mit dem ausgewählten Begriff. -So wird z.B. #Autos zu einer Suche führen, die alle Beiträge deiner Seite umfasst, die dieses Wort erwähnen. -Thematische Tags haben generell eine Mindestlänge von 3 Stellen. -Kürzere Suchbegriffe finden meist keine Suchergebnisse, wobei dieses abhängig von der Datenbankeinstellung ist. -Tags mit einem Leerzeichen werden, wie es auch bei Namen der Fall ist, durch einen Unterstrich gekennzeichnet. -Es ist hingegen nicht möglich, Tags zu erstellen, deren gesuchtes Wort einen Unterstrich enthält. +Thematische Tags werden durch eine "#" gekennzeichnet. +Dieses Zeichen erstellen einen Link zur allgemeinen Seitensuche mit dem ausgewählten Begriff. +So wird z.B. #Autos zu einer Suche führen, die alle Beiträge deiner Seite umfasst, die dieses Wort erwähnen. +Thematische Tags haben generell eine Mindestlänge von 3 Stellen. +Kürzere Suchbegriffe finden meist keine Suchergebnisse, wobei dieses abhängig von der Datenbankeinstellung ist. +Tags mit einem Leerzeichen werden, wie es auch bei Namen der Fall ist, durch einen Unterstrich gekennzeichnet. +Es ist hingegen nicht möglich, Tags zu erstellen, deren gesuchtes Wort einen Unterstrich enthält. Thematische Tags werden auch dann nicht verlinkt, wenn sie nur aus Nummern bestehen, wie z.B. #1. Wenn du einen numerischen Tag nutzen willst, füge bitte einen Beschreibungstext hinzu wie z.B. #2012_Wahl. From 4f6e02357a0cb8f8fdaf8586a3d26783df3fe385 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 May 2023 19:46:35 -0400 Subject: [PATCH 009/259] Replace "group" with "circle" in database comments - Table names "group" and "group_member" are unchanged --- database.sql | 28 ++++++++++++++-------------- doc/database.md | 4 ++-- doc/database/db_attach.md | 4 ++-- doc/database/db_event.md | 4 ++-- doc/database/db_group.md | 6 +++--- doc/database/db_group_member.md | 12 ++++++------ doc/database/db_permissionset.md | 4 ++-- doc/database/db_photo.md | 4 ++-- static/dbstructure.config.php | 28 ++++++++++++++-------------- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/database.sql b/database.sql index 4e674d63f..f61896033 100644 --- a/database.sql +++ b/database.sql @@ -252,9 +252,9 @@ CREATE TABLE IF NOT EXISTS `permissionset` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id of this permission set', `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'', - `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups', + `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles', `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id', - `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups', + `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles', PRIMARY KEY(`id`), INDEX `uid_allow_cid_allow_gid_deny_cid_deny_gid` (`uid`,`allow_cid`(50),`allow_gid`(30),`deny_cid`(50),`deny_gid`(30)), FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE @@ -457,9 +457,9 @@ CREATE TABLE IF NOT EXISTS `attach` ( `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time', `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edit time', `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>', - `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups', + `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles', `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id', - `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups', + `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles', `backend-class` tinytext COMMENT 'Storage backend class', `backend-ref` text COMMENT 'Storage backend data reference', PRIMARY KEY(`id`), @@ -662,9 +662,9 @@ CREATE TABLE IF NOT EXISTS `event` ( `nofinish` boolean NOT NULL DEFAULT '0' COMMENT 'if event does have no end this is 1', `ignore` boolean NOT NULL DEFAULT '0' COMMENT '0 or 1', `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'', - `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups', + `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles', `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id', - `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups', + `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles', PRIMARY KEY(`id`), INDEX `uid_start` (`uid`,`start`), INDEX `cid` (`cid`), @@ -716,29 +716,29 @@ CREATE TABLE IF NOT EXISTS `group` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', `visible` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the member list is not private', - `deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the group has been deleted', + `deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the circle has been deleted', `cid` int unsigned COMMENT 'Contact id of forum. When this field is filled then the members are synced automatically.', - `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of group', + `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of circle', PRIMARY KEY(`id`), INDEX `uid` (`uid`), INDEX `cid` (`cid`), FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE -) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, group info'; +) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy circles, circle info'; -- -- TABLE group_member -- CREATE TABLE IF NOT EXISTS `group_member` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `gid` int unsigned NOT NULL DEFAULT 0 COMMENT 'groups.id of the associated group', - `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id of the member assigned to the associated group', + `gid` int unsigned NOT NULL DEFAULT 0 COMMENT 'group.id of the associated circle', + `contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id of the member assigned to the associated circle', PRIMARY KEY(`id`), INDEX `contactid` (`contact-id`), UNIQUE INDEX `gid_contactid` (`gid`,`contact-id`), FOREIGN KEY (`gid`) REFERENCES `group` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE -) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, member info'; +) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy circles, member info'; -- -- TABLE gserver-tag @@ -1114,9 +1114,9 @@ CREATE TABLE IF NOT EXISTS `photo` ( `scale` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', `profile` boolean NOT NULL DEFAULT '0' COMMENT '', `allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'', - `allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups', + `allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles', `deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id', - `deny_gid` mediumtext COMMENT 'Access Control - list of denied groups', + `deny_gid` mediumtext COMMENT 'Access Control - list of denied circles', `accessible` boolean NOT NULL DEFAULT '0' COMMENT 'Make photo publicly accessible, ignoring permissions', `backend-class` tinytext COMMENT 'Storage backend class', `backend-ref` text COMMENT 'Storage backend data reference', diff --git a/doc/database.md b/doc/database.md index 461c1c2d9..3c03d31b1 100644 --- a/doc/database.md +++ b/doc/database.md @@ -30,8 +30,8 @@ Database Tables | [fetch-entry](help/database/db_fetch-entry) | | | [fetched-activity](help/database/db_fetched-activity) | Id of fetched activities | | [fsuggest](help/database/db_fsuggest) | friend suggestion stuff | -| [group](help/database/db_group) | privacy groups, group info | -| [group_member](help/database/db_group_member) | privacy groups, member info | +| [group](help/database/db_group) | privacy circles, circle info | +| [group_member](help/database/db_group_member) | privacy circles, member info | | [gserver](help/database/db_gserver) | Global servers | | [gserver-tag](help/database/db_gserver-tag) | Tags that the server has subscribed | | [hook](help/database/db_hook) | addon hook registry | diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md index 76d8e01f2..38ce83a7c 100644 --- a/doc/database/db_attach.md +++ b/doc/database/db_attach.md @@ -18,9 +18,9 @@ Fields | created | creation time | datetime | NO | | 0001-01-01 00:00:00 | | | edited | last edit time | datetime | NO | | 0001-01-01 00:00:00 | | | allow_cid | Access Control - list of allowed contact.id '<19><78> | mediumtext | YES | | NULL | | -| allow_gid | Access Control - list of allowed groups | mediumtext | YES | | NULL | | +| allow_gid | Access Control - list of allowed circles | mediumtext | YES | | NULL | | | deny_cid | Access Control - list of denied contact.id | mediumtext | YES | | NULL | | -| deny_gid | Access Control - list of denied groups | mediumtext | YES | | NULL | | +| deny_gid | Access Control - list of denied circles | mediumtext | YES | | NULL | | | backend-class | Storage backend class | tinytext | YES | | NULL | | | backend-ref | Storage backend data reference | text | YES | | NULL | | diff --git a/doc/database/db_event.md b/doc/database/db_event.md index 499e550c4..c7daea987 100644 --- a/doc/database/db_event.md +++ b/doc/database/db_event.md @@ -25,9 +25,9 @@ Fields | nofinish | if event does have no end this is 1 | boolean | NO | | 0 | | | ignore | 0 or 1 | boolean | NO | | 0 | | | allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext | YES | | NULL | | -| allow_gid | Access Control - list of allowed groups | mediumtext | YES | | NULL | | +| allow_gid | Access Control - list of allowed circles | mediumtext | YES | | NULL | | | deny_cid | Access Control - list of denied contact.id | mediumtext | YES | | NULL | | -| deny_gid | Access Control - list of denied groups | mediumtext | YES | | NULL | | +| deny_gid | Access Control - list of denied circles | mediumtext | YES | | NULL | | Indexes ------------ diff --git a/doc/database/db_group.md b/doc/database/db_group.md index ad7fa4a3d..e94cf53eb 100644 --- a/doc/database/db_group.md +++ b/doc/database/db_group.md @@ -1,7 +1,7 @@ Table group =========== -privacy groups, group info +privacy circles, circle info Fields ------ @@ -11,9 +11,9 @@ Fields | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | | uid | Owner User id | mediumint unsigned | NO | | 0 | | | visible | 1 indicates the member list is not private | boolean | NO | | 0 | | -| deleted | 1 indicates the group has been deleted | boolean | NO | | 0 | | +| deleted | 1 indicates the circle has been deleted | boolean | NO | | 0 | | | cid | Contact id of forum. When this field is filled then the members are synced automatically. | int unsigned | YES | | NULL | | -| name | human readable name of group | varchar(255) | NO | | | | +| name | human readable name of circle | varchar(255) | NO | | | | Indexes ------------ diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md index a544f3b0e..efe83e4ae 100644 --- a/doc/database/db_group_member.md +++ b/doc/database/db_group_member.md @@ -1,16 +1,16 @@ Table group_member =========== -privacy groups, member info +privacy circles, member info Fields ------ -| Field | Description | Type | Null | Key | Default | Extra | -| ---------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- | -| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| gid | groups.id of the associated group | int unsigned | NO | | 0 | | -| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO | | 0 | | +| Field | Description | Type | Null | Key | Default | Extra | +| ---------- | ---------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- | +| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | +| gid | group.id of the associated circle | int unsigned | NO | | 0 | | +| contact-id | contact.id of the member assigned to the associated circle | int unsigned | NO | | 0 | | Indexes ------------ diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md index 38c6fe8f3..82059b2f3 100644 --- a/doc/database/db_permissionset.md +++ b/doc/database/db_permissionset.md @@ -11,9 +11,9 @@ Fields | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | | uid | Owner id of this permission set | mediumint unsigned | NO | | 0 | | | allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext | YES | | NULL | | -| allow_gid | Access Control - list of allowed groups | mediumtext | YES | | NULL | | +| allow_gid | Access Control - list of allowed circles | mediumtext | YES | | NULL | | | deny_cid | Access Control - list of denied contact.id | mediumtext | YES | | NULL | | -| deny_gid | Access Control - list of denied groups | mediumtext | YES | | NULL | | +| deny_gid | Access Control - list of denied circles | mediumtext | YES | | NULL | | Indexes ------------ diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md index ed417f614..c41e913ca 100644 --- a/doc/database/db_photo.md +++ b/doc/database/db_photo.md @@ -30,9 +30,9 @@ Fields | scale | | tinyint unsigned | NO | | 0 | | | profile | | boolean | NO | | 0 | | | allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext | YES | | NULL | | -| allow_gid | Access Control - list of allowed groups | mediumtext | YES | | NULL | | +| allow_gid | Access Control - list of allowed circles | mediumtext | YES | | NULL | | | deny_cid | Access Control - list of denied contact.id | mediumtext | YES | | NULL | | -| deny_gid | Access Control - list of denied groups | mediumtext | YES | | NULL | | +| deny_gid | Access Control - list of denied circles | mediumtext | YES | | NULL | | | accessible | Make photo publicly accessible, ignoring permissions | boolean | NO | | 0 | | | backend-class | Storage backend class | tinytext | YES | | NULL | | | backend-ref | Storage backend data reference | text | YES | | NULL | | diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index ffb66d970..4c4e3cdbe 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -311,9 +311,9 @@ return [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner id of this permission set"], "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"], - "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"], + "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"], "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"], - "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"], + "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"], ], "indexes" => [ "PRIMARY" => ["id"], @@ -513,9 +513,9 @@ return [ "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time"], "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "last edit time"], "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>"], - "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"], + "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"], "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"], - "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"], + "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"], "backend-class" => ["type" => "tinytext", "comment" => "Storage backend class"], "backend-ref" => ["type" => "text", "comment" => "Storage backend data reference"], ], @@ -715,9 +715,9 @@ return [ "nofinish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if event does have no end this is 1"], "ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "0 or 1"], "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"], - "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"], + "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"], "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"], - "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"], + "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"], ], "indexes" => [ "PRIMARY" => ["id"], @@ -760,14 +760,14 @@ return [ ] ], "group" => [ - "comment" => "privacy groups, group info", + "comment" => "privacy circles, circle info", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], "visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the member list is not private"], - "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the group has been deleted"], + "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the circle has been deleted"], "cid" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Contact id of forum. When this field is filled then the members are synced automatically."], - "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of group"], + "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of circle"], ], "indexes" => [ "PRIMARY" => ["id"], @@ -776,11 +776,11 @@ return [ ] ], "group_member" => [ - "comment" => "privacy groups, member info", + "comment" => "privacy circles, member info", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["group" => "id"], "comment" => "groups.id of the associated group"], - "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated group"], + "gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["group" => "id"], "comment" => "group.id of the associated circle"], + "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated circle"], ], "indexes" => [ "PRIMARY" => ["id"], @@ -1150,9 +1150,9 @@ return [ "scale" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""], "profile" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"], - "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"], + "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"], "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"], - "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"], + "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"], "accessible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Make photo publicly accessible, ignoring permissions"], "backend-class" => ["type" => "tinytext", "comment" => "Storage backend class"], "backend-ref" => ["type" => "text", "comment" => "Storage backend data reference"], From 4f7740264ec1d5b7633e24f317d75d00ddf8caad Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 13 May 2023 19:54:35 -0400 Subject: [PATCH 010/259] Replace "group" with "circle" in the rest of the code - Remaining mentions already mean "forum" --- README.md | 46 +-- images/default-group-mm.png | Bin 598 -> 0 bytes images/icons/10/{group.png => circle.png} | Bin images/icons/16/{group.png => circle.png} | Bin images/icons/22/{group.png => circle.png} | Bin images/icons/48/{group.png => circle.png} | Bin images/icons/Makefile | 6 +- images/icons/{group.png => circle.png} | Bin mod/photos.php | 8 +- src/Content/Item.php | 8 +- src/Content/Text/HTML.php | 2 +- src/Content/Widget.php | 18 +- src/Core/ACL.php | 50 +-- .../Api/Friendica/{Group.php => Circle.php} | 12 +- src/Factory/Api/Mastodon/ListEntity.php | 6 +- src/Model/Attach.php | 6 +- src/Model/{Group.php => Circle.php} | 294 +++++++++--------- src/Model/Contact.php | 4 +- src/Model/Contact/{Group.php => Circle.php} | 26 +- src/Model/Item.php | 20 +- src/Model/Photo.php | 24 +- src/Model/User.php | 20 +- src/Module/Admin/Site.php | 8 +- .../Friendica/{Group => Circle}/Create.php | 24 +- .../Friendica/{Group => Circle}/Delete.php | 13 +- .../Api/Friendica/{Group => Circle}/Show.php | 19 +- .../Friendica/{Group => Circle}/Update.php | 15 +- src/Module/Api/Friendica/Events/Create.php | 4 +- src/Module/Api/Friendica/Photo/Create.php | 4 +- src/Module/Api/Friendica/Photo/Update.php | 4 +- src/Module/Api/Mastodon/Accounts/Lists.php | 8 +- src/Module/Api/Mastodon/Lists.php | 24 +- src/Module/Api/Mastodon/Lists/Accounts.php | 6 +- src/Module/Api/Mastodon/Statuses.php | 6 +- src/Module/Api/Twitter/Lists/Create.php | 28 +- src/Module/Api/Twitter/Lists/Destroy.php | 26 +- src/Module/Api/Twitter/Lists/Ownership.php | 22 +- src/Module/Api/Twitter/Lists/Statuses.php | 8 +- src/Module/Api/Twitter/Lists/Update.php | 26 +- src/Module/Api/Twitter/Statuses/Update.php | 8 +- src/Module/Calendar/Event/API.php | 16 +- src/Module/{Group.php => Circle.php} | 176 +++++------ src/Module/Contact.php | 22 +- src/Module/Contact/Profile.php | 8 +- src/Module/Conversation/Network.php | 34 +- src/Module/Item/Compose.php | 32 +- src/Module/Notifications/Ping.php | 18 +- src/Module/PermissionTooltip.php | 38 +-- src/Module/Profile/Conversations.php | 2 +- src/Module/Profile/Photos.php | 12 +- src/Module/Search/Acl.php | 82 ++--- src/Module/Settings/Account.php | 18 +- src/Module/Settings/Profile/Index.php | 10 +- src/Module/Settings/UserExport.php | 10 +- src/Module/Update/Profile.php | 2 +- src/Module/User/Import.php | 30 +- src/Module/Welcome.php | 6 +- .../Api/Friendica/{Group.php => Circle.php} | 21 +- src/Protocol/ActivityPub/ClientToServer.php | 4 +- src/Protocol/ActivityPub/Receiver.php | 2 +- .../Repository/PermissionSet.php | 18 +- src/Security/Security.php | 18 +- src/Util/ACLFormatter.php | 8 +- src/Worker/Notifier.php | 14 +- static/defaults.config.php | 6 +- static/routes.config.php | 42 ++- static/settings.config.php | 6 +- tests/src/Util/ACLFormatterTest.php | 22 +- view/js/autocomplete.js | 2 +- view/js/main.js | 22 +- view/templates/acl/full_selector.tpl | 36 +-- view/templates/acl/self_only.tpl | 6 +- view/templates/admin/site.tpl | 2 +- view/templates/calendar/calendar_head.tpl | 4 +- view/templates/circle_drop.tpl | 12 + view/templates/circle_edit.tpl | 26 ++ view/templates/circle_editor.tpl | 62 ++++ view/templates/circle_selection.tpl | 9 + view/templates/circle_side.tpl | 48 +++ view/templates/group_drop.tpl | 12 - view/templates/group_edit.tpl | 26 -- view/templates/group_selection.tpl | 9 - view/templates/group_side.tpl | 48 --- view/templates/groupeditor.tpl | 62 ---- view/templates/item/compose.tpl | 8 +- view/templates/photos_head.tpl | 6 +- view/templates/settings/account.tpl | 4 +- view/templates/settings/head.tpl | 8 +- view/templates/welcome.tpl | 8 +- view/theme/duepuntozero/deriv/darkzero.css | 20 +- view/theme/duepuntozero/deriv/slackr.css | 2 +- view/theme/duepuntozero/style.css | 46 +-- view/theme/duepuntozero/theme.php | 4 +- view/theme/frio/css/style.css | 68 ++-- .../frio/js/{mod_group.js => mod_circle.js} | 48 +-- view/theme/frio/js/mod_events.js | 4 +- view/theme/frio/js/mod_photos.js | 4 +- view/theme/frio/js/theme.js | 6 +- view/theme/frio/scheme/black.css | 2 +- view/theme/frio/templates/admin/site.tpl | 2 +- view/theme/frio/templates/circle_drop.tpl | 5 + .../{group_edit.tpl => circle_edit.tpl} | 38 +-- view/theme/frio/templates/circle_editor.tpl | 19 ++ view/theme/frio/templates/circle_side.tpl | 60 ++++ view/theme/frio/templates/contact/entry.tpl | 2 +- view/theme/frio/templates/group_drop.tpl | 5 - view/theme/frio/templates/group_side.tpl | 60 ---- view/theme/frio/templates/groupeditor.tpl | 19 -- .../theme/frio/templates/settings/account.tpl | 2 +- view/theme/quattro/dark/style.css | 32 +- view/theme/quattro/green/style.css | 32 +- view/theme/quattro/js/quattro.js | 8 +- view/theme/quattro/lilac/style.css | 32 +- view/theme/quattro/quattro.less | 22 +- view/theme/quattro/templates/circle_side.tpl | 30 ++ view/theme/quattro/templates/group_side.tpl | 30 -- view/theme/smoothly/style.css | 64 ++-- view/theme/smoothly/templates/jot-header.tpl | 4 +- view/theme/smoothly/theme.php | 4 +- view/theme/vier/style.css | 38 +-- 120 files changed, 1308 insertions(+), 1304 deletions(-) delete mode 100644 images/default-group-mm.png rename images/icons/10/{group.png => circle.png} (100%) rename images/icons/16/{group.png => circle.png} (100%) rename images/icons/22/{group.png => circle.png} (100%) rename images/icons/48/{group.png => circle.png} (100%) rename images/icons/{group.png => circle.png} (100%) rename src/Factory/Api/Friendica/{Group.php => Circle.php} (82%) rename src/Model/{Group.php => Circle.php} (60%) rename src/Model/Contact/{Group.php => Circle.php} (72%) rename src/Module/Api/Friendica/{Group => Circle}/Create.php (77%) rename src/Module/Api/Friendica/{Group => Circle}/Delete.php (88%) rename src/Module/Api/Friendica/{Group => Circle}/Show.php (75%) rename src/Module/Api/Friendica/{Group => Circle}/Update.php (87%) rename src/Module/{Group.php => Circle.php} (60%) rename src/Object/Api/Friendica/{Group.php => Circle.php} (77%) create mode 100644 view/templates/circle_drop.tpl create mode 100644 view/templates/circle_edit.tpl create mode 100644 view/templates/circle_editor.tpl create mode 100644 view/templates/circle_selection.tpl create mode 100644 view/templates/circle_side.tpl delete mode 100644 view/templates/group_drop.tpl delete mode 100644 view/templates/group_edit.tpl delete mode 100644 view/templates/group_selection.tpl delete mode 100644 view/templates/group_side.tpl delete mode 100644 view/templates/groupeditor.tpl rename view/theme/frio/js/{mod_group.js => mod_circle.js} (52%) create mode 100644 view/theme/frio/templates/circle_drop.tpl rename view/theme/frio/templates/{group_edit.tpl => circle_edit.tpl} (53%) create mode 100644 view/theme/frio/templates/circle_editor.tpl create mode 100644 view/theme/frio/templates/circle_side.tpl delete mode 100644 view/theme/frio/templates/group_drop.tpl delete mode 100644 view/theme/frio/templates/group_side.tpl delete mode 100644 view/theme/frio/templates/groupeditor.tpl create mode 100644 view/theme/quattro/templates/circle_side.tpl delete mode 100644 view/theme/quattro/templates/group_side.tpl diff --git a/README.md b/README.md index cbd801b5d..e66f3969e 100644 --- a/README.md +++ b/README.md @@ -17,29 +17,29 @@ Have a look at the [installation documentation](doc/Install.md) for further info ### Friendica Screenshots -| ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-1.png?raw=true "Frio theme in mobile browser") ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-2.png?raw=true "Frio theme in mobile browser") -|:--:| -|*Frio theme, mobile browser. Timeline and composer view.*| -|![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-1.png?raw=true "Frio theme in desktop browser") -|*Frio theme, desktop browser. Timeline view, contact info popped up, control menu open.*| -|![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-2.png?raw=true "Frio theme in desktop browser") -|*Frio theme, desktop browser. Menu open for controlling individual posts.*| -|![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-3.png?raw=true "Frio theme in desktop browser") -|*Frio theme, desktop browser. Profile view, notification menu open.*| -|![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-2.png?raw=true "Frio theme in desktop browser") -|*Number of new posts, in total and by group.*| -|![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-1.png?raw=true "Frio theme in desktop browser") -|*Calender with popup of event.*| -|![Frio theme default colour in standard browser on tablet](images/screenshots/friendica-frio-default-profile-1.png?raw=true "Frio theme default colour in standard browser on tablet") -|*Notifications menu and private messages counter, standard browser on tablet.*| -|![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-2.png?raw=true "Frio theme in desktop browser") -|*Number of visible contacts, standard browser.*| -|![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-1.png?raw=true "Frio theme in desktop browser") -|*Network posts chronologically ordered, standard browser.*| -|![Vier theme in desktop browser](images/screenshots/friendica-vier-profile.png?raw=true "Vier theme in desktop browser") -|*Vier theme, desktop browser. Public timeline view.*| -|![Vier theme in desktop browser](images/screenshots/friendica-vier-community.png?raw=true "Vier theme in desktop browser") -|*Vier theme, desktop browser. Community post displayed.*| +| ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-1.png?raw=true "Frio theme in mobile browser") ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-2.png?raw=true "Frio theme in mobile browser") | +|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| +| *Frio theme, mobile browser. Timeline and composer view.* | +| ![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-1.png?raw=true "Frio theme in desktop browser") | +| *Frio theme, desktop browser. Timeline view, contact info popped up, control menu open.* | +| ![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-2.png?raw=true "Frio theme in desktop browser") | +| *Frio theme, desktop browser. Menu open for controlling individual posts.* | +| ![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-3.png?raw=true "Frio theme in desktop browser") | +| *Frio theme, desktop browser. Profile view, notification menu open.* | +| ![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-2.png?raw=true "Frio theme in desktop browser") | +| *Number of new posts, in total and by circle.* | +| ![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-1.png?raw=true "Frio theme in desktop browser") | +| *Calendar with popup of event.* | +| ![Frio theme default colour in standard browser on tablet](images/screenshots/friendica-frio-default-profile-1.png?raw=true "Frio theme default colour in standard browser on tablet") | +| *Notifications menu and private messages counter, standard browser on tablet.* | +| ![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-2.png?raw=true "Frio theme in desktop browser") | +| *Number of visible contacts, standard browser.* | +| ![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-1.png?raw=true "Frio theme in desktop browser") | +| *Network posts chronologically ordered, standard browser.* | +| ![Vier theme in desktop browser](images/screenshots/friendica-vier-profile.png?raw=true "Vier theme in desktop browser") | +| *Vier theme, desktop browser. Public timeline view.* | +| ![Vier theme in desktop browser](images/screenshots/friendica-vier-community.png?raw=true "Vier theme in desktop browser") | +| *Vier theme, desktop browser. Community post displayed.* | ## Endorsements diff --git a/images/default-group-mm.png b/images/default-group-mm.png deleted file mode 100644 index bfc8b335a79900f030c282b2899fc3cae3f9bfce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 598 zcmV-c0;&CpP)*sQs{hRzI*+BBiB)U@$f| z#?yxl*cJ$os=W0`$YN&B+UGW7@$I|e70iAO=znm_+>@2v7LqxXIfQ-a49|OR637$q zI}r8&tF?U^@p1}&2%`^>rvg+v*sSyg$YRKr63*9$${|xz>sl zdiUV^;07>%gzoqP*s^pmjRneLm1g`IYzMjqWNM^8p0aHQ$?FF!@VDTjN$rk~O4aC0{T@b-`qYO4n=-=yXnM1mef1}YgIG#e# zh0dUs^+Sk;60}{YN(qiW)>*i|{1#7O*~k89D#}7mO(?+XSyR!Q!0^4IbUdxocw#II z2JiNzF%59KfN0c)E~iRw{7ET#cMuNhXcxcQaNB{Pqp>`Kw|Tp>d8(N`(-c4%*bZc? z_WGd@M{u>PYX+Lz?wj+_gGFOy+BC;ga{(7)bQ_<4Xww)SaQ(|*$JM#nLp!Mb?R2p$ zn0&1_vL)=w%g}=b(f&&9*gW*Q_d!HN6fF`|50& kUk8IO&`sbV((fPbF9U(EkUx)l(*OVf07*qoM6N<$g2F%ziU0rr diff --git a/images/icons/10/group.png b/images/icons/10/circle.png similarity index 100% rename from images/icons/10/group.png rename to images/icons/10/circle.png diff --git a/images/icons/16/group.png b/images/icons/16/circle.png similarity index 100% rename from images/icons/16/group.png rename to images/icons/16/circle.png diff --git a/images/icons/22/group.png b/images/icons/22/circle.png similarity index 100% rename from images/icons/22/group.png rename to images/icons/22/circle.png diff --git a/images/icons/48/group.png b/images/icons/48/circle.png similarity index 100% rename from images/icons/48/group.png rename to images/icons/48/circle.png diff --git a/images/icons/Makefile b/images/icons/Makefile index bfb5927df..18094baac 100644 --- a/images/icons/Makefile +++ b/images/icons/Makefile @@ -1,6 +1,6 @@ IMAGES=add.png edit.png gear.png info.png menu.png \ - notify_off.png star.png delete.png feed.png group.png \ + notify_off.png star.png delete.png feed.png circle.png \ lock.png notice.png notify_on.png user.png link.png \ play.png plugin.png unlock.png zip.png audio.png video.png \ image.png text.png @@ -10,7 +10,7 @@ DESTS=10/ 16/ 22/ 48/ \ $(addprefix 16/, $(IMAGES)) \ $(addprefix 22/, $(IMAGES)) \ $(addprefix 48/, $(IMAGES)) - + all: $(DESTS) %/: @@ -18,7 +18,7 @@ all: $(DESTS) 10/%.png: %.png convert $< -resize 10x10 $@ - + 16/%.png: %.png convert $< -resize 16x16 $@ diff --git a/images/icons/group.png b/images/icons/circle.png similarity index 100% rename from images/icons/group.png rename to images/icons/circle.png diff --git a/mod/photos.php b/mod/photos.php index 0a8dc472d..233d28a5e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -163,14 +163,14 @@ function photos_post(App $a) $aclFormatter = DI::aclFormatter(); $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $owner_record['allow_cid'] ?? ''; - $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $owner_record['allow_gid'] ?? ''; + $str_circle_allow = isset($_REQUEST['circle_allow']) ? $aclFormatter->toString($_REQUEST['circle_allow']) : $owner_record['allow_gid'] ?? ''; $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $owner_record['deny_cid'] ?? ''; - $str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $owner_record['deny_gid'] ?? ''; + $str_circle_deny = isset($_REQUEST['circle_deny']) ? $aclFormatter->toString($_REQUEST['circle_deny']) : $owner_record['deny_gid'] ?? ''; $visibility = $_REQUEST['visibility'] ?? ''; if ($visibility === 'public') { // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected - $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = ''; + $str_contact_allow = $str_circle_allow = $str_contact_deny = $str_circle_deny = ''; } else if ($visibility === 'custom') { // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL // case that would make it public. So we always append the author's contact id to the allowed contacts. @@ -338,7 +338,7 @@ function photos_post(App $a) $photo = $photos[0]; $ext = $phototypes[$photo['type']]; Photo::update( - ['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny], + ['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_circle_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_circle_deny], ['resource-id' => $resource_id, 'uid' => $page_owner_uid] ); diff --git a/src/Content/Item.php b/src/Content/Item.php index 172729f26..ede78a217 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -38,7 +38,7 @@ use Friendica\Model\Attach; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\FileTag; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item as ItemModel; use Friendica\Model\Photo; use Friendica\Model\Tag; @@ -542,7 +542,7 @@ class Item if ($private_forum) { $item['allow_cid'] = '<' . $private_id . '>'; - $item['allow_gid'] = '<' . Group::getIdForForum($forum_contact['id']) . '>'; + $item['allow_gid'] = '<' . Circle::getIdForForum($forum_contact['id']) . '>'; } else { $item['allow_cid'] = ''; $item['allow_gid'] = ''; @@ -863,9 +863,9 @@ class Item } $post['allow_cid'] = isset($request['contact_allow']) ? $this->aclFormatter->toString($request['contact_allow']) : $user['allow_cid'] ?? ''; - $post['allow_gid'] = isset($request['group_allow']) ? $this->aclFormatter->toString($request['group_allow']) : $user['allow_gid'] ?? ''; + $post['allow_gid'] = isset($request['circle_allow']) ? $this->aclFormatter->toString($request['circle_allow']) : $user['allow_gid'] ?? ''; $post['deny_cid'] = isset($request['contact_deny']) ? $this->aclFormatter->toString($request['contact_deny']) : $user['deny_cid'] ?? ''; - $post['deny_gid'] = isset($request['group_deny']) ? $this->aclFormatter->toString($request['group_deny']) : $user['deny_gid'] ?? ''; + $post['deny_gid'] = isset($request['circle_deny']) ? $this->aclFormatter->toString($request['circle_deny']) : $user['deny_gid'] ?? ''; $visibility = $request['visibility'] ?? ''; if ($visibility === 'public') { diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php index 988274f8d..d17f75f75 100644 --- a/src/Content/Text/HTML.php +++ b/src/Content/Text/HTML.php @@ -531,7 +531,7 @@ class HTML $ignore = false; // A list of some links that should be ignored - $list = ["/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/", + $list = ["/user/", "/tag/", "/group/", "/circle/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/", "//plus.google.com/", "//twitter.com/"]; foreach ($list as $listitem) { if (strpos($treffer[1], $listitem) !== false) { diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 1d10f6142..375d4df11 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -29,7 +29,7 @@ use Friendica\Core\Search; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Model\Profile; @@ -194,29 +194,29 @@ class Widget } /** - * Return group membership widget + * Return circle membership widget * * @param string $baseurl * @param string $selected * @return string * @throws \Exception */ - public static function groups(string $baseurl, string $selected = ''): string + public static function circles(string $baseurl, string $selected = ''): string { if (!DI::userSession()->getLocalUserId()) { return ''; } - $options = array_map(function ($group) { + $options = array_map(function ($circle) { return [ - 'ref' => $group['id'], - 'name' => $group['name'] + 'ref' => $circle['id'], + 'name' => $circle['name'] ]; - }, Group::getByUserId(DI::userSession()->getLocalUserId())); + }, Circle::getByUserId(DI::userSession()->getLocalUserId())); return self::filter( - 'group', - DI::l10n()->t('Groups'), + 'circle', + DI::l10n()->t('Circles'), '', DI::l10n()->t('Everyone'), $baseurl, diff --git a/src/Core/ACL.php b/src/Core/ACL.php index aa5e2221b..be32670b7 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -25,7 +25,7 @@ use Friendica\App\Page; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\User; /** @@ -182,40 +182,40 @@ class ACL } /** - * Returns the ACL list of groups (including meta-groups) for a given user id + * Returns the ACL list of circles (including meta-circles) for a given user id * * @param int $user_id * @return array */ - public static function getGroupListByUserId(int $user_id) + public static function getCircleListByUserId(int $user_id) { - $acl_groups = [ + $acl_circles = [ [ - 'id' => Group::FOLLOWERS, + 'id' => Circle::FOLLOWERS, 'name' => DI::l10n()->t('Followers'), 'addr' => '', 'micro' => 'images/twopeople.png', - 'type' => 'group', + 'type' => 'circle', ], [ - 'id' => Group::MUTUALS, + 'id' => Circle::MUTUALS, 'name' => DI::l10n()->t('Mutuals'), 'addr' => '', 'micro' => 'images/twopeople.png', - 'type' => 'group', + 'type' => 'circle', ] ]; - foreach (Group::getByUserId($user_id) as $group) { - $acl_groups[] = [ - 'id' => $group['id'], - 'name' => $group['name'], + foreach (Circle::getByUserId($user_id) as $circle) { + $acl_circles[] = [ + 'id' => $circle['id'], + 'name' => $circle['name'], 'addr' => '', 'micro' => 'images/twopeople.png', - 'type' => 'group', + 'type' => 'circle', ]; } - return $acl_groups; + return $acl_circles; } /** @@ -279,7 +279,7 @@ class ACL } else { $visibility = 'public'; // Default permission display for custom panel - $default_permissions['allow_gid'] = [Group::FOLLOWERS]; + $default_permissions['allow_gid'] = [Circle::FOLLOWERS]; } $jotnets_fields = []; @@ -303,15 +303,15 @@ class ACL $acl_contacts = self::getContactListByUserId($user['uid'], $condition); - $acl_groups = self::getGroupListByUserId($user['uid']); + $acl_circles = self::getCircleListByUserId($user['uid']); - $acl_list = array_merge($acl_groups, $acl_contacts); + $acl_list = array_merge($acl_circles, $acl_contacts); $input_names = [ 'visibility' => $form_prefix ? $form_prefix . '[visibility]' : 'visibility', - 'group_allow' => $form_prefix ? $form_prefix . '[group_allow]' : 'group_allow', + 'circle_allow' => $form_prefix ? $form_prefix . '[circle_allow]' : 'circle_allow', 'contact_allow' => $form_prefix ? $form_prefix . '[contact_allow]' : 'contact_allow', - 'group_deny' => $form_prefix ? $form_prefix . '[group_deny]' : 'group_deny', + 'circle_deny' => $form_prefix ? $form_prefix . '[circle_deny]' : 'circle_deny', 'contact_deny' => $form_prefix ? $form_prefix . '[contact_deny]' : 'contact_deny', 'emailcc' => $form_prefix ? $form_prefix . '[emailcc]' : 'emailcc', ]; @@ -321,7 +321,7 @@ class ACL '$public_title' => DI::l10n()->t('Public'), '$public_desc' => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'), '$custom_title' => DI::l10n()->t('Limited/Private'), - '$custom_desc' => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a group to show a filtered list. You can also mention the special groups "Followers" and "Mutuals".'), + '$custom_desc' => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a circle to show a filtered list. You can also mention the special circles "Followers" and "Mutuals".'), '$allow_label' => DI::l10n()->t('Show to:'), '$deny_label' => DI::l10n()->t('Except to:'), '$emailcc' => DI::l10n()->t('CC: email addresses'), @@ -329,12 +329,12 @@ class ACL '$jotnets_summary' => DI::l10n()->t('Connectors'), '$visibility' => $visibility, '$acl_contacts' => json_encode($acl_contacts), - '$acl_groups' => json_encode($acl_groups), + '$acl_circles' => json_encode($acl_circles), '$acl_list' => json_encode($acl_list), '$contact_allow' => implode(',', $default_permissions['allow_cid']), - '$group_allow' => implode(',', $default_permissions['allow_gid']), + '$circle_allow' => implode(',', $default_permissions['allow_gid']), '$contact_deny' => implode(',', $default_permissions['deny_cid']), - '$group_deny' => implode(',', $default_permissions['deny_gid']), + '$circle_deny' => implode(',', $default_permissions['deny_gid']), '$for_federation' => $for_federation, '$jotnets_fields' => $jotnets_fields, '$input_names' => $input_names, @@ -381,7 +381,7 @@ class ACL * @return bool * @throws Exception */ - public static function isValidGroup($acl_string, $uid) + public static function isValidCircle($acl_string, $uid) { if (empty($acl_string)) { return true; @@ -394,7 +394,7 @@ class ACL $gid_array = $array[0]; foreach ($gid_array as $gid) { $gid = str_replace(['<', '>'], ['', ''], $gid); - if (!DBA::exists('group', ['id' => $gid, 'uid' => $uid, 'deleted' => false])) { + if (!DBA::exists('circle', ['id' => $gid, 'uid' => $uid, 'deleted' => false])) { return false; } } diff --git a/src/Factory/Api/Friendica/Group.php b/src/Factory/Api/Friendica/Circle.php similarity index 82% rename from src/Factory/Api/Friendica/Group.php rename to src/Factory/Api/Friendica/Circle.php index 4f085cd2b..bf20ceb6d 100644 --- a/src/Factory/Api/Friendica/Group.php +++ b/src/Factory/Api/Friendica/Circle.php @@ -27,7 +27,7 @@ use Friendica\Network\HTTPException; use Psr\Log\LoggerInterface; use Friendica\Factory\Api\Twitter\User as TwitterUser; -class Group extends BaseFactory +class Circle extends BaseFactory { /** @var twitterUser entity */ private $twitterUser; @@ -43,19 +43,19 @@ class Group extends BaseFactory } /** - * @param int $id id of the group + * @param int $id id of the circle * @return array * @throws HTTPException\InternalServerErrorException */ public function createFromId(int $id): array { - $group = $this->dba->selectFirst('group', [], ['id' => $id, 'deleted' => false]); - if (empty($group)) { + $circle = $this->dba->selectFirst('group', [], ['id' => $id, 'deleted' => false]); + if (empty($circle)) { return []; } - $user = $this->twitterUser->createFromUserId($group['uid'])->toArray(); - $object = new \Friendica\Object\Api\Friendica\Group($group, $user); + $user = $this->twitterUser->createFromUserId($circle['uid'])->toArray(); + $object = new \Friendica\Object\Api\Friendica\Circle($circle, $user); return $object->toArray(); } diff --git a/src/Factory/Api/Mastodon/ListEntity.php b/src/Factory/Api/Mastodon/ListEntity.php index a78c8dd63..effdd45a1 100644 --- a/src/Factory/Api/Mastodon/ListEntity.php +++ b/src/Factory/Api/Mastodon/ListEntity.php @@ -40,9 +40,9 @@ class ListEntity extends BaseFactory /** * @throws InternalServerErrorException */ - public function createFromGroupId(int $id): \Friendica\Object\Api\Mastodon\ListEntity + public function createFromCircleId(int $id): \Friendica\Object\Api\Mastodon\ListEntity { - $group = $this->dba->selectFirst('group', ['name'], ['id' => $id, 'deleted' => false]); - return new \Friendica\Object\Api\Mastodon\ListEntity($id, $group['name'] ?? '', 'list'); + $circle = $this->dba->selectFirst('group', ['name'], ['id' => $id, 'deleted' => false]); + return new \Friendica\Object\Api\Mastodon\ListEntity($id, $circle['name'] ?? '', 'list'); } } diff --git a/src/Model/Attach.php b/src/Model/Attach.php index 3dfb2e21e..a008b3a4d 100644 --- a/src/Model/Attach.php +++ b/src/Model/Attach.php @@ -190,9 +190,9 @@ class Attach * @param string $filetype Mimetype. optional, default = '' * @param integer $filesize File size in bytes. optional, default = null * @param string $allow_cid Permissions, allowed contacts. optional, default = '' - * @param string $allow_gid Permissions, allowed groups. optional, default = '' - * @param string $deny_cid Permissions, denied contacts.optional, default = '' - * @param string $deny_gid Permissions, denied group.optional, default = '' + * @param string $allow_gid Permissions, allowed circles. optional, default = '' + * @param string $deny_cid Permissions, denied contacts. optional, default = '' + * @param string $deny_gid Permissions, denied circle. optional, default = '' * * @return boolean|integer Row id on success, False on errors * @throws \Friendica\Network\HTTPException\InternalServerErrorException diff --git a/src/Model/Group.php b/src/Model/Circle.php similarity index 60% rename from src/Model/Group.php rename to src/Model/Circle.php index 45e1ee72d..e1ef4ad33 100644 --- a/src/Model/Group.php +++ b/src/Model/Circle.php @@ -34,16 +34,16 @@ use Friendica\Protocol\ActivityPub; /** * functions for interacting with the group database table */ -class Group +class Circle { const FOLLOWERS = '~'; const MUTUALS = '&'; /** - * Fetches group record by user id and maybe includes deleted groups as well + * Fetches circle record by user id and maybe includes deleted circles as well * - * @param int $uid User id to fetch group(s) for - * @param bool $includesDeleted Whether deleted groups should be included + * @param int $uid User id to fetch circle(s) for + * @param bool $includesDeleted Whether deleted circles should be included * @return array|bool Array on success, bool on error */ public static function getByUserId(int $uid, bool $includesDeleted = false) @@ -58,16 +58,16 @@ class Group } /** - * Checks whether given group id is found in database + * Checks whether given circle id is found in database * - * @param int $group_id Group id + * @param int $circle_id Circle id * @param int $uid Optional user id * @return bool * @throws \Exception */ - public static function exists(int $group_id, int $uid = null): bool + public static function exists(int $circle_id, int $uid = null): bool { - $condition = ['id' => $group_id, 'deleted' => false]; + $condition = ['id' => $circle_id, 'deleted' => false]; if (!is_null($uid)) { $condition = [ @@ -79,13 +79,13 @@ class Group } /** - * Create a new contact group + * Create a new contact circle * - * Note: If we found a deleted group with the same name, we restore it + * Note: If we found a deleted circle with the same name, we restore it * - * @param int $uid User id to create group for - * @param string $name Name of group - * @return int|boolean Id of newly created group or false on error + * @param int $uid User id to create circle for + * @param string $name Name of circle + * @return int|boolean Id of newly created circle or false on error * @throws \Exception */ public static function create(int $uid, string $name) @@ -95,14 +95,14 @@ class Group $gid = self::getIdByName($uid, $name); // check for dupes if ($gid !== false) { // This could be a problem. - // Let's assume we've just created a group which we once deleted - // all the old members are gone, but the group remains so we don't break any security - // access lists. What we're doing here is reviving the dead group, but old content which - // was restricted to this group may now be seen by the new group members. - $group = DBA::selectFirst('group', ['deleted'], ['id' => $gid]); - if (DBA::isResult($group) && $group['deleted']) { + // Let's assume we've just created a circle which we once deleted + // all the old members are gone, but the circle remains, so we don't break any security + // access lists. What we're doing here is reviving the dead circle, but old content which + // was restricted to this circle may now be seen by the new circle members. + $circle = DBA::selectFirst('group', ['deleted'], ['id' => $gid]); + if (DBA::isResult($circle) && $circle['deleted']) { DBA::update('group', ['deleted' => 0], ['id' => $gid]); - DI::sysmsg()->addNotice(DI::l10n()->t('A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name.')); + DI::sysmsg()->addNotice(DI::l10n()->t('A deleted circle with this name was revived. Existing item permissions may apply to this circle and any future members. If this is not what you intended, please create another circle with a different name.')); } return true; } @@ -116,10 +116,10 @@ class Group } /** - * Update group information. + * Update circle information. * - * @param int $id Group ID - * @param string $name Group name + * @param int $id Circle ID + * @param string $name Circle name * * @return bool Was the update successful? * @throws \Exception @@ -130,10 +130,10 @@ class Group } /** - * Get a list of group ids a contact belongs to + * Get a list of circle ids a contact belongs to * * @param int $cid Contact id - * @return array Group ids + * @return array Circle ids * @throws \Exception */ public static function getIdsByContactId(int $cid): array @@ -143,50 +143,50 @@ class Group return []; } - $groupIds = []; + $circleIds = []; $stmt = DBA::select('group_member', ['gid'], ['contact-id' => $cid]); - while ($group = DBA::fetch($stmt)) { - $groupIds[] = $group['gid']; + while ($circle = DBA::fetch($stmt)) { + $circleIds[] = $circle['gid']; } DBA::close($stmt); - // Meta-groups + // Meta-circles if ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND) { - $groupIds[] = self::FOLLOWERS; + $circleIds[] = self::FOLLOWERS; } if ($contact['rel'] == Contact::FRIEND) { - $groupIds[] = self::MUTUALS; + $circleIds[] = self::MUTUALS; } - return $groupIds; + return $circleIds; } /** - * count unread group items + * count unread circle items * - * Count unread items of each groups of the local user + * Count unread items of each circle of the local user * * @return array - * 'id' => group id - * 'name' => group name - * 'count' => counted unseen group items + * 'id' => circle id + * 'name' => circle name + * 'count' => counted unseen circle items * @throws \Exception */ public static function countUnseen() { - $stmt = DBA::p("SELECT `group`.`id`, `group`.`name`, + $stmt = DBA::p("SELECT `circle`.`id`, `circle`.`name`, (SELECT COUNT(*) FROM `post-user` WHERE `uid` = ? AND `unseen` AND `contact-id` IN (SELECT `contact-id` - FROM `group_member` - WHERE `group_member`.`gid` = `group`.`id`) + FROM `group_member` AS `circle_member` + WHERE `circle_member`.`gid` = `circle`.`id`) ) AS `count` - FROM `group` - WHERE `group`.`uid` = ?;", + FROM `group` AS `circle` + WHERE `circle`.`uid` = ?;", DI::userSession()->getLocalUserId(), DI::userSession()->getLocalUserId() ); @@ -195,13 +195,13 @@ class Group } /** - * Get the group id for a user/name couple + * Get the circle id for a user/name couple * - * Returns false if no group has been found. + * Returns false if no circle has been found. * * @param int $uid User id - * @param string $name Group name - * @return int|boolean Groups' id number or false on error + * @param string $name Circle name + * @return int|boolean Circle's id number or false on error * @throws \Exception */ public static function getIdByName(int $uid, string $name) @@ -210,16 +210,16 @@ class Group return false; } - $group = DBA::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]); - if (DBA::isResult($group)) { - return $group['id']; + $circle = DBA::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]); + if (DBA::isResult($circle)) { + return $circle['id']; } return false; } /** - * Mark a group as deleted + * Mark a circle as deleted * * @param int $gid * @return boolean @@ -231,13 +231,13 @@ class Group return false; } - $group = DBA::selectFirst('group', ['uid'], ['id' => $gid]); - if (!DBA::isResult($group)) { + $circle = DBA::selectFirst('group', ['uid'], ['id' => $gid]); + if (!DBA::isResult($circle)) { return false; } - // remove group from default posting lists - $user = DBA::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]); + // remove circle from default posting lists + $user = DBA::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $circle['uid']]); if (DBA::isResult($user)) { $change = false; @@ -255,21 +255,21 @@ class Group } if ($change) { - DBA::update('user', $user, ['uid' => $group['uid']]); + DBA::update('user', $user, ['uid' => $circle['uid']]); } } // remove all members DBA::delete('group_member', ['gid' => $gid]); - // remove group + // remove circle $return = DBA::update('group', ['deleted' => 1], ['id' => $gid]); return $return; } /** - * Adds a contact to a group + * Adds a contact to a circle * * @param int $gid * @param int $cid @@ -283,12 +283,12 @@ class Group } // @TODO Backward compatibility with user contacts, remove by version 2022.03 - $group = DBA::selectFirst('group', ['uid'], ['id' => $gid]); - if (empty($group)) { - throw new HTTPException\NotFoundException('Group not found.'); + $circle = DBA::selectFirst('group', ['uid'], ['id' => $gid]); + if (empty($circle)) { + throw new HTTPException\NotFoundException('Circle not found.'); } - $cdata = Contact::getPublicAndUserContactID($cid, $group['uid']); + $cdata = Contact::getPublicAndUserContactID($cid, $circle['uid']); if (empty($cdata['user'])) { throw new HTTPException\NotFoundException('Invalid contact.'); } @@ -297,7 +297,7 @@ class Group } /** - * Removes a contact from a group + * Removes a contact from a circle * * @param int $gid * @param int $cid @@ -311,12 +311,12 @@ class Group } // @TODO Backward compatibility with user contacts, remove by version 2022.03 - $group = DBA::selectFirst('group', ['uid'], ['id' => $gid]); - if (empty($group)) { - throw new HTTPException\NotFoundException('Group not found.'); + $circle = DBA::selectFirst('group', ['uid'], ['id' => $gid]); + if (empty($circle)) { + throw new HTTPException\NotFoundException('Circle not found.'); } - $cdata = Contact::getPublicAndUserContactID($cid, $group['uid']); + $cdata = Contact::getPublicAndUserContactID($cid, $circle['uid']); if (empty($cdata['user'])) { throw new HTTPException\NotFoundException('Invalid contact.'); } @@ -325,7 +325,7 @@ class Group } /** - * Adds contacts to a group + * Adds contacts to a circle * * @param int $gid * @param array $contacts Array with contact ids @@ -339,13 +339,13 @@ class Group } // @TODO Backward compatibility with user contacts, remove by version 2022.03 - $group = DBA::selectFirst('group', ['uid'], ['id' => $gid]); - if (empty($group)) { - throw new HTTPException\NotFoundException('Group not found.'); + $circle = DBA::selectFirst('group', ['uid'], ['id' => $gid]); + if (empty($circle)) { + throw new HTTPException\NotFoundException('Circle not found.'); } foreach ($contacts as $cid) { - $cdata = Contact::getPublicAndUserContactID($cid, $group['uid']); + $cdata = Contact::getPublicAndUserContactID($cid, $circle['uid']); if (empty($cdata['user'])) { throw new HTTPException\NotFoundException('Invalid contact.'); } @@ -355,9 +355,9 @@ class Group } /** - * Removes contacts from a group + * Removes contacts from a circle * - * @param int $gid Group id + * @param int $gid Circle id * @param array $contacts Contact ids * @return bool * @throws \Exception @@ -369,15 +369,15 @@ class Group } // @TODO Backward compatibility with user contacts, remove by version 2022.03 - $group = DBA::selectFirst('group', ['uid'], ['id' => $gid]); - if (empty($group)) { - throw new HTTPException\NotFoundException('Group not found.'); + $circle = DBA::selectFirst('group', ['uid'], ['id' => $gid]); + if (empty($circle)) { + throw new HTTPException\NotFoundException('Circle not found.'); } $contactIds = []; foreach ($contacts as $cid) { - $cdata = Contact::getPublicAndUserContactID($cid, $group['uid']); + $cdata = Contact::getPublicAndUserContactID($cid, $circle['uid']); if (empty($cdata['user'])) { throw new HTTPException\NotFoundException('Invalid contact.'); } @@ -390,18 +390,18 @@ class Group } /** - * Returns the combined list of contact ids from a group id list + * Returns the combined list of contact ids from a circle id list * * @param int $uid User id - * @param array $group_ids Groups ids + * @param array $circle_ids Circles ids * @param boolean $check_dead Whether check "dead" records (?) * @param boolean $expand_followers Expand the list of followers * @return array * @throws \Exception */ - public static function expand(int $uid, array $group_ids, bool $check_dead = false, bool $expand_followers = true): array + public static function expand(int $uid, array $circle_ids, bool $check_dead = false, bool $expand_followers = true): array { - if (!is_array($group_ids) || !count($group_ids)) { + if (!is_array($circle_ids) || !count($circle_ids)) { return []; } @@ -419,7 +419,7 @@ class Group $networks = array_diff($networks, [Protocol::MAIL]); } - $key = array_search(self::FOLLOWERS, $group_ids); + $key = array_search(self::FOLLOWERS, $circle_ids); if ($key !== false) { if ($expand_followers) { $followers = Contact::selectToArray(['id'], [ @@ -438,10 +438,10 @@ class Group } else { $followers_collection = true; } - unset($group_ids[$key]); + unset($circle_ids[$key]); } - $key = array_search(self::MUTUALS, $group_ids); + $key = array_search(self::MUTUALS, $circle_ids); if ($key !== false) { $mutuals = Contact::selectToArray(['id'], [ 'uid' => $uid, @@ -457,12 +457,12 @@ class Group $return[] = $mutual['id']; } - unset($group_ids[$key]); + unset($circle_ids[$key]); } - $stmt = DBA::select('group_member', ['contact-id'], ['gid' => $group_ids]); - while ($group_member = DBA::fetch($stmt)) { - $return[] = $group_member['contact-id']; + $stmt = DBA::select('group_member', ['contact-id'], ['gid' => $circle_ids]); + while ($circle_member = DBA::fetch($stmt)) { + $return[] = $circle_member['contact-id']; } DBA::close($stmt); @@ -478,17 +478,17 @@ class Group } /** - * Returns a templated group selection list + * Returns a templated circle selection list * * @param int $uid User id - * @param int $gid An optional pre-selected group + * @param int $gid An optional pre-selected circle * @param string $label An optional label of the list * @return string * @throws \Exception */ - public static function displayGroupSelection(int $uid, int $gid = 0, string $label = ''): string + public static function getSelectorHTML(int $uid, int $gid = 0, string $label = ''): string { - $display_groups = [ + $display_circles = [ [ 'name' => '', 'id' => '0', @@ -497,53 +497,53 @@ class Group ]; $stmt = DBA::select('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null], ['order' => ['name']]); - while ($group = DBA::fetch($stmt)) { - $display_groups[] = [ - 'name' => $group['name'], - 'id' => $group['id'], - 'selected' => $gid == $group['id'] ? 'true' : '' + while ($circle = DBA::fetch($stmt)) { + $display_circles[] = [ + 'name' => $circle['name'], + 'id' => $circle['id'], + 'selected' => $gid == $circle['id'] ? 'true' : '' ]; } DBA::close($stmt); - Logger::info('Got groups', $display_groups); + Logger::info('Got circles', $display_circles); if ($label == '') { - $label = DI::l10n()->t('Default privacy group for new contacts'); + $label = DI::l10n()->t('Default privacy circle for new contacts'); } - $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('group_selection.tpl'), [ + $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('circle_selection.tpl'), [ '$label' => $label, - '$groups' => $display_groups + '$circles' => $display_circles ]); return $o; } /** - * Create group sidebar widget + * Create circle sidebar widget * * @param string $every * @param string $each * @param string $editmode - * 'standard' => include link 'Edit groups' - * 'extended' => include link 'Create new group' - * 'full' => include link 'Create new group' and provide for each group a link to edit this group - * @param string|int $group_id Distinct group id or 'everyone' + * 'standard' => include link 'Edit circles' + * 'extended' => include link 'Create new circle' + * 'full' => include link 'Create new circle' and provide for each circle a link to edit this circle + * @param string|int $circle_id Distinct circle id or 'everyone' * @param int $cid Contact id * @return string Sidebar widget HTML code * @throws \Exception */ - public static function sidebarWidget(string $every = 'contact', string $each = 'group', string $editmode = 'standard', $group_id = '', int $cid = 0) + public static function sidebarWidget(string $every = 'contact', string $each = 'circle', string $editmode = 'standard', $circle_id = '', int $cid = 0) { if (!DI::userSession()->getLocalUserId()) { return ''; } - $display_groups = [ + $display_circles = [ [ 'text' => DI::l10n()->t('Everybody'), 'id' => 0, - 'selected' => (($group_id === 'everyone') ? 'group-selected' : ''), + 'selected' => (($circle_id === 'everyone') ? 'circle-selected' : ''), 'href' => $every, ] ]; @@ -554,66 +554,66 @@ class Group } $stmt = DBA::select('group', [], ['deleted' => false, 'uid' => DI::userSession()->getLocalUserId(), 'cid' => null], ['order' => ['name']]); - while ($group = DBA::fetch($stmt)) { - $selected = (($group_id == $group['id']) ? ' group-selected' : ''); + while ($circle = DBA::fetch($stmt)) { + $selected = (($circle_id == $circle['id']) ? ' circle-selected' : ''); if ($editmode == 'full') { - $groupedit = [ - 'href' => 'group/' . $group['id'], + $circleedit = [ + 'href' => 'circle/' . $circle['id'], 'title' => DI::l10n()->t('edit'), ]; } else { - $groupedit = null; + $circleedit = null; } - if ($each == 'group') { - $count = DBA::count('group_member', ['gid' => $group['id']]); - $group_name = sprintf('%s (%d)', $group['name'], $count); + if ($each == 'circle') { + $count = DBA::count('group_member', ['gid' => $circle['id']]); + $circle_name = sprintf('%s (%d)', $circle['name'], $count); } else { - $group_name = $group['name']; + $circle_name = $circle['name']; } - $display_groups[] = [ - 'id' => $group['id'], + $display_circles[] = [ + 'id' => $circle['id'], 'cid' => $cid, - 'text' => $group_name, - 'href' => $each . '/' . $group['id'], - 'edit' => $groupedit, + 'text' => $circle_name, + 'href' => $each . '/' . $circle['id'], + 'edit' => $circleedit, 'selected' => $selected, - 'ismember' => in_array($group['id'], $member_of), + 'ismember' => in_array($circle['id'], $member_of), ]; } DBA::close($stmt); - // Don't show the groups on the network page when there is only one - if ((count($display_groups) <= 2) && ($each == 'network')) { + // Don't show the circles on the network page when there is only one + if ((count($display_circles) <= 2) && ($each == 'network')) { return ''; } - $tpl = Renderer::getMarkupTemplate('group_side.tpl'); + $tpl = Renderer::getMarkupTemplate('circle_side.tpl'); $o = Renderer::replaceMacros($tpl, [ '$add' => DI::l10n()->t('add'), - '$title' => DI::l10n()->t('Groups'), - '$groups' => $display_groups, - 'newgroup' => $editmode == 'extended' || $editmode == 'full' ? 1 : '', - 'grouppage' => 'group/', - '$edittext' => DI::l10n()->t('Edit group'), - '$ungrouped' => $every === 'contact' ? DI::l10n()->t('Contacts not in any group') : '', - '$ungrouped_selected' => (($group_id === 'none') ? 'group-selected' : ''), - '$createtext' => DI::l10n()->t('Create a new group'), - '$creategroup' => DI::l10n()->t('Group Name: '), - '$editgroupstext' => DI::l10n()->t('Edit groups'), - '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'), + '$title' => DI::l10n()->t('Circles'), + '$circles' => $display_circles, + '$new_circle' => $editmode == 'extended' || $editmode == 'full' ? 1 : '', + '$circle_page' => 'circle/', + '$edittext' => DI::l10n()->t('Edit circle'), + '$uncircled' => $every === 'contact' ? DI::l10n()->t('Contacts not in any circle') : '', + '$uncircled_selected' => (($circle_id === 'none') ? 'circle-selected' : ''), + '$createtext' => DI::l10n()->t('Create a new circle'), + '$create_circle' => DI::l10n()->t('Circle Name: '), + '$edit_circles_text' => DI::l10n()->t('Edit circles'), + '$form_security_token' => BaseModule::getFormSecurityToken('circle_edit'), ]); return $o; } /** - * Fetch the group id for the given contact id + * Fetch the circle id for the given contact id * * @param integer $id Contact ID - * @return integer Group IO + * @return integer Circle ID */ public static function getIdForForum(int $id): int { @@ -623,8 +623,8 @@ class Group return 0; } - $group = DBA::selectFirst('group', ['id'], ['uid' => $contact['uid'], 'cid' => $id]); - if (empty($group)) { + $circle = DBA::selectFirst('group', ['id'], ['uid' => $contact['uid'], 'cid' => $id]); + if (empty($circle)) { $fields = [ 'uid' => $contact['uid'], 'name' => $contact['name'], @@ -633,14 +633,14 @@ class Group DBA::insert('group', $fields); $gid = DBA::lastInsertId(); } else { - $gid = $group['id']; + $gid = $circle['id']; } return $gid; } /** - * Fetch the followers of a given contact id and store them as group members + * Fetch the followers of a given contact id and store them as circle members * * @param integer $id Contact ID * @return void @@ -664,9 +664,9 @@ class Group return; } - $group_members = DBA::selectToArray('group_member', ['contact-id'], ['gid' => $gid]); - if (!empty($group_members)) { - $current = array_unique(array_column($group_members, 'contact-id')); + $circle_members = DBA::selectToArray('group_member', ['contact-id'], ['gid' => $gid]); + if (!empty($circle_members)) { + $current = array_unique(array_column($circle_members, 'contact-id')); } else { $current = []; } diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 134bbc1e5..78150f1ff 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -3097,7 +3097,7 @@ class Contact $contact_id = $contact['id']; $result['cid'] = $contact_id; - Group::addMember(User::getDefaultGroup($uid), $contact_id); + Circle::addMember(User::getDefaultCircle($uid), $contact_id); // Update the avatar self::updateAvatar($contact_id, $ret['photo']); @@ -3238,7 +3238,7 @@ class Contact DI::intro()->save($intro); } - Group::addMember(User::getDefaultGroup($importer['uid']), $contact_record['id']); + Circle::addMember(User::getDefaultCircle($importer['uid']), $contact_record['id']); if (($user['notify-flags'] & Notification\Type::INTRO) && $user['page-flags'] == User::PAGE_FLAGS_NORMAL) { DI::notify()->createFromArray([ diff --git a/src/Model/Contact/Group.php b/src/Model/Contact/Circle.php similarity index 72% rename from src/Model/Contact/Group.php rename to src/Model/Contact/Circle.php index 37742f6bb..d3eea5ac5 100644 --- a/src/Model/Contact/Group.php +++ b/src/Model/Contact/Circle.php @@ -26,12 +26,12 @@ use Friendica\DI; use Friendica\Model\Contact; /** - * This class provides information about contact groups based on the "group_member" table. + * This class provides information about contact circles based on the "group_member" table. */ -class Group +class Circle { /** - * Returns a list of contacts belonging in a group + * Returns a list of contacts belonging in a circle * * @param int $gid * @return array @@ -42,10 +42,10 @@ class Group $return = []; if (intval($gid)) { - $stmt = DBA::p('SELECT `group_member`.`contact-id`, `contact`.* + $stmt = DBA::p('SELECT `circle_member`.`contact-id`, `contact`.* FROM `contact` - INNER JOIN `group_member` - ON `contact`.`id` = `group_member`.`contact-id` + INNER JOIN `group_member` AS `circle_member` + ON `contact`.`id` = `circle_member`.`contact-id` WHERE `gid` = ? AND `contact`.`uid` = ? AND NOT `contact`.`self` @@ -66,24 +66,24 @@ class Group } /** - * Returns ungrouped contact count or list for user + * Returns uncircled contact count or list for user * - * Returns either the total number of ungrouped contacts for the given user - * id or a paginated list of ungrouped contacts. + * Returns either the total number of uncircled contacts for the given user + * id or a paginated list of uncircled contacts. * * @param int $uid uid * @return array * @throws \Exception */ - public static function listUngrouped(int $uid) + public static function listUncircled(int $uid) { return Contact::selectToArray([], ["`uid` = ? AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `failed` - AND `id` NOT IN (SELECT DISTINCT(`contact-id`) FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` - WHERE `group`.`uid` = ? AND `contact-id` = `contact`.`id`)", $uid, $uid]); + AND `id` NOT IN (SELECT DISTINCT(`contact-id`) FROM `group_member` AS `circle_member` INNER JOIN `group` AS `circle` ON `circle`.`id` = `circle_member`.`gid` + WHERE `circle`.`uid` = ? AND `contact-id` = `contact`.`id`)", $uid, $uid]); } /** - * Remove a contact from all groups + * Remove a contact from all circles * * @param integer $contact_id * diff --git a/src/Model/Item.php b/src/Model/Item.php index 8f45b3eb5..60e88757e 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -2254,7 +2254,7 @@ class Item if ($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) { $allow_cid = ''; - $allow_gid = '<' . Group::FOLLOWERS . '>'; + $allow_gid = '<' . Circle::FOLLOWERS . '>'; $deny_cid = ''; $deny_gid = ''; self::performActivity($item['id'], 'announce', $uid, $allow_cid, $allow_gid, $deny_cid, $deny_gid); @@ -2528,13 +2528,13 @@ class Item $expand_followers = true; } - $allow_people = $aclFormatter->expand($obj['allow_cid']); - $allow_groups = Group::expand($obj['uid'], $aclFormatter->expand($obj['allow_gid']), $check_dead, $expand_followers); - $deny_people = $aclFormatter->expand($obj['deny_cid']); - $deny_groups = Group::expand($obj['uid'], $aclFormatter->expand($obj['deny_gid']), $check_dead); - $recipients = array_unique(array_merge($allow_people, $allow_groups)); - $deny = array_unique(array_merge($deny_people, $deny_groups)); - $recipients = array_diff($recipients, $deny); + $allow_people = $aclFormatter->expand($obj['allow_cid']); + $allow_circles = Circle::expand($obj['uid'], $aclFormatter->expand($obj['allow_gid']), $check_dead, $expand_followers); + $deny_people = $aclFormatter->expand($obj['deny_cid']); + $deny_circles = Circle::expand($obj['uid'], $aclFormatter->expand($obj['deny_gid']), $check_dead); + $recipients = array_unique(array_merge($allow_people, $allow_circles)); + $deny = array_unique(array_merge($deny_people, $deny_circles)); + $recipients = array_diff($recipients, $deny); return $recipients; } @@ -2900,9 +2900,9 @@ class Item /* * Authenticated visitor. Unless pre-verified, * check that the contact belongs to this $owner_id - * and load the groups the visitor belongs to. + * and load the circles the visitor belongs to. * If pre-verified, the caller is expected to have already - * done this and passed the groups into this function. + * done this and passed the circles into this function. */ $permissionSets = DI::permissionSet()->selectByContactId($remote_user, $owner_id); diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 1b87e82d5..44ee6a670 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -414,9 +414,9 @@ class Photo * @param integer $scale Scale * @param integer $type Photo type, optional, default: Photo::DEFAULT * @param string $allow_cid Permissions, allowed contacts. optional, default = "" - * @param string $allow_gid Permissions, allowed groups. optional, default = "" - * @param string $deny_cid Permissions, denied contacts.optional, default = "" - * @param string $deny_gid Permissions, denied group.optional, default = "" + * @param string $allow_gid Permissions, allowed circles. optional, default = "" + * @param string $deny_cid Permissions, denied contacts. optional, default = "" + * @param string $deny_gid Permissions, denied circle. optional, default = "" * @param string $desc Photo caption. optional, default = "" * * @return boolean True on success @@ -836,7 +836,7 @@ class Photo * @return string * @throws \Exception */ - public static function setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny) + public static function setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_circle_allow, $str_contact_deny, $str_circle_deny) { // Simplify image codes $img_body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body); @@ -881,7 +881,7 @@ class Photo * Then set the permissions to public. */ - self::setPermissionForResource($image_rid, $uid, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); + self::setPermissionForResource($image_rid, $uid, $str_contact_allow, $str_circle_allow, $str_contact_deny, $str_circle_deny); } return true; @@ -894,15 +894,15 @@ class Photo * @param string $image_rid * @param integer $uid * @param string $str_contact_allow - * @param string $str_group_allow + * @param string $str_circle_allow * @param string $str_contact_deny - * @param string $str_group_deny + * @param string $str_circle_deny * @return void */ - public static function setPermissionForResource(string $image_rid, int $uid, string $str_contact_allow, string $str_group_allow, string $str_contact_deny, string $str_group_deny) + public static function setPermissionForResource(string $image_rid, int $uid, string $str_contact_allow, string $str_circle_allow, string $str_contact_deny, string $str_circle_deny) { - $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, - 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny, + $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_circle_allow, + 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_circle_deny, 'accessible' => DI::pConfig()->get($uid, 'system', 'accessible-photos', false)]; $condition = ['resource-id' => $image_rid, 'uid' => $uid]; @@ -1228,9 +1228,9 @@ class Photo * @param string $album Album name * @param string $description Photo caption * @param string $allow_cid Permissions, allowed contacts - * @param string $allow_gid Permissions, allowed groups + * @param string $allow_gid Permissions, allowed circles * @param string $deny_cid Permissions, denied contacts - * @param string $deny_gid Permissions, denied group + * @param string $deny_gid Permissions, denied circles * * @return integer preview photo size * @throws \Friendica\Network\HTTPException\InternalServerErrorException diff --git a/src/Model/User.php b/src/Model/User.php index 3be13bebf..cb769ce3f 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -483,23 +483,23 @@ class User } /** - * Returns the default group for a given user and network + * Returns the default circle for a given user and network * * @param int $uid User id * - * @return int group id + * @return int circle id * @throws Exception */ - public static function getDefaultGroup(int $uid): int + public static function getDefaultCircle(int $uid): int { $user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]); if (DBA::isResult($user)) { - $default_group = $user["def_gid"]; + $default_circle = $user['def_gid']; } else { - $default_group = 0; + $default_circle = 0; } - return $default_group; + return $default_circle; } /** @@ -1188,13 +1188,13 @@ class User throw new Exception(DI::l10n()->t('An error occurred creating your self contact. Please try again.')); } - // Create a group with no members. This allows somebody to use it - // right away as a default group for new contacts. - $def_gid = Group::create($uid, DI::l10n()->t('Friends')); + // Create a circle with no members. This allows somebody to use it + // right away as a default circle for new contacts. + $def_gid = Circle::create($uid, DI::l10n()->t('Friends')); if (!$def_gid) { DBA::delete('user', ['uid' => $uid]); - throw new Exception(DI::l10n()->t('An error occurred creating your default contact group. Please try again.')); + throw new Exception(DI::l10n()->t('An error occurred creating your default contact circle. Please try again.')); } $fields = ['def_gid' => $def_gid]; diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 4f5a35ab7..09624dcfc 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -131,7 +131,7 @@ class Site extends BaseAdmin $temppath = (!empty($_POST['temppath']) ? trim($_POST['temppath']) : ''); $singleuser = (!empty($_POST['singleuser']) ? trim($_POST['singleuser']) : ''); $only_tag_search = !empty($_POST['only_tag_search']); - $compute_group_counts = !empty($_POST['compute_group_counts']); + $compute_circle_counts = !empty($_POST['compute_circle_counts']); $check_new_version_url = (!empty($_POST['check_new_version_url']) ? trim($_POST['check_new_version_url']) : 'none'); $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); @@ -278,7 +278,7 @@ class Site extends BaseAdmin $transactionConfig->set('system', 'temppath', $temppath); $transactionConfig->set('system', 'only_tag_search' , $only_tag_search); - $transactionConfig->set('system', 'compute_group_counts', $compute_group_counts); + $transactionConfig->set('system', 'compute_circle_counts', $compute_circle_counts); $transactionConfig->set('system', 'worker_queues' , $worker_queues); $transactionConfig->set('system', 'worker_fastlane' , $worker_fastlane); @@ -452,7 +452,7 @@ class Site extends BaseAdmin '$block_public' => ['block_public', DI::l10n()->t('Block public'), DI::config()->get('system', 'block_public'), DI::l10n()->t('Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.')], '$force_publish' => ['publish_all', DI::l10n()->t('Force publish'), DI::config()->get('system', 'publish_all'), DI::l10n()->t('Check to force all profiles on this site to be listed in the site directory.') . '' . DI::l10n()->t('Enabling this may violate privacy laws like the GDPR') . ''], '$global_directory' => ['directory', DI::l10n()->t('Global directory URL'), DI::config()->get('system', 'directory'), DI::l10n()->t('URL to the global directory. If this is not set, the global directory is completely unavailable to the application.')], - '$newuser_private' => ['newuser_private', DI::l10n()->t('Private posts by default for new users'), DI::config()->get('system', 'newuser_private'), DI::l10n()->t('Set default post permissions for all new members to the default privacy group rather than public.')], + '$newuser_private' => ['newuser_private', DI::l10n()->t('Private posts by default for new users'), DI::config()->get('system', 'newuser_private'), DI::l10n()->t('Set default post permissions for all new members to the default privacy circle rather than public.')], '$enotify_no_content' => ['enotify_no_content', DI::l10n()->t('Don\'t include post content in email notifications'), DI::config()->get('system', 'enotify_no_content'), DI::l10n()->t('Don\'t include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.')], '$private_addons' => ['private_addons', DI::l10n()->t('Disallow public access to addons listed in the apps menu.'), DI::config()->get('config', 'private_addons'), DI::l10n()->t('Checking this box will restrict addons listed in the apps menu to members only.')], '$disable_embedded' => ['disable_embedded', DI::l10n()->t('Don\'t embed private images in posts'), DI::config()->get('system', 'disable_embedded'), DI::l10n()->t('Don\'t replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.')], @@ -504,7 +504,7 @@ class Site extends BaseAdmin '$max_display_comments' => ['max_display_comments', DI::l10n()->t('Maximum numbers of comments per post on the display page'), DI::config()->get('system', 'max_display_comments'), DI::l10n()->t('How many comments should be shown on the single view for each post? Default value is 1000.')], '$temppath' => ['temppath', DI::l10n()->t('Temp path'), DI::config()->get('system', 'temppath'), DI::l10n()->t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')], '$only_tag_search' => ['only_tag_search', DI::l10n()->t('Only search in tags'), DI::config()->get('system', 'only_tag_search'), DI::l10n()->t('On large systems the text search can slow down the system extremely.')], - '$compute_group_counts' => ['compute_group_counts', DI::l10n()->t('Generate counts per contact group when calculating network count'), DI::config()->get('system', 'compute_group_counts'), DI::l10n()->t('On systems with users that heavily use contact groups the query can be very expensive.')], + '$compute_circle_counts' => ['compute_circle_counts', DI::l10n()->t('Generate counts per contact circle when calculating network count'), DI::config()->get('system', 'compute_group_counts') ?? DI::config()->get('system', 'compute_circle_counts'), DI::l10n()->t('On systems with users that heavily use contact circles the query can be very expensive.')], '$worker_queues' => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], '$worker_fastlane' => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], diff --git a/src/Module/Api/Friendica/Group/Create.php b/src/Module/Api/Friendica/Circle/Create.php similarity index 77% rename from src/Module/Api/Friendica/Group/Create.php rename to src/Module/Api/Friendica/Circle/Create.php index 290389931..b2787bdd5 100644 --- a/src/Module/Api/Friendica/Group/Create.php +++ b/src/Module/Api/Friendica/Circle/Create.php @@ -19,14 +19,15 @@ * */ -namespace Friendica\Module\Api\Friendica\Group; +namespace Friendica\Module\Api\Friendica\Circle; use Friendica\Database\DBA; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module\BaseApi; use Friendica\Network\HTTPException; /** + * API endpoint: /api/friendica/circle_create * API endpoint: /api/friendica/group_create */ class Create extends BaseApi @@ -43,23 +44,22 @@ class Create extends BaseApi // error if no name specified if ($name == '') { - throw new HTTPException\BadRequestException('group name not specified'); + throw new HTTPException\BadRequestException('circle name not specified'); } - // error message if specified group name already exists + // error message if specified circle name already exists if (DBA::exists('group', ['uid' => $uid, 'name' => $name, 'deleted' => false])) { - throw new HTTPException\BadRequestException('group name already exists'); + throw new HTTPException\BadRequestException('circle name already exists'); } - // Check if the group needs to be reactivated + // Check if the circle needs to be reactivated if (DBA::exists('group', ['uid' => $uid, 'name' => $name, 'deleted' => true])) { - $reactivate_group = true; + $reactivate_circle = true; } - // create group - $ret = Group::create($uid, $name); + $ret = Circle::create($uid, $name); if ($ret) { - $gid = Group::getIdByName($uid, $name); + $gid = Circle::getIdByName($uid, $name); } else { throw new HTTPException\BadRequestException('other API error'); } @@ -70,7 +70,7 @@ class Create extends BaseApi foreach ($users as $user) { $cid = $user['cid']; if (DBA::exists('contact', ['id' => $cid, 'uid' => $uid])) { - Group::addMember($gid, $cid); + Circle::addMember($gid, $cid); } else { $erroraddinguser = true; $errorusers[] = $cid; @@ -78,7 +78,7 @@ class Create extends BaseApi } // return success message incl. missing users in array - $status = ($erroraddinguser ? 'missing user' : ((isset($reactivate_group) && $reactivate_group) ? 'reactivated' : 'ok')); + $status = ($erroraddinguser ? 'missing user' : (!empty($reactivate_circle) ? 'reactivated' : 'ok')); $result = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers]; diff --git a/src/Module/Api/Friendica/Group/Delete.php b/src/Module/Api/Friendica/Circle/Delete.php similarity index 88% rename from src/Module/Api/Friendica/Group/Delete.php rename to src/Module/Api/Friendica/Circle/Delete.php index 68e0a0578..18db1216b 100644 --- a/src/Module/Api/Friendica/Group/Delete.php +++ b/src/Module/Api/Friendica/Circle/Delete.php @@ -19,15 +19,16 @@ * */ -namespace Friendica\Module\Api\Friendica\Group; +namespace Friendica\Module\Api\Friendica\Circle; use Friendica\Database\DBA; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module\BaseApi; use Friendica\Network\HTTPException\BadRequestException; /** * API endpoint: /api/friendica/group/delete + * API endpoint: /api/friendica/circle/delete */ class Delete extends BaseApi { @@ -55,16 +56,16 @@ class Delete extends BaseApi // error message if specified gid is not in database if (!DBA::exists('group', ['uid' => $uid, 'id' => $request['gid'], 'name' => $request['name']])) { - throw new BadRequestException('wrong group name'); + throw new BadRequestException('wrong circle name'); } - // delete group - $gid = Group::getIdByName($uid, $request['name']); + // delete circle + $gid = Circle::getIdByName($uid, $request['name']); if (empty($request['gid'])) { throw new BadRequestException('other API error'); } - $ret = Group::remove($gid); + $ret = Circle::remove($gid); if ($ret) { // return success diff --git a/src/Module/Api/Friendica/Group/Show.php b/src/Module/Api/Friendica/Circle/Show.php similarity index 75% rename from src/Module/Api/Friendica/Group/Show.php rename to src/Module/Api/Friendica/Circle/Show.php index 336393107..9f2f93ede 100644 --- a/src/Module/Api/Friendica/Group/Show.php +++ b/src/Module/Api/Friendica/Circle/Show.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Module\Api\Friendica\Group; +namespace Friendica\Module\Api\Friendica\Circle; use Friendica\Database\DBA; use Friendica\DI; @@ -28,6 +28,7 @@ use Friendica\Module\BaseApi; use Friendica\Network\HTTPException; /** + * API endpoint: /api/friendica/circle_show * API endpoint: /api/friendica/group_show */ class Show extends BaseApi @@ -41,22 +42,22 @@ class Show extends BaseApi // params $gid = $this->getRequestValue($request, 'gid', 0); - // get data of the specified group id or all groups if not specified + // get data of the specified circle id or all circles if not specified if ($gid != 0) { - $groups = DBA::selectToArray('group', [], ['deleted' => false, 'uid' => $uid, 'id' => $gid]); + $circles = DBA::selectToArray('group', [], ['deleted' => false, 'uid' => $uid, 'id' => $gid]); // error message if specified gid is not in database - if (!DBA::isResult($groups)) { + if (!DBA::isResult($circles)) { throw new HTTPException\BadRequestException('gid not available'); } } else { - $groups = DBA::selectToArray('group', [], ['deleted' => false, 'uid' => $uid]); + $circles = DBA::selectToArray('group', [], ['deleted' => false, 'uid' => $uid]); } - // loop through all groups and retrieve all members for adding data in the user array + // loop through all circles and retrieve all members for adding data in the user array $grps = []; - foreach ($groups as $rr) { - $members = Contact\Group::getById($rr['id']); + foreach ($circles as $circle) { + $members = Contact\Circle::getById($circle['id']); $users = []; if ($type == 'xml') { @@ -71,7 +72,7 @@ class Show extends BaseApi $users[] = DI::twitterUser()->createFromContactId($member['contact-id'], $uid, true)->toArray(); } } - $grps[] = ['name' => $rr['name'], 'gid' => $rr['id'], $user_element => $users]; + $grps[] = ['name' => $circle['name'], 'gid' => $circle['id'], $user_element => $users]; } $this->response->exit('group_update', ['group' => $grps], $this->parameters['extension'] ?? null); diff --git a/src/Module/Api/Friendica/Group/Update.php b/src/Module/Api/Friendica/Circle/Update.php similarity index 87% rename from src/Module/Api/Friendica/Group/Update.php rename to src/Module/Api/Friendica/Circle/Update.php index bee037d97..38bbea382 100644 --- a/src/Module/Api/Friendica/Group/Update.php +++ b/src/Module/Api/Friendica/Circle/Update.php @@ -19,15 +19,16 @@ * */ -namespace Friendica\Module\Api\Friendica\Group; +namespace Friendica\Module\Api\Friendica\Circle; use Friendica\Database\DBA; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module\BaseApi; use Friendica\Network\HTTPException\BadRequestException; /** + * API endpoint: /api/friendica/circle_update * API endpoint: /api/friendica/group_update */ class Update extends BaseApi @@ -45,7 +46,7 @@ class Update extends BaseApi // error if no name specified if (!$name) { - throw new BadRequestException('group name not specified'); + throw new BadRequestException('circle name not specified'); } // error if no gid specified @@ -54,15 +55,15 @@ class Update extends BaseApi } // remove members - $members = Contact\Group::getById($gid); + $members = Contact\Circle::getById($gid); foreach ($members as $member) { $cid = $member['id']; foreach ($users as $user) { $found = $user['cid'] == $cid; } if (!isset($found) || !$found) { - $gid = Group::getIdByName($uid, $name); - Group::removeMember($gid, $cid); + $gid = Circle::getIdByName($uid, $name); + Circle::removeMember($gid, $cid); } } @@ -73,7 +74,7 @@ class Update extends BaseApi $cid = $user['cid']; if (DBA::exists('contact', ['id' => $cid, 'uid' => $uid])) { - Group::addMember($gid, $cid); + Circle::addMember($gid, $cid); } else { $erroraddinguser = true; $errorusers[] = $cid; diff --git a/src/Module/Api/Friendica/Events/Create.php b/src/Module/Api/Friendica/Events/Create.php index a0b969ee2..4eb92e9c8 100644 --- a/src/Module/Api/Friendica/Events/Create.php +++ b/src/Module/Api/Friendica/Events/Create.php @@ -53,9 +53,9 @@ class Create extends BaseApi 'place' => '', //location of the event 'publish' => 0, //publish message 'allow_cid' => '', //array of allowed person, if access restricted - 'allow_gid' => '', //array of allowed groups, if access restricted + 'allow_gid' => '', //array of allowed circles, if access restricted 'deny_cid' => '', //array of denied person, if access restricted - 'deny_gid' => '', //array of denied groups, if access restricted + 'deny_gid' => '', //array of denied circles, if access restricted ], $request); // error if no name specified diff --git a/src/Module/Api/Friendica/Photo/Create.php b/src/Module/Api/Friendica/Photo/Create.php index 6cb9241c9..4190145aa 100644 --- a/src/Module/Api/Friendica/Photo/Create.php +++ b/src/Module/Api/Friendica/Photo/Create.php @@ -78,8 +78,8 @@ class Create extends BaseApi $acl_input_error = false; $acl_input_error |= !ACL::isValidContact($allow_cid, $uid); $acl_input_error |= !ACL::isValidContact($deny_cid, $uid); - $acl_input_error |= !ACL::isValidGroup($allow_gid, $uid); - $acl_input_error |= !ACL::isValidGroup($deny_gid, $uid); + $acl_input_error |= !ACL::isValidCircle($allow_gid, $uid); + $acl_input_error |= !ACL::isValidCircle($deny_gid, $uid); if ($acl_input_error) { throw new HTTPException\BadRequestException('acl data invalid'); } diff --git a/src/Module/Api/Friendica/Photo/Update.php b/src/Module/Api/Friendica/Photo/Update.php index 0eec5a344..d9ff769aa 100644 --- a/src/Module/Api/Friendica/Photo/Update.php +++ b/src/Module/Api/Friendica/Photo/Update.php @@ -79,8 +79,8 @@ class Update extends BaseApi $acl_input_error = false; $acl_input_error |= !ACL::isValidContact($allow_cid, $uid); $acl_input_error |= !ACL::isValidContact($deny_cid, $uid); - $acl_input_error |= !ACL::isValidGroup($allow_gid, $uid); - $acl_input_error |= !ACL::isValidGroup($deny_gid, $uid); + $acl_input_error |= !ACL::isValidCircle($allow_gid, $uid); + $acl_input_error |= !ACL::isValidCircle($deny_gid, $uid); if ($acl_input_error) { throw new HTTPException\BadRequestException('acl data invalid'); } diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php index 2d254a296..e34dd4137 100644 --- a/src/Module/Api/Mastodon/Accounts/Lists.php +++ b/src/Module/Api/Mastodon/Accounts/Lists.php @@ -53,11 +53,11 @@ class Lists extends BaseApi $cdata = Contact::getPublicAndUserContactID($id, $uid); if (!empty($cdata['user'])) { - $groups = DBA::select('group_member', ['gid'], ['contact-id' => $cdata['user']]); - while ($group = DBA::fetch($groups)) { - $lists[] = DI::mstdnList()->createFromGroupId($group['gid']); + $circles = DBA::select('group_member', ['gid'], ['contact-id' => $cdata['user']]); + while ($circle = DBA::fetch($circles)) { + $lists[] = DI::mstdnList()->createFromCircleId($circle['gid']); } - DBA::close($groups); + DBA::close($circles); } System::jsonExit($lists); diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php index 3e5a47198..a007c80d3 100644 --- a/src/Module/Api/Mastodon/Lists.php +++ b/src/Module/Api/Mastodon/Lists.php @@ -24,7 +24,7 @@ namespace Friendica\Module\Api\Mastodon; use Friendica\Core\System; use Friendica\DI; use Friendica\Module\BaseApi; -use Friendica\Model\Group; +use Friendica\Model\Circle; /** * @see https://docs.joinmastodon.org/methods/timelines/lists/ @@ -40,11 +40,11 @@ class Lists extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - if (!Group::exists($this->parameters['id'], $uid)) { + if (!Circle::exists($this->parameters['id'], $uid)) { DI::mstdnError()->RecordNotFound(); } - if (!Group::remove($this->parameters['id'])) { + if (!Circle::remove($this->parameters['id'])) { DI::mstdnError()->InternalError(); } @@ -64,14 +64,14 @@ class Lists extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - Group::create($uid, $request['title']); + Circle::create($uid, $request['title']); - $id = Group::getIdByName($uid, $request['title']); + $id = Circle::getIdByName($uid, $request['title']); if (!$id) { DI::mstdnError()->InternalError(); } - System::jsonExit(DI::mstdnList()->createFromGroupId($id)); + System::jsonExit(DI::mstdnList()->createFromCircleId($id)); } public function put(array $request = []) @@ -85,7 +85,7 @@ class Lists extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - Group::update($this->parameters['id'], $request['title']); + Circle::update($this->parameters['id'], $request['title']); } /** @@ -99,18 +99,16 @@ class Lists extends BaseApi if (empty($this->parameters['id'])) { $lists = []; - $groups = Group::getByUserId($uid); - - foreach ($groups as $group) { - $lists[] = DI::mstdnList()->createFromGroupId($group['id']); + foreach (Circle::getByUserId($uid) as $circle) { + $lists[] = DI::mstdnList()->createFromCircleId($circle['id']); } } else { $id = $this->parameters['id']; - if (!Group::exists($id, $uid)) { + if (!Circle::exists($id, $uid)) { DI::mstdnError()->RecordNotFound(); } - $lists = DI::mstdnList()->createFromGroupId($id); + $lists = DI::mstdnList()->createFromCircleId($id); } System::jsonExit($lists); diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php index e19dfb031..465f22a26 100644 --- a/src/Module/Api/Mastodon/Lists/Accounts.php +++ b/src/Module/Api/Mastodon/Lists/Accounts.php @@ -24,7 +24,7 @@ namespace Friendica\Module\Api\Mastodon\Lists; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module\BaseApi; /** @@ -46,7 +46,7 @@ class Accounts extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - return Group::removeMembers($this->parameters['id'], $request['account_ids']); + return Circle::removeMembers($this->parameters['id'], $request['account_ids']); } protected function post(array $request = []) @@ -61,7 +61,7 @@ class Accounts extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - Group::addMembers($this->parameters['id'], $request['account_ids']); + Circle::addMembers($this->parameters['id'], $request['account_ids']); } /** diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php index 72641235d..dad0451fc 100644 --- a/src/Module/Api/Mastodon/Statuses.php +++ b/src/Module/Api/Mastodon/Statuses.php @@ -30,7 +30,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item; use Friendica\Model\Photo; use Friendica\Model\Post; @@ -230,7 +230,7 @@ class Statuses extends BaseApi $item['deny_gid'] = $owner['deny_gid']; } else { $item['allow_cid'] = ''; - $item['allow_gid'] = '<' . Group::FOLLOWERS . '>'; + $item['allow_gid'] = '<' . Circle::FOLLOWERS . '>'; $item['deny_cid'] = ''; $item['deny_gid'] = ''; } @@ -241,7 +241,7 @@ class Statuses extends BaseApi // The permissions are assigned in "expandTags" break; default: - if (is_numeric($request['visibility']) && Group::exists($request['visibility'], $uid)) { + if (is_numeric($request['visibility']) && Circle::exists($request['visibility'], $uid)) { $item['allow_cid'] = ''; $item['allow_gid'] = '<' . $request['visibility'] . '>'; $item['deny_cid'] = ''; diff --git a/src/Module/Api/Twitter/Lists/Create.php b/src/Module/Api/Twitter/Lists/Create.php index f7612d32f..1f2f63882 100644 --- a/src/Module/Api/Twitter/Lists/Create.php +++ b/src/Module/Api/Twitter/Lists/Create.php @@ -24,34 +24,34 @@ namespace Friendica\Module\Api\Twitter\Lists; use Friendica\App; use Friendica\Core\L10n; use Friendica\Database\Database; -use Friendica\Factory\Api\Friendica\Group as FriendicaGroup; +use Friendica\Factory\Api\Friendica\Circle as FriendicaCircle; use Friendica\Module\BaseApi; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module\Api\ApiResponse; use Friendica\Network\HTTPException; use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; /** - * Update information about a group. + * Update information about a circle. * * @see https://developer.twitter.com/en/docs/accounts-and-users/create-manage-lists/api-reference/post-lists-update */ class Create extends BaseApi { - /** @var friendicaGroup */ - private $friendicaGroup; + /** @var FriendicaCircle */ + private $friendicaCircle; /** @var Database */ private $dba; - public function __construct(Database $dba, FriendicaGroup $friendicaGroup, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) + public function __construct(Database $dba, FriendicaCircle $friendicaCircle, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) { parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->dba = $dba; - $this->friendicaGroup = $friendicaGroup; + $this->dba = $dba; + $this->friendicaCircle = $friendicaCircle; } protected function rawContent(array $request = []) @@ -63,22 +63,22 @@ class Create extends BaseApi $name = $this->getRequestValue($request, 'name', ''); if ($name == '') { - throw new HTTPException\BadRequestException('group name not specified'); + throw new HTTPException\BadRequestException('circle name not specified'); } - // error message if specified group name already exists + // error message if specified circle name already exists if ($this->dba->exists('group', ['uid' => $uid, 'name' => $name, 'deleted' => false])) { - throw new HTTPException\BadRequestException('group name already exists'); + throw new HTTPException\BadRequestException('circle name already exists'); } - $ret = Group::create($uid, $name); + $ret = Circle::create($uid, $name); if ($ret) { - $gid = Group::getIdByName($uid, $name); + $gid = Circle::getIdByName($uid, $name); } else { throw new HTTPException\BadRequestException('other API error'); } - $grp = $this->friendicaGroup->createFromId($gid); + $grp = $this->friendicaCircle->createFromId($gid); $this->response->exit('statuses', ['lists' => ['lists' => $grp]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } diff --git a/src/Module/Api/Twitter/Lists/Destroy.php b/src/Module/Api/Twitter/Lists/Destroy.php index 6a4e2eab8..0214e3ff6 100644 --- a/src/Module/Api/Twitter/Lists/Destroy.php +++ b/src/Module/Api/Twitter/Lists/Destroy.php @@ -24,34 +24,34 @@ namespace Friendica\Module\Api\Twitter\Lists; use Friendica\App; use Friendica\Core\L10n; use Friendica\Database\Database; -use Friendica\Factory\Api\Friendica\Group as FriendicaGroup; +use Friendica\Factory\Api\Friendica\Circle as FriendicaCirle; use Friendica\Module\BaseApi; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module\Api\ApiResponse; use Friendica\Network\HTTPException; use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; /** - * Delete a group. + * Delete a circle. * * @see https://developer.twitter.com/en/docs/accounts-and-users/create-manage-lists/api-reference/post-lists-destroy */ class Destroy extends BaseApi { - /** @var friendicaGroup */ - private $friendicaGroup; + /** @var FriendicaCirle */ + private $friendicaCircle; /** @var Database */ private $dba; - public function __construct(Database $dba, FriendicaGroup $friendicaGroup, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) + public function __construct(Database $dba, FriendicaCirle $friendicaCircle, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) { parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->dba = $dba; - $this->friendicaGroup = $friendicaGroup; + $this->dba = $dba; + $this->friendicaCircle = $friendicaCircle; } protected function rawContent(array $request = []) @@ -67,16 +67,16 @@ class Destroy extends BaseApi throw new HTTPException\BadRequestException('gid not specified'); } - // get data of the specified group id - $group = $this->dba->selectFirst('group', [], ['uid' => $uid, 'id' => $gid]); + // get data of the specified circle id + $circle = $this->dba->selectFirst('group', [], ['uid' => $uid, 'id' => $gid]); // error message if specified gid is not in database - if (!$group) { + if (!$circle) { throw new HTTPException\BadRequestException('gid not available'); } - $list = $this->friendicaGroup->createFromId($gid); + $list = $this->friendicaCircle->createFromId($gid); - if (Group::remove($gid)) { + if (Circle::remove($gid)) { $this->response->exit('statuses', ['lists' => ['lists' => $list]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } } diff --git a/src/Module/Api/Twitter/Lists/Ownership.php b/src/Module/Api/Twitter/Lists/Ownership.php index 6ecd58689..2a1ea5ac6 100644 --- a/src/Module/Api/Twitter/Lists/Ownership.php +++ b/src/Module/Api/Twitter/Lists/Ownership.php @@ -24,7 +24,7 @@ namespace Friendica\Module\Api\Twitter\Lists; use Friendica\App; use Friendica\Core\L10n; use Friendica\Database\Database; -use Friendica\Factory\Api\Friendica\Group as FriendicaGroup; +use Friendica\Factory\Api\Friendica\Circle as FriendicaCircle; use Friendica\Module\BaseApi; use Friendica\Model\Contact; use Friendica\Module\Api\ApiResponse; @@ -32,36 +32,36 @@ use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; /** - * Returns all groups the user owns. + * Returns all circles the user owns. * * @see https://developer.twitter.com/en/docs/accounts-and-users/create-manage-lists/api-reference/get-lists-ownerships */ class Ownership extends BaseApi { - /** @var friendicaGroup */ - private $friendicaGroup; + /** @var FriendicaCircle */ + private $friendicaCircle; /** @var Database */ private $dba; - public function __construct(Database $dba, FriendicaGroup $friendicaGroup, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) + public function __construct(Database $dba, FriendicaCircle $friendicaCircle, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) { parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->dba = $dba; - $this->friendicaGroup = $friendicaGroup; + $this->dba = $dba; + $this->friendicaCircle = $friendicaCircle; } protected function rawContent(array $request = []) { BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - $groups = $this->dba->select('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null]); + $circles = $this->dba->select('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null]); - // loop through all groups + // loop through all circles $lists = []; - foreach ($groups as $group) { - $lists[] = $this->friendicaGroup->createFromId($group['id']); + foreach ($circles as $circle) { + $lists[] = $this->friendicaCircle->createFromId($circle['id']); } $this->response->exit('statuses', ['lists' => ['lists' => $lists]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); diff --git a/src/Module/Api/Twitter/Lists/Statuses.php b/src/Module/Api/Twitter/Lists/Statuses.php index 4f64a54e8..7d159c498 100644 --- a/src/Module/Api/Twitter/Lists/Statuses.php +++ b/src/Module/Api/Twitter/Lists/Statuses.php @@ -36,7 +36,7 @@ use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; /** - * Returns recent statuses from users in the specified group. + * Returns recent statuses from users in the specified circle. * * @see https://developer.twitter.com/en/docs/accounts-and-users/create-manage-lists/api-reference/get-lists-ownerships */ @@ -76,9 +76,9 @@ class Statuses extends BaseApi $start = max(0, ($page - 1) * $count); - $groups = $this->dba->selectToArray('group_member', ['contact-id'], ['gid' => $request['list_id']]); - $gids = array_column($groups, 'contact-id'); - $condition = ['uid' => $uid, 'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'contact-id' => $gids]; + $members = $this->dba->selectToArray('group_member', ['contact-id'], ['gid' => $request['list_id']]); + $cids = array_column($members, 'contact-id'); + $condition = ['uid' => $uid, 'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'contact-id' => $cids]; $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $since_id]); if ($max_id > 0) { diff --git a/src/Module/Api/Twitter/Lists/Update.php b/src/Module/Api/Twitter/Lists/Update.php index d6748d72e..6a925eeda 100644 --- a/src/Module/Api/Twitter/Lists/Update.php +++ b/src/Module/Api/Twitter/Lists/Update.php @@ -24,34 +24,34 @@ namespace Friendica\Module\Api\Twitter\Lists; use Friendica\App; use Friendica\Core\L10n; use Friendica\Database\Database; -use Friendica\Factory\Api\Friendica\Group as FriendicaGroup; +use Friendica\Factory\Api\Friendica\Circle as FriendicaCircle; use Friendica\Module\BaseApi; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module\Api\ApiResponse; use Friendica\Network\HTTPException; use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; /** - * Update information about a group. + * Update information about a circle. * * @see https://developer.twitter.com/en/docs/accounts-and-users/create-manage-lists/api-reference/post-lists-update */ class Update extends BaseApi { - /** @var friendicaGroup */ - private $friendicaGroup; + /** @var FriendicaCircle */ + private $friendicaCircle; /** @var Database */ private $dba; - public function __construct(Database $dba, FriendicaGroup $friendicaGroup, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) + public function __construct(Database $dba, FriendicaCircle $friendicaCircle, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = []) { parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->dba = $dba; - $this->friendicaGroup = $friendicaGroup; + $this->dba = $dba; + $this->friendicaCircle = $friendicaCircle; } protected function rawContent(array $request = []) @@ -68,15 +68,15 @@ class Update extends BaseApi throw new HTTPException\BadRequestException('gid not specified'); } - // get data of the specified group id - $group = $this->dba->selectFirst('group', [], ['uid' => $uid, 'id' => $gid]); + // get data of the specified circle id + $circle = $this->dba->selectFirst('group', [], ['uid' => $uid, 'id' => $gid]); // error message if specified gid is not in database - if (!$group) { + if (!$circle) { throw new HTTPException\BadRequestException('gid not available'); } - if (Group::update($gid, $name)) { - $list = $this->friendicaGroup->createFromId($gid); + if (Circle::update($gid, $name)) { + $list = $this->friendicaCircle->createFromId($gid); $this->response->exit('statuses', ['lists' => ['lists' => $list]], $this->parameters['extension'] ?? null, Contact::getPublicIdByUserId($uid)); } diff --git a/src/Module/Api/Twitter/Statuses/Update.php b/src/Module/Api/Twitter/Statuses/Update.php index df51ff8a8..397e3bbd2 100644 --- a/src/Module/Api/Twitter/Statuses/Update.php +++ b/src/Module/Api/Twitter/Statuses/Update.php @@ -62,9 +62,9 @@ class Update extends BaseApi 'source' => '', 'include_entities' => false, 'contact_allow' => $owner['allow_cid'], - 'group_allow' => $owner['allow_gid'], + 'circle_allow' => $owner['allow_gid'], 'contact_deny' => $owner['deny_cid'], - 'group_deny' => $owner['deny_gid'], + 'circle_deny' => $owner['deny_gid'], ], $request); if (!empty($request['htmlstatus'])) { @@ -102,9 +102,9 @@ class Update extends BaseApi $aclFormatter = DI::aclFormatter(); $item['allow_cid'] = $aclFormatter->toString($request['contact_allow']); - $item['allow_gid'] = $aclFormatter->toString($request['group_allow']); + $item['allow_gid'] = $aclFormatter->toString($request['circle_allow']); $item['deny_cid'] = $aclFormatter->toString($request['contact_deny']); - $item['deny_gid'] = $aclFormatter->toString($request['group_deny']); + $item['deny_gid'] = $aclFormatter->toString($request['circle_deny']); if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) { $item['private'] = Item::PRIVATE; diff --git a/src/Module/Calendar/Event/API.php b/src/Module/Calendar/Event/API.php index acb2dd4ea..e8fce8ed7 100644 --- a/src/Module/Calendar/Event/API.php +++ b/src/Module/Calendar/Event/API.php @@ -212,14 +212,14 @@ class API extends BaseModule } $strAclContactAllow = isset($request['contact_allow']) ? $aclFormatter->toString($request['contact_allow']) : $user['allow_cid'] ?? ''; - $strAclGroupAllow = isset($request['group_allow']) ? $aclFormatter->toString($request['group_allow']) : $user['allow_gid'] ?? ''; - $strContactDeny = isset($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : $user['deny_cid'] ?? ''; - $strGroupDeny = isset($request['group_deny']) ? $aclFormatter->toString($request['group_deny']) : $user['deny_gid'] ?? ''; + $strAclCircleAllow = isset($request['circle_allow']) ? $aclFormatter->toString($request['circle_allow']) : $user['allow_gid'] ?? ''; + $strContactDeny = isset($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : $user['deny_cid'] ?? ''; + $strCircleDeny = isset($request['circle_deny']) ? $aclFormatter->toString($request['circle_deny']) : $user['deny_gid'] ?? ''; $visibility = $request['visibility'] ?? ''; if ($visibility === 'public') { // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected - $strAclContactAllow = $strAclGroupAllow = $strContactDeny = $strGroupDeny = ''; + $strAclContactAllow = $strAclCircleAllow = $strContactDeny = $strCircleDeny = ''; } elseif ($visibility === 'custom') { // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL // case that would make it public. So we always append the author's contact id to the allowed contacts. @@ -228,9 +228,9 @@ class API extends BaseModule } } else { $strAclContactAllow = $aclFormatter->toString($self); - $strAclGroupAllow = ''; + $strAclCircleAllow = ''; $strContactDeny = ''; - $strGroupDeny = ''; + $strCircleDeny = ''; } $datarray = [ @@ -244,9 +244,9 @@ class API extends BaseModule 'uid' => $uid, 'cid' => $cid, 'allow_cid' => $strAclContactAllow, - 'allow_gid' => $strAclGroupAllow, + 'allow_gid' => $strAclCircleAllow, 'deny_cid' => $strContactDeny, - 'deny_gid' => $strGroupDeny, + 'deny_gid' => $strCircleDeny, 'id' => $eventId, ]; diff --git a/src/Module/Group.php b/src/Module/Circle.php similarity index 60% rename from src/Module/Group.php rename to src/Module/Circle.php index 78b49d993..74d52ee62 100644 --- a/src/Module/Group.php +++ b/src/Module/Circle.php @@ -28,7 +28,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model; -class Group extends BaseModule +class Circle extends BaseModule { protected function post(array $request = []) { @@ -43,34 +43,34 @@ class Group extends BaseModule // @TODO: Replace with parameter from router if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'new')) { - BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit'); + BaseModule::checkFormSecurityTokenRedirectOnError('/circle/new', 'circle_edit'); - $name = trim($request['groupname']); - $r = Model\Group::create(DI::userSession()->getLocalUserId(), $name); + $name = trim($request['circle_name']); + $r = Model\Circle::create(DI::userSession()->getLocalUserId(), $name); if ($r) { - $r = Model\Group::getIdByName(DI::userSession()->getLocalUserId(), $name); + $r = Model\Circle::getIdByName(DI::userSession()->getLocalUserId(), $name); if ($r) { - DI::baseUrl()->redirect('group/' . $r); + DI::baseUrl()->redirect('circle/' . $r); } } else { - DI::sysmsg()->addNotice(DI::l10n()->t('Could not create group.')); + DI::sysmsg()->addNotice(DI::l10n()->t('Could not create circle.')); } - DI::baseUrl()->redirect('group'); + DI::baseUrl()->redirect('circle'); } // @TODO: Replace with parameter from router if ((DI::args()->getArgc() == 2) && intval(DI::args()->getArgv()[1])) { - BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_edit'); + BaseModule::checkFormSecurityTokenRedirectOnError('/circle', 'circle_edit'); - $group = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => DI::userSession()->getLocalUserId()]); - if (!DBA::isResult($group)) { - DI::sysmsg()->addNotice(DI::l10n()->t('Group not found.')); + $circle = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => DI::userSession()->getLocalUserId()]); + if (!DBA::isResult($circle)) { + DI::sysmsg()->addNotice(DI::l10n()->t('Circle not found.')); DI::baseUrl()->redirect('contact'); } - $groupname = trim($_POST['groupname']); - if (strlen($groupname) && ($groupname != $group['name'])) { - if (!Model\Group::update($group['id'], $groupname)) { - DI::sysmsg()->addNotice(DI::l10n()->t('Group name was not changed.')); + $circlename = trim($_POST['circle_name']); + if (strlen($circlename) && ($circlename != $circle['name'])) { + if (!Model\Circle::update($circle['id'], $circlename)) { + DI::sysmsg()->addNotice(DI::l10n()->t('Circle name was not changed.')); } } } @@ -84,11 +84,11 @@ class Group extends BaseModule } if (isset($this->parameters['command'])) { - $group_id = $this->parameters['group']; + $circle_id = $this->parameters['circle']; $contact_id = $this->parameters['contact']; - if (!Model\Group::exists($group_id, DI::userSession()->getLocalUserId())) { - throw new \Exception(DI::l10n()->t('Unknown group.'), 404); + if (!Model\Circle::exists($circle_id, DI::userSession()->getLocalUserId())) { + throw new \Exception(DI::l10n()->t('Unknown circle.'), 404); } // @TODO Backward compatibility with user contacts, remove by version 2022.03 @@ -112,18 +112,18 @@ class Group extends BaseModule switch($this->parameters['command']) { case 'add': - if (!Model\Group::addMember($group_id, $cdata['user'])) { - throw new \Exception(DI::l10n()->t('Unable to add the contact to the group.'), 500); + if (!Model\Circle::addMember($circle_id, $cdata['user'])) { + throw new \Exception(DI::l10n()->t('Unable to add the contact to the circle.'), 500); } - $message = DI::l10n()->t('Contact successfully added to group.'); + $message = DI::l10n()->t('Contact successfully added to circle.'); break; case 'remove': - if (!Model\Group::removeMember($group_id, $cdata['user'])) { - throw new \Exception(DI::l10n()->t('Unable to remove the contact from the group.'), 500); + if (!Model\Circle::removeMember($circle_id, $cdata['user'])) { + throw new \Exception(DI::l10n()->t('Unable to remove the contact from the circle.'), 500); } - $message = DI::l10n()->t('Contact successfully removed from group.'); + $message = DI::l10n()->t('Contact successfully removed from circle.'); break; } } else { @@ -148,56 +148,58 @@ class Group extends BaseModule $a = DI::app(); - DI::page()['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : 'everyone')); + DI::page()['aside'] = Model\Circle::sidebarWidget('contact', 'circle', 'extended', ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : 'everyone')); - // With no group number provided we jump to the unassigned contacts as a starting point + // With no circle number provided we jump to the unassigned contacts as a starting point // @TODO: Replace with parameter from router if (DI::args()->getArgc() == 1) { - DI::baseUrl()->redirect('group/none'); + DI::baseUrl()->redirect('circle/none'); } - // Switch to text mode interface if we have more than 'n' contacts or group members - $switchtotext = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'groupedit_image_limit'); + // Switch to text mode interface if we have more than 'n' contacts or circle members + $switchtotext = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'circle_edit_image_limit') ?? + DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'groupedit_image_limit'); if (is_null($switchtotext)) { - $switchtotext = DI::config()->get('system', 'groupedit_image_limit', 200); + $switchtotext = DI::config()->get('system', 'groupedit_image_limit') ?? + DI::config()->get('system', 'circle_edit_image_limit'); } - $tpl = Renderer::getMarkupTemplate('group_edit.tpl'); + $tpl = Renderer::getMarkupTemplate('circle_edit.tpl'); $context = [ - '$submit' => DI::l10n()->t('Save Group'), + '$submit' => DI::l10n()->t('Save Circle'), '$submit_filter' => DI::l10n()->t('Filter'), ]; // @TODO: Replace with parameter from router if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'new')) { return Renderer::replaceMacros($tpl, $context + [ - '$title' => DI::l10n()->t('Create a group of contacts/friends.'), - '$gname' => ['groupname', DI::l10n()->t('Group Name: '), '', ''], + '$title' => DI::l10n()->t('Create a circle of contacts/friends.'), + '$gname' => ['circle_name', DI::l10n()->t('Circle Name: '), '', ''], '$gid' => 'new', - '$form_security_token' => BaseModule::getFormSecurityToken("group_edit"), + '$form_security_token' => BaseModule::getFormSecurityToken('circle_edit'), ]); } - $nogroup = false; + $nocircle = false; // @TODO: Replace with parameter from router if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'none') || - (DI::args()->getArgc() == 1) && (DI::args()->getArgv()[0] === 'nogroup')) { + (DI::args()->getArgc() == 1) && (DI::args()->getArgv()[0] === 'nocircle')) { $id = -1; - $nogroup = true; - $group = [ + $nocircle = true; + $circle = [ 'id' => $id, - 'name' => DI::l10n()->t('Contacts not in any group'), + 'name' => DI::l10n()->t('Contacts not in any circle'), ]; $members = []; $preselected = []; $context = $context + [ - '$title' => $group['name'], - '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''], + '$title' => $circle['name'], + '$gname' => ['circle_name', DI::l10n()->t('Circle Name: '), $circle['name'], ''], '$gid' => $id, '$editable' => 0, ]; @@ -205,25 +207,25 @@ class Group extends BaseModule // @TODO: Replace with parameter from router if ((DI::args()->getArgc() == 3) && (DI::args()->getArgv()[1] === 'drop')) { - BaseModule::checkFormSecurityTokenRedirectOnError('/group', 'group_drop', 't'); + BaseModule::checkFormSecurityTokenRedirectOnError('/circle', 'circle_drop', 't'); // @TODO: Replace with parameter from router if (intval(DI::args()->getArgv()[2])) { - if (!Model\Group::exists(DI::args()->getArgv()[2], DI::userSession()->getLocalUserId())) { - DI::sysmsg()->addNotice(DI::l10n()->t('Group not found.')); + if (!Model\Circle::exists(DI::args()->getArgv()[2], DI::userSession()->getLocalUserId())) { + DI::sysmsg()->addNotice(DI::l10n()->t('Circle not found.')); DI::baseUrl()->redirect('contact'); } - if (!Model\Group::remove(DI::args()->getArgv()[2])) { - DI::sysmsg()->addNotice(DI::l10n()->t('Unable to remove group.')); + if (!Model\Circle::remove(DI::args()->getArgv()[2])) { + DI::sysmsg()->addNotice(DI::l10n()->t('Unable to remove circle.')); } } - DI::baseUrl()->redirect('group'); + DI::baseUrl()->redirect('circle'); } // @TODO: Replace with parameter from router if ((DI::args()->getArgc() > 2) && intval(DI::args()->getArgv()[1]) && intval(DI::args()->getArgv()[2])) { - BaseModule::checkFormSecurityTokenForbiddenOnError('group_member_change', 't'); + BaseModule::checkFormSecurityTokenForbiddenOnError('circle_member_change', 't'); if (DBA::exists('contact', ['id' => DI::args()->getArgv()[2], 'uid' => DI::userSession()->getLocalUserId(), 'self' => false, 'pending' => false, 'blocked' => false])) { $change = intval(DI::args()->getArgv()[2]); @@ -232,13 +234,13 @@ class Group extends BaseModule // @TODO: Replace with parameter from router if ((DI::args()->getArgc() > 1) && intval(DI::args()->getArgv()[1])) { - $group = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => DI::userSession()->getLocalUserId(), 'deleted' => false]); - if (!DBA::isResult($group)) { - DI::sysmsg()->addNotice(DI::l10n()->t('Group not found.')); + $circle = DBA::selectFirst('group', ['id', 'name'], ['id' => DI::args()->getArgv()[1], 'uid' => DI::userSession()->getLocalUserId(), 'deleted' => false]); + if (!DBA::isResult($circle)) { + DI::sysmsg()->addNotice(DI::l10n()->t('Circle not found.')); DI::baseUrl()->redirect('contact'); } - $members = Model\Contact\Group::getById($group['id']); + $members = Model\Contact\Circle::getById($circle['id']); $preselected = []; if (count($members)) { @@ -249,12 +251,12 @@ class Group extends BaseModule if ($change) { if (in_array($change, $preselected)) { - Model\Group::removeMember($group['id'], $change); + Model\Circle::removeMember($circle['id'], $change); } else { - Model\Group::addMember($group['id'], $change); + Model\Circle::addMember($circle['id'], $change); } - $members = Model\Contact\Group::getById($group['id']); + $members = Model\Contact\Circle::getById($circle['id']); $preselected = []; if (count($members)) { foreach ($members as $member) { @@ -263,59 +265,59 @@ class Group extends BaseModule } } - $drop_tpl = Renderer::getMarkupTemplate('group_drop.tpl'); + $drop_tpl = Renderer::getMarkupTemplate('circle_drop.tpl'); $drop_txt = Renderer::replaceMacros($drop_tpl, [ - '$id' => $group['id'], - '$delete' => DI::l10n()->t('Delete Group'), - '$form_security_token' => BaseModule::getFormSecurityToken("group_drop"), + '$id' => $circle['id'], + '$delete' => DI::l10n()->t('Delete Circle'), + '$form_security_token' => BaseModule::getFormSecurityToken('circle_drop'), ]); $context = $context + [ - '$title' => $group['name'], - '$gname' => ['groupname', DI::l10n()->t('Group Name: '), $group['name'], ''], - '$gid' => $group['id'], + '$title' => $circle['name'], + '$gname' => ['circle_name', DI::l10n()->t('Circle Name: '), $circle['name'], ''], + '$gid' => $circle['id'], '$drop' => $drop_txt, - '$form_security_token' => BaseModule::getFormSecurityToken('group_edit'), - '$edit_name' => DI::l10n()->t('Edit Group Name'), + '$form_security_token' => BaseModule::getFormSecurityToken('circle_edit'), + '$edit_name' => DI::l10n()->t('Edit Circle Name'), '$editable' => 1, ]; } - if (!isset($group)) { + if (!isset($circle)) { throw new \Friendica\Network\HTTPException\BadRequestException(); } - $groupeditor = [ + $circle_editor = [ 'label_members' => DI::l10n()->t('Members'), 'members' => [], 'label_contacts' => DI::l10n()->t('All Contacts'), - 'group_is_empty' => DI::l10n()->t('Group is empty'), + 'circle_is_empty' => DI::l10n()->t('Circle is empty'), 'contacts' => [], ]; - $sec_token = addslashes(BaseModule::getFormSecurityToken('group_member_change')); + $sec_token = addslashes(BaseModule::getFormSecurityToken('circle_member_change')); - // Format the data of the group members + // Format the data of the circle members foreach ($members as $member) { if ($member['url']) { $entry = Contact::getContactTemplateVars($member); $entry['label'] = 'members'; $entry['photo_menu'] = ''; $entry['change_member'] = [ - 'title' => DI::l10n()->t("Remove contact from group"), - 'gid' => $group['id'], + 'title' => DI::l10n()->t('Remove contact from circle'), + 'gid' => $circle['id'], 'cid' => $member['id'], 'sec_token' => $sec_token ]; - $groupeditor['members'][] = $entry; + $circle_editor['members'][] = $entry; } else { - Model\Group::removeMember($group['id'], $member['id']); + Model\Circle::removeMember($circle['id'], $member['id']); } } - if ($nogroup) { - $contacts = Model\Contact\Group::listUngrouped(DI::userSession()->getLocalUserId()); + if ($nocircle) { + $contacts = Model\Contact\Circle::listUncircled(DI::userSession()->getLocalUserId()); } else { $contacts_stmt = DBA::select('contact', [], ['rel' => [Model\Contact::FOLLOWER, Model\Contact::FRIEND, Model\Contact::SHARING], @@ -327,40 +329,40 @@ class Group extends BaseModule } if (DBA::isResult($contacts)) { - // Format the data of the contacts who aren't in the contact group + // Format the data of the contacts who aren't in the contact circle foreach ($contacts as $member) { if (!in_array($member['id'], $preselected)) { $entry = Contact::getContactTemplateVars($member); $entry['label'] = 'contacts'; - if (!$nogroup) + if (!$nocircle) $entry['photo_menu'] = []; - if (!$nogroup) { + if (!$nocircle) { $entry['change_member'] = [ - 'title' => DI::l10n()->t("Add contact to group"), - 'gid' => $group['id'], + 'title' => DI::l10n()->t('Add contact to circle'), + 'gid' => $circle['id'], 'cid' => $member['id'], 'sec_token' => $sec_token ]; } - $groupeditor['contacts'][] = $entry; + $circle_editor['contacts'][] = $entry; } } } - $context['$groupeditor'] = $groupeditor; + $context['$circle_editor'] = $circle_editor; // If there are to many contacts we could provide an alternative view mode - $total = count($groupeditor['members']) + count($groupeditor['contacts']); + $total = count($circle_editor['members']) + count($circle_editor['contacts']); $context['$shortmode'] = (($switchtotext && ($total > $switchtotext)) ? true : false); if ($change) { - $tpl = Renderer::getMarkupTemplate('groupeditor.tpl'); + $tpl = Renderer::getMarkupTemplate('circle_editor.tpl'); echo Renderer::replaceMacros($tpl, $context); System::exit(); } return Renderer::replaceMacros($tpl, $context); } -} \ No newline at end of file +} diff --git a/src/Module/Contact.php b/src/Module/Contact.php index a70db0234..d3db92133 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -191,7 +191,7 @@ class Contact extends BaseModule $search = trim($_GET['search'] ?? ''); $nets = trim($_GET['nets'] ?? ''); $rel = trim($_GET['rel'] ?? ''); - $group = trim($_GET['group'] ?? ''); + $circle = trim($_GET['circle'] ?? ''); $accounttype = $_GET['accounttype'] ?? ''; $accounttypeid = User::getAccountTypeByString($accounttype); @@ -211,12 +211,12 @@ class Contact extends BaseModule $follow_widget = Widget::follow(); } - $account_widget = Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype); + $account_widget = Widget::accountTypes($_SERVER['REQUEST_URI'], $accounttype); $networks_widget = Widget::networks($_SERVER['REQUEST_URI'], $nets); - $rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel); - $groups_widget = Widget::groups($_SERVER['REQUEST_URI'], $group); + $rel_widget = Widget::contactRels($_SERVER['REQUEST_URI'], $rel); + $circles_widget = Widget::circles($_SERVER['REQUEST_URI'], $circle); - DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $rel_widget . $groups_widget . $networks_widget . $account_widget; + DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $rel_widget . $circles_widget . $networks_widget . $account_widget; $tpl = Renderer::getMarkupTemplate('contacts-head.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ @@ -306,9 +306,9 @@ class Contact extends BaseModule break; } - if ($group) { + if ($circle) { $sql_extra .= " AND `id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)"; - $sql_values[] = $group; + $sql_values[] = $circle; } $networks = Widget::unavailableNetworks(); @@ -391,11 +391,11 @@ class Contact extends BaseModule 'accesskey' => 'h', ], [ - 'label' => DI::l10n()->t('Groups'), - 'url' => 'group', + 'label' => DI::l10n()->t('Circles'), + 'url' => 'circle', 'sel' => '', - 'title' => DI::l10n()->t('Organize your contact groups'), - 'id' => 'contactgroups-tab', + 'title' => DI::l10n()->t('Organize your contact circles'), + 'id' => 'contactcircles-tab', 'accesskey' => 'e', ], ]; diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php index d80405e23..d38563fbf 100644 --- a/src/Module/Contact/Profile.php +++ b/src/Module/Contact/Profile.php @@ -37,7 +37,7 @@ use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Module; use Friendica\Module\Response; use Friendica\Network\HTTPException; @@ -222,13 +222,13 @@ class Profile extends BaseModule } $vcard_widget = Widget\VCard::getHTML($contact); - $groups_widget = ''; + $circles_widget = ''; if (!in_array($localRelationship->rel, [Contact::NOTHING, Contact::SELF])) { - $groups_widget = Group::sidebarWidget('contact', 'group', 'full', 'everyone', $data['user']); + $circles_widget = Circle::sidebarWidget('contact', 'circle', 'full', 'everyone', $data['user']); } - $this->page['aside'] .= $vcard_widget . $groups_widget; + $this->page['aside'] .= $vcard_widget . $circles_widget; $o = ''; Nav::setSelected('contact'); diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 5653b128a..72e541be4 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -36,7 +36,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Model\Profile; @@ -50,7 +50,7 @@ use Friendica\Util\DateTimeFormat; class Network extends BaseModule { /** @var int */ - private static $groupId; + private static $circleId; /** @var int */ private static $forumContactId; /** @var string */ @@ -89,7 +89,7 @@ class Network extends BaseModule $module = 'network'; DI::page()['aside'] .= Widget::accountTypes($module, self::$accountTypeString); - DI::page()['aside'] .= Group::sidebarWidget($module, $module . '/group', 'standard', self::$groupId); + DI::page()['aside'] .= Circle::sidebarWidget($module, $module . '/circle', 'standard', self::$circleId); DI::page()['aside'] .= ForumManager::widget($module . '/forum', DI::userSession()->getLocalUserId(), self::$forumContactId); DI::page()['aside'] .= Widget::postedByYear($module . '/archive', DI::userSession()->getLocalUserId(), false); DI::page()['aside'] .= Widget::networks($module, !self::$forumContactId ? self::$network : ''); @@ -131,8 +131,8 @@ class Network extends BaseModule $a = DI::app(); $default_permissions = []; - if (self::$groupId) { - $default_permissions['allow_gid'] = [self::$groupId]; + if (self::$circleId) { + $default_permissions['allow_gid'] = [self::$circleId]; } $allowedCids = []; @@ -160,23 +160,23 @@ class Network extends BaseModule } $x = [ - 'lockstate' => self::$groupId || self::$forumContactId || self::$network || ACL::getLockstateForUserId($a->getLoggedInUserId()) ? 'lock' : 'unlock', + 'lockstate' => self::$circleId || self::$forumContactId || self::$network || ACL::getLockstateForUserId($a->getLoggedInUserId()) ? 'lock' : 'unlock', 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), true, $default_permissions), - 'bang' => ((self::$groupId || self::$forumContactId || self::$network) ? '!' : ''), + 'bang' => ((self::$circleId || self::$forumContactId || self::$network) ? '!' : ''), 'content' => $content, ]; $o .= DI::conversation()->statusEditor($x); } - if (self::$groupId) { - $group = DBA::selectFirst('group', ['name'], ['id' => self::$groupId, 'uid' => DI::userSession()->getLocalUserId()]); - if (!DBA::isResult($group)) { - DI::sysmsg()->addNotice(DI::l10n()->t('No such group')); + if (self::$circleId) { + $circle = DBA::selectFirst('group', ['name'], ['id' => self::$circleId, 'uid' => DI::userSession()->getLocalUserId()]); + if (!DBA::isResult($circle)) { + DI::sysmsg()->addNotice(DI::l10n()->t('No such circle')); } $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [ - '$title' => DI::l10n()->t('Group: %s', $group['name']) + '$title' => DI::l10n()->t('Circle: %s', $circle['name']) ]) . $o; } elseif (self::$forumContactId) { $contact = Contact::getById(self::$forumContactId); @@ -305,7 +305,7 @@ class Network extends BaseModule protected function parseRequest(array $get) { - self::$groupId = $this->parameters['group_id'] ?? 0; + self::$circleId = $this->parameters['circle_id'] ?? 0; self::$forumContactId = $this->parameters['contact_id'] ?? 0; @@ -411,8 +411,8 @@ class Network extends BaseModule $conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` >= ? ", DateTimeFormat::convert(self::$dateTo, 'UTC', DI::app()->getTimeZone())]); } - if (self::$groupId) { - $conditionStrings = DBA::mergeConditions($conditionStrings, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", self::$groupId]); + if (self::$circleId) { + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", self::$circleId]); } elseif (self::$forumContactId) { $conditionStrings = DBA::mergeConditions($conditionStrings, ["((`contact-id` = ?) OR `uri-id` IN (SELECT `parent-uri-id` FROM `post-user-view` WHERE (`contact-id` = ? AND `gravity` = ? AND `vid` = ? AND `uid` = ?)))", @@ -476,10 +476,10 @@ class Network extends BaseModule $parents = []; } - // We aren't going to try and figure out at the item, group, and page + // We aren't going to try and figure out at the item, circle, and page // level which items you've seen and which you haven't. If you're looking // at the top level network page just mark everything seen. - if (!self::$groupId && !self::$forumContactId && !self::$star && !self::$mention) { + if (!self::$circleId && !self::$forumContactId && !self::$star && !self::$mention) { $condition = ['unseen' => true, 'uid' => DI::userSession()->getLocalUserId()]; self::setItemsSeenByCondition($condition); } elseif (!empty($parents)) { diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index 8201a61a6..6766cb5e5 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -113,9 +113,9 @@ class Compose extends BaseModule $user = User::getById(DI::userSession()->getLocalUserId(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'default-location']); $contact_allow_list = $this->ACLFormatter->expand($user['allow_cid']); - $group_allow_list = $this->ACLFormatter->expand($user['allow_gid']); + $circle_allow_list = $this->ACLFormatter->expand($user['allow_gid']); $contact_deny_list = $this->ACLFormatter->expand($user['deny_cid']); - $group_deny_list = $this->ACLFormatter->expand($user['deny_gid']); + $circle_deny_list = $this->ACLFormatter->expand($user['deny_gid']); switch ($posttype) { case Item::PT_PERSONAL_NOTE: @@ -123,9 +123,9 @@ class Compose extends BaseModule $type = 'note'; $doesFederate = false; $contact_allow_list = [$a->getContactId()]; - $group_allow_list = []; + $circle_allow_list = []; $contact_deny_list = []; - $group_deny_list = []; + $circle_deny_list = []; break; default: $compose_title = $this->l10n->t('Compose new post'); @@ -133,19 +133,19 @@ class Compose extends BaseModule $doesFederate = true; $contact_allow = $_REQUEST['contact_allow'] ?? ''; - $group_allow = $_REQUEST['group_allow'] ?? ''; + $circle_allow = $_REQUEST['circle_allow'] ?? ''; $contact_deny = $_REQUEST['contact_deny'] ?? ''; - $group_deny = $_REQUEST['group_deny'] ?? ''; + $circle_deny = $_REQUEST['circle_deny'] ?? ''; if ($contact_allow - . $group_allow + . $circle_allow . $contact_deny - . $group_deny) + . $circle_deny) { $contact_allow_list = $contact_allow ? explode(',', $contact_allow) : []; - $group_allow_list = $group_allow ? explode(',', $group_allow) : []; + $circle_allow_list = $circle_allow ? explode(',', $circle_allow) : []; $contact_deny_list = $contact_deny ? explode(',', $contact_deny) : []; - $group_deny_list = $group_deny ? explode(',', $group_deny) : []; + $circle_deny_list = $circle_deny ? explode(',', $circle_deny) : []; } break; @@ -229,18 +229,18 @@ class Compose extends BaseModule '$body' => $body, '$location' => $location, - '$contact_allow'=> implode(',', $contact_allow_list), - '$group_allow' => implode(',', $group_allow_list), - '$contact_deny' => implode(',', $contact_deny_list), - '$group_deny' => implode(',', $group_deny_list), + '$contact_allow' => implode(',', $contact_allow_list), + '$circle_allow' => implode(',', $circle_allow_list), + '$contact_deny' => implode(',', $contact_deny_list), + '$circle_deny' => implode(',', $circle_deny_list), '$jotplugins' => $jotplugins, '$rand_num' => Crypto::randomDigits(12), '$acl_selector' => ACL::getFullSelectorHTML($this->page, $a->getLoggedInUserId(), $doesFederate, [ 'allow_cid' => $contact_allow_list, - 'allow_gid' => $group_allow_list, + 'allow_gid' => $circle_allow_list, 'deny_cid' => $contact_deny_list, - 'deny_gid' => $group_deny_list, + 'deny_gid' => $circle_deny_list, ]), ]); } diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php index 3cd4d7020..dd9e8cccd 100644 --- a/src/Module/Notifications/Ping.php +++ b/src/Module/Notifications/Ping.php @@ -35,7 +35,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\System; use Friendica\Database\Database; use Friendica\Database\DBA; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Post; use Friendica\Model\User; use Friendica\Model\Verb; @@ -108,7 +108,7 @@ class Ping extends BaseModule $network_count = 0; $register_count = 0; $sysnotify_count = 0; - $groups_unseen = []; + $circles_unseen = []; $forums_unseen = []; $event_count = 0; @@ -151,12 +151,12 @@ class Ping extends BaseModule } } - $compute_group_counts = $this->config->get('system','compute_group_counts'); - if ($network_count && $compute_group_counts) { - // Find out how unseen network posts are spread across groups - foreach (Group::countUnseen() as $group_count) { - if ($group_count['count'] > 0) { - $groups_unseen[] = $group_count; + $compute_circle_counts = $this->config->get('system','compute_group_counts') ?? $this->config->get('system','compute_circle_counts'); + if ($network_count && $compute_circle_counts) { + // Find out how unseen network posts are spread across circles + foreach (Circle::countUnseen() as $circle_count) { + if ($circle_count['count'] > 0) { + $circles_unseen[] = $circle_count; } } @@ -289,7 +289,7 @@ class Ping extends BaseModule $data['events-today'] = $today_event_count; $data['birthdays'] = $birthday_count; $data['birthdays-today'] = $today_birthday_count; - $data['groups'] = $groups_unseen; + $data['circles'] = $circles_unseen; $data['forums'] = $forums_unseen; $data['notification'] = ($notification_count < 50) ? $notification_count : '49+'; diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php index dbfdd5ef2..4e5191e5a 100644 --- a/src/Module/PermissionTooltip.php +++ b/src/Module/PermissionTooltip.php @@ -27,7 +27,7 @@ use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\APContact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Model\Tag; @@ -113,29 +113,29 @@ class PermissionTooltip extends \Friendica\BaseModule exit; } - $allowed_users = $model['allow_cid']; - $allowed_groups = $model['allow_gid']; - $deny_users = $model['deny_cid']; - $deny_groups = $model['deny_gid']; + $allowed_users = $model['allow_cid']; + $allowed_circles = $model['allow_gid']; + $deny_users = $model['deny_cid']; + $deny_circles = $model['deny_gid']; $o = DI::l10n()->t('Visible to:') . '
'; $l = []; - if (count($allowed_groups)) { - $key = array_search(Group::FOLLOWERS, $allowed_groups); + if (count($allowed_circles)) { + $key = array_search(Circle::FOLLOWERS, $allowed_circles); if ($key !== false) { $l[] = '' . DI::l10n()->t('Followers') . ''; - unset($allowed_groups[$key]); + unset($allowed_circles[$key]); } - $key = array_search(Group::MUTUALS, $allowed_groups); + $key = array_search(Circle::MUTUALS, $allowed_circles); if ($key !== false) { $l[] = '' . DI::l10n()->t('Mutuals') . ''; - unset($allowed_groups[$key]); + unset($allowed_circles[$key]); } - foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_groups]) as $group) { - $l[] = '' . $group['name'] . ''; + foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_circles]) as $circle) { + $l[] = '' . $circle['name'] . ''; } } @@ -143,21 +143,21 @@ class PermissionTooltip extends \Friendica\BaseModule $l[] = $contact['name']; } - if (count($deny_groups)) { - $key = array_search(Group::FOLLOWERS, $deny_groups); + if (count($deny_circles)) { + $key = array_search(Circle::FOLLOWERS, $deny_circles); if ($key !== false) { $l[] = '' . DI::l10n()->t('Followers') . ''; - unset($deny_groups[$key]); + unset($deny_circles[$key]); } - $key = array_search(Group::MUTUALS, $deny_groups); + $key = array_search(Circle::MUTUALS, $deny_circles); if ($key !== false) { $l[] = '' . DI::l10n()->t('Mutuals') . ''; - unset($deny_groups[$key]); + unset($deny_circles[$key]); } - foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_groups]) as $group) { - $l[] = '' . $group['name'] . ''; + foreach (DI::dba()->selectToArray('group', ['name'], ['id' => $allowed_circles]) as $circle) { + $l[] = '' . $circle['name'] . ''; } } diff --git a/src/Module/Profile/Conversations.php b/src/Module/Profile/Conversations.php index 715bf45d3..edd99e418 100644 --- a/src/Module/Profile/Conversations.php +++ b/src/Module/Profile/Conversations.php @@ -165,7 +165,7 @@ class Conversations extends BaseProfile $o .= $this->conversation->statusEditor($x); } - // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups + // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched their circles $condition = Item::getPermissionsConditionArrayByUserId($profile['uid']); $last_updated_array = $this->session->get('last_updated', []); diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php index 9d8b27592..fcd0b78b0 100644 --- a/src/Module/Profile/Photos.php +++ b/src/Module/Profile/Photos.php @@ -93,14 +93,14 @@ class Photos extends \Friendica\Module\BaseProfile } $str_contact_allow = isset($request['contact_allow']) ? $this->aclFormatter->toString($request['contact_allow']) : $this->owner['allow_cid'] ?? ''; - $str_group_allow = isset($request['group_allow']) ? $this->aclFormatter->toString($request['group_allow']) : $this->owner['allow_gid'] ?? ''; + $str_circle_allow = isset($request['circle_allow']) ? $this->aclFormatter->toString($request['circle_allow']) : $this->owner['allow_gid'] ?? ''; $str_contact_deny = isset($request['contact_deny']) ? $this->aclFormatter->toString($request['contact_deny']) : $this->owner['deny_cid'] ?? ''; - $str_group_deny = isset($request['group_deny']) ? $this->aclFormatter->toString($request['group_deny']) : $this->owner['deny_gid'] ?? ''; + $str_circle_deny = isset($request['circle_deny']) ? $this->aclFormatter->toString($request['circle_deny']) : $this->owner['deny_gid'] ?? ''; $visibility = $request['visibility'] ?? ''; if ($visibility === 'public') { // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected - $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = ''; + $str_contact_allow = $str_circle_allow = $str_contact_deny = $str_circle_deny = ''; } else if ($visibility === 'custom') { // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL // case that would make it public. So we always append the author's contact id to the allowed contacts. @@ -231,7 +231,7 @@ class Photos extends \Friendica\Module\BaseProfile $resource_id = Photo::newResource(); - $preview = Photo::storeWithPreview($image, $this->owner['uid'], $resource_id, $filename, $filesize, $album, '', $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); + $preview = Photo::storeWithPreview($image, $this->owner['uid'], $resource_id, $filename, $filesize, $album, '', $str_contact_allow, $str_circle_allow, $str_contact_deny, $str_circle_deny); if ($preview < 0) { $this->logger->warning('image store failed'); $this->systemMessages->addNotice($this->t('Image upload failed.')); @@ -267,9 +267,9 @@ class Photos extends \Friendica\Module\BaseProfile $arr['author-avatar'] = $this->owner['thumb']; $arr['title'] = ''; $arr['allow_cid'] = $str_contact_allow; - $arr['allow_gid'] = $str_group_allow; + $arr['allow_gid'] = $str_circle_allow; $arr['deny_cid'] = $str_contact_deny; - $arr['deny_gid'] = $str_group_deny; + $arr['deny_gid'] = $str_circle_deny; $arr['visible'] = $visible; $arr['origin'] = 1; diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php index 11c3eea79..4aa892215 100644 --- a/src/Module/Search/Acl.php +++ b/src/Module/Search/Acl.php @@ -46,13 +46,13 @@ use Psr\Log\LoggerInterface; */ class Acl extends BaseModule { - const TYPE_GLOBAL_CONTACT = 'x'; - const TYPE_MENTION_CONTACT = 'c'; - const TYPE_MENTION_GROUP = 'g'; - const TYPE_MENTION_CONTACT_GROUP = ''; - const TYPE_MENTION_FORUM = 'f'; - const TYPE_PRIVATE_MESSAGE = 'm'; - const TYPE_ANY_CONTACT = 'a'; + const TYPE_GLOBAL_CONTACT = 'x'; + const TYPE_MENTION_CONTACT = 'c'; + const TYPE_MENTION_CIRCLE = 'g'; + const TYPE_MENTION_CONTACT_CIRCLE = ''; + const TYPE_MENTION_FORUM = 'f'; + const TYPE_PRIVATE_MESSAGE = 'm'; + const TYPE_ANY_CONTACT = 'a'; /** @var IHandleUserSessions */ private $session; @@ -73,7 +73,7 @@ class Acl extends BaseModule throw new HTTPException\UnauthorizedException($this->t('You must be logged in to use this module.')); } - $type = $request['type'] ?? self::TYPE_MENTION_CONTACT_GROUP; + $type = $request['type'] ?? self::TYPE_MENTION_CONTACT_CIRCLE; if ($type === self::TYPE_GLOBAL_CONTACT) { $o = $this->globalContactSearch($request); } else { @@ -128,28 +128,28 @@ class Acl extends BaseModule $this->logger->info('ACL {action} - {subaction} - start', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]); - $sql_extra = ''; - $condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", $this->session->getLocalUserId()]; - $condition_group = ["`uid` = ? AND NOT `deleted`", $this->session->getLocalUserId()]; + $sql_extra = ''; + $condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", $this->session->getLocalUserId()]; + $condition_circle = ["`uid` = ? AND NOT `deleted`", $this->session->getLocalUserId()]; if ($search != '') { - $sql_extra = "AND `name` LIKE '%%" . $this->database->escape($search) . "%%'"; - $condition = DBA::mergeConditions($condition, ["(`attag` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", + $sql_extra = "AND `name` LIKE '%%" . $this->database->escape($search) . "%%'"; + $condition = DBA::mergeConditions($condition, ["(`attag` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", '%' . $search . '%', '%' . $search . '%', '%' . $search . '%']); - $condition_group = DBA::mergeConditions($condition_group, ["`name` LIKE ?", '%' . $search . '%']); + $condition_circle = DBA::mergeConditions($condition_circle, ["`name` LIKE ?", '%' . $search . '%']); } - // count groups and contacts - $group_count = 0; - if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) { - $group_count = $this->database->count('group', $condition_group); + // count circles and contacts + $circle_count = 0; + if ($type == self::TYPE_MENTION_CONTACT_CIRCLE || $type == self::TYPE_MENTION_CIRCLE) { + $circle_count = $this->database->count('group', $condition_circle); } $networks = Widget::unavailableNetworks(); $condition = DBA::mergeConditions($condition, array_merge(["NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")"], $networks)); switch ($type) { - case self::TYPE_MENTION_CONTACT_GROUP: + case self::TYPE_MENTION_CONTACT_CIRCLE: $condition = DBA::mergeConditions($condition, ["NOT `self` AND NOT `blocked` AND `notify` != ? AND `network` != ?", '', Protocol::OSTATUS ]); @@ -176,52 +176,52 @@ class Acl extends BaseModule $contact_count = $this->database->count('contact', $condition); - $resultTotal = $group_count + $contact_count; + $resultTotal = $circle_count + $contact_count; - $resultGroups = []; + $resultCircles = []; $resultContacts = []; - if ($type == self::TYPE_MENTION_CONTACT_GROUP || $type == self::TYPE_MENTION_GROUP) { + if ($type == self::TYPE_MENTION_CONTACT_CIRCLE || $type == self::TYPE_MENTION_CIRCLE) { /// @todo We should cache this query. // This can be done when we can delete cache entries via wildcard - $groups = $this->database->toArray($this->database->p("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids - FROM `group` - INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` - WHERE NOT `group`.`deleted` AND `group`.`uid` = ? + $circles = $this->database->toArray($this->database->p("SELECT `circle`.`id`, `circle`.`name`, GROUP_CONCAT(DISTINCT `circle_member`.`contact-id` SEPARATOR ',') AS uids + FROM `group` AS `circle` + INNER JOIN `group_member` AS `circle_member` ON `circle_member`.`gid` = `circle`.`id` + WHERE NOT `circle`.`deleted` AND `circle`.`uid` = ? $sql_extra - GROUP BY `group`.`name`, `group`.`id` - ORDER BY `group`.`name` + GROUP BY `circle`.`name`, `circle`.`id` + ORDER BY `circle`.`name` LIMIT ?, ?", $this->session->getLocalUserId(), $start, $count )); - foreach ($groups as $group) { - $resultGroups[] = [ - 'type' => 'g', + foreach ($circles as $circle) { + $resultCircles[] = [ + 'type' => self::TYPE_MENTION_CIRCLE, 'photo' => 'images/twopeople.png', - 'name' => htmlspecialchars($group['name']), - 'id' => intval($group['id']), - 'uids' => array_map('intval', explode(',', $group['uids'])), + 'name' => htmlspecialchars($circle['name']), + 'id' => intval($circle['id']), + 'uids' => array_map('intval', explode(',', $circle['uids'])), 'link' => '', 'forum' => '0' ]; } - if ((count($resultGroups) > 0) && ($search == '')) { - $resultGroups[] = ['separator' => true]; + if ((count($resultCircles) > 0) && ($search == '')) { + $resultCircles[] = ['separator' => true]; } } $contacts = []; - if ($type != self::TYPE_MENTION_GROUP) { + if ($type != self::TYPE_MENTION_CIRCLE) { $contacts = Contact::selectToArray([], $condition, ['order' => ['name']]); } $forums = []; foreach ($contacts as $contact) { $entry = [ - 'type' => 'c', + 'type' => self::TYPE_MENTION_CONTACT, 'photo' => Contact::getMicro($contact, true), 'name' => htmlspecialchars($contact['name']), 'id' => intval($contact['id']), @@ -246,7 +246,7 @@ class Acl extends BaseModule $resultContacts = array_merge($forums, $resultContacts); } - $resultItems = array_merge($resultGroups, $resultContacts); + $resultItems = array_merge($resultCircles, $resultContacts); if ($conv_id) { // In multithreaded posts the conv_id is not the parent of the whole thread @@ -277,7 +277,7 @@ class Acl extends BaseModule $contact = Contact::getByURL($author, false, ['micro', 'name', 'id', 'network', 'nick', 'addr', 'url', 'forum', 'avatar']); if ($contact) { $unknown_contacts[] = [ - 'type' => 'c', + 'type' => self::TYPE_MENTION_CONTACT, 'photo' => Contact::getMicro($contact, true), 'name' => htmlspecialchars($contact['name']), 'id' => intval($contact['id']), @@ -298,7 +298,7 @@ class Acl extends BaseModule 'tot' => $resultTotal, 'start' => $start, 'count' => $count, - 'groups' => $resultGroups, + 'circles' => $resultCircles, 'contacts' => $resultContacts, 'items' => $resultItems, 'type' => $type, diff --git a/src/Module/Settings/Account.php b/src/Module/Settings/Account.php index cba12cc39..c2b227c85 100644 --- a/src/Module/Settings/Account.php +++ b/src/Module/Settings/Account.php @@ -29,7 +29,7 @@ use Friendica\Core\Search; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Notification; use Friendica\Model\Post\UserNotification; use Friendica\Model\Profile; @@ -162,23 +162,23 @@ class Account extends BaseSettings $blocktags = empty($request['blocktags']); // this setting is inverted! $unkmail = !empty($request['unkmail']); $cntunkmail = intval($request['cntunkmail'] ?? 0); - $def_gid = intval($request['group-selection'] ?? 0); + $def_gid = intval($request['circle-selection'] ?? 0); $aclFormatter = DI::aclFormatter(); - $str_group_allow = !empty($request['group_allow']) ? $aclFormatter->toString($request['group_allow']) : ''; $str_contact_allow = !empty($request['contact_allow']) ? $aclFormatter->toString($request['contact_allow']) : ''; - $str_group_deny = !empty($request['group_deny']) ? $aclFormatter->toString($request['group_deny']) : ''; - $str_contact_deny = !empty($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : ''; + $str_circle_allow = !empty($request['circle_allow']) ? $aclFormatter->toString($request['circle_allow']) : ''; + $str_contact_deny = !empty($request['contact_deny']) ? $aclFormatter->toString($request['contact_deny']) : ''; + $str_circle_deny = !empty($request['circle_deny']) ? $aclFormatter->toString($request['circle_deny']) : ''; DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'unlisted', !empty($request['unlisted'])); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'accessible-photos', !empty($request['accessible-photos'])); $fields = [ 'allow_cid' => $str_contact_allow, - 'allow_gid' => $str_group_allow, + 'allow_gid' => $str_circle_allow, 'deny_cid' => $str_contact_deny, - 'deny_gid' => $str_group_deny, + 'deny_gid' => $str_circle_deny, 'maxreq' => $maxreq, 'def_gid' => $def_gid, 'blockwall' => $blockwall, @@ -329,7 +329,7 @@ class Account extends BaseSettings $fields = [ 'allow_cid' => '', 'allow_gid' => $page_flags == User::PAGE_FLAGS_PRVGROUP ? - '<' . Group::FOLLOWERS . '>' + '<' . Circle::FOLLOWERS . '>' : '', 'deny_cid' => '', 'deny_gid' => '', @@ -592,7 +592,7 @@ class Account extends BaseSettings '$blocktags' => ['blocktags', DI::l10n()->t('Allow friends to tag your posts?'), (intval($user['blocktags']) ? '0' : '1'), DI::l10n()->t('Your contacts can add additional tags to your posts.')], '$unkmail' => ['unkmail', DI::l10n()->t('Permit unknown people to send you private mail?'), $unkmail, DI::l10n()->t('Friendica network users may send you private messages even if they are not in your contact list.')], '$cntunkmail' => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail, DI::l10n()->t("(to prevent spam abuse)")], - '$group_select' => Group::displayGroupSelection(DI::userSession()->getLocalUserId(), $user['def_gid']), + '$circle_select' => Circle::getSelectorHTML(DI::userSession()->getLocalUserId(), $user['def_gid']), '$permissions' => DI::l10n()->t('Default Post Permissions'), '$aclselect' => ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()), diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php index 4e3967ec1..c8b27e394 100644 --- a/src/Module/Settings/Profile/Index.php +++ b/src/Module/Settings/Profile/Index.php @@ -260,7 +260,7 @@ class Index extends BaseSettings

You can use BBCodes in the field values.

Reorder by dragging the field title.

Empty the label field to remove a custom field.

-

Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected groups.

", +

Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected circles.

", 'profile/' . $profile['nickname'] . '/profile' ), '$custom_fields' => $custom_fields, @@ -284,9 +284,9 @@ class Index extends BaseSettings $permissionSet = DI::permissionSet()->selectOrCreate(DI::permissionSetFactory()->createFromString( $uid, DI::aclFormatter()->toString($profileFieldInputs['new']['contact_allow'] ?? ''), - DI::aclFormatter()->toString($profileFieldInputs['new']['group_allow'] ?? ''), + DI::aclFormatter()->toString($profileFieldInputs['new']['circle_allow'] ?? ''), DI::aclFormatter()->toString($profileFieldInputs['new']['contact_deny'] ?? ''), - DI::aclFormatter()->toString($profileFieldInputs['new']['group_deny'] ?? '') + DI::aclFormatter()->toString($profileFieldInputs['new']['circle_deny'] ?? '') )); $profileFields->append(DI::profileFieldFactory()->createFromValues( @@ -305,9 +305,9 @@ class Index extends BaseSettings $permissionSet = DI::permissionSet()->selectOrCreate(DI::permissionSetFactory()->createFromString( $uid, DI::aclFormatter()->toString($profileFieldInput['contact_allow'] ?? ''), - DI::aclFormatter()->toString($profileFieldInput['group_allow'] ?? ''), + DI::aclFormatter()->toString($profileFieldInput['circle_allow'] ?? ''), DI::aclFormatter()->toString($profileFieldInput['contact_deny'] ?? ''), - DI::aclFormatter()->toString($profileFieldInput['group_deny'] ?? '') + DI::aclFormatter()->toString($profileFieldInput['circle_deny'] ?? '') )); $profileFields->append(DI::profileFieldFactory()->createFromValues( diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index 1eecea3f9..7ff08d97b 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -263,12 +263,12 @@ class UserExport extends BaseSettings sprintf("SELECT * FROM `pconfig` WHERE uid = %d", $user_id) ); - $group = $this->exportMultiRow( + $circle = $this->exportMultiRow( sprintf("SELECT * FROM `group` WHERE uid = %d", $user_id) ); - $group_member = $this->exportMultiRow( - sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", $user_id) + $circle_member = $this->exportMultiRow( + sprintf("SELECT `circle_member`.`gid`, `circle_member`.`contact-id` FROM `group_member` AS `circle_member` INNER JOIN `group` AS `circle` ON `circle`.`id` = `circle_member`.`gid` WHERE `circle`.`uid` = %d", $user_id) ); $output = [ @@ -281,8 +281,8 @@ class UserExport extends BaseSettings 'profile_fields' => $profile_fields, 'photo' => $photo, 'pconfig' => $pconfig, - 'group' => $group, - 'group_member' => $group_member, + 'circle' => $circle, + 'circle_member' => $circle_member, ]; echo json_encode($output, JSON_PARTIAL_OUTPUT_ON_ERROR); diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php index 53406e195..bdbe57320 100644 --- a/src/Module/Update/Profile.php +++ b/src/Module/Update/Profile.php @@ -63,7 +63,7 @@ class Profile extends BaseModule System::htmlUpdateExit($o); } - // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups + // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched their circles $sql_extra = Item::getPermissionsSQLByUserId($a->getProfileOwner()); $last_updated_array = DI::session()->get('last_updated', []); diff --git a/src/Module/User/Import.php b/src/Module/User/Import.php index 48dc0660f..33db88da9 100644 --- a/src/Module/User/Import.php +++ b/src/Module/User/Import.php @@ -231,6 +231,10 @@ class Import extends \Friendica\BaseModule return; } + // Backward compatibility + $account['circle'] = $account['circle'] ?? $account['group']; + $account['circle_member'] = $account['circle_member'] ?? $account['group_member']; + $oldBaseUrl = $account['baseurl']; $newBaseUrl = (string)$this->baseUrl; @@ -312,35 +316,35 @@ class Import extends \Friendica\BaseModule $this->systemMessages->addNotice($this->tt('%d contact not imported', '%d contacts not imported', $errorCount)); } - array_walk($account['group'], function (&$group) use ($newUid) { - $group['uid'] = $newUid; - if ($this->dbImportAssoc('group', $group) === false) { - $this->logger->warning('Error inserting group', ['name' => $group['name'], 'error' => $this->database->errorMessage()]); + array_walk($account['circle'], function (&$circle) use ($newUid) { + $circle['uid'] = $newUid; + if ($this->dbImportAssoc('group', $circle) === false) { + $this->logger->warning('Error inserting circle', ['name' => $circle['name'], 'error' => $this->database->errorMessage()]); } else { - $group['newid'] = $this->lastInsertId(); + $circle['newid'] = $this->lastInsertId(); } }); - foreach ($account['group_member'] as $group_member) { + foreach ($account['circle_member'] as $circle_member) { $import = 0; - foreach ($account['group'] as $group) { - if ($group['id'] == $group_member['gid'] && isset($group['newid'])) { - $group_member['gid'] = $group['newid']; + foreach ($account['circle'] as $circle) { + if ($circle['id'] == $circle_member['gid'] && isset($circle['newid'])) { + $circle_member['gid'] = $circle['newid']; $import++; break; } } foreach ($account['contact'] as $contact) { - if ($contact['id'] == $group_member['contact-id'] && isset($contact['newid'])) { - $group_member['contact-id'] = $contact['newid']; + if ($contact['id'] == $circle_member['contact-id'] && isset($contact['newid'])) { + $circle_member['contact-id'] = $contact['newid']; $import++; break; } } - if ($import == 2 && $this->dbImportAssoc('group_member', $group_member) === false) { - $this->logger->warning('Error inserting group member', ['gid' => $group_member['id'], 'error' => $this->database->errorMessage()]); + if ($import == 2 && $this->dbImportAssoc('group_member', $circle_member) === false) { + $this->logger->warning('Error inserting circle member', ['gid' => $circle_member['id'], 'error' => $this->database->errorMessage()]); } } diff --git a/src/Module/Welcome.php b/src/Module/Welcome.php index f93a7bd23..ad35f31e8 100644 --- a/src/Module/Welcome.php +++ b/src/Module/Welcome.php @@ -73,9 +73,9 @@ class Welcome extends BaseModule '$finding_link' => DI::l10n()->t('Finding New People'), '$finding_txt' => DI::l10n()->t('On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours.'), - '$groups' => DI::l10n()->t('Groups'), - '$group_contact_link' => DI::l10n()->t('Group Your Contacts'), - '$group_contact_txt' => DI::l10n()->t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.'), + '$circles' => DI::l10n()->t('Circles'), + '$circle_contact_link' => DI::l10n()->t('Add Your Contacts To Circle'), + '$circle_contact_txt' => DI::l10n()->t('Once you have made some friends, organize them into private conversation circles from the sidebar of your Contacts page and then you can interact with each circle privately on your Network page.'), '$newuser_private' => $newuser_private, '$private_link' => DI::l10n()->t('Why Aren\'t My Posts Public?'), '$private_txt' => DI::l10n()->t('Friendica respects your privacy. By default, your posts will only show up to people you\'ve added as friends. For more information, see the help section from the link above.'), diff --git a/src/Object/Api/Friendica/Group.php b/src/Object/Api/Friendica/Circle.php similarity index 77% rename from src/Object/Api/Friendica/Group.php rename to src/Object/Api/Friendica/Circle.php index ce75f9eec..5ff1a32cc 100644 --- a/src/Object/Api/Friendica/Group.php +++ b/src/Object/Api/Friendica/Circle.php @@ -23,12 +23,7 @@ namespace Friendica\Object\Api\Friendica; use Friendica\BaseDataTransferObject; -/** - * Class Group - * - * - */ -class Group extends BaseDataTransferObject +class Circle extends BaseDataTransferObject { /** @var string */ protected $name; @@ -42,18 +37,16 @@ class Group extends BaseDataTransferObject protected $mode; /** - * Creates an Group entity array - * - * @param array $group + * @param array $circle Circle row array * @param array $user * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function __construct(array $group, array $user) + public function __construct(array $circle, array $user) { - $this->name = $group['name']; - $this->id = $group['id']; - $this->id_str = (string)$group['id']; + $this->name = $circle['name']; + $this->id = $circle['id']; + $this->id_str = (string)$circle['id']; $this->user = $user; - $this->mode = $group['visible'] ? 'public' : 'private'; + $this->mode = $circle['visible'] ? 'public' : 'private'; } } diff --git a/src/Protocol/ActivityPub/ClientToServer.php b/src/Protocol/ActivityPub/ClientToServer.php index ee162382b..2b52d17b7 100644 --- a/src/Protocol/ActivityPub/ClientToServer.php +++ b/src/Protocol/ActivityPub/ClientToServer.php @@ -28,7 +28,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\APContact; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\Item; use Friendica\Model\Post; use Friendica\Model\User; @@ -284,7 +284,7 @@ class ClientToServer $item['private'] = Item::UNLISTED; } elseif (!empty($object_data['target'][Receiver::TARGET_FOLLOWER])) { $item['allow_cid'] = ''; - $item['allow_gid'] = '<' . Group::FOLLOWERS . '>'; + $item['allow_gid'] = '<' . Circle::FOLLOWERS . '>'; $item['deny_cid'] = ''; $item['deny_gid'] = ''; $item['private'] = Item::PRIVATE; diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index db4196abc..cf2485186 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -1098,7 +1098,7 @@ class Receiver if (!empty($actor)) { $profile = APContact::getByURL($actor); $followers = $profile['followers'] ?? ''; - $is_forum = ($actor['type'] ?? '') == 'Group'; + $is_forum = ($profile['type'] ?? '') == 'Group'; if ($push) { Contact::updateByUrlIfNeeded($actor); } diff --git a/src/Security/PermissionSet/Repository/PermissionSet.php b/src/Security/PermissionSet/Repository/PermissionSet.php index 76cd446c1..58cf6e42f 100644 --- a/src/Security/PermissionSet/Repository/PermissionSet.php +++ b/src/Security/PermissionSet/Repository/PermissionSet.php @@ -25,7 +25,7 @@ use Exception; use Friendica\BaseRepository; use Friendica\Database\Database; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Network\HTTPException\NotFoundException; use Friendica\Security\PermissionSet\Exception\PermissionSetNotFoundException; use Friendica\Security\PermissionSet\Exception\PermissionSetPersistenceException; @@ -140,29 +140,29 @@ class PermissionSet extends BaseRepository $user_contact_str = ''; } - $groups = []; + $circle_ids = []; if (!empty($user_contact_str) && $this->db->exists('contact', [ 'id' => $cid, 'uid' => $uid, 'blocked' => false ])) { - $groups = Group::getIdsByContactId($cid); + $circle_ids = Circle::getIdsByContactId($cid); } - $group_str = '<<>>'; // should be impossible to match - foreach ($groups as $group_id) { - $group_str .= '|<' . preg_quote($group_id) . '>'; + $circle_str = '<<>>'; // should be impossible to match + foreach ($circle_ids as $circle_id) { + $circle_str .= '|<' . preg_quote($circle_id) . '>'; } if (!empty($user_contact_str)) { $condition = ["`uid` = ? AND (NOT (LOCATE(?, `deny_cid`) OR LOCATE(?, `deny_cid`) OR deny_gid REGEXP ?) AND (LOCATE(?, allow_cid) OR LOCATE(?, allow_cid) OR allow_gid REGEXP ? OR (allow_cid = '' AND allow_gid = '')))", - $uid, $user_contact_str, $public_contact_str, $group_str, - $user_contact_str, $public_contact_str, $group_str]; + $uid, $user_contact_str, $public_contact_str, $circle_str, + $user_contact_str, $public_contact_str, $circle_str]; } else { $condition = ["`uid` = ? AND (NOT (LOCATE(?, `deny_cid`) OR deny_gid REGEXP ?) AND (LOCATE(?, allow_cid) OR allow_gid REGEXP ? OR (allow_cid = '' AND allow_gid = '')))", - $uid, $public_contact_str, $group_str, $public_contact_str, $group_str]; + $uid, $public_contact_str, $circle_str, $public_contact_str, $circle_str]; } return $this->select($condition); diff --git a/src/Security/Security.php b/src/Security/Security.php index bc1d98ac1..0774491d0 100644 --- a/src/Security/Security.php +++ b/src/Security/Security.php @@ -24,7 +24,7 @@ namespace Friendica\Security; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\User; /** @@ -117,17 +117,13 @@ class Security if ($local_user && $local_user == $owner_id) { $sql = ''; /* - * Authenticated visitor. Load the groups the visitor belongs to. + * Authenticated visitor. Load the circles the visitor belongs to. */ } elseif ($remote_contact) { - $gs = '<<>>'; // should be impossible to match + $circleIds = '<<>>'; // should be impossible to match - $groups = Group::getIdsByContactId($remote_contact); - - if (is_array($groups)) { - foreach ($groups as $g) { - $gs .= '|<' . intval($g) . '>'; - } + foreach (Circle::getIdsByContactId($remote_contact) as $circleId) { + $circleIds .= '|<' . intval($circleId) . '>'; } $sql = sprintf( @@ -135,9 +131,9 @@ class Security AND (allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR (allow_cid = '' AND allow_gid = ''))" . $acc_sql . ") ", intval($remote_contact), - DBA::escape($gs), + DBA::escape($circleIds), intval($remote_contact), - DBA::escape($gs) + DBA::escape($circleIds) ); } return $sql; diff --git a/src/Util/ACLFormatter.php b/src/Util/ACLFormatter.php index 0351b27a6..f7a0894e1 100644 --- a/src/Util/ACLFormatter.php +++ b/src/Util/ACLFormatter.php @@ -21,7 +21,7 @@ namespace Friendica\Util; -use Friendica\Model\Group; +use Friendica\Model\Circle; /** * Util class for ACL formatting @@ -29,7 +29,7 @@ use Friendica\Model\Group; final class ACLFormatter { /** - * Turn user/group ACLs stored as angle bracketed text into arrays + * Turn user/circle ACLs stored as angle bracketed text into arrays * * @param string|null $acl_string A angle-bracketed list of IDs * @@ -44,7 +44,7 @@ final class ACLFormatter // turn string array of angle-bracketed elements into numeric array // e.g. "<1><2><3>" => array(1,2,3); - preg_match_all('/<(' . Group::FOLLOWERS . '|'. Group::MUTUALS . '|[0-9]+)>/', $acl_string, $matches, PREG_PATTERN_ORDER); + preg_match_all('/<(' . Circle::FOLLOWERS . '|'. Circle::MUTUALS . '|[0-9]+)>/', $acl_string, $matches, PREG_PATTERN_ORDER); return $matches[1]; } @@ -86,7 +86,7 @@ final class ACLFormatter if (intval($item)) { $item = '<' . intval($item) . '>'; // The item is a allowed ACL character - } elseif (in_array($item, [Group::FOLLOWERS, Group::MUTUALS])) { + } elseif (in_array($item, [Circle::FOLLOWERS, Circle::MUTUALS])) { $item = '<' . $item . '>'; // The item is already a ACL string } elseif (preg_match('/<\d+?>/', $item)) { diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 7c78896f3..6eb653dec 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -29,7 +29,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Conversation; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Model\GServer; use Friendica\Model\Item; use Friendica\Model\Post; @@ -340,9 +340,9 @@ class Notifier $aclFormatter = DI::aclFormatter(); $allow_people = $aclFormatter->expand($parent['allow_cid']); - $allow_groups = Group::expand($uid, $aclFormatter->expand($parent['allow_gid']),true); + $allow_circles = Circle::expand($uid, $aclFormatter->expand($parent['allow_gid']),true); $deny_people = $aclFormatter->expand($parent['deny_cid']); - $deny_groups = Group::expand($uid, $aclFormatter->expand($parent['deny_gid'])); + $deny_circles = Circle::expand($uid, $aclFormatter->expand($parent['deny_gid'])); foreach ($items as $item) { $recipients[] = $item['contact-id']; @@ -363,8 +363,8 @@ class Notifier Logger::notice('Deliver', ['target' => $target_id, 'guid' => $target_item['guid'], 'recipients' => $url_recipients]); } - $recipients = array_unique(array_merge($recipients, $allow_people, $allow_groups)); - $deny = array_unique(array_merge($deny_people, $deny_groups)); + $recipients = array_unique(array_merge($recipients, $allow_people, $allow_circles)); + $deny = array_unique(array_merge($deny_people, $deny_circles)); $recipients = array_diff($recipients, $deny); // If this is a public message and pubmail is set on the parent, include all your email contacts @@ -797,7 +797,7 @@ class Notifier foreach (Tag::getByURIId($target_item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]) as $tag) { $target_contact = Contact::getByURL(Strings::normaliseLink($tag['url']), null, [], $uid); if ($target_contact && $target_contact['contact-type'] == Contact::TYPE_COMMUNITY && $target_contact['manually-approve']) { - Group::updateMembersForForum($target_contact['id']); + Circle::updateMembersForForum($target_contact['id']); } } @@ -822,7 +822,7 @@ class Notifier } Logger::info('Remote item will be distributed', ['id' => $target_item['id'], 'url' => $target_item['uri'], 'verb' => $target_item['verb']]); - $check_signature = ($target_item['gravity'] == Item::GRAVITY_ACTIVITY); + $check_signature = ($target_item['gravity'] == Item::GRAVITY_ACTIVITY); } else { Logger::info('Remote activity will not be distributed', ['id' => $target_item['id'], 'url' => $target_item['uri'], 'verb' => $target_item['verb']]); return ['count' => 0, 'contacts' => []]; diff --git a/static/defaults.config.php b/static/defaults.config.php index d0b8262ac..6a0a619a3 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -310,10 +310,10 @@ return [ // Number of "free" searches when system => permit_crawling is enabled. 'free_crawls' => 10, - // groupedit_image_limit (Integer) - // Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names. + // circle_edit_image_limit (Integer) + // Number of contacts at which the circle editor should switch from display the profile pictures of the contacts to only display the names. // This can alternatively be set on a per-account basis in the pconfig table. - 'groupedit_image_limit' => 400, + 'circle_edit_image_limit' => 400, // gserver_update_limit (Integer) // How many servers should be checked at a time? diff --git a/static/routes.config.php b/static/routes.config.php index 0ff13224c..8b4b1a967 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -89,12 +89,20 @@ $apiRoutes = [ '/direct_messages_setseen[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\DirectMessages\Setseen::class, [ R::POST]], '/direct_messages_search[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\DirectMessages\Search ::class, [R::GET ]], '/events[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Index::class, [R::GET ]], - '/event_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Create::class, [ R::POST]], - '/event_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Delete::class, [ R::POST]], - '/group_show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Show::class, [R::GET ]], - '/group_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Create::class, [ R::POST]], - '/group_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Delete::class, [ R::POST]], - '/group_update[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Update::class, [ R::POST]], + '/event_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Create::class, [ R::POST]], + '/event_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Delete::class, [ R::POST]], + '/circle_show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Show::class, [R::GET ]], + '/circle_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Create::class, [ R::POST]], + '/circle_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Delete::class, [ R::POST]], + '/circle_update[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Update::class, [ R::POST]], + + // Backward compatibility + // @deprecated + '/group_show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Show::class, [R::GET ]], + '/group_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Create::class, [ R::POST]], + '/group_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Delete::class, [ R::POST]], + '/group_update[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Update::class, [ R::POST]], + '/profile/show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Profile\Show::class, [R::GET ]], '/photoalbums[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Photoalbum\Index::class, [R::GET ]], '/photoalbum[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Photoalbum\Show::class, [R::GET ]], @@ -446,14 +454,14 @@ return [ '/fsuggest/{contact:\d+}' => [Module\FriendSuggest::class, [R::GET, R::POST]], - '/group' => [ - '[/]' => [Module\Group::class, [R::GET, R::POST]], - '/{group:\d+}' => [Module\Group::class, [R::GET, R::POST]], - '/none' => [Module\Group::class, [R::GET, R::POST]], - '/new' => [Module\Group::class, [R::GET, R::POST]], - '/drop/{group:\d+}' => [Module\Group::class, [R::GET, R::POST]], - '/{group:\d+}/{contact:\d+}' => [Module\Group::class, [R::GET, R::POST]], - '/{group:\d+}/{command:add|remove}/{contact:\d+}' => [Module\Group::class, [R::GET, R::POST]], + '/circle' => [ + '[/]' => [Module\Circle::class, [R::GET, R::POST]], + '/{circle:\d+}' => [Module\Circle::class, [R::GET, R::POST]], + '/none' => [Module\Circle::class, [R::GET, R::POST]], + '/new' => [Module\Circle::class, [R::GET, R::POST]], + '/drop/{circle:\d+}' => [Module\Circle::class, [R::GET, R::POST]], + '/{circle:\d+}/{contact:\d+}' => [Module\Circle::class, [R::GET, R::POST]], + '/{circle:\d+}/{command:add|remove}/{contact:\d+}' => [Module\Circle::class, [R::GET, R::POST]], ], '/hashtag' => [Module\Hashtag::class, [R::GET]], '/help[/{doc:.+}]' => [Module\Help::class, [R::GET]], @@ -511,7 +519,7 @@ return [ '/newmember' => [Module\Welcome::class, [R::GET]], '/nodeinfo/1.0' => [Module\NodeInfo110::class, [R::GET]], '/nodeinfo/2.0' => [Module\NodeInfo120::class, [R::GET]], - '/nogroup' => [Module\Group::class, [R::GET]], + '/nocircle' => [Module\Circle::class, [R::GET]], '/noscrape' => [ '/{nick}' => [Module\NoScrape::class, [R::GET]], @@ -660,7 +668,7 @@ return [ '[/]' => [Module\Conversation\Network::class, [R::GET]], '/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Conversation\Network::class, [R::GET]], '/forum/{contact_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], - '/group/{group_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], + '/circle/{circle_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], ], '/randprof' => [Module\RandomProfile::class, [R::GET]], @@ -680,7 +688,7 @@ return [ '[/]' => [Module\Update\Network::class, [R::GET]], '/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Update\Network::class, [R::GET]], '/forum/{contact_id:\d+}' => [Module\Update\Network::class, [R::GET]], - '/group/{group_id:\d+}' => [Module\Update\Network::class, [R::GET]], + '/circle/{circle_id:\d+}' => [Module\Update\Network::class, [R::GET]], ], '/update_profile' => [Module\Update\Profile::class, [R::GET]], diff --git a/static/settings.config.php b/static/settings.config.php index e17fa0442..47d1a5150 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -114,9 +114,9 @@ return [ // Default value comprises classic role names from RFC 2142. 'forbidden_nicknames' => 'info, marketing, sales, support, abuse, noc, security, postmaster, hostmaster, usenet, news, webmaster, www, uucp, ftp, root, sysop', - // compute_group_counts (Boolean) - // Compute contact group level when counting unseen network posts. - 'compute_group_counts' => true, + // compute_circle_counts (Boolean) + // Compute contact circle level when counting unseen network posts. + 'compute_circle_counts' => true, // jpeg_quality (Integer) // Sets the ImageMagick quality level for JPEG images. Values ranges from 50 (awful) to 100 (near perfect). diff --git a/tests/src/Util/ACLFormatterTest.php b/tests/src/Util/ACLFormatterTest.php index afbf435d8..93e1767dc 100644 --- a/tests/src/Util/ACLFormatterTest.php +++ b/tests/src/Util/ACLFormatterTest.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Util; -use Friendica\Model\Group; +use Friendica\Model\Circle; use Friendica\Util\ACLFormatter; use PHPUnit\Framework\TestCase; @@ -56,8 +56,8 @@ class ACLFormatterTest extends TestCase { return [ 'normal' => [ - 'input' => '<1><2><3><' . Group::FOLLOWERS . '><' . Group::MUTUALS . '>', - 'assert' => ['1', '2', '3', Group::FOLLOWERS, Group::MUTUALS], + 'input' => '<1><2><3><' . Circle::FOLLOWERS . '><' . Circle::MUTUALS . '>', + 'assert' => ['1', '2', '3', Circle::FOLLOWERS, Circle::MUTUALS], ], 'nigNumber' => [ 'input' => '<1><' . PHP_INT_MAX . '><15>', @@ -128,12 +128,12 @@ class ACLFormatterTest extends TestCase $aclFormatter = new ACLFormatter(); $allow_people = $aclFormatter->expand(); - $allow_groups = $aclFormatter->expand(); + $allow_circles = $aclFormatter->expand(); self::assertEmpty($aclFormatter->expand(null)); self::assertEmpty($aclFormatter->expand()); - $recipients = array_unique(array_merge($allow_people, $allow_groups)); + $recipients = array_unique(array_merge($allow_people, $allow_circles)); self::assertEmpty($recipients); } @@ -165,13 +165,13 @@ class ACLFormatterTest extends TestCase 'input' => ["<40195>"], 'assert' => "<40195>", ], - Group::FOLLOWERS => [ - 'input' => [Group::FOLLOWERS, 1], - 'assert' => '<' . Group::FOLLOWERS . '><1>', + Circle::FOLLOWERS => [ + 'input' => [Circle::FOLLOWERS, 1], + 'assert' => '<' . Circle::FOLLOWERS . '><1>', ], - Group::MUTUALS => [ - 'input' => [Group::MUTUALS, 1], - 'assert' => '<' . Group::MUTUALS . '><1>', + Circle::MUTUALS => [ + 'input' => [Circle::MUTUALS, 1], + 'assert' => '<' . Circle::MUTUALS . '><1>', ], 'wrong-angle-brackets' => [ 'input' => ["","<123>"], diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 7d5bd0656..6d4e88382 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -24,7 +24,7 @@ function contact_search(term, callback, backend_url, type, mode) { for(var t in contact_search.cache[bt]) { if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results // Filter old results locally - var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one + var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because circles don't have one matching.unshift({forum:false, text: term, replace: term}); setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems return; diff --git a/view/js/main.js b/view/js/main.js index a1446bca5..a761f44fc 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -289,11 +289,11 @@ $(function() { $('#mail-update-li').html(mail); - $(".sidebar-group-li .notify").removeClass("show"); - $(data.groups).each(function(key, group) { - var gid = group.id; - var gcount = group.count; - $(".group-"+gid+" .notify").addClass("show").text(gcount); + $(".sidebar-circle-li .notify").removeClass("show"); + $(data.circles).each(function(key, circle) { + var gid = circle.id; + var gcount = circle.count; + $(".circle-"+gid+" .notify").addClass("show").text(gcount); }); $(".forum-widget-entry .notify").removeClass("show"); @@ -946,21 +946,21 @@ function bin2hex(s) { return a.join(''); } -function groupChangeMember(gid, cid, sec_token) { +function circleChangeMember(gid, cid, sec_token) { $('body .fakelink').css('cursor', 'wait'); - $.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) { - $('#group-update-wrapper').html(data); + $.get('circle/' + gid + '/' + cid + "?t=" + sec_token, function(data) { + $('#circle-update-wrapper').html(data); $('body .fakelink').css('cursor', 'auto'); }); } -function contactgroupChangeMember(checkbox, gid, cid) { +function contactCircleChangeMember(checkbox, gid, cid) { let url; // checkbox.checked is the checkbox state after the click if (checkbox.checked) { - url = 'group/' + gid + '/add/' + cid; + url = 'circle/' + gid + '/add/' + cid; } else { - url = 'group/' + gid + '/remove/' + cid; + url = 'circle/' + gid + '/remove/' + cid; } $('body').css('cursor', 'wait'); $.post(url) diff --git a/view/templates/acl/full_selector.tpl b/view/templates/acl/full_selector.tpl index a2329614e..fe8c856f1 100644 --- a/view/templates/acl/full_selector.tpl +++ b/view/templates/acl/full_selector.tpl @@ -41,9 +41,9 @@ {{$custom_title}}
- + - +

{{$custom_desc}}

@@ -75,10 +75,10 @@ $(function() { let $acl_allow_input = $('#acl_allow-{{$input_group_id}}'); let $contact_allow_input = $('[name="{{$input_names.contact_allow}}"]'); - let $group_allow_input = $('[name="{{$input_names.group_allow}}"]'); + let $circle_allow_input = $('[name="{{$input_names.circle_allow}}"]'); let $acl_deny_input = $('#acl_deny-{{$input_group_id}}'); let $contact_deny_input = $('[name="{{$input_names.contact_deny}}"]'); - let $group_deny_input = $('[name="{{$input_names.group_deny}}"]'); + let $circle_deny_input = $('[name="{{$input_names.circle_deny}}"]'); let $visibility_public_panel = $('#visibility-public-panel-{{$input_group_id}}'); let $visibility_custom_panel = $('#visibility-custom-panel-{{$input_group_id}}'); let $visibility_public_radio = $('#visibility-public-{{$input_group_id}}'); @@ -125,8 +125,8 @@ }); // Custom visibility tags inputs - let acl_groups = new Bloodhound({ - local: {{$acl_groups nofilter}}, + let acl_circles = new Bloodhound({ + local: {{$acl_circles nofilter}}, identify: function(obj) { return obj.type + '-' + obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name']), queryTokenizer: Bloodhound.tokenizers.whitespace, @@ -163,7 +163,7 @@ freeInput: false, tagClass: function(item) { switch (item.type) { - case 'group' : return 'label label-primary'; + case 'circle' : return 'label label-primary'; case 'contact' : default: return 'label label-info'; @@ -191,7 +191,7 @@ freeInput: false, tagClass: function(item) { switch (item.type) { - case 'group' : return 'label label-primary'; + case 'circle' : return 'label label-primary'; case 'contact' : default: return 'label label-info'; @@ -215,14 +215,14 @@ // Import existing ACL into the tags input fields. - $group_allow_input.val().split(',').forEach(function (group_id) { - $acl_allow_input.tagsinput('add', acl_groups.get('group-' + group_id)[0]); + $circle_allow_input.val().split(',').forEach(function (circle_id) { + $acl_allow_input.tagsinput('add', acl_circles.get('circle-' + circle_id)[0]); }); $contact_allow_input.val().split(',').forEach(function (contact_id) { $acl_allow_input.tagsinput('add', acl_contacts.get('contact-' + contact_id)[0]); }); - $group_deny_input.val().split(',').forEach(function (group_id) { - $acl_deny_input.tagsinput('add', acl_groups.get('group-' + group_id)[0]); + $circle_deny_input.val().split(',').forEach(function (circle_id) { + $acl_deny_input.tagsinput('add', acl_circles.get('circle-' + circle_id)[0]); }); $contact_deny_input.val().split(',').forEach(function (contact_id) { $acl_deny_input.tagsinput('add', acl_contacts.get('contact-' + contact_id)[0]); @@ -237,11 +237,11 @@ } // Update the real acl field - $group_allow_input.val(''); + $circle_allow_input.val(''); $contact_allow_input.val(''); [].forEach.call($acl_allow_input.tagsinput('items'), function (item) { - if (item.type === 'group') { - $group_allow_input.val($group_allow_input.val() + ',' + item.id); + if (item.type === 'circle') { + $circle_allow_input.val($circle_allow_input.val() + ',' + item.id); } else { $contact_allow_input.val($contact_allow_input.val() + ',' + item.id); } @@ -255,11 +255,11 @@ } // Update the real acl field - $group_deny_input.val(''); + $circle_deny_input.val(''); $contact_deny_input.val(''); [].forEach.call($acl_deny_input.tagsinput('items'), function (item) { - if (item.type === 'group') { - $group_deny_input.val($group_deny_input.val() + ',' + item.id); + if (item.type === 'circle') { + $circle_deny_input.val($circle_deny_input.val() + ',' + item.id); } else { $contact_deny_input.val($contact_deny_input.val() + ',' + item.id); } diff --git a/view/templates/acl/self_only.tpl b/view/templates/acl/self_only.tpl index d1c5a00de..03ad6a7c3 100644 --- a/view/templates/acl/self_only.tpl +++ b/view/templates/acl/self_only.tpl @@ -1,5 +1,5 @@ - + - - \ No newline at end of file + + diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 3cf072994..17c318907 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -108,7 +108,7 @@

{{$performance}}

- {{include file="field_checkbox.tpl" field=$compute_group_counts}} + {{include file="field_checkbox.tpl" field=$compute_circle_counts}} {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$max_comments}} {{include file="field_input.tpl" field=$max_display_comments}} diff --git a/view/templates/calendar/calendar_head.tpl b/view/templates/calendar/calendar_head.tpl index b5bf8f6fe..9266cecf7 100644 --- a/view/templates/calendar/calendar_head.tpl +++ b/view/templates/calendar/calendar_head.tpl @@ -153,9 +153,9 @@ } }).trigger('change'); - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { + $('#contact_allow, #contact_deny, #circle_allow, #circle_deny').change(function() { let selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { + $('#contact_allow option:selected, #contact_deny option:selected, #circle_allow option:selected, #circle_deny option:selected').each( function() { selstr = $(this).html(); $('#jot-public').hide(); }); diff --git a/view/templates/circle_drop.tpl b/view/templates/circle_drop.tpl new file mode 100644 index 000000000..e37d1e0e0 --- /dev/null +++ b/view/templates/circle_drop.tpl @@ -0,0 +1,12 @@ + +
+ + +
+
diff --git a/view/templates/circle_edit.tpl b/view/templates/circle_edit.tpl new file mode 100644 index 000000000..aa7ef8b76 --- /dev/null +++ b/view/templates/circle_edit.tpl @@ -0,0 +1,26 @@ + +

{{$title}}

+ + +{{if $editable == 1}} +
+
+ + + {{include file="field_input.tpl" field=$gname}} + {{if $drop}}{{$drop nofilter}}{{/if}} +
+ +
+
+
+
+{{/if}} + + +{{if $circle_editor}} +
+ {{include file="circle_editor.tpl"}} +
+{{/if}} +{{if $desc}}
{{$desc nofilter}}
{{/if}} diff --git a/view/templates/circle_editor.tpl b/view/templates/circle_editor.tpl new file mode 100644 index 000000000..4f3a30eea --- /dev/null +++ b/view/templates/circle_editor.tpl @@ -0,0 +1,62 @@ + +{{* Template for the contact circle list *}} + +{{if $editable == 1}} +{{* The contacts who are already members of the contact circle *}} +
+

{{$circle_editor.label_members}}

+
+ + {{if $circle_editor.members }} + + {{foreach $circle_editor.members as $c}} + {{* If there are too many contacts we use another view mode *}} + {{if $shortmode}} +
+ + {{$c.name}}" + +
+ {{else}} + {{* The normal view mode *}} +
+ + {{$c.name}} + +
+ {{/if}} + {{/foreach}} + + {{else}} + {{$circle_editor.circle_is_empty}} + {{/if}} +
+ +
+
+
+{{/if}} + +{{* The contacts who are not members of the contact circle *}} +
+

{{$circle_editor.label_contacts}}

+ +
+
diff --git a/view/templates/circle_selection.tpl b/view/templates/circle_selection.tpl new file mode 100644 index 000000000..d5a7decf8 --- /dev/null +++ b/view/templates/circle_selection.tpl @@ -0,0 +1,9 @@ + +
+ + +
diff --git a/view/templates/circle_side.tpl b/view/templates/circle_side.tpl new file mode 100644 index 000000000..c33638130 --- /dev/null +++ b/view/templates/circle_side.tpl @@ -0,0 +1,48 @@ + +

{{$title}}

+ +
+ +

{{$title}}

+ + + + + {{if $new_circle}} + + {{else}} + + {{/if}} + + {{if $uncircled}}{{/if}} +
+ diff --git a/view/templates/group_drop.tpl b/view/templates/group_drop.tpl deleted file mode 100644 index e28411d03..000000000 --- a/view/templates/group_drop.tpl +++ /dev/null @@ -1,12 +0,0 @@ - -
- - -
-
diff --git a/view/templates/group_edit.tpl b/view/templates/group_edit.tpl deleted file mode 100644 index 1984dc197..000000000 --- a/view/templates/group_edit.tpl +++ /dev/null @@ -1,26 +0,0 @@ - -

{{$title}}

- - -{{if $editable == 1}} -
-
- - - {{include file="field_input.tpl" field=$gname}} - {{if $drop}}{{$drop nofilter}}{{/if}} -
- -
-
-
-
-{{/if}} - - -{{if $groupeditor}} -
- {{include file="groupeditor.tpl"}} -
-{{/if}} -{{if $desc}}
{{$desc nofilter}}
{{/if}} diff --git a/view/templates/group_selection.tpl b/view/templates/group_selection.tpl deleted file mode 100644 index 7d01df7a7..000000000 --- a/view/templates/group_selection.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
- - -
diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl deleted file mode 100644 index 2aca4cdf4..000000000 --- a/view/templates/group_side.tpl +++ /dev/null @@ -1,48 +0,0 @@ - -

{{$title}}

- -
- -

{{$title}}

- - - - - {{if $newgroup}} - - {{else}} - - {{/if}} - - {{if $ungrouped}}{{/if}} -
- diff --git a/view/templates/groupeditor.tpl b/view/templates/groupeditor.tpl deleted file mode 100644 index 0168a7a2d..000000000 --- a/view/templates/groupeditor.tpl +++ /dev/null @@ -1,62 +0,0 @@ - -{{* Template for the contact group list *}} - -{{if $editable == 1}} -{{* The contacts who are already members of the contact group *}} -
-

{{$groupeditor.label_members}}

-
- - {{if $groupeditor.members }} - - {{foreach $groupeditor.members as $c}} - {{* If there are too many contacts we use another view mode *}} - {{if $shortmode}} -
- - {{$c.name}}" - -
- {{else}} - {{* The normal view mode *}} -
- - {{$c.name}} - -
- {{/if}} - {{/foreach}} - - {{else}} - {{$groupeditor.group_is_empty}} - {{/if}} -
- -
-
-
-{{/if}} - -{{* The contacts who are not members of the contact group *}} -
-

{{$groupeditor.label_contacts}}

- -
-
diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl index c491a0fcf..c127e317e 100644 --- a/view/templates/item/compose.tpl +++ b/view/templates/item/compose.tpl @@ -90,14 +90,14 @@ {{if $scheduled_at}}{{$scheduled_at nofilter}}{{/if}} {{if $created_at}}{{$created_at nofilter}}{{/if}} {{else}} - + - + {{/if}}
\ No newline at end of file + dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}'); + diff --git a/view/templates/photos_head.tpl b/view/templates/photos_head.tpl index 1d693e103..b633ee76d 100644 --- a/view/templates/photos_head.tpl +++ b/view/templates/photos_head.tpl @@ -7,14 +7,14 @@ $(document).ready(function() { - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { + $('#contact_allow, #contact_deny, #circle_allow, #circle_deny').change(function() { var selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { + $('#contact_allow option:selected, #contact_deny option:selected, #circle_allow option:selected, #circle_deny option:selected').each( function() { selstr = $(this).html(); $('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-public').hide(); }); - if(selstr == null) { + if(selstr == null) { $('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-public').show(); } diff --git a/view/templates/settings/account.tpl b/view/templates/settings/account.tpl index 8e9f80dc3..b13576a96 100644 --- a/view/templates/settings/account.tpl +++ b/view/templates/settings/account.tpl @@ -59,7 +59,7 @@ {{include file="field_checkbox.tpl" field=$unkmail}} {{include file="field_input.tpl" field=$cntunkmail}} - {{$group_select nofilter}} + {{$circle_select nofilter}} {{if not $is_community}}

{{$permissions}}

@@ -194,4 +194,4 @@
- \ No newline at end of file + diff --git a/view/templates/settings/head.tpl b/view/templates/settings/head.tpl index 6d58e54a6..ff85f2cb9 100644 --- a/view/templates/settings/head.tpl +++ b/view/templates/settings/head.tpl @@ -6,20 +6,20 @@ $(document).ready(function() { - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { + $('#contact_allow, #contact_deny, #circle_allow, #circle_deny').change(function() { var selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { + $('#contact_allow option:selected, #contact_deny option:selected, #circle_allow option:selected, #circle_deny option:selected').each( function() { selstr = $(this).html(); $('#jot-perms-icon').removeClass('unlock').addClass('lock'); $('#jot-public').hide(); }); - if(selstr == null) { + if(selstr == null) { $('#jot-perms-icon').removeClass('lock').addClass('unlock'); $('#jot-public').show(); } }).trigger('change'); - + $('.settings-content-block').hide(); $('.settings-heading').click(function(){ $('.settings-content-block').hide(); diff --git a/view/templates/welcome.tpl b/view/templates/welcome.tpl index 0ac061b47..02da9b277 100644 --- a/view/templates/welcome.tpl +++ b/view/templates/welcome.tpl @@ -55,16 +55,16 @@ {{$finding_txt nofilter}} -

{{$groups nofilter}}

+

{{$circles nofilter}}

From 969becfc157cded332756f78018a8d9935c9c88a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 2 Jul 2023 22:57:39 -0400 Subject: [PATCH 111/259] Update main transation file after updating strings --- view/lang/C/messages.po | 463 +++++++++++++++++++++++++++++----------- 1 file changed, 339 insertions(+), 124 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index bb912a9ee..445ffcbd3 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-09 17:33+0000\n" +"POT-Creation-Date: 2023-07-09 18:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -294,7 +294,7 @@ msgstr "" #: mod/message.php:201 mod/message.php:357 mod/photos.php:1301 #: src/Content/Conversation.php:392 src/Content/Conversation.php:1506 #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145 -#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:568 +#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:574 msgid "Please wait" msgstr "" @@ -310,8 +310,12 @@ msgstr "" #: src/Module/Install.php:234 src/Module/Install.php:274 #: src/Module/Install.php:309 src/Module/Invite.php:178 #: src/Module/Item/Compose.php:189 src/Module/Moderation/Item/Source.php:79 -#: src/Module/Profile/Profile.php:276 src/Module/Profile/UnkMail.php:155 -#: src/Module/Settings/Profile/Index.php:230 src/Object/Post.php:1084 +#: src/Module/Moderation/Report/Create.php:168 +#: src/Module/Moderation/Report/Create.php:183 +#: src/Module/Moderation/Report/Create.php:211 +#: src/Module/Moderation/Report/Create.php:263 +#: src/Module/Profile/Profile.php:274 src/Module/Profile/UnkMail.php:155 +#: src/Module/Settings/Profile/Index.php:230 src/Object/Post.php:1090 #: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171 #: view/theme/quattro/config.php:87 view/theme/vier/config.php:135 msgid "Submit" @@ -596,29 +600,29 @@ msgstr "" #: mod/photos.php:1139 mod/photos.php:1195 mod/photos.php:1275 #: src/Module/Contact.php:619 src/Module/Item/Compose.php:188 -#: src/Object/Post.php:1081 +#: src/Object/Post.php:1087 msgid "This is you" msgstr "" #: mod/photos.php:1141 mod/photos.php:1197 mod/photos.php:1277 -#: src/Object/Post.php:562 src/Object/Post.php:1083 +#: src/Object/Post.php:568 src/Object/Post.php:1089 msgid "Comment" msgstr "" #: mod/photos.php:1143 mod/photos.php:1199 mod/photos.php:1279 #: src/Content/Conversation.php:407 src/Module/Calendar/Event/Form.php:248 #: src/Module/Item/Compose.php:201 src/Module/Post/Edit.php:165 -#: src/Object/Post.php:1097 +#: src/Object/Post.php:1103 msgid "Preview" msgstr "" #: mod/photos.php:1144 src/Content/Conversation.php:360 -#: src/Module/Post/Edit.php:130 src/Object/Post.php:1085 +#: src/Module/Post/Edit.php:130 src/Object/Post.php:1091 msgid "Loading..." msgstr "" #: mod/photos.php:1236 src/Content/Conversation.php:1422 -#: src/Object/Post.php:262 +#: src/Object/Post.php:263 msgid "Select" msgstr "" @@ -630,19 +634,19 @@ msgstr "" msgid "Delete" msgstr "" -#: mod/photos.php:1298 src/Object/Post.php:400 +#: mod/photos.php:1298 src/Object/Post.php:405 msgid "Like" msgstr "" -#: mod/photos.php:1299 src/Object/Post.php:400 +#: mod/photos.php:1299 src/Object/Post.php:405 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1300 src/Object/Post.php:401 +#: mod/photos.php:1300 src/Object/Post.php:406 msgid "Dislike" msgstr "" -#: mod/photos.php:1302 src/Object/Post.php:401 +#: mod/photos.php:1302 src/Object/Post.php:406 msgid "I don't like this (toggle)" msgstr "" @@ -1222,7 +1226,7 @@ msgid "Visible to everybody" msgstr "" #: src/Content/Conversation.php:330 src/Module/Item/Compose.php:200 -#: src/Object/Post.php:1096 +#: src/Object/Post.php:1102 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -1267,52 +1271,52 @@ msgid "attach file" msgstr "" #: src/Content/Conversation.php:365 src/Module/Item/Compose.php:190 -#: src/Module/Post/Edit.php:171 src/Object/Post.php:1086 +#: src/Module/Post/Edit.php:171 src/Object/Post.php:1092 msgid "Bold" msgstr "" #: src/Content/Conversation.php:366 src/Module/Item/Compose.php:191 -#: src/Module/Post/Edit.php:172 src/Object/Post.php:1087 +#: src/Module/Post/Edit.php:172 src/Object/Post.php:1093 msgid "Italic" msgstr "" #: src/Content/Conversation.php:367 src/Module/Item/Compose.php:192 -#: src/Module/Post/Edit.php:173 src/Object/Post.php:1088 +#: src/Module/Post/Edit.php:173 src/Object/Post.php:1094 msgid "Underline" msgstr "" #: src/Content/Conversation.php:368 src/Module/Item/Compose.php:193 -#: src/Module/Post/Edit.php:174 src/Object/Post.php:1090 +#: src/Module/Post/Edit.php:174 src/Object/Post.php:1096 msgid "Quote" msgstr "" #: src/Content/Conversation.php:369 src/Module/Item/Compose.php:194 -#: src/Module/Post/Edit.php:175 src/Object/Post.php:1091 +#: src/Module/Post/Edit.php:175 src/Object/Post.php:1097 msgid "Add emojis" msgstr "" #: src/Content/Conversation.php:370 src/Module/Item/Compose.php:195 -#: src/Object/Post.php:1089 +#: src/Object/Post.php:1095 msgid "Content Warning" msgstr "" #: src/Content/Conversation.php:371 src/Module/Item/Compose.php:196 -#: src/Module/Post/Edit.php:176 src/Object/Post.php:1092 +#: src/Module/Post/Edit.php:176 src/Object/Post.php:1098 msgid "Code" msgstr "" #: src/Content/Conversation.php:372 src/Module/Item/Compose.php:197 -#: src/Object/Post.php:1093 +#: src/Object/Post.php:1099 msgid "Image" msgstr "" #: src/Content/Conversation.php:373 src/Module/Item/Compose.php:198 -#: src/Module/Post/Edit.php:177 src/Object/Post.php:1094 +#: src/Module/Post/Edit.php:177 src/Object/Post.php:1100 msgid "Link" msgstr "" #: src/Content/Conversation.php:374 src/Module/Item/Compose.php:199 -#: src/Module/Post/Edit.php:178 src/Object/Post.php:1095 +#: src/Module/Post/Edit.php:178 src/Object/Post.php:1101 msgid "Link or Media" msgstr "" @@ -1467,21 +1471,21 @@ msgstr "" msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1466 src/Object/Post.php:513 -#: src/Object/Post.php:514 +#: src/Content/Conversation.php:1466 src/Object/Post.php:518 +#: src/Object/Post.php:519 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1479 src/Object/Post.php:501 +#: src/Content/Conversation.php:1479 src/Object/Post.php:506 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1480 src/Object/Post.php:502 +#: src/Content/Conversation.php:1480 src/Object/Post.php:507 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1488 src/Object/Post.php:527 +#: src/Content/Conversation.php:1488 src/Object/Post.php:532 #, php-format msgid "%s from %s" msgstr "" @@ -1696,7 +1700,7 @@ msgstr "" msgid "Collapse" msgstr "" -#: src/Content/Item.php:434 src/Object/Post.php:482 +#: src/Content/Item.php:434 src/Object/Post.php:487 msgid "Languages" msgstr "" @@ -1754,7 +1758,7 @@ msgstr "" #: src/Content/Nav.php:228 src/Module/BaseProfile.php:49 #: src/Module/BaseSettings.php:100 src/Module/Contact.php:504 -#: src/Module/Contact/Profile.php:392 src/Module/Profile/Profile.php:270 +#: src/Module/Contact/Profile.php:392 src/Module/Profile/Profile.php:268 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:230 msgid "Profile" msgstr "" @@ -2267,12 +2271,12 @@ msgid "More Trending Tags" msgstr "" #: src/Content/Widget/VCard.php:109 src/Model/Profile.php:378 -#: src/Module/Contact/Profile.php:381 src/Module/Profile/Profile.php:201 +#: src/Module/Contact/Profile.php:381 src/Module/Profile/Profile.php:199 msgid "XMPP:" msgstr "" #: src/Content/Widget/VCard.php:110 src/Model/Profile.php:379 -#: src/Module/Contact/Profile.php:383 src/Module/Profile/Profile.php:205 +#: src/Module/Contact/Profile.php:383 src/Module/Profile/Profile.php:203 msgid "Matrix:" msgstr "" @@ -2280,7 +2284,7 @@ msgstr "" #: src/Model/Event.php:109 src/Model/Event.php:473 src/Model/Event.php:965 #: src/Model/Profile.php:373 src/Module/Contact/Profile.php:379 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187 -#: src/Module/Profile/Profile.php:223 +#: src/Module/Profile/Profile.php:221 msgid "Location:" msgstr "" @@ -2295,7 +2299,7 @@ msgstr "" msgid "Unfollow" msgstr "" -#: src/Core/ACL.php:166 src/Module/Profile/Profile.php:271 +#: src/Core/ACL.php:166 src/Module/Profile/Profile.php:269 msgid "Yourself" msgstr "" @@ -3051,7 +3055,7 @@ msgstr "" msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2994 src/Module/Friendica.php:83 +#: src/Model/Contact.php:2994 src/Module/Friendica.php:102 msgid "Blocked domain" msgstr "" @@ -3299,8 +3303,8 @@ msgstr "" msgid "Wall Photos" msgstr "" -#: src/Model/Profile.php:361 src/Module/Profile/Profile.php:285 -#: src/Module/Profile/Profile.php:287 +#: src/Model/Profile.php:361 src/Module/Profile/Profile.php:283 +#: src/Module/Profile/Profile.php:285 msgid "Edit profile" msgstr "" @@ -3309,7 +3313,7 @@ msgid "Change profile photo" msgstr "" #: src/Model/Profile.php:376 src/Module/Directory.php:152 -#: src/Module/Profile/Profile.php:211 +#: src/Module/Profile/Profile.php:209 msgid "Homepage:" msgstr "" @@ -3404,6 +3408,7 @@ msgid "Title/Description:" msgstr "" #: src/Model/Profile.php:1025 src/Module/Admin/Summary.php:221 +#: src/Module/Moderation/Report/Create.php:280 #: src/Module/Moderation/Summary.php:77 msgid "Summary" msgstr "" @@ -3858,6 +3863,8 @@ msgid "Manage Additional Features" msgstr "" #: src/Module/Admin/Federation.php:76 +#: src/Module/Moderation/Report/Create.php:191 +#: src/Module/Moderation/Report/Create.php:316 msgid "Other" msgstr "" @@ -4224,7 +4231,7 @@ msgid "Policies" msgstr "" #: src/Module/Admin/Site.php:406 src/Module/Calendar/Event/Form.php:252 -#: src/Module/Contact.php:547 src/Module/Profile/Profile.php:278 +#: src/Module/Contact.php:547 src/Module/Profile/Profile.php:276 msgid "Advanced" msgstr "" @@ -5707,7 +5714,7 @@ msgstr "" msgid "Share this event" msgstr "" -#: src/Module/Calendar/Event/Form.php:251 src/Module/Profile/Profile.php:277 +#: src/Module/Calendar/Event/Form.php:251 src/Module/Profile/Profile.php:275 msgid "Basic" msgstr "" @@ -5871,7 +5878,7 @@ msgid "Only show blocked contacts" msgstr "" #: src/Module/Contact.php:369 src/Module/Contact.php:441 -#: src/Object/Post.php:360 +#: src/Object/Post.php:365 msgid "Ignored" msgstr "" @@ -6082,7 +6089,7 @@ msgstr[1] "" #: src/Module/Contact/Follow.php:70 src/Module/Contact/Redir.php:62 #: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:194 #: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57 -#: src/Module/Item/Display.php:98 src/Module/Item/Feed.php:59 +#: src/Module/Item/Display.php:96 src/Module/Item/Feed.php:59 #: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41 #: src/Module/Item/Pin.php:41 src/Module/Item/Pin.php:56 #: src/Module/Item/Star.php:42 src/Module/Update/Display.php:37 @@ -6128,7 +6135,7 @@ msgstr "" #: src/Module/Contact/Follow.php:171 src/Module/Contact/Profile.php:387 #: src/Module/Notifications/Introductions.php:191 -#: src/Module/Profile/Profile.php:236 +#: src/Module/Profile/Profile.php:234 msgid "Tags:" msgstr "" @@ -6299,6 +6306,7 @@ msgid "Block/Unblock contact" msgstr "" #: src/Module/Contact/Profile.php:348 +#: src/Module/Moderation/Report/Create.php:293 msgid "Ignore contact" msgstr "" @@ -6554,7 +6562,7 @@ msgstr "" msgid "Posts that mention or involve you" msgstr "" -#: src/Module/Conversation/Network.php:289 src/Object/Post.php:372 +#: src/Module/Conversation/Network.php:289 src/Object/Post.php:377 msgid "Starred" msgstr "" @@ -6907,55 +6915,55 @@ msgstr "" msgid "Suggest a friend for %s" msgstr "" -#: src/Module/Friendica.php:64 +#: src/Module/Friendica.php:82 msgid "Installed addons/apps:" msgstr "" -#: src/Module/Friendica.php:69 +#: src/Module/Friendica.php:87 msgid "No installed addons/apps" msgstr "" -#: src/Module/Friendica.php:74 +#: src/Module/Friendica.php:92 #, php-format msgid "Read about the Terms of Service of this node." msgstr "" -#: src/Module/Friendica.php:81 +#: src/Module/Friendica.php:100 msgid "On this server the following remote servers are blocked." msgstr "" -#: src/Module/Friendica.php:84 +#: src/Module/Friendica.php:103 #: src/Module/Moderation/Blocklist/Server/Index.php:87 #: src/Module/Moderation/Blocklist/Server/Index.php:111 msgid "Reason for the block" msgstr "" -#: src/Module/Friendica.php:86 +#: src/Module/Friendica.php:105 msgid "Download this list in CSV format" msgstr "" -#: src/Module/Friendica.php:100 +#: src/Module/Friendica.php:119 #, php-format msgid "" "This is Friendica, version %s that is running at the web location %s. The " "database version is %s, the post update version is %s." msgstr "" -#: src/Module/Friendica.php:105 +#: src/Module/Friendica.php:124 msgid "" "Please visit Friendi.ca to learn more " "about the Friendica project." msgstr "" -#: src/Module/Friendica.php:106 +#: src/Module/Friendica.php:125 msgid "Bug reports and issues: please visit" msgstr "" -#: src/Module/Friendica.php:106 +#: src/Module/Friendica.php:125 msgid "the bugtracker at github" msgstr "" -#: src/Module/Friendica.php:107 +#: src/Module/Friendica.php:126 msgid "" "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca" msgstr "" @@ -7270,7 +7278,7 @@ msgid "" "Theme Customization settings." msgstr "" -#: src/Module/Item/Display.php:138 src/Module/Update/Display.php:55 +#: src/Module/Item/Display.php:136 src/Module/Update/Display.php:55 msgid "The requested item doesn't exist or has been deleted." msgstr "" @@ -7814,6 +7822,209 @@ msgstr "" msgid "Item Guid" msgstr "" +#: src/Module/Moderation/Report/Create.php:95 +msgid "Contact not found or their server is already blocked on this node." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:136 +msgid "Please login to access this page." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:165 +#: src/Module/Moderation/Report/Create.php:180 +#: src/Module/Moderation/Report/Create.php:208 +#: src/Module/Moderation/Report/Create.php:260 +#: src/Module/Moderation/Report/Create.php:279 +msgid "Create Moderation Report" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:166 +msgid "Pick Contact" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:167 +msgid "" +"Please enter below the contact address or profile URL you would like to " +"create a moderation report about." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:171 +msgid "Contact address/URL" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:181 +msgid "Pick Category" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:182 +msgid "Please pick below the category of your report." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:186 +#: src/Module/Moderation/Report/Create.php:311 +msgid "Spam" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:186 +msgid "" +"This contact is publishing many repeated/overly long posts/replies or " +"advertising their product/websites in otherwise irrelevant conversations." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:187 +#: src/Module/Moderation/Report/Create.php:312 +msgid "Illegal Content" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:187 +msgid "" +"This contact is publishing content that is considered illegal in this node's " +"hosting juridiction." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:188 +#: src/Module/Moderation/Report/Create.php:313 +msgid "Community Safety" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:188 +msgid "" +"This contact aggravated you or other people, by being provocative or " +"insensitive, intentionally or not. This includes disclosing people's private " +"information (doxxing), posting threats or offensive pictures in posts or " +"replies." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:189 +#: src/Module/Moderation/Report/Create.php:314 +msgid "Unwanted Content/Behavior" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:189 +msgid "" +"This contact has repeatedly published content irrelevant to the node's theme " +"or is openly criticizing the node's administration/moderation without " +"directly engaging with the relevant people for example or repeatedly " +"nitpicking on a sensitive topic." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:190 +#: src/Module/Moderation/Report/Create.php:315 +msgid "Rules Violation" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:190 +msgid "" +"This contact violated one or more rules of this node. You will be able to " +"pick which one(s) in the next step." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:191 +msgid "" +"Please elaborate below why you submitted this report. The more details you " +"provide, the better your report can be handled." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:193 +msgid "Additional Information" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:193 +msgid "" +"Please provide any additional information relevant to this particular " +"report. You will be able to attach posts by this contact in the next step, " +"but any context is welcome." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:209 +msgid "Pick Rules" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:210 +msgid "Please pick below the node rules you believe this contact violated." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:261 +msgid "Pick Posts" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:262 +msgid "Please optionally pick posts to attach to your report." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:281 +msgid "Submit Report" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:282 +msgid "Further Action" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:283 +msgid "" +"You can also perform one of the following action on the contact you reported:" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:291 +msgid "Nothing" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:292 +msgid "Collapse contact" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:292 +msgid "" +"Their posts and replies will keep appearing in your Network page but their " +"content will be collapsed by default." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:293 +msgid "" +"Their posts won't appear in your Network page anymore, but their replies can " +"appear in forum threads. They still can follow you." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:294 +msgid "Block contact" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:294 +msgid "" +"Their posts won't appear in your Network page anymore, but their replies can " +"appear in forum threads, with their content collapsed by default. They " +"cannot follow you but still can have access to your public posts by other " +"means." +msgstr "" + +#: src/Module/Moderation/Report/Create.php:297 +msgid "Forward report" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:297 +msgid "Would you ike to forward this report to the remote server?" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:330 +msgid "1. Pick a contact" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:331 +msgid "2. Pick a category" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:332 +msgid "2a. Pick rules" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:333 +msgid "2b. Add comment" +msgstr "" + +#: src/Module/Moderation/Report/Create.php:334 +msgid "3. Pick posts" +msgstr "" + #: src/Module/Moderation/Summary.php:53 msgid "Normal Account" msgstr "" @@ -8364,20 +8575,20 @@ msgid "No contacts." msgstr "" #: src/Module/Profile/Conversations.php:106 -#: src/Module/Profile/Conversations.php:109 src/Module/Profile/Profile.php:353 -#: src/Module/Profile/Profile.php:356 src/Protocol/Feed.php:1090 +#: src/Module/Profile/Conversations.php:109 src/Module/Profile/Profile.php:351 +#: src/Module/Profile/Profile.php:354 src/Protocol/Feed.php:1090 #: src/Protocol/OStatus.php:1009 #, php-format msgid "%s's timeline" msgstr "" -#: src/Module/Profile/Conversations.php:107 src/Module/Profile/Profile.php:354 +#: src/Module/Profile/Conversations.php:107 src/Module/Profile/Profile.php:352 #: src/Protocol/Feed.php:1094 src/Protocol/OStatus.php:1014 #, php-format msgid "%s's posts" msgstr "" -#: src/Module/Profile/Conversations.php:108 src/Module/Profile/Profile.php:355 +#: src/Module/Profile/Conversations.php:108 src/Module/Profile/Profile.php:353 #: src/Protocol/Feed.php:1097 src/Protocol/OStatus.php:1018 #, php-format msgid "%s's comments" @@ -8412,43 +8623,43 @@ msgstr "" msgid "View Album" msgstr "" -#: src/Module/Profile/Profile.php:114 src/Module/Profile/Restricted.php:50 +#: src/Module/Profile/Profile.php:112 src/Module/Profile/Restricted.php:50 msgid "Profile not found." msgstr "" -#: src/Module/Profile/Profile.php:160 +#: src/Module/Profile/Profile.php:158 #, php-format msgid "" "You're currently viewing your profile as %s Cancel" msgstr "" -#: src/Module/Profile/Profile.php:169 src/Module/Settings/Account.php:576 +#: src/Module/Profile/Profile.php:167 src/Module/Settings/Account.php:576 msgid "Full Name:" msgstr "" -#: src/Module/Profile/Profile.php:174 +#: src/Module/Profile/Profile.php:172 msgid "Member since:" msgstr "" -#: src/Module/Profile/Profile.php:180 +#: src/Module/Profile/Profile.php:178 msgid "j F, Y" msgstr "" -#: src/Module/Profile/Profile.php:181 +#: src/Module/Profile/Profile.php:179 msgid "j F" msgstr "" -#: src/Module/Profile/Profile.php:189 src/Util/Temporal.php:168 +#: src/Module/Profile/Profile.php:187 src/Util/Temporal.php:168 msgid "Birthday:" msgstr "" -#: src/Module/Profile/Profile.php:192 src/Module/Settings/Profile/Index.php:253 +#: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:253 #: src/Util/Temporal.php:170 msgid "Age: " msgstr "" -#: src/Module/Profile/Profile.php:192 src/Module/Settings/Profile/Index.php:253 +#: src/Module/Profile/Profile.php:190 src/Module/Settings/Profile/Index.php:253 #: src/Util/Temporal.php:170 #, php-format msgid "%d year old" @@ -8456,19 +8667,19 @@ msgid_plural "%d years old" msgstr[0] "" msgstr[1] "" -#: src/Module/Profile/Profile.php:197 src/Module/Settings/Profile/Index.php:246 +#: src/Module/Profile/Profile.php:195 src/Module/Settings/Profile/Index.php:246 msgid "Description:" msgstr "" -#: src/Module/Profile/Profile.php:263 +#: src/Module/Profile/Profile.php:261 msgid "Groups:" msgstr "" -#: src/Module/Profile/Profile.php:275 +#: src/Module/Profile/Profile.php:273 msgid "View profile as:" msgstr "" -#: src/Module/Profile/Profile.php:292 +#: src/Module/Profile/Profile.php:290 msgid "View as" msgstr "" @@ -11297,222 +11508,226 @@ msgstr "" msgid "Remove locally" msgstr "" -#: src/Object/Post.php:270 +#: src/Object/Post.php:271 #, php-format msgid "Block %s" msgstr "" -#: src/Object/Post.php:275 +#: src/Object/Post.php:276 #, php-format msgid "Ignore %s" msgstr "" -#: src/Object/Post.php:280 +#: src/Object/Post.php:281 #, php-format msgid "Collapse %s" msgstr "" #: src/Object/Post.php:285 +msgid "Report post" +msgstr "" + +#: src/Object/Post.php:290 msgid "Save to folder" msgstr "" -#: src/Object/Post.php:325 +#: src/Object/Post.php:330 msgid "I will attend" msgstr "" -#: src/Object/Post.php:325 +#: src/Object/Post.php:330 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:325 +#: src/Object/Post.php:330 msgid "I might attend" msgstr "" -#: src/Object/Post.php:355 +#: src/Object/Post.php:360 msgid "Ignore thread" msgstr "" -#: src/Object/Post.php:356 +#: src/Object/Post.php:361 msgid "Unignore thread" msgstr "" -#: src/Object/Post.php:357 +#: src/Object/Post.php:362 msgid "Toggle ignore status" msgstr "" -#: src/Object/Post.php:367 +#: src/Object/Post.php:372 msgid "Add star" msgstr "" -#: src/Object/Post.php:368 +#: src/Object/Post.php:373 msgid "Remove star" msgstr "" -#: src/Object/Post.php:369 +#: src/Object/Post.php:374 msgid "Toggle star status" msgstr "" -#: src/Object/Post.php:380 +#: src/Object/Post.php:385 msgid "Pin" msgstr "" -#: src/Object/Post.php:381 +#: src/Object/Post.php:386 msgid "Unpin" msgstr "" -#: src/Object/Post.php:382 +#: src/Object/Post.php:387 msgid "Toggle pin status" msgstr "" -#: src/Object/Post.php:385 +#: src/Object/Post.php:390 msgid "Pinned" msgstr "" -#: src/Object/Post.php:390 +#: src/Object/Post.php:395 msgid "Add tag" msgstr "" -#: src/Object/Post.php:403 +#: src/Object/Post.php:408 msgid "Quote share this" msgstr "" -#: src/Object/Post.php:403 +#: src/Object/Post.php:408 msgid "Quote Share" msgstr "" -#: src/Object/Post.php:406 +#: src/Object/Post.php:411 msgid "Reshare this" msgstr "" -#: src/Object/Post.php:406 +#: src/Object/Post.php:411 msgid "Reshare" msgstr "" -#: src/Object/Post.php:407 +#: src/Object/Post.php:412 msgid "Cancel your Reshare" msgstr "" -#: src/Object/Post.php:407 +#: src/Object/Post.php:412 msgid "Unshare" msgstr "" -#: src/Object/Post.php:458 +#: src/Object/Post.php:463 #, php-format msgid "%s (Received %s)" msgstr "" -#: src/Object/Post.php:464 +#: src/Object/Post.php:469 msgid "Comment this item on your system" msgstr "" -#: src/Object/Post.php:464 +#: src/Object/Post.php:469 msgid "Remote comment" msgstr "" -#: src/Object/Post.php:486 +#: src/Object/Post.php:491 msgid "Share via ..." msgstr "" -#: src/Object/Post.php:486 +#: src/Object/Post.php:491 msgid "Share via external services" msgstr "" -#: src/Object/Post.php:515 +#: src/Object/Post.php:520 msgid "to" msgstr "" -#: src/Object/Post.php:516 +#: src/Object/Post.php:521 msgid "via" msgstr "" -#: src/Object/Post.php:517 +#: src/Object/Post.php:522 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:518 +#: src/Object/Post.php:523 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:563 +#: src/Object/Post.php:569 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:566 +#: src/Object/Post.php:572 msgid "More" msgstr "" -#: src/Object/Post.php:584 +#: src/Object/Post.php:590 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:585 +#: src/Object/Post.php:591 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:586 +#: src/Object/Post.php:592 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:587 +#: src/Object/Post.php:593 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:588 +#: src/Object/Post.php:594 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:608 +#: src/Object/Post.php:614 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:609 +#: src/Object/Post.php:615 msgid "Show more" msgstr "" -#: src/Object/Post.php:610 +#: src/Object/Post.php:616 msgid "Show fewer" msgstr "" -#: src/Object/Post.php:646 +#: src/Object/Post.php:652 #, php-format msgid "Reshared by: %s" msgstr "" -#: src/Object/Post.php:651 +#: src/Object/Post.php:657 #, php-format msgid "Viewed by: %s" msgstr "" -#: src/Object/Post.php:656 +#: src/Object/Post.php:662 #, php-format msgid "Liked by: %s" msgstr "" -#: src/Object/Post.php:661 +#: src/Object/Post.php:667 #, php-format msgid "Disliked by: %s" msgstr "" -#: src/Object/Post.php:666 +#: src/Object/Post.php:672 #, php-format msgid "Attended by: %s" msgstr "" -#: src/Object/Post.php:671 +#: src/Object/Post.php:677 #, php-format msgid "Maybe attended by: %s" msgstr "" -#: src/Object/Post.php:676 +#: src/Object/Post.php:682 #, php-format msgid "Not attended by: %s" msgstr "" -#: src/Object/Post.php:681 +#: src/Object/Post.php:687 #, php-format msgid "Reacted with %s by: %s" msgstr "" From 37131a6785c70882c7da83d63de13167ff8e5290 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 9 Jul 2023 20:56:51 -0400 Subject: [PATCH 112/259] Normalize item action label key name - Remove unused $item.return reference in asynchronous item action URLs --- src/Object/Post.php | 11 ++++------- view/templates/search_item.tpl | 14 +++++++------- view/templates/wall_thread.tpl | 2 +- view/theme/frio/templates/search_item.tpl | 2 +- view/theme/frio/templates/wall_thread.tpl | 11 ++++++----- view/theme/quattro/templates/search_item.tpl | 2 +- view/theme/quattro/templates/wall_item_tag.tpl | 12 ++++++------ view/theme/quattro/templates/wall_thread.tpl | 2 +- view/theme/smoothly/templates/search_item.tpl | 16 ++++++++-------- view/theme/smoothly/templates/wall_thread.tpl | 2 +- view/theme/vier/templates/search_item.tpl | 2 +- view/theme/vier/templates/wall_item_tag.tpl | 12 ++++++------ 12 files changed, 43 insertions(+), 45 deletions(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index 28db23894..915dead94 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -248,9 +248,6 @@ class Post $pinned = DI::l10n()->t('Pinned item'); } - // Showing the one or the other text, depending upon if we can only hide it or really delete it. - $delete = $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally'); - $drop = false; $block = false; $ignore = false; @@ -260,24 +257,24 @@ class Post 'dropping' => $dropping, 'pagedrop' => $item['pagedrop'], 'select' => DI::l10n()->t('Select'), - 'delete' => $delete, + 'label' => $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally'), ]; } if (!$item['self'] && DI::userSession()->getLocalUserId()) { $block = [ 'blocking' => true, - 'block' => DI::l10n()->t('Block %s', $item['author-name']), + 'label' => DI::l10n()->t('Block %s', $item['author-name']), 'author_id' => $item['author-id'], ]; $ignore = [ 'ignoring' => true, - 'ignore' => DI::l10n()->t('Ignore %s', $item['author-name']), + 'label' => DI::l10n()->t('Ignore %s', $item['author-name']), 'author_id' => $item['author-id'], ]; $collapse = [ 'collapsing' => true, - 'collapse' => DI::l10n()->t('Collapse %s', $item['author-name']), + 'label' => DI::l10n()->t('Collapse %s', $item['author-name']), 'author_id' => $item['author-id'], ]; } diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl index fc322be95..4320ec6cf 100644 --- a/view/templates/search_item.tpl +++ b/view/templates/search_item.tpl @@ -7,8 +7,8 @@
-
{{$item.name}} @@ -19,17 +19,17 @@
-
+
{{if $item.lock}}
{{$item.lock}}
- {{else}}
{{/if}} + {{else}}
{{/if}}
{{$item.location_html nofilter}}
{{$item.name}} -
{{$item.pinned}}
-
+
{{$item.pinned}}
+
{{$item.title}}
@@ -46,7 +46,7 @@
- {{if $item.drop && $item.drop.dropping}}{{/if}} + {{if $item.drop && $item.drop.dropping}}{{/if}}
{{if $item.drop && $item.drop.pagedrop}}{{/if}}
diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index 5e9dd96d6..90218d911 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -166,7 +166,7 @@ {{/if}} {{if $item.drop && $item.drop.dropping}} - {{$item.drop.delete}} + {{$item.drop.label}} {{/if}} {{if $item.edpost}} {{$item.edpost.1}} diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index 4a3e006aa..ef02e1064 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -245,7 +245,7 @@ {{if $item.drop && $item.drop.dropping}}
  • - {{$item.drop.delete}} + {{$item.drop.label}}
    • {{/if}} diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 3e9d19e02..29e0c6463 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -390,23 +390,24 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.drop && $item.drop.dropping}}
  • - {{$item.drop.delete}} + {{$item.drop.label}}
    • {{/if}} {{if $item.block}}
  • - {{$item.block.block}} + {{$item.block.label}}
    • {{/if}} {{if $item.ignore_author}}
  • - {{$item.ignore_author.ignore}} + {{$item.ignore_author.label}}
    • {{/if}} {{if $item.collapse}}
  • - {{$item.collapse.collapse}} + {{$item.collapse.label}} +
    • {{/if}} @@ -559,7 +560,7 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.drop && $item.drop.dropping}}
  • - {{$item.drop.delete}} + {{$item.drop.label}}
    • {{/if}} diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl index b5c6af7e7..dc89c3e50 100644 --- a/view/theme/quattro/templates/search_item.tpl +++ b/view/theme/quattro/templates/search_item.tpl @@ -75,7 +75,7 @@ {{/if}} {{if $item.drop && $item.drop.dropping}} - {{$item.drop.delete}} + {{$item.drop.label}} {{/if}} {{if $item.edpost}} diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl index 3aa9d3ad4..023bde970 100644 --- a/view/theme/quattro/templates/wall_item_tag.tpl +++ b/view/theme/quattro/templates/wall_item_tag.tpl @@ -2,12 +2,12 @@ {{else}} {{if $item.comment_firstcollapsed}}
    - {{$item.num_comments}} - {{$item.hide_text}} - {{if $item.thread_level==3}} - + {{if $item.thread_level==3}} - expand / @@ -32,7 +32,7 @@ - +
    {{$item.location_html nofilter}}
    @@ -44,7 +44,7 @@ {{/if}} {{if $item.drop && $item.drop.dropping}} - {{$item.drop.delete}} + {{$item.drop.label}} {{/if}} diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl index 1683f10d0..197ce776f 100644 --- a/view/theme/quattro/templates/wall_thread.tpl +++ b/view/theme/quattro/templates/wall_thread.tpl @@ -149,7 +149,7 @@ {{/if}} {{if $item.drop && $item.drop.dropping}} - {{$item.drop.delete}} + {{$item.drop.label}} {{/if}} {{if $item.edpost}} diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl index 94d713267..89d51701a 100644 --- a/view/theme/smoothly/templates/search_item.tpl +++ b/view/theme/smoothly/templates/search_item.tpl @@ -5,8 +5,8 @@
    -
    {{$item.name}} @@ -17,16 +17,16 @@
    -
    +
    {{if $item.location_html}}{{$item.location_html nofilter}} {{/if}}
    {{if $item.lock}}
    {{$item.lock}}
    - {{else}}
    {{/if}} + {{else}}
    {{/if}}
    - {{if $item.drop && $item.drop.dropping}}{{/if}} + {{if $item.drop && $item.drop.dropping}}{{/if}}
    {{if $item.drop && $item.drop.pagedrop}}{{/if}}
    @@ -39,9 +39,9 @@
    {{$item.name}}
    {{$item.ago}}
    - -
    - + +
    +
    diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl index 53602cc8f..594799f6b 100644 --- a/view/theme/smoothly/templates/wall_thread.tpl +++ b/view/theme/smoothly/templates/wall_thread.tpl @@ -136,7 +136,7 @@
    {{if $item.drop && $item.drop.dropping}} - + {{/if}}
    diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl index e556335a5..51de297d3 100644 --- a/view/theme/vier/templates/search_item.tpl +++ b/view/theme/vier/templates/search_item.tpl @@ -80,7 +80,7 @@ {{/if}} {{if $item.drop && $item.drop.dropping}} - {{$item.drop.delete}} + {{$item.drop.label}} {{/if}} {{if $item.edpost}} diff --git a/view/theme/vier/templates/wall_item_tag.tpl b/view/theme/vier/templates/wall_item_tag.tpl index c12cb7085..92cfaf914 100644 --- a/view/theme/vier/templates/wall_item_tag.tpl +++ b/view/theme/vier/templates/wall_item_tag.tpl @@ -3,12 +3,12 @@ {{else}} {{if $item.comment_firstcollapsed}}
    - {{$item.num_comments}} - {{$item.hide_text}} - {{if $item.thread_level==3}} - + {{if $item.thread_level==3}} - expand / @@ -32,7 +32,7 @@ - +
    {{$item.location_html nofilter}}
    @@ -44,7 +44,7 @@ {{/if}} {{if $item.drop && $item.drop.dropping}} - {{$item.drop.delete}} + {{$item.drop.label}} {{/if}} From 3748adf2fda4f547da278400c44d4a9771023e94 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 9 Jul 2023 22:44:40 -0400 Subject: [PATCH 113/259] Fix exception module not setting the HTTP response code - Page->run now returns an updated response for use with Page->exit - Remove now duplicated header setting in Page->run - Remove now obsolete (and ineffective) HTTP return code setting from Module\Special\HTTPException->content - Add HTTP response code and reason setting in BaseModule->run --- src/App.php | 8 +++++--- src/App/Page.php | 19 +++++-------------- src/BaseModule.php | 1 + src/Module/Special/HTTPException.php | 2 -- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/App.php b/src/App.php index a48e21571..db3e644c2 100644 --- a/src/App.php +++ b/src/App.php @@ -706,11 +706,13 @@ class App $timestamp = microtime(true); $response = $module->run($httpException, $input); $this->profiler->set(microtime(true) - $timestamp, 'content'); + + // Wrapping HTML responses in the theme template if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) { - $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); - } else { - $page->exit($response); + $response = $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $nav, $this->session->getLocalUserId()); } + + $page->exit($response); } catch (HTTPException $e) { $httpException->rawContent($e); } diff --git a/src/App/Page.php b/src/App/Page.php index 6252d9a88..96bb59425 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -39,6 +39,7 @@ use Friendica\Network\HTTPException; use Friendica\Util\Network; use Friendica\Util\Profiler; use Friendica\Util\Strings; +use GuzzleHttp\Psr7\Utils; use Psr\Http\Message\ResponseInterface; /** @@ -499,20 +500,6 @@ class Page implements ArrayAccess $this->page['nav'] = $nav->getHtml(); } - foreach ($response->getHeaders() as $key => $header) { - if (is_array($header)) { - $header_str = implode(',', $header); - } else { - $header_str = $header; - } - - if (empty($key)) { - header($header_str); - } else { - header("$key: $header_str"); - } - } - // Build the page - now that we have all the components if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) { $doc = new DOMDocument(); @@ -583,6 +570,10 @@ class Page implements ArrayAccess // Used as is in view/php/default.php $lang = $l10n->getCurrentLang(); + ob_start(); require_once $template; + $body = ob_get_clean(); + + return $response->withBody(Utils::streamFor($body)); } } diff --git a/src/BaseModule.php b/src/BaseModule.php index b43e98477..619095dfb 100644 --- a/src/BaseModule.php +++ b/src/BaseModule.php @@ -251,6 +251,7 @@ abstract class BaseModule implements ICanHandleRequests throw $e; } + $this->response->setStatus($e->getCode(), $e->getMessage()); $this->response->addContent($httpException->content($e)); } finally { $this->profiler->set(microtime(true) - $timestamp, 'content'); diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php index 8a8cc30eb..2cac142fc 100644 --- a/src/Module/Special/HTTPException.php +++ b/src/Module/Special/HTTPException.php @@ -126,8 +126,6 @@ class HTTPException */ public function content(\Friendica\Network\HTTPException $e): string { - header($this->server['SERVER_PROTOCOL'] ?? 'HTTP/1.0' . ' ' . $e->getCode() . ' ' . $e->getDescription()); - if ($e->getCode() >= 400) { $this->logger->debug('Exit with error', [ From c822d5fa945e9b323f28c776c51fa4635ce5f04c Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 10 Jul 2023 20:50:16 +0000 Subject: [PATCH 114/259] Fix "Cannot drop index 'last-editor-uid': needed in a foreign key constraint" --- database.sql | 11 ++++++++--- doc/database/db_report.md | 1 + static/dbstructure.config.php | 1 + static/dbview.config.php | 10 +++++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/database.sql b/database.sql index 5b6f1695c..13158d1ea 100644 --- a/database.sql +++ b/database.sql @@ -1712,6 +1712,7 @@ CREATE TABLE IF NOT EXISTS `report` ( INDEX `cid` (`cid`), INDEX `reporter-id` (`reporter-id`), INDEX `gsid` (`gsid`), + INDEX `last-editor-uid` (`last-editor-uid`), INDEX `assigned-uid` (`assigned-uid`), INDEX `status-resolution` (`status`,`resolution`), INDEX `created` (`created`), @@ -2635,13 +2636,15 @@ CREATE VIEW `network-item-view` AS SELECT `ownercontact`.`contact-type` AS `contact-type` FROM `post-user` INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid` - INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id` + STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id` - INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) + AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked` AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`); @@ -2664,12 +2667,14 @@ CREATE VIEW `network-thread-view` AS SELECT FROM `post-thread-user` INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id` + STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id` - LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`) + AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked` AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`); diff --git a/doc/database/db_report.md b/doc/database/db_report.md index cb2bcb189..d14383999 100644 --- a/doc/database/db_report.md +++ b/doc/database/db_report.md @@ -35,6 +35,7 @@ Indexes | cid | cid | | reporter-id | reporter-id | | gsid | gsid | +| last-editor-uid | last-editor-uid | | assigned-uid | assigned-uid | | status-resolution | status, resolution | | created | created | diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 33cf1d86a..303e42e03 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -1710,6 +1710,7 @@ return [ "cid" => ["cid"], "reporter-id" => ["reporter-id"], "gsid" => ["gsid"], + "last-editor-uid" => ["last-editor-uid"], "assigned-uid" => ["assigned-uid"], "status-resolution" => ["status", "resolution"], "created" => ["created"], diff --git a/static/dbview.config.php b/static/dbview.config.php index 004063a41..43959f363 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -776,13 +776,15 @@ ], "query" => "FROM `post-user` INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid` - INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id` + STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id` - INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`) + AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked` AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)" ], @@ -803,12 +805,14 @@ "query" => "FROM `post-thread-user` INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id` + STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id` + STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id` LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id` - LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id` WHERE `post-user`.`visible` AND NOT `post-user`.`deleted` AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`) AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`) + AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked` AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`) AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`)" ], From 52c062adb6f1fc4eea1474fa1269e6afe8303799 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 11 Jul 2023 07:43:53 +0000 Subject: [PATCH 115/259] Fix "Cannot add or update a child row: a foreign key constraint fails" --- database.sql | 2 +- doc/database/db_report.md | 2 +- static/dbstructure.config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database.sql b/database.sql index 13158d1ea..e9db927f1 100644 --- a/database.sql +++ b/database.sql @@ -1695,7 +1695,7 @@ CREATE TABLE IF NOT EXISTS `report` ( `uid` mediumint unsigned COMMENT 'Reporting user', `reporter-id` int unsigned COMMENT 'Reporting contact', `cid` int unsigned NOT NULL COMMENT 'Reported contact', - `gsid` int unsigned NOT NULL COMMENT 'Reported contact server', + `gsid` int unsigned COMMENT 'Reported contact server', `comment` text COMMENT 'Report', `category-id` int unsigned NOT NULL DEFAULT 1 COMMENT 'Report category, one of Entity\Report::CATEGORY_*', `forward` boolean COMMENT 'Forward the report to the remote server', diff --git a/doc/database/db_report.md b/doc/database/db_report.md index d14383999..c2890e25a 100644 --- a/doc/database/db_report.md +++ b/doc/database/db_report.md @@ -12,7 +12,7 @@ Fields | uid | Reporting user | mediumint unsigned | YES | | NULL | | | reporter-id | Reporting contact | int unsigned | YES | | NULL | | | cid | Reported contact | int unsigned | NO | | NULL | | -| gsid | Reported contact server | int unsigned | NO | | NULL | | +| gsid | Reported contact server | int unsigned | YES | | NULL | | | comment | Report | text | YES | | NULL | | | category-id | Report category, one of Entity\Report::CATEGORY_* | int unsigned | NO | | 1 | | | forward | Forward the report to the remote server | boolean | YES | | NULL | | diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 303e42e03..1a61d9f21 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -1691,7 +1691,7 @@ return [ "uid" => ["type" => "mediumint unsigned", "foreign" => ["user" => "uid"], "comment" => "Reporting user"], "reporter-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Reporting contact"], "cid" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["contact" => "id"], "comment" => "Reported contact"], - "gsid" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["gserver" => "id"], "comment" => "Reported contact server"], + "gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id"], "comment" => "Reported contact server"], "comment" => ["type" => "text", "comment" => "Report"], "category-id" => ["type" => "int unsigned", "not null" => 1, "default" => \Friendica\Moderation\Entity\Report::CATEGORY_OTHER, "comment" => "Report category, one of Entity\Report::CATEGORY_*"], "forward" => ["type" => "boolean", "comment" => "Forward the report to the remote server"], From 91d63213ae79f6b75ccc8aa10b427ea36ba3c703 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 11 Jul 2023 09:00:41 -0400 Subject: [PATCH 116/259] Reintroduce is_string modifier in addons/connector templates - Address https://github.com/friendica/friendica/issues/13157#issuecomment-1606003698 --- view/templates/settings/addons/connector.tpl | 2 +- view/theme/frio/templates/settings/addons/connector.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/templates/settings/addons/connector.tpl b/view/templates/settings/addons/connector.tpl index adf615f9e..c06c78195 100644 --- a/view/templates/settings/addons/connector.tpl +++ b/view/templates/settings/addons/connector.tpl @@ -9,7 +9,7 @@
    {{if $submit}}
    - {{if $submit}} + {{if $submit|is_string}} {{else}} {{$count = 1}} diff --git a/view/theme/frio/templates/settings/addons/connector.tpl b/view/theme/frio/templates/settings/addons/connector.tpl index 23e796fc5..aee0e2845 100644 --- a/view/theme/frio/templates/settings/addons/connector.tpl +++ b/view/theme/frio/templates/settings/addons/connector.tpl @@ -11,7 +11,7 @@
    {{if $submit}} - {{if $submit}} + {{if $submit|is_string}} {{else}} {{$count = 1}} From 248148af991380968596e97fc1c22176fe70ef65 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 11 Jul 2023 09:02:53 -0400 Subject: [PATCH 117/259] Return early if no items are provided in Content\Conversation->getThreadList - Address https://github.com/friendica/friendica/issues/13157#issuecomment-1628437859 --- src/Content/Conversation.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index b645ecf4b..6cad2b980 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -589,6 +589,10 @@ class Conversation */ public function getThreadList(array $items, string $mode, bool $preview, bool $pagedrop, string $formSecurityToken): array { + if (!$items) { + return []; + } + if (in_array($mode, [self::MODE_FILED, self::MODE_SEARCH, self::MODE_CONTACT_POSTS])) { $threads = $this->getContextLessThreadList($items, $mode, $preview, $pagedrop, $formSecurityToken); } else { From 3624792bd6942023ef24703cba9d82e4f67e73ed Mon Sep 17 00:00:00 2001 From: Steffen K9 Date: Tue, 11 Jul 2023 22:37:45 +0200 Subject: [PATCH 118/259] Fix db error: missing column name 'line-text' See https://github.com/friendica/friendica/issues/13277#issuecomment-1631359293 --- src/Moderation/Repository/Report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Moderation/Repository/Report.php b/src/Moderation/Repository/Report.php index 4681ea3b9..e405f7808 100644 --- a/src/Moderation/Repository/Report.php +++ b/src/Moderation/Repository/Report.php @@ -109,7 +109,7 @@ final class Report extends \Friendica\BaseRepository } $reportPosts = new Collection\Report\Posts(array_map([$this->postFactory, 'createFromTableRow'], $this->db->selectToArray('report-post', ['uri-id', 'status'], ['rid' => $condition['id'] ?? 0]))); - $reportRules = new Collection\Report\Rules(array_map([$this->ruleFactory, 'createFromTableRow'], $this->db->selectToArray('report-rule', ['line-id', 'line-text'], ['rid' => $condition['id'] ?? 0]))); + $reportRules = new Collection\Report\Rules(array_map([$this->ruleFactory, 'createFromTableRow'], $this->db->selectToArray('report-rule', ['line-id', 'text'], ['rid' => $condition['id'] ?? 0]))); return $this->factory->createFromTableRow($fields, $reportPosts, $reportRules); } From f87c105518caa8f0e7d6de74d1e075e6433b0e85 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 13 Jul 2023 23:51:03 -0400 Subject: [PATCH 119/259] Remove unused variable trheadids from Content\Conversation - Address https://github.com/friendica/friendica/issues/13157#issuecomment-1635208668 --- src/Content/Conversation.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 6cad2b980..710422ee7 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -1381,8 +1381,6 @@ class Conversation continue; } - $threadsid++; - // prevent private email from leaking. if ($item['network'] === Protocol::MAIL && $this->session->getLocalUserId() != $item['uid']) { continue; From 8b5a49fb5c2c8fdd4b519e1be7305960f54b4caa Mon Sep 17 00:00:00 2001 From: Steffen K9 Date: Sat, 15 Jul 2023 14:41:29 +0200 Subject: [PATCH 120/259] Fix WSOD when creating a report using PHP8.x Fixes https://github.com/friendica/friendica/issues/13277 --- src/Module/Moderation/Report/Create.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Moderation/Report/Create.php b/src/Module/Moderation/Report/Create.php index 0e0e4c925..019a19ced 100644 --- a/src/Module/Moderation/Report/Create.php +++ b/src/Module/Moderation/Report/Create.php @@ -338,7 +338,7 @@ class Create extends BaseModule '$category' => $category, '$rules' => $rules ?? [], '$comment' => BBCode::convert($this->session->get('report_comment') ?? '', false, ), - '$posts' => count($request['uri-ids']), + '$posts' => count($request['uri-ids'] ?? []), ]); } } From 8bb33dccd1d945c849c7006ee56a73fc9404323c Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 15 Jul 2023 20:12:08 +0000 Subject: [PATCH 121/259] Unified BBCode conversion, improved proxy functionality --- src/Content/OEmbed.php | 3 +-- src/Content/Text/BBCode.php | 8 ++++---- src/Content/Text/NPF.php | 2 +- src/Core/System.php | 10 ++++++---- src/Factory/Api/Mastodon/Field.php | 2 +- src/Model/Event.php | 9 +++++---- src/Model/User.php | 11 +++++++++++ src/Module/Api/Friendica/Profile/Show.php | 2 +- src/Module/Debug/Babel.php | 6 +++--- src/Module/Moderation/Report/Create.php | 2 +- src/Module/Notifications/Introductions.php | 2 +- src/Module/Register.php | 2 +- src/Module/Tos.php | 5 +++-- src/Navigation/Notifications/Entity/Notify.php | 4 ++-- src/Navigation/Notifications/Factory/Introduction.php | 4 ++-- src/Object/Api/Friendica/Notification.php | 2 +- src/Object/Api/Mastodon/ScheduledStatus.php | 2 +- src/Profile/ProfileField/Entity/ProfileField.php | 6 +++++- src/Profile/ProfileField/Factory/ProfileField.php | 6 +++++- src/Util/EMailer/NotifyMailBuilder.php | 2 +- src/Util/EMailer/SystemMailBuilder.php | 2 +- static/settings.config.php | 4 ++++ 22 files changed, 61 insertions(+), 35 deletions(-) diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 7afdfac35..df2cafea4 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -312,8 +312,7 @@ class OEmbed */ public static function BBCode2HTML(string $text): string { - $stopoembed = DI::config()->get('system', 'no_oembed'); - if ($stopoembed == true) { + if (DI::config()->get('system', 'no_oembed')) { return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "" . DI::l10n()->t('Embedding disabled') . " : $1", $text); } return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", [self::class, 'replaceCallback'], $text); diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 3635ba874..503adbd57 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -142,7 +142,7 @@ class BBCode break; case 'title': - $value = self::convert(html_entity_decode($value, ENT_QUOTES, 'UTF-8'), false, true); + $value = self::convertForUriId(0, html_entity_decode($value, ENT_QUOTES, 'UTF-8'), BBCode::EXTERNAL); $value = html_entity_decode($value, ENT_QUOTES, 'UTF-8'); $value = str_replace(['[', ']'], ['[', ']'], $value); $data['title'] = $value; @@ -236,7 +236,7 @@ class BBCode // Remove attachment $text = self::replaceAttachment($text); - $naked_text = HTML::toPlaintext(self::convert($text, false, 0, true), 0, !$keep_urls); + $naked_text = HTML::toPlaintext(self::convert($text, false, BBCode::EXTERNAL, true), 0, !$keep_urls); DI::profiler()->stopRecording(); return $naked_text; @@ -2065,7 +2065,7 @@ class BBCode // Convert it to HTML - don't try oembed if ($for_diaspora) { - $text = self::convert($text, false, self::DIASPORA); + $text = self::convertForUriId(0, $text, self::DIASPORA); // Add all tags that maybe were removed if (preg_match_all("/#\[url\=([$url_search_string]*)\](.*?)\[\/url\]/ism", $original_text, $tags)) { @@ -2079,7 +2079,7 @@ class BBCode $text = $text . ' ' . $tagline; } } else { - $text = self::convert($text, false, self::CONNECTORS); + $text = self::convertForUriId(0, $text, self::CONNECTORS); } // If a link is followed by a quote then there should be a newline before it diff --git a/src/Content/Text/NPF.php b/src/Content/Text/NPF.php index 2f0b36083..f5a6e2dc1 100644 --- a/src/Content/Text/NPF.php +++ b/src/Content/Text/NPF.php @@ -45,7 +45,7 @@ class NPF { $bbcode = self::prepareBody($bbcode); - $html = BBCode::convert($bbcode, false, BBCode::NPF); + $html = BBCode::convertForUriId($uri_id, $bbcode, BBCode::NPF); if (empty($html)) { return []; } diff --git a/src/Core/System.php b/src/Core/System.php index 00bdcd455..602d85c83 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -25,6 +25,7 @@ use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\DI; +use Friendica\Model\User; use Friendica\Module\Response; use Friendica\Network\HTTPException\FoundException; use Friendica\Network\HTTPException\MovedPermanentlyException; @@ -226,9 +227,10 @@ class System * @param integer $depth How many calls to include in the stacks after filtering * @param int $offset How many calls to shave off the top of the stack, for example if * this is called from a centralized method that isn't relevant to the callstack + * @param bool $full If enabled, the callstack is not compacted * @return string */ - public static function callstack(int $depth = 4, int $offset = 0): string + public static function callstack(int $depth = 4, int $offset = 0, bool $full = false): string { $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); @@ -243,7 +245,7 @@ class System while ($func = array_pop($trace)) { if (!empty($func['class'])) { - if (in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray', + if (!$full && in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray', 'select', 'update', 'delete', 'selectFirstForUser', 'selectForUser']) && (substr($previous['class'], 0, 15) === 'Friendica\Model')) { continue; @@ -251,7 +253,7 @@ class System // Don't show multiple calls from the Database classes to show the essential parts of the callstack $func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']); - if (!$previous['database'] || !$func['database']) { + if ($full || !$previous['database'] || !$func['database']) { $classparts = explode("\\", $func['class']); $callstack[] = array_pop($classparts).'::'.$func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : ''); $previous = $func; @@ -669,7 +671,7 @@ class System if (DI::config()->get('system', 'tosdisplay')) { $rulelist = DI::config()->get('system', 'tosrules') ?: DI::config()->get('system', 'tostext'); - $html = BBCode::convert($rulelist, false, BBCode::EXTERNAL); + $html = BBCode::convertForUriId(User::getSystemUriId(), $rulelist, BBCode::EXTERNAL); $msg = HTML::toPlaintext($html, 0, true); foreach (explode("\n", trim($msg)) as $line) { diff --git a/src/Factory/Api/Mastodon/Field.php b/src/Factory/Api/Mastodon/Field.php index 8b24eb486..e4fe20305 100644 --- a/src/Factory/Api/Mastodon/Field.php +++ b/src/Factory/Api/Mastodon/Field.php @@ -38,7 +38,7 @@ class Field extends BaseFactory */ public function createFromProfileField(ProfileField $profileField): \Friendica\Object\Api\Mastodon\Field { - return new \Friendica\Object\Api\Mastodon\Field($profileField->label, BBCode::convert($profileField->value, false, BBCode::ACTIVITYPUB)); + return new \Friendica\Object\Api\Mastodon\Field($profileField->label, BBCode::convertForUriId($profileField->uriId, $profileField->value, BBCode::ACTIVITYPUB)); } /** diff --git a/src/Model/Event.php b/src/Model/Event.php index bc0337064..6ac1e2774 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -928,7 +928,7 @@ class Event } // Format the event location. - $location = self::locationToArray($item['event-location']); + $location = self::locationToArray($item['event-location'], $item['uri-id']); // Construct the profile link (magic-auth). $author = [ @@ -978,7 +978,8 @@ class Event * Note: The string must only contain location data. A string with no bbcode will be * handled as location name. * - * @param string $s The string with the bbcode formatted location data. + * @param string $s The string with the bbcode formatted location data. + * @param int $uri_id The uri-id of the related post * * @return array The array with the location data. * 'name' => The name of the location,
    @@ -986,7 +987,7 @@ class Event * 'coordinates' => Latitude and longitude (e.g. '48.864716,2.349014').
    * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function locationToArray(string $s = ''): array + private static function locationToArray(string $s, int $uri_id): array { if ($s == '') { return []; @@ -1012,7 +1013,7 @@ class Event } } - $location['name'] = BBCode::convert($location['name']); + $location['name'] = BBCode::convertForUriId($uri_id, $location['name']); // Construct the map HTML. if (isset($location['address'])) { diff --git a/src/Model/User.php b/src/Model/User.php index 854961154..89d75849f 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -132,6 +132,17 @@ class User return null; } + /** + * Get the Uri-Id of the system account + * + * @return integer + */ + public static function getSystemUriId(): int + { + $system = self::getSystemAccount(); + return $system['uri-id'] ?? 0; + } + /** * Fetch the system account * diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php index 28909f0e3..b97fcdcab 100644 --- a/src/Module/Api/Friendica/Profile/Show.php +++ b/src/Module/Api/Friendica/Profile/Show.php @@ -78,7 +78,7 @@ class Show extends BaseApi foreach ($profileFields as $profileField) { $custom_fields[] = [ 'label' => $profileField->label, - 'value' => BBCode::convert($profileField->value, false, BBCode::TWITTER_API), + 'value' => BBCode::convertForUriId($profileField->uriId, $profileField->value, BBCode::TWITTER_API), ]; } diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php index 560d002a1..a914f4fe9 100644 --- a/src/Module/Debug/Babel.php +++ b/src/Module/Debug/Babel.php @@ -58,7 +58,7 @@ class Babel extends BaseModule 'content' => visible_whitespace($plain) ]; - $html = Text\BBCode::convert($bbcode); + $html = Text\BBCode::convertForUriId(0, $bbcode); $results[] = [ 'title' => DI::l10n()->t('BBCode::convert (raw HTML)'), 'content' => visible_whitespace($html) @@ -125,7 +125,7 @@ class Babel extends BaseModule 'title' => DI::l10n()->t('PageInfo::appendToBody'), 'content' => visible_whitespace($body2) ]; - $html3 = Text\BBCode::convert($body2); + $html3 = Text\BBCode::convertForUriId(0, $body2); $results[] = [ 'title' => DI::l10n()->t('PageInfo::appendToBody => BBCode::convert (raw HTML)'), 'content' => visible_whitespace($html3) @@ -203,7 +203,7 @@ class Babel extends BaseModule 'content' => visible_whitespace($bbcode) ]; - $html2 = Text\BBCode::convert($bbcode); + $html2 = Text\BBCode::convertForUriId(0, $bbcode); $results[] = [ 'title' => DI::l10n()->t('HTML::toBBCode => BBCode::convert'), 'content' => $html2 diff --git a/src/Module/Moderation/Report/Create.php b/src/Module/Moderation/Report/Create.php index 0e0e4c925..1185730ab 100644 --- a/src/Module/Moderation/Report/Create.php +++ b/src/Module/Moderation/Report/Create.php @@ -337,7 +337,7 @@ class Create extends BaseModule '$contact' => $contact, '$category' => $category, '$rules' => $rules ?? [], - '$comment' => BBCode::convert($this->session->get('report_comment') ?? '', false, ), + '$comment' => BBCode::convertForUriId($contact['uri-id'] ?? 0, $this->session->get('report_comment') ?? '', BBCode::EXTERNAL), '$posts' => count($request['uri-ids']), ]); } diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 246bed540..1c4a98b47 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -147,7 +147,7 @@ class Introductions extends BaseNotifications $knowyou = ''; } - $convertedName = BBCode::convert($Introduction->getName()); + $convertedName = BBCode::convertForUriId($owner['uri-id'], $Introduction->getName()); $helptext = $this->t('Shall your connection be bidirectional or not?'); $helptext2 = $this->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName); diff --git a/src/Module/Register.php b/src/Module/Register.php index d26fb0a3d..a62525a98 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -150,7 +150,7 @@ class Register extends BaseModule '$invite_label' => DI::l10n()->t('Your invitation code: '), '$invite_id' => $invite_id, '$regtitle' => DI::l10n()->t('Registration'), - '$registertext' => BBCode::convert(DI::config()->get('config', 'register_text', '')), + '$registertext' => BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('config', 'register_text', '')), '$fillwith' => $fillwith, '$fillext' => $fillext, '$oidlabel' => $oidlabel, diff --git a/src/Module/Tos.php b/src/Module/Tos.php index af6481008..3b151c31f 100644 --- a/src/Module/Tos.php +++ b/src/Module/Tos.php @@ -27,6 +27,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Content\Text\BBCode; +use Friendica\Model\User; use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; @@ -98,9 +99,9 @@ class Tos extends BaseModule return Renderer::replaceMacros($tpl, [ '$title' => $this->t('Terms of Service'), - '$tostext' => BBCode::convert($this->config->get('system', 'tostext')), + '$tostext' => BBCode::convertForUriId(User::getSystemUriId(), $this->config->get('system', 'tostext')), '$rulestitle' => $this->t('Rules'), - '$rules' => BBCode::convert($rules), + '$rules' => BBCode::convertForUriId(User::getSystemUriId(), $rules), '$displayprivstatement' => $this->config->get('system', 'tosprivstatement'), '$privstatementtitle' => $this->t('Privacy Statement'), '$privacy_operate' => $this->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'), diff --git a/src/Navigation/Notifications/Entity/Notify.php b/src/Navigation/Notifications/Entity/Notify.php index 45f450b1d..56db3dc5c 100644 --- a/src/Navigation/Notifications/Entity/Notify.php +++ b/src/Navigation/Notifications/Entity/Notify.php @@ -118,7 +118,7 @@ class Notify extends BaseEntity public function updateMsgFromPreamble($epreamble) { $this->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $this->link->__toString()]); - $this->msg_cache = self::formatMessage($this->name_cache, strip_tags(BBCode::convert($this->msg))); + $this->msg_cache = self::formatMessage($this->name_cache, strip_tags(BBCode::convertForUriId(0, $this->msg, BBCode::EXTERNAL))); } /** @@ -134,6 +134,6 @@ class Notify extends BaseEntity */ public static function formatMessage(string $name, string $message): string { - return str_replace('{0}', '' . strip_tags(BBCode::convert($name)) . '', htmlspecialchars($message)); + return str_replace('{0}', '' . strip_tags(BBCode::convertForUriId(0, $name, BBCode::EXTERNAL)) . '', htmlspecialchars($message)); } } diff --git a/src/Navigation/Notifications/Factory/Introduction.php b/src/Navigation/Notifications/Factory/Introduction.php index 3d176743c..5078cac3c 100644 --- a/src/Navigation/Notifications/Factory/Introduction.php +++ b/src/Navigation/Notifications/Factory/Introduction.php @@ -163,8 +163,8 @@ class Introduction extends BaseFactory 'contact_id' => $intro['contact-id'], 'photo' => Contact::getPhoto($intro), 'name' => $intro['name'], - 'location' => BBCode::convert($intro['location'], false), - 'about' => BBCode::convert($intro['about'], false), + 'location' => BBCode::convertForUriId($intro['uri-id'], $intro['location'], BBCode::EXTERNAL), + 'about' => BBCode::convertForUriId ($intro['uri-id'], $intro['about'], BBCode::EXTERNAL), 'keywords' => $intro['keywords'], 'hidden' => $intro['hidden'] == 1, 'post_newfriend' => (intval($this->pConfig->get($this->session->getLocalUserId(), 'system', 'post_newfriend')) ? '1' : 0), diff --git a/src/Object/Api/Friendica/Notification.php b/src/Object/Api/Friendica/Notification.php index 92e6ff044..df59bb6b8 100644 --- a/src/Object/Api/Friendica/Notification.php +++ b/src/Object/Api/Friendica/Notification.php @@ -98,7 +98,7 @@ class Notification extends BaseDataTransferObject $this->date_rel = Temporal::getRelativeDate($this->date); try { - $this->msg_html = BBCode::convert($this->msg, false); + $this->msg_html = BBCode::convertForUriId($Notify->uriId, $this->msg, BBCode::EXTERNAL); } catch (\Exception $e) { $this->msg_html = ''; } diff --git a/src/Object/Api/Mastodon/ScheduledStatus.php b/src/Object/Api/Mastodon/ScheduledStatus.php index de28b048a..65506a21d 100644 --- a/src/Object/Api/Mastodon/ScheduledStatus.php +++ b/src/Object/Api/Mastodon/ScheduledStatus.php @@ -67,7 +67,7 @@ class ScheduledStatus extends BaseDataTransferObject $this->scheduled_at = DateTimeFormat::utc($delayed_post['delayed'], DateTimeFormat::JSON); $this->params = [ - 'text' => BBCode::convert(BBCode::setMentionsToNicknames($parameters['item']['body'] ?? ''), false, BBCode::MASTODON_API), + 'text' => BBCode::convertForUriId($parameters['item']['uri-id'] ?? 0, BBCode::setMentionsToNicknames($parameters['item']['body'] ?? ''), BBCode::MASTODON_API), 'media_ids' => $media_ids, 'sensitive' => null, 'spoiler_text' => $parameters['item']['title'] ?? '', diff --git a/src/Profile/ProfileField/Entity/ProfileField.php b/src/Profile/ProfileField/Entity/ProfileField.php index a2a7c43ce..2461e02bd 100644 --- a/src/Profile/ProfileField/Entity/ProfileField.php +++ b/src/Profile/ProfileField/Entity/ProfileField.php @@ -34,6 +34,7 @@ use Friendica\Security\PermissionSet\Entity\PermissionSet; * * @property-read int|null $id * @property-read int $uid + * @property-read int $uriId * @property-read int $order * @property-read string $label * @property-read string $value @@ -50,6 +51,8 @@ class ProfileField extends BaseEntity /** @var int */ protected $uid; /** @var int */ + protected $uriId; + /** @var int */ protected $order; /** @var string */ protected $label; @@ -60,7 +63,7 @@ class ProfileField extends BaseEntity /** @var \DateTime */ protected $edited; - public function __construct(int $uid, int $order, string $label, string $value, \DateTime $created, \DateTime $edited, PermissionSet $permissionSet, int $id = null) + public function __construct(int $uid, int $order, string $label, string $value, \DateTime $created, \DateTime $edited, PermissionSet $permissionSet, int $id = null, int $uriId = null) { $this->permissionSet = $permissionSet; $this->uid = $uid; @@ -70,6 +73,7 @@ class ProfileField extends BaseEntity $this->created = $created; $this->edited = $edited; $this->id = $id; + $this->uriId = $uriId; } /** diff --git a/src/Profile/ProfileField/Factory/ProfileField.php b/src/Profile/ProfileField/Factory/ProfileField.php index cad542bc7..3c8e4673e 100644 --- a/src/Profile/ProfileField/Factory/ProfileField.php +++ b/src/Profile/ProfileField/Factory/ProfileField.php @@ -26,6 +26,7 @@ use Friendica\Profile\ProfileField\Exception\UnexpectedPermissionSetException; use Friendica\Security\PermissionSet\Factory\PermissionSet as PermissionSetFactory; use Friendica\Profile\ProfileField\Entity; use Friendica\Capabilities\ICanCreateFromTableRow; +use Friendica\Model\User; use Friendica\Security\PermissionSet\Entity\PermissionSet; use Psr\Log\LoggerInterface; @@ -54,6 +55,8 @@ class ProfileField extends BaseFactory implements ICanCreateFromTableRow throw new UnexpectedPermissionSetException('Either set the PermissionSet fields (join) or the PermissionSet itself'); } + $owner = User::getOwnerDataById($row['uid']); + return new Entity\ProfileField( $row['uid'], $row['order'], @@ -69,7 +72,8 @@ class ProfileField extends BaseFactory implements ICanCreateFromTableRow $row['deny_gid'], $row['psid'] ), - $row['id'] ?? null + $row['id'] ?? null, + $owner['uri-id'] ?? null ); } diff --git a/src/Util/EMailer/NotifyMailBuilder.php b/src/Util/EMailer/NotifyMailBuilder.php index b7e9c51d4..4191dbba2 100644 --- a/src/Util/EMailer/NotifyMailBuilder.php +++ b/src/Util/EMailer/NotifyMailBuilder.php @@ -179,7 +179,7 @@ class NotifyMailBuilder extends MailBuilder */ protected function getHtmlMessage() { - $htmlVersion = BBCode::convert($this->body); + $htmlVersion = BBCode::convertForUriId(0, $this->body, BBCode::EXTERNAL); // load the template for private message notifications $tpl = Renderer::getMarkupTemplate('email/notify/html.tpl'); diff --git a/src/Util/EMailer/SystemMailBuilder.php b/src/Util/EMailer/SystemMailBuilder.php index 3c50ba916..68e19ae83 100644 --- a/src/Util/EMailer/SystemMailBuilder.php +++ b/src/Util/EMailer/SystemMailBuilder.php @@ -100,7 +100,7 @@ class SystemMailBuilder extends MailBuilder '$preamble' => str_replace("\n", "
    \n", $this->preamble), '$thanks' => $this->l10n->t('thanks'), '$site_admin' => $this->siteAdmin, - '$htmlversion' => BBCode::convert($this->body), + '$htmlversion' => BBCode::convertForUriId(0, $this->body, BBCode::EXTERNAL), ]); } diff --git a/static/settings.config.php b/static/settings.config.php index 47d1a5150..335b70256 100644 --- a/static/settings.config.php +++ b/static/settings.config.php @@ -164,6 +164,10 @@ return [ // Allow pseudonyms (true) or enforce a space between first name and last name in Full name, as an anti spam measure (false). 'no_regfullname' => true, + // no_oembed_rich_content (Boolean) + // If enabled, allow OEmbed for all URLs. Disabled by default. + 'no_oembed_rich_content' => true, + // optimize_tables (Boolean) // Periodically (once an hour) run an "optimize table" command for cache tables 'optimize_tables' => false, From 08dafd6d7071df90f0a2d29039623470b95b055a Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 16 Jul 2023 07:26:20 +0000 Subject: [PATCH 122/259] Use plaintext for names and titles --- src/Content/Text/BBCode.php | 7 +++++-- src/Model/Event.php | 7 +++---- src/Model/Profile.php | 4 ++-- src/Module/Notifications/Introductions.php | 2 +- src/Navigation/Notifications/Entity/Notify.php | 4 ++-- src/Navigation/Notifications/Factory/FormattedNotify.php | 2 +- src/Navigation/Notifications/Factory/Notify.php | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 503adbd57..875674544 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -142,7 +142,7 @@ class BBCode break; case 'title': - $value = self::convertForUriId(0, html_entity_decode($value, ENT_QUOTES, 'UTF-8'), BBCode::EXTERNAL); + $value = self::toPlaintext(html_entity_decode($value, ENT_QUOTES, 'UTF-8')); $value = html_entity_decode($value, ENT_QUOTES, 'UTF-8'); $value = str_replace(['[', ']'], ['[', ']'], $value); $data['title'] = $value; @@ -226,7 +226,7 @@ class BBCode * @param bool $keep_urls Whether to keep URLs in the resulting plaintext * @return string */ - public static function toPlaintext(string $text, bool $keep_urls = true): string + public static function toPlaintext(string $text, bool $keep_urls = true, bool $strip_tags = false): string { DI::profiler()->startRecording('rendering'); // Remove pictures in advance to avoid unneeded proxy calls @@ -238,6 +238,9 @@ class BBCode $naked_text = HTML::toPlaintext(self::convert($text, false, BBCode::EXTERNAL, true), 0, !$keep_urls); + if ($strip_tags) { + $naked_text = strip_tags($naked_text); + } DI::profiler()->stopRecording(); return $naked_text; } diff --git a/src/Model/Event.php b/src/Model/Event.php index 6ac1e2774..5aa2f2488 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -928,7 +928,7 @@ class Event } // Format the event location. - $location = self::locationToArray($item['event-location'], $item['uri-id']); + $location = self::locationToArray($item['event-location']); // Construct the profile link (magic-auth). $author = [ @@ -979,7 +979,6 @@ class Event * handled as location name. * * @param string $s The string with the bbcode formatted location data. - * @param int $uri_id The uri-id of the related post * * @return array The array with the location data. * 'name' => The name of the location,
    @@ -987,7 +986,7 @@ class Event * 'coordinates' => Latitude and longitude (e.g. '48.864716,2.349014').
    * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function locationToArray(string $s, int $uri_id): array + private static function locationToArray(string $s): array { if ($s == '') { return []; @@ -1013,7 +1012,7 @@ class Event } } - $location['name'] = BBCode::convertForUriId($uri_id, $location['name']); + $location['name'] = BBCode::toPlaintext($location['name'], false, true); // Construct the map HTML. if (isset($location['address'])) { diff --git a/src/Model/Profile.php b/src/Model/Profile.php index e6c8e4822..0a6881853 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -640,13 +640,13 @@ class Profile $istoday = true; } - $title = strip_tags(html_entity_decode(BBCode::convertForUriId($rr['uri-id'], $rr['summary']), ENT_QUOTES, 'UTF-8')); + $title = BBCode::toPlaintext($rr['summary'], false, true); if (strlen($title) > 35) { $title = substr($title, 0, 32) . '... '; } - $description = substr(strip_tags(BBCode::convertForUriId($rr['uri-id'], $rr['desc'])), 0, 32) . '... '; + $description = BBCode::toPlaintext($rr['desc'], false, true) . '... '; if (!$description) { $description = DI::l10n()->t('[No description]'); } diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 1c4a98b47..48c0d4dfe 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -147,7 +147,7 @@ class Introductions extends BaseNotifications $knowyou = ''; } - $convertedName = BBCode::convertForUriId($owner['uri-id'], $Introduction->getName()); + $convertedName = BBCode::toPlaintext($Introduction->getName(), false, true); $helptext = $this->t('Shall your connection be bidirectional or not?'); $helptext2 = $this->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName); diff --git a/src/Navigation/Notifications/Entity/Notify.php b/src/Navigation/Notifications/Entity/Notify.php index 56db3dc5c..d45976c17 100644 --- a/src/Navigation/Notifications/Entity/Notify.php +++ b/src/Navigation/Notifications/Entity/Notify.php @@ -118,7 +118,7 @@ class Notify extends BaseEntity public function updateMsgFromPreamble($epreamble) { $this->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $this->link->__toString()]); - $this->msg_cache = self::formatMessage($this->name_cache, strip_tags(BBCode::convertForUriId(0, $this->msg, BBCode::EXTERNAL))); + $this->msg_cache = self::formatMessage($this->name_cache, BBCode::toPlaintext($this->msg, false, true)); } /** @@ -134,6 +134,6 @@ class Notify extends BaseEntity */ public static function formatMessage(string $name, string $message): string { - return str_replace('{0}', '' . strip_tags(BBCode::convertForUriId(0, $name, BBCode::EXTERNAL)) . '', htmlspecialchars($message)); + return str_replace('{0}', '' . BBCode::toPlaintext($name, false, true) . '', htmlspecialchars($message)); } } diff --git a/src/Navigation/Notifications/Factory/FormattedNotify.php b/src/Navigation/Notifications/Factory/FormattedNotify.php index 33abf63e4..75f6e7676 100644 --- a/src/Navigation/Notifications/Factory/FormattedNotify.php +++ b/src/Navigation/Notifications/Factory/FormattedNotify.php @@ -222,7 +222,7 @@ class FormattedNotify extends BaseFactory $this->baseUrl . '/notify/' . $Notify->id, Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO), $Notify->url, - strip_tags(BBCode::toPlaintext($Notify->msg ?? '')), + BBCode::toPlaintext($Notify->msg ?? '', false, true), DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL), 'r'), Temporal::getRelativeDate($Notify->date->format(DateTimeFormat::MYSQL)), $Notify->seen diff --git a/src/Navigation/Notifications/Factory/Notify.php b/src/Navigation/Notifications/Factory/Notify.php index c180d4121..dd59b3323 100644 --- a/src/Navigation/Notifications/Factory/Notify.php +++ b/src/Navigation/Notifications/Factory/Notify.php @@ -68,7 +68,7 @@ class Notify extends BaseFactory implements ICanCreateFromTableRow false, $params['verb'] ?? '', $params['otype'] ?? '', - substr(strip_tags(BBCode::convertForUriId($uri_id, $params['source_name'])), 0, 255), + substr(BBCode::toPlaintext($params['source_name'], false, true), 0, 255), null, null, $item_id, From 01bbf4041881ae06904aa5fa5dce843fe30a1e7d Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 16 Jul 2023 09:32:17 +0000 Subject: [PATCH 123/259] Simplify plaintext creation --- src/Core/System.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Core/System.php b/src/Core/System.php index 602d85c83..f15548346 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -671,9 +671,7 @@ class System if (DI::config()->get('system', 'tosdisplay')) { $rulelist = DI::config()->get('system', 'tosrules') ?: DI::config()->get('system', 'tostext'); - $html = BBCode::convertForUriId(User::getSystemUriId(), $rulelist, BBCode::EXTERNAL); - - $msg = HTML::toPlaintext($html, 0, true); + $msg = BBCode::toPlaintext($rulelist, false); foreach (explode("\n", trim($msg)) as $line) { $line = trim($line); if ($line) { From fd055193ac47948c4245453fe4e0f01c9f9ed7eb Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 16 Jul 2023 09:33:52 +0000 Subject: [PATCH 124/259] Removed unused variable --- src/Content/Conversation.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 6cad2b980..710422ee7 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -1381,8 +1381,6 @@ class Conversation continue; } - $threadsid++; - // prevent private email from leaking. if ($item['network'] === Protocol::MAIL && $this->session->getLocalUserId() != $item['uid']) { continue; From 7315048474665d00003406860c608695c4a3684f Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 16 Jul 2023 09:48:37 +0000 Subject: [PATCH 125/259] Revert change --- src/Model/Event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 5aa2f2488..8221fa82b 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -978,7 +978,7 @@ class Event * Note: The string must only contain location data. A string with no bbcode will be * handled as location name. * - * @param string $s The string with the bbcode formatted location data. + * @param string $s The string with the bbcode formatted location data. * * @return array The array with the location data. * 'name' => The name of the location,
    @@ -986,7 +986,7 @@ class Event * 'coordinates' => Latitude and longitude (e.g. '48.864716,2.349014').
    * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function locationToArray(string $s): array + private static function locationToArray(string $s = ''): array { if ($s == '') { return []; From 14b76e48f085a48ea44812cdc9057c7404f0102a Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 2 Jul 2023 23:56:56 +0200 Subject: [PATCH 126/259] Introduce dynamic hook loading - Dynamically load addon files - Dynamically load hooks - Rewrite Logger-logic to use new hook logic (Monolog is working again) --- bin/auth_ejabberd.php | 6 +- bin/console.php | 6 +- bin/daemon.php | 6 +- bin/worker.php | 6 +- index.php | 3 + .../Addon/Capabilities/ICanLoadAddons.php | 37 ++++++ .../AddonInvalidConfigFileException.php} | 12 +- src/Core/Addon/Model/AddonLoader.php | 70 ++++++++++ src/Core/Hooks/Capabilities/HookType.php | 39 ++++++ .../Capabilities/ICanCreateInstances.php | 59 +++++++++ ...nstances.php => ICanRegisterInstances.php} | 40 ++---- .../Exceptions/HookConfigException.php} | 8 +- src/Core/Hooks/Model/DiceInstanceManager.php | 111 ++++++++++++++++ src/Core/Hooks/Model/InstanceManager.php | 104 --------------- src/Core/Hooks/Util/HookFileManager.php | 118 +++++++++++++++++ .../Capabilities/ICheckLoggerSettings.php | 42 ++++++ .../Capabilities/IHaveCallIntrospections.php | 2 +- src/Core/Logger/Capabilities/LogChannel.php | 43 +++++++ .../Logger/Exception/LogLevelException.php | 5 +- .../Exception/LoggerArgumentException.php | 5 +- src/Core/Logger/Exception/LoggerException.php | 5 +- .../Exception/LoggerUnusableException.php | 35 +++++ .../Factory/AbstractLoggerTypeFactory.php | 80 ++++++++++++ src/Core/Logger/Factory/Logger.php | 120 ++---------------- src/Core/Logger/Factory/ProfilerLogger.php | 53 ++++++++ src/Core/Logger/Factory/StreamLogger.php | 100 +++++++++++++++ src/Core/Logger/Factory/SyslogLogger.php | 60 +++++++++ src/Core/Logger/Type/README.md | 26 ---- src/Core/Logger/Type/StreamLogger.php | 81 ++---------- src/Core/Logger/Type/SyslogLogger.php | 29 ++--- src/{ => Core/Logger}/Util/FileSystem.php | 6 +- src/Core/Logger/Util/LoggerSettingsCheck.php | 91 +++++++++++++ src/DI.php | 23 ++-- src/Module/Admin/Summary.php | 36 +----- static/dependencies.config.php | 82 +++++++----- static/hooks.config.php | 37 ++++++ .../Util/Hooks/InstanceMocks/FakeInstance.php | 4 +- .../Core/Hooks/Model/InstanceManagerTest.php | 38 +++--- tests/src/Core/Logger/StreamLoggerTest.php | 4 +- 39 files changed, 1163 insertions(+), 469 deletions(-) create mode 100644 src/Core/Addon/Capabilities/ICanLoadAddons.php rename src/Core/{Hooks/Capabilities/IAmAStrategy.php => Addon/Exception/AddonInvalidConfigFileException.php} (71%) create mode 100644 src/Core/Addon/Model/AddonLoader.php create mode 100644 src/Core/Hooks/Capabilities/HookType.php create mode 100644 src/Core/Hooks/Capabilities/ICanCreateInstances.php rename src/Core/Hooks/Capabilities/{ICanManageInstances.php => ICanRegisterInstances.php} (55%) rename src/Core/{Logger/Exception/LoggerInvalidException.php => Hooks/Exceptions/HookConfigException.php} (82%) create mode 100644 src/Core/Hooks/Model/DiceInstanceManager.php delete mode 100644 src/Core/Hooks/Model/InstanceManager.php create mode 100644 src/Core/Hooks/Util/HookFileManager.php create mode 100644 src/Core/Logger/Capabilities/ICheckLoggerSettings.php create mode 100644 src/Core/Logger/Capabilities/LogChannel.php create mode 100644 src/Core/Logger/Exception/LoggerUnusableException.php create mode 100644 src/Core/Logger/Factory/AbstractLoggerTypeFactory.php create mode 100644 src/Core/Logger/Factory/ProfilerLogger.php create mode 100644 src/Core/Logger/Factory/StreamLogger.php create mode 100644 src/Core/Logger/Factory/SyslogLogger.php delete mode 100644 src/Core/Logger/Type/README.md rename src/{ => Core/Logger}/Util/FileSystem.php (94%) create mode 100644 src/Core/Logger/Util/LoggerSettingsCheck.php create mode 100644 static/hooks.config.php diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php index 40e7d3b97..b923009e6 100755 --- a/bin/auth_ejabberd.php +++ b/bin/auth_ejabberd.php @@ -58,6 +58,7 @@ if (php_sapi_name() !== 'cli') { use Dice\Dice; use Friendica\App\Mode; +use Friendica\Core\Logger\Capabilities\LogChannel; use Friendica\Security\ExAuth; use Psr\Log\LoggerInterface; @@ -78,7 +79,10 @@ chdir($directory); require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]); +/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); +$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::AUTH_JABBERED]]); \Friendica\DI::init($dice); \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class)); diff --git a/bin/console.php b/bin/console.php index e1bc6b498..b2cde1082 100755 --- a/bin/console.php +++ b/bin/console.php @@ -26,13 +26,17 @@ if (php_sapi_name() !== 'cli') { } use Dice\Dice; +use Friendica\Core\Logger\Capabilities\LogChannel; use Friendica\DI; use Psr\Log\LoggerInterface; require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['console']]); +/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); +$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::CONSOLE]]); /// @fixme Necessary until Hooks inside the Logger can get loaded without the DI-class DI::init($dice); diff --git a/bin/daemon.php b/bin/daemon.php index e550aea89..1f0bb7079 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -38,7 +38,6 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\DateTimeFormat; -use Psr\Log\LoggerInterface; // Get options $shortopts = 'f'; @@ -60,7 +59,10 @@ if (!file_exists('index.php') && (sizeof($_SERVER['argv']) != 0)) { require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]); +/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); +$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [Logger\Capabilities\LogChannel::DAEMON]]); DI::init($dice); \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class)); diff --git a/bin/worker.php b/bin/worker.php index a74213248..18a41e064 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -29,6 +29,7 @@ if (php_sapi_name() !== 'cli') { use Dice\Dice; use Friendica\App; use Friendica\App\Mode; +use Friendica\Core\Logger\Capabilities\LogChannel; use Friendica\Core\Update; use Friendica\Core\Worker; use Friendica\DI; @@ -54,7 +55,10 @@ if (!file_exists("index.php") && (sizeof($_SERVER["argv"]) != 0)) { require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['worker']]); +/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); +$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::WORKER]]); DI::init($dice); \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class)); diff --git a/index.php b/index.php index 90df9c00e..ce82470b6 100644 --- a/index.php +++ b/index.php @@ -30,6 +30,9 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) { require __DIR__ . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/static/dependencies.config.php'); +/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); $dice = $dice->addRule(Friendica\App\Mode::class, ['call' => [['determineRunMode', [false, $_SERVER], Dice::CHAIN_CALL]]]); \Friendica\DI::init($dice); diff --git a/src/Core/Addon/Capabilities/ICanLoadAddons.php b/src/Core/Addon/Capabilities/ICanLoadAddons.php new file mode 100644 index 000000000..a28826ffb --- /dev/null +++ b/src/Core/Addon/Capabilities/ICanLoadAddons.php @@ -0,0 +1,37 @@ +. + * + */ + +namespace Friendica\Core\Addon\Capabilities; + +/** + * Interface for loading Addons specific content + */ +interface ICanLoadAddons +{ + /** + * Returns a merged config array of all active addons for a given config-name + * + * @param string $configName The config-name (config-file at the static directory, like 'hooks' => '{addon}/static/hooks.config.php) + * + * @return array the merged array + */ + public function getActiveAddonConfig(string $configName): array; +} diff --git a/src/Core/Hooks/Capabilities/IAmAStrategy.php b/src/Core/Addon/Exception/AddonInvalidConfigFileException.php similarity index 71% rename from src/Core/Hooks/Capabilities/IAmAStrategy.php rename to src/Core/Addon/Exception/AddonInvalidConfigFileException.php index 017cb56c4..3bb41be53 100644 --- a/src/Core/Hooks/Capabilities/IAmAStrategy.php +++ b/src/Core/Addon/Exception/AddonInvalidConfigFileException.php @@ -19,11 +19,17 @@ * */ -namespace Friendica\Core\Hooks\Capabilities; +namespace Friendica\Core\Addon\Exception; + +use Throwable; /** - * All classes, implementing this interface are valid Strategies for Hook calls + * Exception in case one or more config files of the addons are invalid */ -interface IAmAStrategy +class AddonInvalidConfigFileException extends \RuntimeException { + public function __construct($message = "", $code = 0, Throwable $previous = null) + { + parent::__construct($message, 500, $previous); + } } diff --git a/src/Core/Addon/Model/AddonLoader.php b/src/Core/Addon/Model/AddonLoader.php new file mode 100644 index 000000000..707601aef --- /dev/null +++ b/src/Core/Addon/Model/AddonLoader.php @@ -0,0 +1,70 @@ +. + * + */ + +namespace Friendica\Core\Addon\Model; + +use Friendica\Core\Addon\Capabilities\ICanLoadAddons; +use Friendica\Core\Addon\Exception\AddonInvalidConfigFileException; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Util\Strings; + +class AddonLoader implements ICanLoadAddons +{ + const STATIC_PATH = 'static'; + /** @var string */ + protected $basePath; + /** @var IManageConfigValues */ + protected $config; + + public function __construct(string $basePath, IManageConfigValues $config) + { + $this->basePath = $basePath; + $this->config = $config; + } + + /** {@inheritDoc} */ + public function getActiveAddonConfig(string $configName): array + { + $addons = array_keys(array_filter($this->config->get('addons') ?? [])); + $returnConfig = []; + + foreach ($addons as $addon) { + $addonName = Strings::sanitizeFilePathItem(trim($addon)); + + $configFile = $this->basePath . '/addon/' . $addonName . '/' . static::STATIC_PATH . '/' . $configName . '.config.php'; + + if (!file_exists($configFile)) { + // Addon unmodified, skipping + continue; + } + + $config = include $configFile; + + if (!is_array($config)) { + throw new AddonInvalidConfigFileException('Error loading config file ' . $configFile); + } + + $returnConfig = array_merge_recursive($returnConfig, $config); + } + + return $returnConfig; + } +} diff --git a/src/Core/Hooks/Capabilities/HookType.php b/src/Core/Hooks/Capabilities/HookType.php new file mode 100644 index 000000000..6fea41e17 --- /dev/null +++ b/src/Core/Hooks/Capabilities/HookType.php @@ -0,0 +1,39 @@ +. + * + */ + +namespace Friendica\Core\Hooks\Capabilities; + +interface HookType +{ + /** + * Defines the key for the list of strategy-hooks. + * + * @see https://refactoring.guru/design-patterns/strategy + */ + const STRATEGY = 'strategy'; + /** + * Defines the key for the list of decorator-hooks. + * + * @see https://refactoring.guru/design-patterns/decorator + */ + const DECORATOR = 'decorator'; + const EVENT = 'event'; +} diff --git a/src/Core/Hooks/Capabilities/ICanCreateInstances.php b/src/Core/Hooks/Capabilities/ICanCreateInstances.php new file mode 100644 index 000000000..6e5d8beb4 --- /dev/null +++ b/src/Core/Hooks/Capabilities/ICanCreateInstances.php @@ -0,0 +1,59 @@ +. + * + */ + +namespace Friendica\Core\Hooks\Capabilities; + +use Friendica\Core\Hooks\Exceptions\HookInstanceException; + +/** + * creates special instance and decorator treatments for given classes + */ +interface ICanCreateInstances +{ + /** + * Returns a new instance of a given class for the corresponding name + * + * The instance will be build based on the registered strategy and the (unique) name + * + * In case, there are registered decorators for this class as well, all decorators of the list will be wrapped + * around the instance before returning it + * + * @param string $class The fully-qualified name of the given class or interface which will get returned + * @param string $name An arbitrary identifier to find a concrete instance strategy. + * @param array $arguments Additional arguments, which can be passed to the constructor of "$class" at runtime + * + * @return object The concrete instance of the type "$class" + */ + public function createWithName(string $class, string $name, array $arguments = []): object; + + /** + * Returns a new instance of a given class + * + * In case, there are registered decorators for this class as well, all decorators of the list will be wrapped + * around the instance before returning it + * + * @param string $class The fully-qualified name of the given class or interface which will get returned + * @param array $arguments Additional arguments, which can be passed to the constructor of "$class" at runtime + * + * @return object The concrete instance of the type "$class" + */ + public function create(string $class, array $arguments = []): object; +} diff --git a/src/Core/Hooks/Capabilities/ICanManageInstances.php b/src/Core/Hooks/Capabilities/ICanRegisterInstances.php similarity index 55% rename from src/Core/Hooks/Capabilities/ICanManageInstances.php rename to src/Core/Hooks/Capabilities/ICanRegisterInstances.php index bdad1b923..23a77ab35 100644 --- a/src/Core/Hooks/Capabilities/ICanManageInstances.php +++ b/src/Core/Hooks/Capabilities/ICanRegisterInstances.php @@ -21,61 +21,43 @@ namespace Friendica\Core\Hooks\Capabilities; -use Friendica\Core\Hooks\Exceptions\HookInstanceException; use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; /** - * Managing special instance and decorator treatments for classes + * Register strategies and decorator/treatment handling for given classes */ -interface ICanManageInstances +interface ICanRegisterInstances { /** * Register a class(strategy) for a given interface with a unique name. * * @see https://refactoring.guru/design-patterns/strategy * - * @param string $interface The interface, which the given class implements - * @param string $name An arbitrary identifier for the given class, which will be used for factories, dependency injections etc. - * @param string $class The fully-qualified given class name - * @param ?array $arguments Additional arguments, which can be passed to the constructor + * @param string $interface The interface, which the given class implements + * @param string $class The fully-qualified given class name + * A placeholder for dependencies is possible as well + * @param ?string $name An arbitrary identifier for the given class, which will be used for factories, dependency injections etc. * * @return $this This interface for chain-calls * * @throws HookRegisterArgumentException in case the given class for the interface isn't valid or already set */ - public function registerStrategy(string $interface, string $name, string $class, array $arguments = null): self; + public function registerStrategy(string $interface, string $class, ?string $name = null): self; /** * Register a new decorator for a given class or interface - * @see https://refactoring.guru/design-patterns/decorator + * + * @see https://refactoring.guru/design-patterns/decorator * * @note Decorator attach new behaviors to classes without changing them or without letting them know about it. * * @param string $class The fully-qualified class or interface name, which gets decorated by a class * @param string $decoratorClass The fully-qualified name of the class which mimics the given class or interface and adds new functionality - * @param array $arguments Additional arguments, which can be passed to the constructor of "decoratorClass" + * A placeholder for dependencies is possible as well * * @return $this This interface for chain-calls * * @throws HookRegisterArgumentException in case the given class for the class or interface isn't valid */ - public function registerDecorator(string $class, string $decoratorClass, array $arguments = []): self; - - /** - * Returns a new instance of a given class for the corresponding name - * - * The instance will be build based on the registered strategy and the (unique) name - * - * In case, there are registered decorators for this class as well, all decorators of the list will be wrapped - * around the instance before returning it - * - * @param string $class The fully-qualified name of the given class or interface which will get returned - * @param string $name An arbitrary identifier to find a concrete instance strategy. - * @param array $arguments Additional arguments, which can be passed to the constructor of "$class" at runtime - * - * @return object The concrete instance of the type "$class" - * - * @throws HookInstanceException In case the class cannot get created - */ - public function getInstance(string $class, string $name, array $arguments = []): object; + public function registerDecorator(string $class, string $decoratorClass): self; } diff --git a/src/Core/Logger/Exception/LoggerInvalidException.php b/src/Core/Hooks/Exceptions/HookConfigException.php similarity index 82% rename from src/Core/Logger/Exception/LoggerInvalidException.php rename to src/Core/Hooks/Exceptions/HookConfigException.php index db6ecb78c..ceca721b1 100644 --- a/src/Core/Logger/Exception/LoggerInvalidException.php +++ b/src/Core/Hooks/Exceptions/HookConfigException.php @@ -19,13 +19,11 @@ * */ -namespace Friendica\Core\Logger\Exception; +namespace Friendica\Core\Hooks\Exceptions; -use Throwable; - -class LoggerInvalidException extends \RuntimeException +class HookConfigException extends \RuntimeException { - public function __construct($message = "", Throwable $previous = null) + public function __construct($message = "", \Throwable $previous = null) { parent::__construct($message, 500, $previous); } diff --git a/src/Core/Hooks/Model/DiceInstanceManager.php b/src/Core/Hooks/Model/DiceInstanceManager.php new file mode 100644 index 000000000..381e0a7fe --- /dev/null +++ b/src/Core/Hooks/Model/DiceInstanceManager.php @@ -0,0 +1,111 @@ +. + * + */ + +namespace Friendica\Core\Hooks\Model; + +use Dice\Dice; +use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; +use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; +use Friendica\Core\Hooks\Exceptions\HookInstanceException; +use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; +use Friendica\Core\Hooks\Util\HookFileManager; + +/** + * This class represents an instance register, which uses Dice for creation + * + * @see Dice + */ +class DiceInstanceManager implements ICanCreateInstances, ICanRegisterInstances +{ + protected $instance = []; + protected $decorator = []; + + /** @var Dice */ + protected $dice; + + public function __construct(Dice $dice, HookFileManager $hookFileManager) + { + $this->dice = $dice; + $hookFileManager->setupHooks($this); + } + + /** {@inheritDoc} */ + public function registerStrategy(string $interface, string $class, ?string $name = null): ICanRegisterInstances + { + if (!empty($this->instance[$interface][$name])) { + throw new HookRegisterArgumentException(sprintf('A class with the name %s is already set for the interface %s', $name, $interface)); + } + + $this->instance[$interface][$name] = $class; + + return $this; + } + + /** {@inheritDoc} */ + public function registerDecorator(string $class, string $decoratorClass): ICanRegisterInstances + { + $this->decorator[$class][] = $decoratorClass; + + return $this; + } + + /** {@inheritDoc} */ + public function create(string $class, array $arguments = []): object + { + $instanceClassName = $class; + $instanceRule = $this->dice->getRule($instanceClassName) ?? []; + + $instanceRule = array_replace_recursive($instanceRule, [ + 'constructParams' => $arguments, + ]); + + $this->dice = $this->dice->addRule($instanceClassName, $instanceRule); + + foreach ($this->decorator[$class] ?? [] as $decorator) { + $dependencyRule = $this->dice->getRule($decorator); + for ($i = 0; $i < count($dependencyRule['call'] ?? []); $i++) { + $dependencyRule['call'][$i][1] = [[Dice::INSTANCE => $instanceClassName]]; + } + $dependencyRule['constructParams'] = $arguments; + $dependencyRule['substitutions'] = [ + $class => $instanceClassName, + ]; + + $this->dice = $this->dice->addRule($decorator, $dependencyRule); + + $instanceClassName = $decorator; + } + + return $this->dice->create($instanceClassName); + } + + /** {@inheritDoc} */ + public function createWithName(string $class, string $name, array $arguments = []): object + { + if (empty($this->instance[$class][$name])) { + throw new HookInstanceException(sprintf('The class with the name %s isn\'t registered for the class or interface %s', $name, $class)); + } + + $instanceClassName = $this->instance[$class][$name]; + + return $this->create($instanceClassName, $arguments); + } +} diff --git a/src/Core/Hooks/Model/InstanceManager.php b/src/Core/Hooks/Model/InstanceManager.php deleted file mode 100644 index 7bfcfa420..000000000 --- a/src/Core/Hooks/Model/InstanceManager.php +++ /dev/null @@ -1,104 +0,0 @@ -. - * - */ - -namespace Friendica\Core\Hooks\Model; - -use Dice\Dice; -use Friendica\Core\Hooks\Capabilities\IAmAStrategy; -use Friendica\Core\Hooks\Capabilities\ICanManageInstances; -use Friendica\Core\Hooks\Exceptions\HookInstanceException; -use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; - -/** {@inheritDoc} */ -class InstanceManager implements ICanManageInstances -{ - protected $instance = []; - protected $instanceArguments = []; - protected $decorator = []; - - /** @var Dice */ - protected $dice; - - public function __construct(Dice $dice) - { - $this->dice = $dice; - } - - /** {@inheritDoc} */ - public function registerStrategy(string $interface, string $name, string $class, array $arguments = null): ICanManageInstances - { - if (!is_a($class, $interface, true)) { - throw new HookRegisterArgumentException(sprintf('%s is not a valid class for the interface %s', $class, $interface)); - } - - if (!is_a($class, IAmAStrategy::class, true)) { - throw new HookRegisterArgumentException(sprintf('%s does not inherit from the marker interface %s', $class, IAmAStrategy::class)); - } - - if (!empty($this->instance[$interface][$name])) { - throw new HookRegisterArgumentException(sprintf('A class with the name %s is already set for the interface %s', $name, $interface)); - } - - $this->instance[$interface][$name] = $class; - $this->instanceArguments[$interface][$name] = $arguments; - - return $this; - } - - /** {@inheritDoc} */ - public function registerDecorator(string $class, string $decoratorClass, array $arguments = []): ICanManageInstances - { - if (!is_a($decoratorClass, $class, true)) { - throw new HookRegisterArgumentException(sprintf('%s is not a valid substitution for the given class or interface %s', $decoratorClass, $class)); - } - - $this->decorator[$class][] = [ - 'class' => $decoratorClass, - 'arguments' => $arguments, - ]; - - return $this; - } - - /** {@inheritDoc} */ - public function getInstance(string $class, string $name, array $arguments = []): object - { - if (empty($this->instance[$class][$name])) { - throw new HookInstanceException(sprintf('The class with the name %s isn\'t registered for the class or interface %s', $name, $class)); - } - - $instance = $this->dice->create($this->instance[$class][$name], array_merge($this->instanceArguments[$class][$name] ?? [], $arguments)); - - foreach ($this->decorator[$class] ?? [] as $decorator) { - $this->dice = $this->dice->addRule($class, [ - 'instanceOf' => $decorator['class'], - 'constructParams' => empty($decorator['arguments']) ? null : $decorator['arguments'], - /// @todo maybe support call structures for hooks as well in a later stage - could make factory calls easier - 'call' => null, - 'substitutions' => [$class => $instance], - ]); - - $instance = $this->dice->create($class); - } - - return $instance; - } -} diff --git a/src/Core/Hooks/Util/HookFileManager.php b/src/Core/Hooks/Util/HookFileManager.php new file mode 100644 index 000000000..357567857 --- /dev/null +++ b/src/Core/Hooks/Util/HookFileManager.php @@ -0,0 +1,118 @@ +. + * + */ + +namespace Friendica\Core\Hooks\Util; + +use Friendica\Core\Addon\Capabilities\ICanLoadAddons; +use Friendica\Core\Hooks\Capabilities\HookType; +use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; +use Friendica\Core\Hooks\Exceptions\HookConfigException; + +/** + * Manage all hooks.config.php files + */ +class HookFileManager +{ + const STATIC_DIR = 'static'; + const CONFIG_NAME = 'hooks'; + + /** @var ICanLoadAddons */ + protected $addonLoader; + /** @var array */ + protected $hookConfig = []; + /** @var string */ + protected $basePath; + + public function __construct(string $basePath, ICanLoadAddons $addonLoader) + { + $this->basePath = $basePath; + $this->addonLoader = $addonLoader; + } + + /** + * Loads all kinds of hooks and registers the corresponding instances + * + * @param ICanRegisterInstances $instanceRegister The instance register + * + * @return void + */ + public function setupHooks(ICanRegisterInstances $instanceRegister) + { + // In case it wasn't used before, reload the whole hook config + if (empty($this->hookConfig)) { + $this->reloadHookConfig(); + } + + foreach ($this->hookConfig as $hookType => $classList) { + switch ($hookType) { + case HookType::STRATEGY: + foreach ($classList as $interface => $strategy) { + foreach ($strategy as $dependencyName => $names) { + if (is_array($names)) { + foreach ($names as $name) { + $instanceRegister->registerStrategy($interface, $dependencyName, $name); + } + } else { + $instanceRegister->registerStrategy($interface, $dependencyName, $names); + } + } + } + break; + case HookType::DECORATOR: + foreach ($classList as $interface => $decorators) { + if (is_array($decorators)) { + foreach ($decorators as $decorator) { + $instanceRegister->registerDecorator($interface, $decorator); + } + } else { + $instanceRegister->registerDecorator($interface, $decorators); + } + } + break; + } + } + } + + /** + * Reloads all hook config files into the config cache for later usage + * + * Merges all hook configs from every addon - if present - as well + * + * @return void + */ + protected function reloadHookConfig() + { + // load core hook config + $configFile = $this->basePath . '/' . static::STATIC_DIR . '/' . static::CONFIG_NAME . '.config.php'; + + if (!file_exists($configFile)) { + throw new HookConfigException(sprintf('config file %s does not exit.', $configFile)); + } + + $config = include $configFile; + + if (!is_array($config)) { + throw new HookConfigException('Error loading config file ' . $configFile); + } + + $this->hookConfig = array_merge_recursive($config, $this->addonLoader->getActiveAddonConfig(static::CONFIG_NAME)); + } +} diff --git a/src/Core/Logger/Capabilities/ICheckLoggerSettings.php b/src/Core/Logger/Capabilities/ICheckLoggerSettings.php new file mode 100644 index 000000000..532425ec0 --- /dev/null +++ b/src/Core/Logger/Capabilities/ICheckLoggerSettings.php @@ -0,0 +1,42 @@ +. + * + */ + +namespace Friendica\Core\Logger\Capabilities; + +/** + * Whenever a logging specific check is necessary, use this interface to encapsulate and centralize this logic + */ +interface ICheckLoggerSettings +{ + /** + * Checks if the logfile is set and usable + * + * @return string|null null in case everything is ok, otherwise returns the error + */ + public function checkLogfile(): ?string; + + /** + * Checks if the debugging logfile is usable in case it is set! + * + * @return string|null null in case everything is ok, otherwise returns the error + */ + public function checkDebugLogfile(): ?string; +} diff --git a/src/Core/Logger/Capabilities/IHaveCallIntrospections.php b/src/Core/Logger/Capabilities/IHaveCallIntrospections.php index 83d75f976..7f884bf64 100644 --- a/src/Core/Logger/Capabilities/IHaveCallIntrospections.php +++ b/src/Core/Logger/Capabilities/IHaveCallIntrospections.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Capabilities/LogChannel.php b/src/Core/Logger/Capabilities/LogChannel.php new file mode 100644 index 000000000..54ae03217 --- /dev/null +++ b/src/Core/Logger/Capabilities/LogChannel.php @@ -0,0 +1,43 @@ +. + * + */ + +namespace Friendica\Core\Logger\Capabilities; + +/** + * An enum class for the Log channels + */ +interface LogChannel +{ + /** @var string channel for the auth_ejabbered script */ + public const AUTH_JABBERED = 'auth_ejabberd'; + /** @var string Default channel in case it isn't set explicit */ + public const DEFAULT = self::APP; + /** @var string channel for console execution */ + public const CONSOLE = 'console'; + /** @var string channel for developer focused logging */ + public const DEV = 'dev'; + /** @var string channel for daemon executions */ + public const DAEMON = 'daemon'; + /** @var string channel for worker execution */ + public const WORKER = 'worker'; + /** @var string channel for frontend app executions */ + public const APP = 'app'; +} diff --git a/src/Core/Logger/Exception/LogLevelException.php b/src/Core/Logger/Exception/LogLevelException.php index 36b2c31cf..39b2d17a9 100644 --- a/src/Core/Logger/Exception/LogLevelException.php +++ b/src/Core/Logger/Exception/LogLevelException.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 @@ -23,6 +23,9 @@ namespace Friendica\Core\Logger\Exception; use Throwable; +/** + * Exception in case the loglevel isn't set or isn't valid + */ class LogLevelException extends \InvalidArgumentException { public function __construct($message = "", Throwable $previous = null) diff --git a/src/Core/Logger/Exception/LoggerArgumentException.php b/src/Core/Logger/Exception/LoggerArgumentException.php index a0b9949b0..08eabe84a 100644 --- a/src/Core/Logger/Exception/LoggerArgumentException.php +++ b/src/Core/Logger/Exception/LoggerArgumentException.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 @@ -23,6 +23,9 @@ namespace Friendica\Core\Logger\Exception; use Throwable; +/** + * Exception in case an argument of a logger class isn't valid + */ class LoggerArgumentException extends \InvalidArgumentException { public function __construct($message = "", Throwable $previous = null) diff --git a/src/Core/Logger/Exception/LoggerException.php b/src/Core/Logger/Exception/LoggerException.php index 7e3637327..13bcff8f3 100644 --- a/src/Core/Logger/Exception/LoggerException.php +++ b/src/Core/Logger/Exception/LoggerException.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 @@ -23,6 +23,9 @@ namespace Friendica\Core\Logger\Exception; use Throwable; +/** + * A generic exception of the logging namespace + */ class LoggerException extends \Exception { public function __construct($message = "", Throwable $previous = null) diff --git a/src/Core/Logger/Exception/LoggerUnusableException.php b/src/Core/Logger/Exception/LoggerUnusableException.php new file mode 100644 index 000000000..29336e086 --- /dev/null +++ b/src/Core/Logger/Exception/LoggerUnusableException.php @@ -0,0 +1,35 @@ +. + * + */ + +namespace Friendica\Core\Logger\Exception; + +use Throwable; + +/** + * Exception in case the used logging instance is unusable because of some circumstances + */ +class LoggerUnusableException extends \RuntimeException +{ + public function __construct($message = "", Throwable $previous = null) + { + parent::__construct($message, 500, $previous); + } +} diff --git a/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php b/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php new file mode 100644 index 000000000..a6ff5eebb --- /dev/null +++ b/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php @@ -0,0 +1,80 @@ +. + * + */ + +namespace Friendica\Core\Logger\Factory; + +use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; +use Psr\Log\LogLevel; + +/** + * Abstract class for creating logger types, which includes common necessary logic/content + */ +abstract class AbstractLoggerTypeFactory +{ + /** @var string */ + protected $channel; + /** @var IHaveCallIntrospections */ + protected $introspection; + + /** + * @param string $channel The channel for the logger + */ + public function __construct(IHaveCallIntrospections $introspection, string $channel) + { + $this->channel = $channel; + $this->introspection = $introspection; + } + + /** + * Mapping a legacy level to the PSR-3 compliant levels + * + * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel + * + * @param string $level the level to be mapped + * + * @return string the PSR-3 compliant level + */ + protected static function mapLegacyConfigDebugLevel(string $level): string + { + switch ($level) { + // legacy WARNING + case "0": + return LogLevel::ERROR; + // legacy INFO + case "1": + return LogLevel::WARNING; + // legacy TRACE + case "2": + return LogLevel::NOTICE; + // legacy DEBUG + case "3": + return LogLevel::INFO; + // legacy DATA + case "4": + // legacy ALL + case "5": + return LogLevel::DEBUG; + // default if nothing set + default: + return $level; + } + } +} diff --git a/src/Core/Logger/Factory/Logger.php b/src/Core/Logger/Factory/Logger.php index 2821a813c..3fde878a3 100644 --- a/src/Core/Logger/Factory/Logger.php +++ b/src/Core/Logger/Factory/Logger.php @@ -22,134 +22,38 @@ namespace Friendica\Core\Logger\Factory; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Hooks\Capabilities\ICanManageInstances; -use Friendica\Core\Logger\Exception\LogLevelException; -use Friendica\Core\Logger\Type\ProfilerLogger; -use Friendica\Core\Logger\Type\StreamLogger; -use Friendica\Core\Logger\Type\SyslogLogger; +use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; +use Friendica\Core\Logger\Capabilities\LogChannel; use Psr\Log\LoggerInterface; -use Psr\Log\LogLevel; use Psr\Log\NullLogger; +use Throwable; /** - * A logger factory + * The logger factory for the core logging instances */ class Logger { - const DEV_CHANNEL = 'dev'; - - /** @var string The log-channel (app, worker, ...) */ + /** @var string The channel */ protected $channel; - /** @var ICanManageInstances */ - protected $instanceManager; - /** @var IManageConfigValues */ - protected $config; - public function __construct(string $channel, ICanManageInstances $instanceManager, IManageConfigValues $config, string $logfile = null) + public function __construct(string $channel = LogChannel::DEFAULT) { - $this->channel = $channel; - $this->instanceManager = $instanceManager; - $this->config = $config; - - $this->instanceManager - ->registerStrategy(LoggerInterface::class, 'syslog', SyslogLogger::class) - ->registerStrategy(LoggerInterface::class, 'stream', StreamLogger::class, isset($logfile) ? [$logfile] : null); - - if ($this->config->get('system', 'profiling') ?? false) { - $this->instanceManager->registerDecorator(LoggerInterface::class, ProfilerLogger::class); - } + $this->channel = $channel; } - /** - * Creates a new PSR-3 compliant logger instances - * - * @param string|null $loglevel (optional) A given loglevel in case the loglevel in the config isn't applicable - * - * @return LoggerInterface The PSR-3 compliant logger instance - */ - public function create(string $loglevel = null): LoggerInterface + public function create(ICanCreateInstances $createInstances, IManageConfigValues $config): LoggerInterface { - if (empty($this->config->get('system', 'debugging') ?? false)) { + if (empty($config->get('system', 'debugging') ?? false)) { return new NullLogger(); } - $loglevel = $loglevel ?? static::mapLegacyConfigDebugLevel($this->config->get('system', 'loglevel')); - $name = $this->config->get('system', 'logger_config') ?? 'stream'; + $name = $config->get('system', 'logger_config') ?? ''; try { - /** @var LoggerInterface */ - return $this->instanceManager->getInstance(LoggerInterface::class, $name, [$this->channel, $loglevel]); - } catch (LogLevelException $exception) { - // If there's a wrong config value for loglevel, try again with standard - $logger = $this->create(LogLevel::NOTICE); - $logger->warning('Invalid loglevel set in config.', ['loglevel' => $loglevel]); - return $logger; - } catch (\Throwable $e) { + return $createInstances->createWithName(LoggerInterface::class, $name, [$this->channel]); + } catch (Throwable $e) { // No logger ... return new NullLogger(); } } - - /** - * Creates a new PSR-3 compliant develop logger - * - * If you want to debug only interactions from your IP or the IP of a remote server for federation debug, - * you'll use this logger instance for the duration of your work. - * - * It should never get filled during normal usage of Friendica - * - * @return LoggerInterface The PSR-3 compliant logger instance - * @throws \Exception - */ - public function createDev() - { - $debugging = $this->config->get('system', 'debugging'); - $stream = $this->config->get('system', 'dlogfile'); - $developerIp = $this->config->get('system', 'dlogip'); - - if ((!isset($developerIp) || !$debugging) && - (!is_file($stream) || is_writable($stream))) { - return new NullLogger(); - } - - $name = $this->config->get('system', 'logger_config') ?? 'stream'; - - /** @var LoggerInterface */ - return $this->instanceManager->getInstance(LoggerInterface::class, $name, [self::DEV_CHANNEL, LogLevel::DEBUG, $stream]); - } - - /** - * Mapping a legacy level to the PSR-3 compliant levels - * - * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel - * - * @param string $level the level to be mapped - * - * @return string the PSR-3 compliant level - */ - private static function mapLegacyConfigDebugLevel(string $level): string - { - switch ($level) { - // legacy WARNING - case "0": - return LogLevel::ERROR; - // legacy INFO - case "1": - return LogLevel::WARNING; - // legacy TRACE - case "2": - return LogLevel::NOTICE; - // legacy DEBUG - case "3": - return LogLevel::INFO; - // legacy DATA - case "4": - // legacy ALL - case "5": - return LogLevel::DEBUG; - // default if nothing set - default: - return $level; - } - } } diff --git a/src/Core/Logger/Factory/ProfilerLogger.php b/src/Core/Logger/Factory/ProfilerLogger.php new file mode 100644 index 000000000..3d126921d --- /dev/null +++ b/src/Core/Logger/Factory/ProfilerLogger.php @@ -0,0 +1,53 @@ +. + * + */ + +namespace Friendica\Core\Logger\Factory; + +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\Logger\Type\ProfilerLogger as ProfilerLoggerClass; +use Friendica\Util\Profiler; +use Psr\Log\LoggerInterface; + +/** + * The logger factory for the ProfilerLogger + * + * @see ProfilerLoggerClass + */ +class ProfilerLogger extends AbstractLoggerTypeFactory +{ + /** + * Wraps a given Logger with profiling information in case profiling is enabled + * + * @param IManageConfigValues $config The system configuration + * @param LoggerInterface $logger The given logger class, which should get wrapped + * @param Profiler $profiler The profiler utility + * + * @return LoggerInterface The PSR-3 compliant logger instance + */ + public function create(IManageConfigValues $config, LoggerInterface $logger, Profiler $profiler): LoggerInterface + { + if ($config->get('system', 'profiling') ?? false) { + return $logger; + } else { + return new ProfilerLoggerClass($logger, $profiler); + } + } +} diff --git a/src/Core/Logger/Factory/StreamLogger.php b/src/Core/Logger/Factory/StreamLogger.php new file mode 100644 index 000000000..85475b3af --- /dev/null +++ b/src/Core/Logger/Factory/StreamLogger.php @@ -0,0 +1,100 @@ +. + * + */ + +namespace Friendica\Core\Logger\Factory; + +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\Logger\Capabilities\LogChannel; +use Friendica\Core\Logger\Exception\LoggerArgumentException; +use Friendica\Core\Logger\Exception\LoggerException; +use Friendica\Core\Logger\Type\StreamLogger as StreamLoggerClass; +use Friendica\Core\Logger\Util\FileSystem; +use Psr\Log\LoggerInterface; +use Psr\Log\LogLevel; +use Psr\Log\NullLogger; + +/** + * The logger factory for the StreamLogger instance + * + * @see StreamLoggerClass + */ +class StreamLogger extends AbstractLoggerTypeFactory +{ + /** + * Creates a new PSR-3 compliant stream logger instance + * + * @param IManageConfigValues $config The system configuration + * @param string|null $logfile (optional) A given logfile which should be used as stream (e.g. in case of + * developer logging) + * @param string|null $channel (optional) A given channel in case it is different from the default + * + * @return LoggerInterface The PSR-3 compliant logger instance + * + * @throws LoggerException in case the logger cannot get created + */ + public function create(IManageConfigValues $config, string $logfile = null, string $channel = null): LoggerInterface + { + $fileSystem = new FileSystem(); + + $logfile = $logfile ?? $config->get('system', 'logfile'); + if ((@file_exists($logfile) && !@is_writable($logfile)) && !@is_writable(basename($logfile))) { + throw new LoggerArgumentException(sprintf('%s is not a valid logfile', $logfile)); + } + + $loglevel = static::mapLegacyConfigDebugLevel($config->get('system', 'loglevel')); + + if (array_key_exists($loglevel, StreamLoggerClass::levelToInt)) { + $loglevel = StreamLoggerClass::levelToInt[$loglevel]; + } else { + $loglevel = StreamLoggerClass::levelToInt[LogLevel::NOTICE]; + } + + $stream = $fileSystem->createStream($logfile); + + return new StreamLoggerClass($channel ?? $this->channel, $this->introspection, $stream, $loglevel, getmypid()); + } + + /** + * Creates a new PSR-3 compliant develop logger + * + * If you want to debug only interactions from your IP or the IP of a remote server for federation debug, + * you'll use this logger instance for the duration of your work. + * + * It should never get filled during normal usage of Friendica + * + * @return LoggerInterface The PSR-3 compliant logger instance + * + * @throws LoggerException + */ + public function createDev(IManageConfigValues $config) + { + $debugging = $config->get('system', 'debugging'); + $logfile = $config->get('system', 'dlogfile'); + $developerIp = $config->get('system', 'dlogip'); + + if ((!isset($developerIp) || !$debugging) && + (!is_file($logfile) || is_writable($logfile))) { + return new NullLogger(); + } + + return $this->create($config, $logfile, LogChannel::DEV); + } +} diff --git a/src/Core/Logger/Factory/SyslogLogger.php b/src/Core/Logger/Factory/SyslogLogger.php new file mode 100644 index 000000000..5a8789584 --- /dev/null +++ b/src/Core/Logger/Factory/SyslogLogger.php @@ -0,0 +1,60 @@ +. + * + */ + +namespace Friendica\Core\Logger\Factory; + +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\Logger\Exception\LoggerException; +use Friendica\Core\Logger\Type\SyslogLogger as SyslogLoggerClass; +use Psr\Log\LoggerInterface; +use Psr\Log\LogLevel; + +/** + * The logger factory for the SyslogLogger instance + * + * @see SyslogLoggerClass + */ +class SyslogLogger extends AbstractLoggerTypeFactory +{ + /** + * Creates a new PSR-3 compliant syslog logger instance + * + * @param IManageConfigValues $config The system configuration + * + * @return LoggerInterface The PSR-3 compliant logger instance + * + * @throws LoggerException in case the logger cannot get created + */ + public function create(IManageConfigValues $config): LoggerInterface + { + $logOpts = $config->get('system', 'syslog_flags') ?? SyslogLoggerClass::DEFAULT_FLAGS; + $logFacility = $config->get('system', 'syslog_facility') ?? SyslogLoggerClass::DEFAULT_FACILITY; + $loglevel = SyslogLogger::mapLegacyConfigDebugLevel($config->get('system', 'loglevel')); + + if (!array_key_exists($loglevel, SyslogLoggerClass::logLevels)) { + $loglevel = SyslogLoggerClass::logLevels[$loglevel]; + } else { + $loglevel = SyslogLoggerClass::logLevels[LogLevel::NOTICE]; + } + + return new SyslogLoggerClass($this->channel, $this->introspection, $loglevel, $logOpts, $logFacility); + } +} diff --git a/src/Core/Logger/Type/README.md b/src/Core/Logger/Type/README.md deleted file mode 100644 index b204353c0..000000000 --- a/src/Core/Logger/Type/README.md +++ /dev/null @@ -1,26 +0,0 @@ -## Friendica\Util\Logger - -This namespace contains the different implementations of a Logger. - -### Configuration guideline - -The following settings are possible for `logger_config`: -- [`stream`](StreamLogger.php): A small logger for files or streams -- [`syslog`](SyslogLogger.php): Prints the logging output into the syslog - -[`VoidLogger`](VoidLogger.php) is a fallback logger without any function if no debugging is enabled. - -[`ProfilerLogger`](ProfilerLogger.php) is a wrapper around an existing logger in case profiling is enabled for Friendica. -Every log call will be saved to the `Profiler` with a timestamp. - -### Implementation guideline - -Each logging implementation should pe capable of printing at least the following information: -- An unique ID for each Request/Call -- The process ID (PID) -- A timestamp of the logging entry -- The critically of the log entry -- A log message -- A context of the log message (f.e which user) - -If possible, a Logger should extend [`AbstractLogger`](AbstractLogger.php), because it contains additional, Friendica specific business logic for each logging call. diff --git a/src/Core/Logger/Type/StreamLogger.php b/src/Core/Logger/Type/StreamLogger.php index d56f5b20e..87f1a3937 100644 --- a/src/Core/Logger/Type/StreamLogger.php +++ b/src/Core/Logger/Type/StreamLogger.php @@ -21,20 +21,16 @@ namespace Friendica\Core\Logger\Type; -use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Hooks\Capabilities\IAmAStrategy; use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; -use Friendica\Core\Logger\Exception\LoggerArgumentException; use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; use Friendica\Util\DateTimeFormat; -use Friendica\Util\FileSystem; use Psr\Log\LogLevel; /** * A Logger instance for logging into a stream (file, stdout, stderr) */ -class StreamLogger extends AbstractLogger implements IAmAStrategy +class StreamLogger extends AbstractLogger { /** * The minimum loglevel at which this logger will be triggered @@ -42,12 +38,6 @@ class StreamLogger extends AbstractLogger implements IAmAStrategy */ private $logLevel; - /** - * The file URL of the stream (if needed) - * @var string - */ - private $url; - /** * The stream, where the current logger is writing into * @var resource @@ -60,16 +50,11 @@ class StreamLogger extends AbstractLogger implements IAmAStrategy */ private $pid; - /** - * @var FileSystem - */ - private $fileSystem; - /** * Translates LogLevel log levels to integer values * @var array */ - private $levelToInt = [ + public const levelToInt = [ LogLevel::EMERGENCY => 0, LogLevel::ALERT => 1, LogLevel::CRITICAL => 2, @@ -84,41 +69,20 @@ class StreamLogger extends AbstractLogger implements IAmAStrategy * {@inheritdoc} * @param string $level The minimum loglevel at which this logger will be triggered * - * @throws LoggerArgumentException - * @throws LogLevelException + * @throws LoggerException */ - public function __construct(string $channel, IManageConfigValues $config, IHaveCallIntrospections $introspection, FileSystem $fileSystem, string $level = LogLevel::DEBUG) + public function __construct(string $channel, IHaveCallIntrospections $introspection, $stream, int $logLevel, int $pid) { - $this->fileSystem = $fileSystem; - - $stream = $this->logfile ?? $config->get('system', 'logfile'); - if ((@file_exists($stream) && !@is_writable($stream)) && !@is_writable(basename($stream))) { - throw new LoggerArgumentException(sprintf('%s is not a valid logfile', $stream)); - } - parent::__construct($channel, $introspection); - if (is_resource($stream)) { - $this->stream = $stream; - } elseif (is_string($stream)) { - $this->url = $stream; - } else { - throw new LoggerArgumentException('A stream must either be a resource or a string.'); - } - - $this->pid = getmypid(); - if (array_key_exists($level, $this->levelToInt)) { - $this->logLevel = $this->levelToInt[$level]; - } else { - throw new LogLevelException(sprintf('The level "%s" is not valid.', $level)); - } - - $this->checkStream(); + $this->stream = $stream; + $this->pid = $pid; + $this->logLevel = $logLevel; } public function close() { - if ($this->url && is_resource($this->stream)) { + if (is_resource($this->stream)) { fclose($this->stream); } @@ -139,18 +103,16 @@ class StreamLogger extends AbstractLogger implements IAmAStrategy */ protected function addEntry($level, string $message, array $context = []) { - if (!array_key_exists($level, $this->levelToInt)) { + if (!array_key_exists($level, static::levelToInt)) { throw new LogLevelException(sprintf('The level "%s" is not valid.', $level)); } - $logLevel = $this->levelToInt[$level]; + $logLevel = static::levelToInt[$level]; if ($logLevel > $this->logLevel) { return; } - $this->checkStream(); - $formattedLog = $this->formatLog($level, $message, $context); fwrite($this->stream, $formattedLog); } @@ -185,27 +147,4 @@ class StreamLogger extends AbstractLogger implements IAmAStrategy return $logMessage; } - - /** - * Checks the current stream - * - * @throws LoggerException - * @throws LoggerArgumentException - */ - private function checkStream() - { - if (is_resource($this->stream)) { - return; - } - - if (empty($this->url)) { - throw new LoggerArgumentException('Missing stream URL.'); - } - - try { - $this->stream = $this->fileSystem->createStream($this->url); - } catch (\UnexpectedValueException $exception) { - throw new LoggerException('Cannot create stream.', $exception); - } - } } diff --git a/src/Core/Logger/Type/SyslogLogger.php b/src/Core/Logger/Type/SyslogLogger.php index 3c9ab581a..88dc1964d 100644 --- a/src/Core/Logger/Type/SyslogLogger.php +++ b/src/Core/Logger/Type/SyslogLogger.php @@ -21,8 +21,6 @@ namespace Friendica\Core\Logger\Type; -use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Hooks\Capabilities\IAmAStrategy; use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; @@ -32,7 +30,7 @@ use Psr\Log\LogLevel; * A Logger instance for syslogging (fast, but simple) * @see http://php.net/manual/en/function.syslog.php */ -class SyslogLogger extends AbstractLogger implements IAmAStrategy +class SyslogLogger extends AbstractLogger { const IDENT = 'Friendica'; @@ -45,7 +43,7 @@ class SyslogLogger extends AbstractLogger implements IAmAStrategy * Translates LogLevel log levels to syslog log priorities. * @var array */ - private $logLevels = [ + public const logLevels = [ LogLevel::DEBUG => LOG_DEBUG, LogLevel::INFO => LOG_INFO, LogLevel::NOTICE => LOG_NOTICE, @@ -60,7 +58,7 @@ class SyslogLogger extends AbstractLogger implements IAmAStrategy * Translates log priorities to string outputs * @var array */ - private $logToString = [ + protected const logToString = [ LOG_DEBUG => 'DEBUG', LOG_INFO => 'INFO', LOG_NOTICE => 'NOTICE', @@ -101,19 +99,18 @@ class SyslogLogger extends AbstractLogger implements IAmAStrategy /** * {@inheritdoc} - * @param string $level The minimum loglevel at which this logger will be triggered * - * @throws LogLevelException - * @throws LoggerException + * @param string $logLevel The minimum loglevel at which this logger will be triggered + * @param string $logOptions + * @param string $logFacility */ - public function __construct(string $channel, IManageConfigValues $config, IHaveCallIntrospections $introspection, string $level = LogLevel::NOTICE) + public function __construct(string $channel, IHaveCallIntrospections $introspection, string $logLevel, string $logOptions, string $logFacility) { parent::__construct($channel, $introspection); - $this->logOpts = $config->get('system', 'syslog_flags') ?? static::DEFAULT_FLAGS; - $this->logFacility = $config->get('system', 'syslog_facility') ?? static::DEFAULT_FACILITY; - $this->logLevel = $this->mapLevelToPriority($level); - $this->introspection->addClasses([self::class]); + $this->logOpts = $logOptions; + $this->logFacility = $logFacility; + $this->logLevel = $logLevel; } /** @@ -149,11 +146,11 @@ class SyslogLogger extends AbstractLogger implements IAmAStrategy */ public function mapLevelToPriority(string $level): int { - if (!array_key_exists($level, $this->logLevels)) { + if (!array_key_exists($level, static::logLevels)) { throw new LogLevelException(sprintf('The level "%s" is not valid.', $level)); } - return $this->logLevels[$level]; + return static::logLevels[$level]; } /** @@ -202,7 +199,7 @@ class SyslogLogger extends AbstractLogger implements IAmAStrategy $record = array_merge($record, ['uid' => $this->logUid]); $logMessage = $this->channel . ' '; - $logMessage .= '[' . $this->logToString[$level] . ']: '; + $logMessage .= '[' . static::logToString[$level] . ']: '; $logMessage .= $this->psrInterpolate($message, $context) . ' '; $logMessage .= $this->jsonEncodeArray($context) . ' - '; $logMessage .= $this->jsonEncodeArray($record); diff --git a/src/Util/FileSystem.php b/src/Core/Logger/Util/FileSystem.php similarity index 94% rename from src/Util/FileSystem.php rename to src/Core/Logger/Util/FileSystem.php index a21e7fb60..3793ac4a9 100644 --- a/src/Util/FileSystem.php +++ b/src/Core/Logger/Util/FileSystem.php @@ -19,10 +19,10 @@ * */ -namespace Friendica\Util; +namespace Friendica\Core\Logger\Util; /** - * Util class for filesystem manipulation + * Util class for filesystem manipulation for Logger classes */ class FileSystem { @@ -38,7 +38,7 @@ class FileSystem * * @return string The directory name (empty if no directory is found, like urls) */ - public function createDir(string $file) + public function createDir(string $file): string { $dirname = null; $pos = strpos($file, '://'); diff --git a/src/Core/Logger/Util/LoggerSettingsCheck.php b/src/Core/Logger/Util/LoggerSettingsCheck.php new file mode 100644 index 000000000..7782216da --- /dev/null +++ b/src/Core/Logger/Util/LoggerSettingsCheck.php @@ -0,0 +1,91 @@ +. + * + */ + +namespace Friendica\Core\Logger\Util; + +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\L10n; +use Friendica\Core\Logger\Capabilities\ICheckLoggerSettings; +use Friendica\Core\Logger\Exception\LoggerUnusableException; + +/** {@inheritDoc} */ +class LoggerSettingsCheck implements ICheckLoggerSettings +{ + /** @var IManageConfigValues */ + protected $config; + /** @var $fileSystem */ + protected $fileSystem; + /** @var L10n */ + protected $l10n; + + public function __construct(IManageConfigValues $config, FileSystem $fileSystem, L10n $l10n) + { + $this->config = $config; + $this->fileSystem = $fileSystem; + $this->l10n = $l10n; + } + + /** {@inheritDoc} */ + public function checkLogfile(): ?string + { + // Check logfile permission + if ($this->config->get('system', 'debugging')) { + $file = $this->config->get('system', 'logfile'); + + try { + $stream = $this->fileSystem->createStream($file); + + if (!isset($stream)) { + throw new LoggerUnusableException('Stream is null.'); + } + } catch (\Throwable $exception) { + return $this->l10n->t('The logfile \'%s\' is not usable. No logging possible (error: \'%s\')', $file, $exception->getMessage()); + } + } + + return null; + } + + /** {@inheritDoc} */ + public function checkDebugLogfile(): ?string + { + // Check logfile permission + if ($this->config->get('system', 'debugging')) { + $file = $this->config->get('system', 'dlogfile'); + + if (empty($file)) { + return null; + } + + try { + $stream = $this->fileSystem->createStream($file); + + if (!isset($stream)) { + throw new LoggerUnusableException('Stream is null.'); + } + } catch (\Throwable $exception) { + return $this->l10n->t('The debug logfile \'%s\' is not usable. No logging possible (error: \'%s\')', $file, $exception->getMessage()); + } + } + + return null; + } +} diff --git a/src/DI.php b/src/DI.php index 8d706ed37..ad8745622 100644 --- a/src/DI.php +++ b/src/DI.php @@ -22,10 +22,12 @@ namespace Friendica; use Dice\Dice; -use Friendica\Core\Session\Capability\IHandleSessions; -use Friendica\Core\Session\Capability\IHandleUserSessions; -use Friendica\Navigation\SystemMessages; -use Psr\Log\LoggerInterface; +use \Friendica\Core\Logger\Capabilities\ICheckLoggerSettings; +use \Friendica\Core\Logger\Util\LoggerSettingsCheck; +use \Friendica\Core\Session\Capability\IHandleSessions; +use \Friendica\Core\Session\Capability\IHandleUserSessions; +use \Friendica\Navigation\SystemMessages; +use \Psr\Log\LoggerInterface; /** * This class is capable of getting all dynamic created classes @@ -295,6 +297,11 @@ abstract class DI static::init($flushDice); } + public static function loggCheck(): ICheckLoggerSettings + { + return self::$dice->create(LoggerSettingsCheck::class); + } + /** * @return LoggerInterface */ @@ -692,14 +699,6 @@ abstract class DI return self::$dice->create(Util\DateTimeFormat::class); } - /** - * @return Util\FileSystem - */ - public static function fs() - { - return self::$dice->create(Util\FileSystem::class); - } - /** * @return Util\Profiler */ diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index d872f4825..80437305d 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -79,7 +79,7 @@ class Summary extends BaseAdmin // Check if github.com/friendica/stable/VERSION is higher then // the local version of Friendica. Check is opt-in, source may be stable or develop branch if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') { - $gitversion = DI::keyValue()->get('git_friendica_version') ?? ''; + $gitversion = DI::keyValue()->get('git_friendica_version') ?? ''; if (version_compare(App::VERSION, $gitversion) < 0) { $warningtext[] = DI::l10n()->t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', App::VERSION, $gitversion); @@ -126,35 +126,11 @@ class Summary extends BaseAdmin } // Check logfile permission - if (DI::config()->get('system', 'debugging')) { - $file = DI::config()->get('system', 'logfile'); - - $fileSystem = DI::fs(); - - try { - $stream = $fileSystem->createStream($file); - - if (!isset($stream)) { - throw new ServiceUnavailableException('Stream is null.'); - } - - } catch (\Throwable $exception) { - $warningtext[] = DI::l10n()->t('The logfile \'%s\' is not usable. No logging possible (error: \'%s\')', $file, $exception->getMessage()); - } - - $file = DI::config()->get('system', 'dlogfile'); - - try { - if (!empty($file)) { - $stream = $fileSystem->createStream($file); - - if (!isset($stream)) { - throw new ServiceUnavailableException('Stream is null.'); - } - } - } catch (\Throwable $exception) { - $warningtext[] = DI::l10n()->t('The debug logfile \'%s\' is not usable. No logging possible (error: \'%s\')', $file, $exception->getMessage()); - } + if (($return = DI::loggCheck()->checkLogfile()) !== null) { + $warningtext[] = $return; + } + if (($return = DI::loggCheck()->checkDebugLogfile()) !== null) { + $warningtext[] = $return; } // check legacy basepath settings diff --git a/static/dependencies.config.php b/static/dependencies.config.php index 089116642..2b246f845 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -37,8 +37,9 @@ use Dice\Dice; use Friendica\App; use Friendica\Core\Cache; use Friendica\Core\Config; -use Friendica\Core\Hooks\Capabilities\ICanManageInstances; -use Friendica\Core\Hooks\Model\InstanceManager; +use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; +use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; +use Friendica\Core\Hooks\Model\DiceInstanceManager; use Friendica\Core\PConfig; use Friendica\Core\L10n; use Friendica\Core\Lock; @@ -62,6 +63,13 @@ return [ // one instance for the whole execution 'shared' => true, ], + \Friendica\Core\Addon\Capabilities\ICanLoadAddons::class => [ + 'instanceOf' => \Friendica\Core\Addon\Model\AddonLoader::class, + 'constructParams' => [ + [Dice::INSTANCE => '$basepath'], + [Dice::INSTANCE => Dice::SELF], + ], + ], '$basepath' => [ 'instanceOf' => Util\BasePath::class, 'call' => [ @@ -78,8 +86,24 @@ return [ $_SERVER ] ], - ICanManageInstances::class => [ - 'instanceOf' => InstanceManager::class, + DiceInstanceManager::class => [ + 'constructParams' => [ + [Dice::INSTANCE => Dice::SELF], + ] + ], + \Friendica\Core\Hooks\Util\HookFileManager::class => [ + 'constructParams' => [ + [Dice::INSTANCE => '$basepath'], + ], + ], + ICanRegisterInstances::class => [ + 'instanceOf' => DiceInstanceManager::class, + 'constructParams' => [ + [Dice::INSTANCE => Dice::SELF], + ], + ], + ICanCreateInstances::class => [ + 'instanceOf' => DiceInstanceManager::class, 'constructParams' => [ [Dice::INSTANCE => Dice::SELF], ], @@ -156,40 +180,40 @@ return [ [Dice::INSTANCE => '$basepath'], ], ], - /** - * Create a Logger, which implements the LoggerInterface - * - * Same as: - * $loggerFactory = new Factory\LoggerFactory(); - * $logger = $loggerFactory->create($channel, $configuration, $profiler); - * - * Attention1: We can use DICE for detecting dependencies inside "chained" calls too - * Attention2: The variable "$channel" is passed inside the creation of the dependencies per: - * $app = $dice->create(App::class, [], ['$channel' => 'index']); - * and is automatically passed as an argument with the same name - */ - LoggerInterface::class => [ + \Psr\Log\LoggerInterface::class => [ 'instanceOf' => \Friendica\Core\Logger\Factory\Logger::class, - 'constructParams' => [ - 'index', - ], 'call' => [ ['create', [], Dice::CHAIN_CALL], ], ], - '$devLogger' => [ - 'instanceOf' => \Friendica\Core\Logger\Factory\Logger::class, - 'constructParams' => [ - 'dev', - ], + \Friendica\Core\Logger\Type\SyslogLogger::class => [ + 'instanceOf' => \Friendica\Core\Logger\Factory\SyslogLogger::class, 'call' => [ - ['createDev', [], Dice::CHAIN_CALL], - ] + ['create', [], Dice::CHAIN_CALL], + ], + ], + \Friendica\Core\Logger\Type\StreamLogger::class => [ + 'instanceOf' => \Friendica\Core\Logger\Factory\StreamLogger::class, + 'call' => [ + ['create', [], Dice::CHAIN_CALL], + ], + ], + \Friendica\Core\Logger\Type\ProfilerLogger::class => [ + 'instanceOf' => \Friendica\Core\Logger\Factory\ProfilerLogger::class, + 'call' => [ + ['create', [], Dice::CHAIN_CALL], + ], ], \Friendica\Core\Logger\Capabilities\IHaveCallIntrospections::class => [ - 'instanceOf' => \Friendica\Core\Logger\Util\Introspection::class, + 'instanceOf' => \Friendica\Core\Logger\Util\Introspection::class, 'constructParams' => [ - \Friendica\Core\Logger\Util\Introspection::IGNORE_CLASS_LIST, + \Friendica\Core\Logger\Capabilities\IHaveCallIntrospections::IGNORE_CLASS_LIST, + ], + ], + '$devLogger' => [ + 'instanceOf' => \Friendica\Core\Logger\Factory\StreamLogger::class, + 'call' => [ + ['createDev', [], Dice::CHAIN_CALL], ], ], Cache\Capability\ICanCache::class => [ diff --git a/static/hooks.config.php b/static/hooks.config.php new file mode 100644 index 000000000..ca8863e0f --- /dev/null +++ b/static/hooks.config.php @@ -0,0 +1,37 @@ +. + * + */ + +use Friendica\Core\Hooks\Capabilities\HookType as H; + +return [ + H::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + \Friendica\Core\Logger\Type\SyslogLogger::class => ['syslog'], + \Friendica\Core\Logger\Type\StreamLogger::class => ['stream'], + ], + ], + H::DECORATOR => [ + \Psr\Log\LoggerInterface::class => [ + \Friendica\Core\Logger\Type\ProfilerLogger::class, + ], + ], +]; diff --git a/tests/Util/Hooks/InstanceMocks/FakeInstance.php b/tests/Util/Hooks/InstanceMocks/FakeInstance.php index ff99002f7..9a0e9dd6f 100644 --- a/tests/Util/Hooks/InstanceMocks/FakeInstance.php +++ b/tests/Util/Hooks/InstanceMocks/FakeInstance.php @@ -21,9 +21,7 @@ namespace Friendica\Test\Util\Hooks\InstanceMocks; -use Friendica\Core\Hooks\Capabilities\IAmAStrategy; - -class FakeInstance implements IAmADecoratedInterface, IAmAStrategy +class FakeInstance { protected $aText = null; protected $cBool = null; diff --git a/tests/src/Core/Hooks/Model/InstanceManagerTest.php b/tests/src/Core/Hooks/Model/InstanceManagerTest.php index 4e4c0135c..200500d63 100644 --- a/tests/src/Core/Hooks/Model/InstanceManagerTest.php +++ b/tests/src/Core/Hooks/Model/InstanceManagerTest.php @@ -22,7 +22,7 @@ namespace Friendica\Test\src\Core\Hooks\Model; use Dice\Dice; -use Friendica\Core\Hooks\Model\InstanceManager; +use Friendica\Core\Hooks\Model\DiceInstanceManager; use Friendica\Test\MockedTest; use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstance; use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstanceDecorator; @@ -32,12 +32,12 @@ class InstanceManagerTest extends MockedTest { public function testEqualButNotSameInstance() { - $instance = new InstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice()); $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class); - $getInstanceA = $instance->getInstance(IAmADecoratedInterface::class, 'fake'); - $getInstanceB = $instance->getInstance(IAmADecoratedInterface::class, 'fake'); + $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); + $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); self::assertEquals($getInstanceA, $getInstanceB); self::assertNotSame($getInstanceA, $getInstanceB); @@ -81,7 +81,7 @@ class InstanceManagerTest extends MockedTest */ public function testInstanceWithConstructorAnonymArgs(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new InstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice()); $args = []; @@ -98,9 +98,9 @@ class InstanceManagerTest extends MockedTest $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class, $args); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->getInstance(IAmADecoratedInterface::class, 'fake'); + $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->getInstance(IAmADecoratedInterface::class, 'fake'); + $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); self::assertEquals($getInstanceA, $getInstanceB); self::assertNotSame($getInstanceA, $getInstanceB); @@ -117,7 +117,7 @@ class InstanceManagerTest extends MockedTest */ public function testInstanceConstructorAndGetInstanceWithNamedArgs(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new InstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice()); $args = []; @@ -131,9 +131,9 @@ class InstanceManagerTest extends MockedTest $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class, $args); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->getInstance(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->getInstance(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); self::assertEquals($getInstanceA, $getInstanceB); self::assertNotSame($getInstanceA, $getInstanceB); @@ -150,7 +150,7 @@ class InstanceManagerTest extends MockedTest */ public function testInstanceWithTwoStrategies(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new InstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice()); $args = []; @@ -165,9 +165,9 @@ class InstanceManagerTest extends MockedTest $instance->registerStrategy(IAmADecoratedInterface::class, 'fake23', FakeInstance::class, $args); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->getInstance(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->getInstance(IAmADecoratedInterface::class, 'fake23', [$bString]); + $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake23', [$bString]); self::assertEquals($getInstanceA, $getInstanceB); self::assertNotSame($getInstanceA, $getInstanceB); @@ -184,7 +184,7 @@ class InstanceManagerTest extends MockedTest */ public function testDecorator(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new InstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice()); $args = []; @@ -202,9 +202,9 @@ class InstanceManagerTest extends MockedTest $instance->registerDecorator(IAmADecoratedInterface::class, FakeInstanceDecorator::class, [$prefix]); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->getInstance(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->getInstance(IAmADecoratedInterface::class, 'fake23', [$bString]); + $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake23', [$bString]); self::assertEquals(2, FakeInstanceDecorator::$countInstance); self::assertEquals($getInstanceA, $getInstanceB); @@ -222,7 +222,7 @@ class InstanceManagerTest extends MockedTest */ public function testTwoDecoratorWithPrefix(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new InstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice()); $args = []; @@ -241,9 +241,9 @@ class InstanceManagerTest extends MockedTest $instance->registerDecorator(IAmADecoratedInterface::class, FakeInstanceDecorator::class); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->getInstance(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->getInstance(IAmADecoratedInterface::class, 'fake23', [$bString]); + $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake23', [$bString]); self::assertEquals(4, FakeInstanceDecorator::$countInstance); self::assertEquals($getInstanceA, $getInstanceB); diff --git a/tests/src/Core/Logger/StreamLoggerTest.php b/tests/src/Core/Logger/StreamLoggerTest.php index 1ddddf4c1..c8fac4939 100644 --- a/tests/src/Core/Logger/StreamLoggerTest.php +++ b/tests/src/Core/Logger/StreamLoggerTest.php @@ -24,7 +24,7 @@ namespace Friendica\Test\src\Core\Logger; use Friendica\Core\Logger\Exception\LoggerArgumentException; use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; -use Friendica\Util\FileSystem; +use Friendica\Core\Logger\Util\FileSystem; use Friendica\Test\Util\VFSTrait; use Friendica\Core\Logger\Type\StreamLogger; use org\bovigo\vfs\vfsStream; @@ -41,7 +41,7 @@ class StreamLoggerTest extends AbstractLoggerTest private $logfile; /** - * @var Filesystem + * @var \Friendica\Core\Logger\Util\Filesystem */ private $fileSystem; From 89a31e43b250e3b95266077214edd34ab4f15c7e Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 3 Jul 2023 00:06:17 +0200 Subject: [PATCH 127/259] Fix license check --- src/Core/Addon/Capabilities/ICanLoadAddons.php | 2 +- src/Core/Addon/Model/AddonLoader.php | 2 +- src/Core/Logger/Capabilities/ICheckLoggerSettings.php | 2 +- src/Core/Logger/Capabilities/IHaveCallIntrospections.php | 2 +- src/Core/Logger/Capabilities/LogChannel.php | 2 +- src/Core/Logger/Exception/LogLevelException.php | 2 +- src/Core/Logger/Exception/LoggerArgumentException.php | 2 +- src/Core/Logger/Exception/LoggerException.php | 2 +- src/Core/Logger/Exception/LoggerUnusableException.php | 2 +- src/Core/Logger/Factory/ProfilerLogger.php | 2 +- src/Core/Logger/Factory/StreamLogger.php | 2 +- src/Core/Logger/Factory/SyslogLogger.php | 2 +- static/hooks.config.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Core/Addon/Capabilities/ICanLoadAddons.php b/src/Core/Addon/Capabilities/ICanLoadAddons.php index a28826ffb..9c9d1e841 100644 --- a/src/Core/Addon/Capabilities/ICanLoadAddons.php +++ b/src/Core/Addon/Capabilities/ICanLoadAddons.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Addon/Model/AddonLoader.php b/src/Core/Addon/Model/AddonLoader.php index 707601aef..952246af0 100644 --- a/src/Core/Addon/Model/AddonLoader.php +++ b/src/Core/Addon/Model/AddonLoader.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Capabilities/ICheckLoggerSettings.php b/src/Core/Logger/Capabilities/ICheckLoggerSettings.php index 532425ec0..fb93d18e8 100644 --- a/src/Core/Logger/Capabilities/ICheckLoggerSettings.php +++ b/src/Core/Logger/Capabilities/ICheckLoggerSettings.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Capabilities/IHaveCallIntrospections.php b/src/Core/Logger/Capabilities/IHaveCallIntrospections.php index 7f884bf64..83d75f976 100644 --- a/src/Core/Logger/Capabilities/IHaveCallIntrospections.php +++ b/src/Core/Logger/Capabilities/IHaveCallIntrospections.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Capabilities/LogChannel.php b/src/Core/Logger/Capabilities/LogChannel.php index 54ae03217..5fceae42a 100644 --- a/src/Core/Logger/Capabilities/LogChannel.php +++ b/src/Core/Logger/Capabilities/LogChannel.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Exception/LogLevelException.php b/src/Core/Logger/Exception/LogLevelException.php index 39b2d17a9..a79db80f5 100644 --- a/src/Core/Logger/Exception/LogLevelException.php +++ b/src/Core/Logger/Exception/LogLevelException.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Exception/LoggerArgumentException.php b/src/Core/Logger/Exception/LoggerArgumentException.php index 08eabe84a..bbc1fc066 100644 --- a/src/Core/Logger/Exception/LoggerArgumentException.php +++ b/src/Core/Logger/Exception/LoggerArgumentException.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Exception/LoggerException.php b/src/Core/Logger/Exception/LoggerException.php index 13bcff8f3..742557678 100644 --- a/src/Core/Logger/Exception/LoggerException.php +++ b/src/Core/Logger/Exception/LoggerException.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Exception/LoggerUnusableException.php b/src/Core/Logger/Exception/LoggerUnusableException.php index 29336e086..46e49fd41 100644 --- a/src/Core/Logger/Exception/LoggerUnusableException.php +++ b/src/Core/Logger/Exception/LoggerUnusableException.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Factory/ProfilerLogger.php b/src/Core/Logger/Factory/ProfilerLogger.php index 3d126921d..8c07b51b6 100644 --- a/src/Core/Logger/Factory/ProfilerLogger.php +++ b/src/Core/Logger/Factory/ProfilerLogger.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Factory/StreamLogger.php b/src/Core/Logger/Factory/StreamLogger.php index 85475b3af..6da4b8cd8 100644 --- a/src/Core/Logger/Factory/StreamLogger.php +++ b/src/Core/Logger/Factory/StreamLogger.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/src/Core/Logger/Factory/SyslogLogger.php b/src/Core/Logger/Factory/SyslogLogger.php index 5a8789584..bccf4daf5 100644 --- a/src/Core/Logger/Factory/SyslogLogger.php +++ b/src/Core/Logger/Factory/SyslogLogger.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 diff --git a/static/hooks.config.php b/static/hooks.config.php index ca8863e0f..185bc5e48 100644 --- a/static/hooks.config.php +++ b/static/hooks.config.php @@ -2,7 +2,7 @@ /** * @copyright Copyright (C) 2010-2023, the Friendica project * - * @license GNU AGPL version 3 or any later version + * @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 From 82f3e4ad869b35068ac17fe8e24c6c02e41689d7 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 3 Jul 2023 00:08:58 +0200 Subject: [PATCH 128/259] Make PHP-CS happy --- src/Core/Hooks/Capabilities/ICanCreateInstances.php | 2 -- src/Core/Hooks/Model/DiceInstanceManager.php | 2 +- src/Core/Logger/Capabilities/LogChannel.php | 2 +- src/Core/Logger/Factory/SyslogLogger.php | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Core/Hooks/Capabilities/ICanCreateInstances.php b/src/Core/Hooks/Capabilities/ICanCreateInstances.php index 6e5d8beb4..971430474 100644 --- a/src/Core/Hooks/Capabilities/ICanCreateInstances.php +++ b/src/Core/Hooks/Capabilities/ICanCreateInstances.php @@ -21,8 +21,6 @@ namespace Friendica\Core\Hooks\Capabilities; -use Friendica\Core\Hooks\Exceptions\HookInstanceException; - /** * creates special instance and decorator treatments for given classes */ diff --git a/src/Core/Hooks/Model/DiceInstanceManager.php b/src/Core/Hooks/Model/DiceInstanceManager.php index 381e0a7fe..efbee444a 100644 --- a/src/Core/Hooks/Model/DiceInstanceManager.php +++ b/src/Core/Hooks/Model/DiceInstanceManager.php @@ -35,7 +35,7 @@ use Friendica\Core\Hooks\Util\HookFileManager; */ class DiceInstanceManager implements ICanCreateInstances, ICanRegisterInstances { - protected $instance = []; + protected $instance = []; protected $decorator = []; /** @var Dice */ diff --git a/src/Core/Logger/Capabilities/LogChannel.php b/src/Core/Logger/Capabilities/LogChannel.php index 5fceae42a..31915168b 100644 --- a/src/Core/Logger/Capabilities/LogChannel.php +++ b/src/Core/Logger/Capabilities/LogChannel.php @@ -29,7 +29,7 @@ interface LogChannel /** @var string channel for the auth_ejabbered script */ public const AUTH_JABBERED = 'auth_ejabberd'; /** @var string Default channel in case it isn't set explicit */ - public const DEFAULT = self::APP; + public const DEFAULT = self::APP; /** @var string channel for console execution */ public const CONSOLE = 'console'; /** @var string channel for developer focused logging */ diff --git a/src/Core/Logger/Factory/SyslogLogger.php b/src/Core/Logger/Factory/SyslogLogger.php index bccf4daf5..385625862 100644 --- a/src/Core/Logger/Factory/SyslogLogger.php +++ b/src/Core/Logger/Factory/SyslogLogger.php @@ -37,7 +37,7 @@ class SyslogLogger extends AbstractLoggerTypeFactory /** * Creates a new PSR-3 compliant syslog logger instance * - * @param IManageConfigValues $config The system configuration + * @param IManageConfigValues $config The system configuration * * @return LoggerInterface The PSR-3 compliant logger instance * @@ -45,7 +45,7 @@ class SyslogLogger extends AbstractLoggerTypeFactory */ public function create(IManageConfigValues $config): LoggerInterface { - $logOpts = $config->get('system', 'syslog_flags') ?? SyslogLoggerClass::DEFAULT_FLAGS; + $logOpts = $config->get('system', 'syslog_flags') ?? SyslogLoggerClass::DEFAULT_FLAGS; $logFacility = $config->get('system', 'syslog_facility') ?? SyslogLoggerClass::DEFAULT_FACILITY; $loglevel = SyslogLogger::mapLegacyConfigDebugLevel($config->get('system', 'loglevel')); From e9699b8e559a6fe5c15b794939536ddbf0e26be5 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 3 Jul 2023 00:12:59 +0200 Subject: [PATCH 129/259] Some more PHP-CS --- src/Core/Hooks/Util/HookFileManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Hooks/Util/HookFileManager.php b/src/Core/Hooks/Util/HookFileManager.php index 357567857..eda7e9388 100644 --- a/src/Core/Hooks/Util/HookFileManager.php +++ b/src/Core/Hooks/Util/HookFileManager.php @@ -31,7 +31,7 @@ use Friendica\Core\Hooks\Exceptions\HookConfigException; */ class HookFileManager { - const STATIC_DIR = 'static'; + const STATIC_DIR = 'static'; const CONFIG_NAME = 'hooks'; /** @var ICanLoadAddons */ From e92d25a258f35172f4bb18809db805bfce146dcc Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 3 Jul 2023 00:17:01 +0200 Subject: [PATCH 130/259] Remove unnecessary trailing slashes --- src/DI.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DI.php b/src/DI.php index ad8745622..c62b5e8d7 100644 --- a/src/DI.php +++ b/src/DI.php @@ -22,12 +22,12 @@ namespace Friendica; use Dice\Dice; -use \Friendica\Core\Logger\Capabilities\ICheckLoggerSettings; -use \Friendica\Core\Logger\Util\LoggerSettingsCheck; -use \Friendica\Core\Session\Capability\IHandleSessions; -use \Friendica\Core\Session\Capability\IHandleUserSessions; -use \Friendica\Navigation\SystemMessages; -use \Psr\Log\LoggerInterface; +use Friendica\Core\Logger\Capabilities\ICheckLoggerSettings; +use Friendica\Core\Logger\Util\LoggerSettingsCheck; +use Friendica\Core\Session\Capability\IHandleSessions; +use Friendica\Core\Session\Capability\IHandleUserSessions; +use Friendica\Navigation\SystemMessages; +use Psr\Log\LoggerInterface; /** * This class is capable of getting all dynamic created classes From 0ac247550bdba80ac0247d25cf61847a7fca093d Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 5 Jul 2023 20:58:29 +0200 Subject: [PATCH 131/259] Doc --- doc/AddonsStrategyDecorator.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/AddonsStrategyDecorator.md diff --git a/doc/AddonsStrategyDecorator.md b/doc/AddonsStrategyDecorator.md new file mode 100644 index 000000000..7e0d53e32 --- /dev/null +++ b/doc/AddonsStrategyDecorator.md @@ -0,0 +1,12 @@ +Friendica strategy and decorator Hooks +=========================================== + +* [Home](help) + +## Strategy hooks + +## Decorator hooks + +## hook.config.php + +## Create new hooks From 7bfc3c0ae01f4c6b7b3e51b5f84452469cb3f04f Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 16 Jul 2023 18:38:34 +0200 Subject: [PATCH 132/259] Add doc --- doc/AddonsStrategyDecorator.md | 151 ++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 2 deletions(-) diff --git a/doc/AddonsStrategyDecorator.md b/doc/AddonsStrategyDecorator.md index 7e0d53e32..51456da6c 100644 --- a/doc/AddonsStrategyDecorator.md +++ b/doc/AddonsStrategyDecorator.md @@ -5,8 +5,155 @@ Friendica strategy and decorator Hooks ## Strategy hooks +This type of hook is based on the [Strategy Design Pattern](https://refactoring.guru/design-patterns/strategy). + +A strategy class defines a possible implementation of a given interface based on a unique name. +Every name is possible as long as it's unique and not `null`. +Using an empty name (`''`) is possible as well and should be used as the "default" implementation. +To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capabilities/ICanRegisterInstances.php) interface. + +After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capabilities/ICanCreateInstances.php) interface and the chosen name. + +This is useful in case there are different, possible implementations for the same purpose, like for logging, locking, caching, ... + +Normally, a config entry is used to choose the right implementation at runtime. +And if no config entry is set, the "default" implementation should be used. + +### Example + +```php +interface ExampleInterface +{ + public function testMethod(); +} + +public class ConcreteClassA implements ExampleInterface +{ + public function testMethod() + { + echo "concrete class A"; + } +} + +public class ConcreteClassB implements ExampleInterface +{ + public function testMethod() + { + echo "concrete class B"; + } +} + +/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterInstances $instanceRegister */ +$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A'); +$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassB::class, 'B'); + +/** @var \Friendica\Core\Hooks\Capabilities\ICanCreateInstances $instanceManager */ +/** @var ConcreteClassA $concreteClass */ +$concreteClass = $instanceManager->createWithName(ExampleInterface::class, 'A'); + +$concreteClass->testMethod(); +// output: +// "concrete class A"; +``` + ## Decorator hooks -## hook.config.php +This type of hook is based on the [Decorator Design Pattern](https://refactoring.guru/design-patterns/decorator). -## Create new hooks +A decorator class extends a given strategy instance (see [Strategy hooks](#strategy-hooks)]). +To register a decorator, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capabilities/ICanRegisterInstances.php) interface. + +After registration, a caller can automatically create an instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capabilities/ICanCreateInstances.php) interface and the decorator will wrap its logic around the call. + +This is useful in case you want to extend a given class but the given class isn't responsible for these business logic. Or you want to extend an interface without knowing the concrete implementation. +For example profiling logger calls, Friendica is using a [`ProfilerLogger`](../src/Core/Logger/Type/ProfilerLogger.php), which wraps all other logging implementations and traces each log call. + +Normally, a config entry is used to enable/disable decorator. + +### Example + +```php +interface ExampleInterface +{ + public function testMethod(); +} + +public class ConcreteClassA implements ExampleInterface +{ + public function testMethod() + { + echo "concrete class A"; + } +} + +public class DecoratorClassA implements ExampleInterface +{ + /** @var ExampleInterface */ + protected $example; + + public function __construct(ExampleInterface $example) + { + $this->example = $example; + } + + public function testMethod() + { + echo "decorated!\n"; + $this->example->testMethod(); + } +} + +/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterInstances $instanceRegister */ +$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A'); +$instanceRegister->registerDecorator(ExampleInterface::class, DecoratorClassA::class); + +/** @var \Friendica\Core\Hooks\Capabilities\ICanCreateInstances $instanceManager */ +/** @var ConcreteClassA $concreteClass */ +$concreteClass = $instanceManager->createWithName(ExampleInterface::class, 'A'); + +$concreteClass->testMethod(); +// output: +// "decorated!" +// "concrete class A"; +``` + +## hooks.config.php + +To avoid registering all strategies and decorators manually inside the code, Friendica introduced the [`hooks.config.php`](../static/hooks.config.php) file. + +There, you can register all kind of strategies and decorators in one file. + +### [`HookType::STRATEGY`](../src/Core/Hooks/Capabilities/HookType.php) + +For each given interface, a list of key-value pairs can be set, where the key is the concrete implementation class and the value is an array of unique names. + +### [`HookType::DECORATOR`](../src/Core/Hooks/Capabilities/HookType.php) + +For each given interface, a list of concrete decorator classes can be set. + +### Example + +```php +use Friendica\Core\Hooks\Capabilities\HookType as H; + +return [ + H::STRATEGY => [ + ExampleInterface::class => [ + ConcreteClassA::class => ['A'], + ConcreteClassB::class => ['B'], + ], + ], + H::DECORATOR => [ + ExampleInterface::class => [ + DecoratorClassA::class, + ], + ], +]; +``` + +## Addons + +The hook logic is useful for decoupling the Friendica core logic, but its primary goal is to modularize Friendica in creating addons. + +Therefor you can either use the interfaces directly as shown above, or you can place your own `hooks.config.php` file inside a `static` directory directly under your addon core directory. +Friendica will automatically search these config files for each **activated** addon and register the given hooks. From ddeef9387fc77830815e5d4a38532e78845f7040 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 16 Jul 2023 18:38:41 +0200 Subject: [PATCH 133/259] improve hooks.config.php --- static/hooks.config.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/static/hooks.config.php b/static/hooks.config.php index 185bc5e48..bc235913c 100644 --- a/static/hooks.config.php +++ b/static/hooks.config.php @@ -20,18 +20,20 @@ */ use Friendica\Core\Hooks\Capabilities\HookType as H; +use Friendica\Core\Logger\Type; +use Psr\Log; return [ H::STRATEGY => [ - \Psr\Log\LoggerInterface::class => [ - \Psr\Log\NullLogger::class => [''], - \Friendica\Core\Logger\Type\SyslogLogger::class => ['syslog'], - \Friendica\Core\Logger\Type\StreamLogger::class => ['stream'], + Log\LoggerInterface::class => [ + Log\NullLogger::class => [''], + Type\SyslogLogger::class => ['syslog'], + Type\StreamLogger::class => ['stream'], ], ], H::DECORATOR => [ - \Psr\Log\LoggerInterface::class => [ - \Friendica\Core\Logger\Type\ProfilerLogger::class, + Log\LoggerInterface::class => [ + Type\ProfilerLogger::class, ], ], ]; From 1b4eaa6a1000fe7e3f7df44ea8345319144c3ded Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 16 Jul 2023 18:40:38 +0200 Subject: [PATCH 134/259] Update messages.po --- view/lang/C/messages.po | 314 ++++++++++++++++++++-------------------- 1 file changed, 157 insertions(+), 157 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 445ffcbd3..a017e59dc 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-09 18:36-0400\n" +"POT-Creation-Date: 2023-07-16 16:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -292,9 +292,9 @@ msgid "Insert web link" msgstr "" #: mod/message.php:201 mod/message.php:357 mod/photos.php:1301 -#: src/Content/Conversation.php:392 src/Content/Conversation.php:1506 +#: src/Content/Conversation.php:392 src/Content/Conversation.php:1508 #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145 -#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:574 +#: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:571 msgid "Please wait" msgstr "" @@ -315,7 +315,7 @@ msgstr "" #: src/Module/Moderation/Report/Create.php:211 #: src/Module/Moderation/Report/Create.php:263 #: src/Module/Profile/Profile.php:274 src/Module/Profile/UnkMail.php:155 -#: src/Module/Settings/Profile/Index.php:230 src/Object/Post.php:1090 +#: src/Module/Settings/Profile/Index.php:230 src/Object/Post.php:1087 #: view/theme/duepuntozero/config.php:85 view/theme/frio/config.php:171 #: view/theme/quattro/config.php:87 view/theme/vier/config.php:135 msgid "Submit" @@ -600,33 +600,33 @@ msgstr "" #: mod/photos.php:1139 mod/photos.php:1195 mod/photos.php:1275 #: src/Module/Contact.php:619 src/Module/Item/Compose.php:188 -#: src/Object/Post.php:1087 +#: src/Object/Post.php:1084 msgid "This is you" msgstr "" #: mod/photos.php:1141 mod/photos.php:1197 mod/photos.php:1277 -#: src/Object/Post.php:568 src/Object/Post.php:1089 +#: src/Object/Post.php:565 src/Object/Post.php:1086 msgid "Comment" msgstr "" #: mod/photos.php:1143 mod/photos.php:1199 mod/photos.php:1279 #: src/Content/Conversation.php:407 src/Module/Calendar/Event/Form.php:248 #: src/Module/Item/Compose.php:201 src/Module/Post/Edit.php:165 -#: src/Object/Post.php:1103 +#: src/Object/Post.php:1100 msgid "Preview" msgstr "" #: mod/photos.php:1144 src/Content/Conversation.php:360 -#: src/Module/Post/Edit.php:130 src/Object/Post.php:1091 +#: src/Module/Post/Edit.php:130 src/Object/Post.php:1088 msgid "Loading..." msgstr "" -#: mod/photos.php:1236 src/Content/Conversation.php:1422 -#: src/Object/Post.php:263 +#: mod/photos.php:1236 src/Content/Conversation.php:1424 +#: src/Object/Post.php:260 msgid "Select" msgstr "" -#: mod/photos.php:1237 src/Content/Conversation.php:1423 +#: mod/photos.php:1237 src/Content/Conversation.php:1425 #: src/Module/Moderation/Users/Active.php:136 #: src/Module/Moderation/Users/Blocked.php:136 #: src/Module/Moderation/Users/Index.php:151 @@ -634,19 +634,19 @@ msgstr "" msgid "Delete" msgstr "" -#: mod/photos.php:1298 src/Object/Post.php:405 +#: mod/photos.php:1298 src/Object/Post.php:402 msgid "Like" msgstr "" -#: mod/photos.php:1299 src/Object/Post.php:405 +#: mod/photos.php:1299 src/Object/Post.php:402 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1300 src/Object/Post.php:406 +#: mod/photos.php:1300 src/Object/Post.php:403 msgid "Dislike" msgstr "" -#: mod/photos.php:1302 src/Object/Post.php:406 +#: mod/photos.php:1302 src/Object/Post.php:403 msgid "I don't like this (toggle)" msgstr "" @@ -662,97 +662,97 @@ msgstr "" msgid "Apologies but the website is unavailable at the moment." msgstr "" -#: src/App/Page.php:247 +#: src/App/Page.php:248 msgid "Delete this item?" msgstr "" -#: src/App/Page.php:248 +#: src/App/Page.php:249 msgid "" "Block this author? They won't be able to follow you nor see your public " "posts, and you won't be able to see their posts and their notifications." msgstr "" -#: src/App/Page.php:249 +#: src/App/Page.php:250 msgid "" "Ignore this author? You won't be able to see their posts and their " "notifications." msgstr "" -#: src/App/Page.php:250 +#: src/App/Page.php:251 msgid "Collapse this author's posts?" msgstr "" -#: src/App/Page.php:252 +#: src/App/Page.php:253 msgid "Like not successful" msgstr "" -#: src/App/Page.php:253 +#: src/App/Page.php:254 msgid "Dislike not successful" msgstr "" -#: src/App/Page.php:254 +#: src/App/Page.php:255 msgid "Sharing not successful" msgstr "" -#: src/App/Page.php:255 +#: src/App/Page.php:256 msgid "Attendance unsuccessful" msgstr "" -#: src/App/Page.php:256 +#: src/App/Page.php:257 msgid "Backend error" msgstr "" -#: src/App/Page.php:257 +#: src/App/Page.php:258 msgid "Network error" msgstr "" -#: src/App/Page.php:260 +#: src/App/Page.php:261 msgid "Drop files here to upload" msgstr "" -#: src/App/Page.php:261 +#: src/App/Page.php:262 msgid "Your browser does not support drag and drop file uploads." msgstr "" -#: src/App/Page.php:262 +#: src/App/Page.php:263 msgid "" "Please use the fallback form below to upload your files like in the olden " "days." msgstr "" -#: src/App/Page.php:263 +#: src/App/Page.php:264 msgid "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB." msgstr "" -#: src/App/Page.php:264 +#: src/App/Page.php:265 msgid "You can't upload files of this type." msgstr "" -#: src/App/Page.php:265 +#: src/App/Page.php:266 msgid "Server responded with {{statusCode}} code." msgstr "" -#: src/App/Page.php:266 +#: src/App/Page.php:267 msgid "Cancel upload" msgstr "" -#: src/App/Page.php:267 +#: src/App/Page.php:268 msgid "Upload canceled." msgstr "" -#: src/App/Page.php:268 +#: src/App/Page.php:269 msgid "Are you sure you want to cancel this upload?" msgstr "" -#: src/App/Page.php:269 +#: src/App/Page.php:270 msgid "Remove file" msgstr "" -#: src/App/Page.php:270 +#: src/App/Page.php:271 msgid "You can't upload any more files." msgstr "" -#: src/App/Page.php:348 +#: src/App/Page.php:349 msgid "toggle mobile" msgstr "" @@ -769,31 +769,31 @@ msgstr "" msgid "You must be logged in to use addons. " msgstr "" -#: src/BaseModule.php:400 +#: src/BaseModule.php:401 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: src/BaseModule.php:427 +#: src/BaseModule.php:428 msgid "All contacts" msgstr "" -#: src/BaseModule.php:432 src/Content/Widget.php:243 src/Core/ACL.php:195 +#: src/BaseModule.php:433 src/Content/Widget.php:243 src/Core/ACL.php:195 #: src/Module/Contact.php:415 src/Module/PermissionTooltip.php:127 #: src/Module/PermissionTooltip.php:149 msgid "Followers" msgstr "" -#: src/BaseModule.php:437 src/Content/Widget.php:244 src/Module/Contact.php:418 +#: src/BaseModule.php:438 src/Content/Widget.php:244 src/Module/Contact.php:418 msgid "Following" msgstr "" -#: src/BaseModule.php:442 src/Content/Widget.php:245 src/Module/Contact.php:421 +#: src/BaseModule.php:443 src/Content/Widget.php:245 src/Module/Contact.php:421 msgid "Mutual friends" msgstr "" -#: src/BaseModule.php:450 +#: src/BaseModule.php:451 msgid "Common" msgstr "" @@ -1226,7 +1226,7 @@ msgid "Visible to everybody" msgstr "" #: src/Content/Conversation.php:330 src/Module/Item/Compose.php:200 -#: src/Object/Post.php:1102 +#: src/Object/Post.php:1099 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -1271,52 +1271,52 @@ msgid "attach file" msgstr "" #: src/Content/Conversation.php:365 src/Module/Item/Compose.php:190 -#: src/Module/Post/Edit.php:171 src/Object/Post.php:1092 +#: src/Module/Post/Edit.php:171 src/Object/Post.php:1089 msgid "Bold" msgstr "" #: src/Content/Conversation.php:366 src/Module/Item/Compose.php:191 -#: src/Module/Post/Edit.php:172 src/Object/Post.php:1093 +#: src/Module/Post/Edit.php:172 src/Object/Post.php:1090 msgid "Italic" msgstr "" #: src/Content/Conversation.php:367 src/Module/Item/Compose.php:192 -#: src/Module/Post/Edit.php:173 src/Object/Post.php:1094 +#: src/Module/Post/Edit.php:173 src/Object/Post.php:1091 msgid "Underline" msgstr "" #: src/Content/Conversation.php:368 src/Module/Item/Compose.php:193 -#: src/Module/Post/Edit.php:174 src/Object/Post.php:1096 +#: src/Module/Post/Edit.php:174 src/Object/Post.php:1093 msgid "Quote" msgstr "" #: src/Content/Conversation.php:369 src/Module/Item/Compose.php:194 -#: src/Module/Post/Edit.php:175 src/Object/Post.php:1097 +#: src/Module/Post/Edit.php:175 src/Object/Post.php:1094 msgid "Add emojis" msgstr "" #: src/Content/Conversation.php:370 src/Module/Item/Compose.php:195 -#: src/Object/Post.php:1095 +#: src/Object/Post.php:1092 msgid "Content Warning" msgstr "" #: src/Content/Conversation.php:371 src/Module/Item/Compose.php:196 -#: src/Module/Post/Edit.php:176 src/Object/Post.php:1098 +#: src/Module/Post/Edit.php:176 src/Object/Post.php:1095 msgid "Code" msgstr "" #: src/Content/Conversation.php:372 src/Module/Item/Compose.php:197 -#: src/Object/Post.php:1099 +#: src/Object/Post.php:1096 msgid "Image" msgstr "" #: src/Content/Conversation.php:373 src/Module/Item/Compose.php:198 -#: src/Module/Post/Edit.php:177 src/Object/Post.php:1100 +#: src/Module/Post/Edit.php:177 src/Object/Post.php:1097 msgid "Link" msgstr "" #: src/Content/Conversation.php:374 src/Module/Item/Compose.php:199 -#: src/Module/Post/Edit.php:178 src/Object/Post.php:1101 +#: src/Module/Post/Edit.php:178 src/Object/Post.php:1098 msgid "Link or Media" msgstr "" @@ -1386,111 +1386,111 @@ msgstr "" msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:724 src/Content/Conversation.php:727 -#: src/Content/Conversation.php:730 src/Content/Conversation.php:733 -#: src/Content/Conversation.php:736 +#: src/Content/Conversation.php:728 src/Content/Conversation.php:731 +#: src/Content/Conversation.php:734 src/Content/Conversation.php:737 +#: src/Content/Conversation.php:740 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:739 +#: src/Content/Conversation.php:743 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:742 +#: src/Content/Conversation.php:746 msgid "You subscribed to one or more tags in this post." msgstr "" -#: src/Content/Conversation.php:761 +#: src/Content/Conversation.php:765 #, php-format msgid "%s reshared this." msgstr "" -#: src/Content/Conversation.php:763 +#: src/Content/Conversation.php:767 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:763 +#: src/Content/Conversation.php:767 #, php-format msgid "Reshared by %s <%s>" msgstr "" -#: src/Content/Conversation.php:766 +#: src/Content/Conversation.php:770 #, php-format msgid "%s is participating in this thread." msgstr "" -#: src/Content/Conversation.php:769 +#: src/Content/Conversation.php:773 msgid "Stored for general reasons" msgstr "" -#: src/Content/Conversation.php:772 +#: src/Content/Conversation.php:776 msgid "Global post" msgstr "" -#: src/Content/Conversation.php:775 +#: src/Content/Conversation.php:779 msgid "Sent via an relay server" msgstr "" -#: src/Content/Conversation.php:775 +#: src/Content/Conversation.php:779 #, php-format msgid "Sent via the relay server %s <%s>" msgstr "" -#: src/Content/Conversation.php:778 +#: src/Content/Conversation.php:782 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:778 +#: src/Content/Conversation.php:782 #, php-format msgid "Fetched because of %s <%s>" msgstr "" -#: src/Content/Conversation.php:781 +#: src/Content/Conversation.php:785 msgid "Stored because of a child post to complete this thread." msgstr "" -#: src/Content/Conversation.php:784 +#: src/Content/Conversation.php:788 msgid "Local delivery" msgstr "" -#: src/Content/Conversation.php:787 +#: src/Content/Conversation.php:791 msgid "Stored because of your activity (like, comment, star, ...)" msgstr "" -#: src/Content/Conversation.php:790 +#: src/Content/Conversation.php:794 msgid "Distributed" msgstr "" -#: src/Content/Conversation.php:793 +#: src/Content/Conversation.php:797 msgid "Pushed to us" msgstr "" -#: src/Content/Conversation.php:1450 src/Object/Post.php:248 +#: src/Content/Conversation.php:1452 src/Object/Post.php:248 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1466 src/Object/Post.php:518 -#: src/Object/Post.php:519 +#: src/Content/Conversation.php:1468 src/Object/Post.php:515 +#: src/Object/Post.php:516 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1479 src/Object/Post.php:506 +#: src/Content/Conversation.php:1481 src/Object/Post.php:503 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1480 src/Object/Post.php:507 +#: src/Content/Conversation.php:1482 src/Object/Post.php:504 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1488 src/Object/Post.php:532 +#: src/Content/Conversation.php:1490 src/Object/Post.php:529 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:1504 +#: src/Content/Conversation.php:1506 msgid "View in context" msgstr "" @@ -1700,7 +1700,7 @@ msgstr "" msgid "Collapse" msgstr "" -#: src/Content/Item.php:434 src/Object/Post.php:487 +#: src/Content/Item.php:434 src/Object/Post.php:484 msgid "Languages" msgstr "" @@ -2833,6 +2833,16 @@ msgstr "" msgid "Dec" msgstr "" +#: src/Core/Logger/Util/LoggerSettingsCheck.php:60 +#, php-format +msgid "The logfile '%s' is not usable. No logging possible (error: '%s')" +msgstr "" + +#: src/Core/Logger/Util/LoggerSettingsCheck.php:85 +#, php-format +msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')" +msgstr "" + #: src/Core/Renderer.php:89 src/Core/Renderer.php:118 src/Core/Renderer.php:147 #: src/Core/Renderer.php:181 src/Render/FriendicaSmartyEngine.php:60 msgid "" @@ -3407,7 +3417,7 @@ msgstr "" msgid "Title/Description:" msgstr "" -#: src/Model/Profile.php:1025 src/Module/Admin/Summary.php:221 +#: src/Model/Profile.php:1025 src/Module/Admin/Summary.php:197 #: src/Module/Moderation/Report/Create.php:280 #: src/Module/Moderation/Summary.php:77 msgid "Summary" @@ -3735,7 +3745,7 @@ msgstr "" #: src/Module/Admin/Federation.php:210 src/Module/Admin/Logs/Settings.php:85 #: src/Module/Admin/Logs/View.php:83 src/Module/Admin/Queue.php:72 #: src/Module/Admin/Site.php:398 src/Module/Admin/Storage.php:138 -#: src/Module/Admin/Summary.php:220 src/Module/Admin/Themes/Details.php:90 +#: src/Module/Admin/Summary.php:196 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:77 #: src/Module/Moderation/Users/Create.php:61 #: src/Module/Moderation/Users/Pending.php:96 @@ -5224,50 +5234,40 @@ msgid "" "href=\"%s\">the installation page for help." msgstr "" -#: src/Module/Admin/Summary.php:142 -#, php-format -msgid "The logfile '%s' is not usable. No logging possible (error: '%s')" -msgstr "" - -#: src/Module/Admin/Summary.php:156 -#, php-format -msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')" -msgstr "" - -#: src/Module/Admin/Summary.php:172 +#: src/Module/Admin/Summary.php:148 #, php-format msgid "" "Friendica's system.basepath was updated from '%s' to '%s'. Please remove the " "system.basepath from your db to avoid differences." msgstr "" -#: src/Module/Admin/Summary.php:180 +#: src/Module/Admin/Summary.php:156 #, php-format msgid "" "Friendica's current system.basepath '%s' is wrong and the config file '%s' " "isn't used." msgstr "" -#: src/Module/Admin/Summary.php:188 +#: src/Module/Admin/Summary.php:164 #, php-format msgid "" "Friendica's current system.basepath '%s' is not equal to the config file " "'%s'. Please fix your configuration." msgstr "" -#: src/Module/Admin/Summary.php:199 +#: src/Module/Admin/Summary.php:175 msgid "Message queues" msgstr "" -#: src/Module/Admin/Summary.php:205 +#: src/Module/Admin/Summary.php:181 msgid "Server Settings" msgstr "" -#: src/Module/Admin/Summary.php:223 +#: src/Module/Admin/Summary.php:199 msgid "Version" msgstr "" -#: src/Module/Admin/Summary.php:227 +#: src/Module/Admin/Summary.php:203 msgid "Active addons" msgstr "" @@ -5878,7 +5878,7 @@ msgid "Only show blocked contacts" msgstr "" #: src/Module/Contact.php:369 src/Module/Contact.php:441 -#: src/Object/Post.php:365 +#: src/Object/Post.php:362 msgid "Ignored" msgstr "" @@ -6562,7 +6562,7 @@ msgstr "" msgid "Posts that mention or involve you" msgstr "" -#: src/Module/Conversation/Network.php:289 src/Object/Post.php:377 +#: src/Module/Conversation/Network.php:289 src/Object/Post.php:374 msgid "Starred" msgstr "" @@ -11500,234 +11500,234 @@ msgstr "" msgid "Edit" msgstr "" -#: src/Object/Post.php:252 +#: src/Object/Post.php:261 msgid "Delete globally" msgstr "" -#: src/Object/Post.php:252 +#: src/Object/Post.php:261 msgid "Remove locally" msgstr "" -#: src/Object/Post.php:271 +#: src/Object/Post.php:268 #, php-format msgid "Block %s" msgstr "" -#: src/Object/Post.php:276 +#: src/Object/Post.php:273 #, php-format msgid "Ignore %s" msgstr "" -#: src/Object/Post.php:281 +#: src/Object/Post.php:278 #, php-format msgid "Collapse %s" msgstr "" -#: src/Object/Post.php:285 +#: src/Object/Post.php:282 msgid "Report post" msgstr "" -#: src/Object/Post.php:290 +#: src/Object/Post.php:287 msgid "Save to folder" msgstr "" -#: src/Object/Post.php:330 +#: src/Object/Post.php:327 msgid "I will attend" msgstr "" -#: src/Object/Post.php:330 +#: src/Object/Post.php:327 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:330 +#: src/Object/Post.php:327 msgid "I might attend" msgstr "" -#: src/Object/Post.php:360 +#: src/Object/Post.php:357 msgid "Ignore thread" msgstr "" -#: src/Object/Post.php:361 +#: src/Object/Post.php:358 msgid "Unignore thread" msgstr "" -#: src/Object/Post.php:362 +#: src/Object/Post.php:359 msgid "Toggle ignore status" msgstr "" -#: src/Object/Post.php:372 +#: src/Object/Post.php:369 msgid "Add star" msgstr "" -#: src/Object/Post.php:373 +#: src/Object/Post.php:370 msgid "Remove star" msgstr "" -#: src/Object/Post.php:374 +#: src/Object/Post.php:371 msgid "Toggle star status" msgstr "" -#: src/Object/Post.php:385 +#: src/Object/Post.php:382 msgid "Pin" msgstr "" -#: src/Object/Post.php:386 +#: src/Object/Post.php:383 msgid "Unpin" msgstr "" -#: src/Object/Post.php:387 +#: src/Object/Post.php:384 msgid "Toggle pin status" msgstr "" -#: src/Object/Post.php:390 +#: src/Object/Post.php:387 msgid "Pinned" msgstr "" -#: src/Object/Post.php:395 +#: src/Object/Post.php:392 msgid "Add tag" msgstr "" -#: src/Object/Post.php:408 +#: src/Object/Post.php:405 msgid "Quote share this" msgstr "" -#: src/Object/Post.php:408 +#: src/Object/Post.php:405 msgid "Quote Share" msgstr "" -#: src/Object/Post.php:411 +#: src/Object/Post.php:408 msgid "Reshare this" msgstr "" -#: src/Object/Post.php:411 +#: src/Object/Post.php:408 msgid "Reshare" msgstr "" -#: src/Object/Post.php:412 +#: src/Object/Post.php:409 msgid "Cancel your Reshare" msgstr "" -#: src/Object/Post.php:412 +#: src/Object/Post.php:409 msgid "Unshare" msgstr "" -#: src/Object/Post.php:463 +#: src/Object/Post.php:460 #, php-format msgid "%s (Received %s)" msgstr "" -#: src/Object/Post.php:469 +#: src/Object/Post.php:466 msgid "Comment this item on your system" msgstr "" -#: src/Object/Post.php:469 +#: src/Object/Post.php:466 msgid "Remote comment" msgstr "" -#: src/Object/Post.php:491 +#: src/Object/Post.php:488 msgid "Share via ..." msgstr "" -#: src/Object/Post.php:491 +#: src/Object/Post.php:488 msgid "Share via external services" msgstr "" -#: src/Object/Post.php:520 +#: src/Object/Post.php:517 msgid "to" msgstr "" -#: src/Object/Post.php:521 +#: src/Object/Post.php:518 msgid "via" msgstr "" -#: src/Object/Post.php:522 +#: src/Object/Post.php:519 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:523 +#: src/Object/Post.php:520 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:569 +#: src/Object/Post.php:566 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:572 +#: src/Object/Post.php:569 msgid "More" msgstr "" -#: src/Object/Post.php:590 +#: src/Object/Post.php:587 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:591 +#: src/Object/Post.php:588 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:592 +#: src/Object/Post.php:589 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:593 +#: src/Object/Post.php:590 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:594 +#: src/Object/Post.php:591 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:614 +#: src/Object/Post.php:611 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:615 +#: src/Object/Post.php:612 msgid "Show more" msgstr "" -#: src/Object/Post.php:616 +#: src/Object/Post.php:613 msgid "Show fewer" msgstr "" -#: src/Object/Post.php:652 +#: src/Object/Post.php:649 #, php-format msgid "Reshared by: %s" msgstr "" -#: src/Object/Post.php:657 +#: src/Object/Post.php:654 #, php-format msgid "Viewed by: %s" msgstr "" -#: src/Object/Post.php:662 +#: src/Object/Post.php:659 #, php-format msgid "Liked by: %s" msgstr "" -#: src/Object/Post.php:667 +#: src/Object/Post.php:664 #, php-format msgid "Disliked by: %s" msgstr "" -#: src/Object/Post.php:672 +#: src/Object/Post.php:669 #, php-format msgid "Attended by: %s" msgstr "" -#: src/Object/Post.php:677 +#: src/Object/Post.php:674 #, php-format msgid "Maybe attended by: %s" msgstr "" -#: src/Object/Post.php:682 +#: src/Object/Post.php:679 #, php-format msgid "Not attended by: %s" msgstr "" -#: src/Object/Post.php:687 +#: src/Object/Post.php:684 #, php-format msgid "Reacted with %s by: %s" msgstr "" From c3075d3ebaef9953104c38be870d39bd9f31bd5c Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 16 Jul 2023 18:41:05 +0200 Subject: [PATCH 135/259] add docker-translate command --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 6e0d9f984..60094d5bd 100644 --- a/composer.json +++ b/composer.json @@ -134,6 +134,7 @@ "scripts": { "test": "phpunit", "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l", + "docker:translate": "docker run --rm -v $PWD:/data -w /data friendicaci/transifex bin/run_xgettext.sh", "cs:install": "@composer install --working-dir=bin/dev/php-cs-fixer", "cs:check": [ "@cs:install", From 7e322c21b3ff25f2160bc76808e1412b2891bdae Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 16 Jul 2023 16:48:24 +0000 Subject: [PATCH 136/259] Removed unneeded parameter --- src/Content/Text/BBCode.php | 5 +---- src/Model/Event.php | 2 +- src/Model/Profile.php | 4 ++-- src/Module/Notifications/Introductions.php | 2 +- src/Navigation/Notifications/Entity/Notify.php | 4 ++-- src/Navigation/Notifications/Factory/FormattedNotify.php | 2 +- src/Navigation/Notifications/Factory/Notify.php | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 875674544..f40160c9d 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -226,7 +226,7 @@ class BBCode * @param bool $keep_urls Whether to keep URLs in the resulting plaintext * @return string */ - public static function toPlaintext(string $text, bool $keep_urls = true, bool $strip_tags = false): string + public static function toPlaintext(string $text, bool $keep_urls = true): string { DI::profiler()->startRecording('rendering'); // Remove pictures in advance to avoid unneeded proxy calls @@ -238,9 +238,6 @@ class BBCode $naked_text = HTML::toPlaintext(self::convert($text, false, BBCode::EXTERNAL, true), 0, !$keep_urls); - if ($strip_tags) { - $naked_text = strip_tags($naked_text); - } DI::profiler()->stopRecording(); return $naked_text; } diff --git a/src/Model/Event.php b/src/Model/Event.php index 8221fa82b..ecf21d342 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -1012,7 +1012,7 @@ class Event } } - $location['name'] = BBCode::toPlaintext($location['name'], false, true); + $location['name'] = BBCode::toPlaintext($location['name'], false); // Construct the map HTML. if (isset($location['address'])) { diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 0a6881853..0602df10a 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -640,13 +640,13 @@ class Profile $istoday = true; } - $title = BBCode::toPlaintext($rr['summary'], false, true); + $title = BBCode::toPlaintext($rr['summary'], false); if (strlen($title) > 35) { $title = substr($title, 0, 32) . '... '; } - $description = BBCode::toPlaintext($rr['desc'], false, true) . '... '; + $description = BBCode::toPlaintext($rr['desc'], false) . '... '; if (!$description) { $description = DI::l10n()->t('[No description]'); } diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 48c0d4dfe..921761ab5 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -147,7 +147,7 @@ class Introductions extends BaseNotifications $knowyou = ''; } - $convertedName = BBCode::toPlaintext($Introduction->getName(), false, true); + $convertedName = BBCode::toPlaintext($Introduction->getName(), false); $helptext = $this->t('Shall your connection be bidirectional or not?'); $helptext2 = $this->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName); diff --git a/src/Navigation/Notifications/Entity/Notify.php b/src/Navigation/Notifications/Entity/Notify.php index d45976c17..ab042bc9f 100644 --- a/src/Navigation/Notifications/Entity/Notify.php +++ b/src/Navigation/Notifications/Entity/Notify.php @@ -118,7 +118,7 @@ class Notify extends BaseEntity public function updateMsgFromPreamble($epreamble) { $this->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $this->link->__toString()]); - $this->msg_cache = self::formatMessage($this->name_cache, BBCode::toPlaintext($this->msg, false, true)); + $this->msg_cache = self::formatMessage($this->name_cache, BBCode::toPlaintext($this->msg, false)); } /** @@ -134,6 +134,6 @@ class Notify extends BaseEntity */ public static function formatMessage(string $name, string $message): string { - return str_replace('{0}', '' . BBCode::toPlaintext($name, false, true) . '', htmlspecialchars($message)); + return str_replace('{0}', '' . BBCode::toPlaintext($name, false) . '', htmlspecialchars($message)); } } diff --git a/src/Navigation/Notifications/Factory/FormattedNotify.php b/src/Navigation/Notifications/Factory/FormattedNotify.php index 75f6e7676..9b200dea5 100644 --- a/src/Navigation/Notifications/Factory/FormattedNotify.php +++ b/src/Navigation/Notifications/Factory/FormattedNotify.php @@ -222,7 +222,7 @@ class FormattedNotify extends BaseFactory $this->baseUrl . '/notify/' . $Notify->id, Contact::getAvatarUrlForUrl($Notify->url, $Notify->uid, Proxy::SIZE_MICRO), $Notify->url, - BBCode::toPlaintext($Notify->msg ?? '', false, true), + BBCode::toPlaintext($Notify->msg ?? '', false), DateTimeFormat::local($Notify->date->format(DateTimeFormat::MYSQL), 'r'), Temporal::getRelativeDate($Notify->date->format(DateTimeFormat::MYSQL)), $Notify->seen diff --git a/src/Navigation/Notifications/Factory/Notify.php b/src/Navigation/Notifications/Factory/Notify.php index dd59b3323..40c77c84d 100644 --- a/src/Navigation/Notifications/Factory/Notify.php +++ b/src/Navigation/Notifications/Factory/Notify.php @@ -68,7 +68,7 @@ class Notify extends BaseFactory implements ICanCreateFromTableRow false, $params['verb'] ?? '', $params['otype'] ?? '', - substr(BBCode::toPlaintext($params['source_name'], false, true), 0, 255), + substr(BBCode::toPlaintext($params['source_name'], false), 0, 255), null, null, $item_id, From bd455e75c0970033c6d438b33ed8711ea069a259 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 16 Jul 2023 20:50:04 +0200 Subject: [PATCH 137/259] Update woodpecker PHP version --- .woodpecker/.phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index a2f8f45d7..8f89e4b5b 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -7,9 +7,9 @@ matrix: - PHP_MAJOR_VERSION: 8.0 PHP_VERSION: 8.0.29 - PHP_MAJOR_VERSION: 8.1 - PHP_VERSION: 8.1.20 + PHP_VERSION: 8.1.21 - PHP_MAJOR_VERSION: 8.2 - PHP_VERSION: 8.2.7 + PHP_VERSION: 8.2.8 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...) labels: From a9178e6982811ff4bdc83e70a67ade0e7f6cb6f9 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 16 Jul 2023 22:05:59 +0200 Subject: [PATCH 138/259] Add tests for AddonFiles --- .../src/Core/Addon/Model/AddonLoaderTest.php | 212 ++++++++++++++++++ 1 file changed, 212 insertions(+) create mode 100644 tests/src/Core/Addon/Model/AddonLoaderTest.php diff --git a/tests/src/Core/Addon/Model/AddonLoaderTest.php b/tests/src/Core/Addon/Model/AddonLoaderTest.php new file mode 100644 index 000000000..4496cd42f --- /dev/null +++ b/tests/src/Core/Addon/Model/AddonLoaderTest.php @@ -0,0 +1,212 @@ +. + * + */ + +namespace Friendica\Test\src\Core\Addon\Model; + +use Friendica\Core\Addon\Exception\AddonInvalidConfigFileException; +use Friendica\Core\Addon\Model\AddonLoader; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Test\MockedTest; +use Friendica\Test\Util\VFSTrait; +use org\bovigo\vfs\vfsStream; + +class AddonLoaderTest extends MockedTest +{ + use VFSTrait; + + protected $structure = [ + 'addon' => [ + 'testaddon1' => [ + 'static' => [], + ], + 'testaddon2' => [ + 'static' => [], + ], + 'testaddon3' => [], + ] + ]; + + protected $addons = [ + 'testaddon1', + 'testaddon2', + 'testaddon3', + ]; + + protected $content = << [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], +]; +EOF; + + protected function setUp(): void + { + parent::setUp(); + + $this->setUpVfsDir(); + } + + public function dataHooks(): array + { + return [ + 'normal' => [ + 'structure' => $this->structure, + 'enabled' => $this->addons, + 'files' => [ + 'addon/testaddon1/static/hooks.config.php' => $this->content, + ], + 'assertion' => [ + \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], + ], + ], + 'double' => [ + 'structure' => $this->structure, + 'enabled' => $this->addons, + 'files' => [ + 'addon/testaddon1/static/hooks.config.php' => $this->content, + 'addon/testaddon2/static/hooks.config.php' => $this->content, + ], + 'assertion' => [ + \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => ['', ''], + ], + ], + ], + ], + 'wrongName' => [ + 'structure' => $this->structure, + 'enabled' => $this->addons, + 'files' => [ + 'addon/testaddon1/static/wrong.config.php' => $this->content, + ], + 'assertion' => [ + ], + ], + 'doubleNutOnlyOneEnabled' => [ + 'structure' => $this->structure, + 'enabled' => ['testaddon1'], + 'files' => [ + 'addon/testaddon1/static/hooks.config.php' => $this->content, + 'addon/testaddon2/static/hooks.config.php' => $this->content, + ], + 'assertion' => [ + \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], + ], + ] + ]; + } + + /** + * @dataProvider dataHooks + */ + public function testAddonLoader(array $structure, array $enabledAddons, array $files, array $assertion) + { + vfsStream::create($structure)->at($this->root); + + foreach ($files as $file => $content) { + vfsStream::newFile($file) + ->withContent($content) + ->at($this->root); + } + + $configArray = []; + foreach ($enabledAddons as $enabledAddon) { + $configArray[$enabledAddon] = ['test' => []]; + } + + $config = \Mockery::mock(IManageConfigValues::class); + $config->shouldReceive('get')->with('addons')->andReturn($configArray)->once(); + + $addonLoader = new AddonLoader($this->root->url(), $config); + + self::assertEquals($assertion, $addonLoader->getActiveAddonConfig('hooks')); + } + + /** + * Test the exception in case of a wrong addon content + */ + public function testWrongContent() + { + $filename = 'addon/testaddon1/static/hooks.config.php'; + $wrongContent = "structure)->at($this->root); + + vfsStream::newFile($filename) + ->withContent($wrongContent) + ->at($this->root); + + $configArray = []; + foreach ($this->addons as $enabledAddon) { + $configArray[$enabledAddon] = ['test' => []]; + } + + $config = \Mockery::mock(IManageConfigValues::class); + $config->shouldReceive('get')->with('addons')->andReturn($configArray)->once(); + + $addonLoader = new AddonLoader($this->root->url(), $config); + + self::expectException(AddonInvalidConfigFileException::class); + self::expectExceptionMessage(sprintf('Error loading config file %s', $this->root->getChild($filename)->url())); + + $addonLoader->getActiveAddonConfig('hooks'); + } + + /** + * Test that nothing happens in case there are wrong addons files, but they're not used + */ + public function testNoHooksConfig() + { + $filename = 'addon/testaddon1/static/hooks.config.php'; + $wrongContent = "structure)->at($this->root); + + vfsStream::newFile($filename) + ->withContent($wrongContent) + ->at($this->root); + + $configArray = []; + foreach ($this->addons as $enabledAddon) { + $configArray[$enabledAddon] = ['test' => []]; + } + + $config = \Mockery::mock(IManageConfigValues::class); + $config->shouldReceive('get')->with('addons')->andReturn($configArray)->once(); + + $addonLoader = new AddonLoader($this->root->url(), $config); + self::assertEmpty($addonLoader->getActiveAddonConfig('anythingElse')); + } +} From 527622df4ace40cb52fb48f03fe16881f9e9962e Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 16 Jul 2023 22:41:56 +0200 Subject: [PATCH 139/259] Add tests for HookFileManager --- src/Core/Hooks/Util/HookFileManager.php | 4 +- .../Core/Hooks/Util/HookFileManagerTest.php | 243 ++++++++++++++++++ 2 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 tests/src/Core/Hooks/Util/HookFileManagerTest.php diff --git a/src/Core/Hooks/Util/HookFileManager.php b/src/Core/Hooks/Util/HookFileManager.php index eda7e9388..e25641e36 100644 --- a/src/Core/Hooks/Util/HookFileManager.php +++ b/src/Core/Hooks/Util/HookFileManager.php @@ -104,13 +104,13 @@ class HookFileManager $configFile = $this->basePath . '/' . static::STATIC_DIR . '/' . static::CONFIG_NAME . '.config.php'; if (!file_exists($configFile)) { - throw new HookConfigException(sprintf('config file %s does not exit.', $configFile)); + throw new HookConfigException(sprintf('config file %s does not exist.', $configFile)); } $config = include $configFile; if (!is_array($config)) { - throw new HookConfigException('Error loading config file ' . $configFile); + throw new HookConfigException(sprintf('Error loading config file %s.', $configFile)); } $this->hookConfig = array_merge_recursive($config, $this->addonLoader->getActiveAddonConfig(static::CONFIG_NAME)); diff --git a/tests/src/Core/Hooks/Util/HookFileManagerTest.php b/tests/src/Core/Hooks/Util/HookFileManagerTest.php new file mode 100644 index 000000000..cbd9a63b1 --- /dev/null +++ b/tests/src/Core/Hooks/Util/HookFileManagerTest.php @@ -0,0 +1,243 @@ +setUpVfsDir(); + } + + public function dataHooks(): array + { + return [ + 'normal' => [ + 'content' => << [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], + \Friendica\Core\Hooks\Capabilities\HookType::DECORATOR => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class, + ], + ], +]; +EOF, + 'addonsArray' => [], + 'assertStrategies' => [ + [LoggerInterface::class, NullLogger::class, ''], + ], + 'assertDecorators' => [ + [LoggerInterface::class, NullLogger::class], + ], + ], + 'normalWithString' => [ + 'content' => << [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => '', + ], + ], + \Friendica\Core\Hooks\Capabilities\HookType::DECORATOR => [ + \Psr\Log\LoggerInterface::class => \Psr\Log\NullLogger::class, + ], +]; +EOF, + 'addonsArray' => [], + 'assertStrategies' => [ + [LoggerInterface::class, NullLogger::class, ''], + ], + 'assertDecorators' => [ + [LoggerInterface::class, NullLogger::class], + ], + ], + 'withAddons' => [ + 'content' => << [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], +]; +EOF, + 'addonsArray' => [ + \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => ['null'], + ], + ], + ], + 'assertStrategies' => [ + [LoggerInterface::class, NullLogger::class, ''], + [LoggerInterface::class, NullLogger::class, 'null'], + ], + 'assertDecorators' => [], + ], + 'withAddonsWithString' => [ + 'content' => << [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], +]; +EOF, + 'addonsArray' => [ + \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => 'null', + ], + ], + ], + 'assertStrategies' => [ + [LoggerInterface::class, NullLogger::class, ''], + [LoggerInterface::class, NullLogger::class, 'null'], + ], + 'assertDecorators' => [], + ], + // This should work because unique name convention is part of the instance manager logic, not of the file-infrastructure layer + 'withAddonsDoubleNamed' => [ + 'content' => << [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], +]; +EOF, + 'addonsArray' => [ + \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], + ], + 'assertStrategies' => [ + [LoggerInterface::class, NullLogger::class, ''], + [LoggerInterface::class, NullLogger::class, ''], + ], + 'assertDecorators' => [], + ], + 'withWrongContentButAddons' => [ + 'content' => << [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], +]; +EOF, + 'addonsArray' => [ + \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], + ], + ], + 'assertStrategies' => [ + [LoggerInterface::class, NullLogger::class, ''], + ], + 'assertDecorators' => [], + ], + ]; + } + + /** + * @dataProvider dataHooks + */ + public function testSetupHooks(string $content, array $addonsArray, array $assertStrategies, array $assertDecorators) + { + vfsStream::newFile('static/hooks.config.php') + ->withContent($content) + ->at($this->root); + + $addonLoader = \Mockery::mock(ICanLoadAddons::class); + $addonLoader->shouldReceive('getActiveAddonConfig')->andReturn($addonsArray)->once(); + + $hookFileManager = new HookFileManager($this->root->url(), $addonLoader); + + $instanceManager = \Mockery::mock(ICanRegisterInstances::class); + foreach ($assertStrategies as $assertStrategy) { + $instanceManager->shouldReceive('registerStrategy')->withArgs($assertStrategy)->once(); + } + + foreach ($assertDecorators as $assertDecorator) { + $instanceManager->shouldReceive('registerDecorator')->withArgs($assertDecorator)->once(); + } + + $hookFileManager->setupHooks($instanceManager); + + self::expectNotToPerformAssertions(); + } + + /** + * Test the exception in case the hooks.config.php file is missing + */ + public function testMissingHooksFile() + { + $addonLoader = \Mockery::mock(ICanLoadAddons::class); + $instanceManager = \Mockery::mock(ICanRegisterInstances::class); + $hookFileManager = new HookFileManager($this->root->url(), $addonLoader); + + self::expectException(HookConfigException::class); + self::expectExceptionMessage(sprintf('config file %s does not exist.', + $this->root->url() . '/' . HookFileManager::STATIC_DIR . '/' . HookFileManager::CONFIG_NAME . '.config.php')); + + $hookFileManager->setupHooks($instanceManager); + } + + /** + * Test the exception in case the hooks.config.php file is wrong + */ + public function testWrongHooksFile() + { + $addonLoader = \Mockery::mock(ICanLoadAddons::class); + $instanceManager = \Mockery::mock(ICanRegisterInstances::class); + $hookFileManager = new HookFileManager($this->root->url(), $addonLoader); + + vfsStream::newFile('static/hooks.config.php') + ->withContent("at($this->root); + + self::expectException(HookConfigException::class); + self::expectExceptionMessage(sprintf('Error loading config file %s.', + $this->root->url() . '/' . HookFileManager::STATIC_DIR . '/' . HookFileManager::CONFIG_NAME . '.config.php')); + + $hookFileManager->setupHooks($instanceManager); + } +} From 93af6f0564b28cd8cd30ec28dcced1d2e6e72881 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 00:10:15 +0200 Subject: [PATCH 140/259] Add tests for InstanceManager and remove Decorator hook logic (avoid complex Dice logic) --- doc/AddonsStrategyDecorator.md | 159 --------------- doc/StrategyHooks.md | 89 +++++++++ .../{HookType.php => BehavioralHookType.php} | 14 +- .../Capabilities/ICanCreateInstances.php | 20 +- .../Capabilities/ICanRegisterInstances.php | 19 +- src/Core/Hooks/Model/DiceInstanceManager.php | 45 +---- src/Core/Hooks/Util/HookFileManager.php | 15 +- src/Core/Logger/Factory/Logger.php | 12 +- static/hooks.config.php | 7 +- .../Util/Hooks/InstanceMocks/FakeInstance.php | 4 +- .../InstanceMocks/FakeInstanceDecorator.php | 12 +- .../src/Core/Addon/Model/AddonLoaderTest.php | 8 +- .../Core/Hooks/Model/InstanceManagerTest.php | 182 ++++++++---------- .../Core/Hooks/Util/HookFileManagerTest.php | 22 +-- 14 files changed, 218 insertions(+), 390 deletions(-) delete mode 100644 doc/AddonsStrategyDecorator.md create mode 100644 doc/StrategyHooks.md rename src/Core/Hooks/Capabilities/{HookType.php => BehavioralHookType.php} (82%) diff --git a/doc/AddonsStrategyDecorator.md b/doc/AddonsStrategyDecorator.md deleted file mode 100644 index 51456da6c..000000000 --- a/doc/AddonsStrategyDecorator.md +++ /dev/null @@ -1,159 +0,0 @@ -Friendica strategy and decorator Hooks -=========================================== - -* [Home](help) - -## Strategy hooks - -This type of hook is based on the [Strategy Design Pattern](https://refactoring.guru/design-patterns/strategy). - -A strategy class defines a possible implementation of a given interface based on a unique name. -Every name is possible as long as it's unique and not `null`. -Using an empty name (`''`) is possible as well and should be used as the "default" implementation. -To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capabilities/ICanRegisterInstances.php) interface. - -After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capabilities/ICanCreateInstances.php) interface and the chosen name. - -This is useful in case there are different, possible implementations for the same purpose, like for logging, locking, caching, ... - -Normally, a config entry is used to choose the right implementation at runtime. -And if no config entry is set, the "default" implementation should be used. - -### Example - -```php -interface ExampleInterface -{ - public function testMethod(); -} - -public class ConcreteClassA implements ExampleInterface -{ - public function testMethod() - { - echo "concrete class A"; - } -} - -public class ConcreteClassB implements ExampleInterface -{ - public function testMethod() - { - echo "concrete class B"; - } -} - -/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterInstances $instanceRegister */ -$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A'); -$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassB::class, 'B'); - -/** @var \Friendica\Core\Hooks\Capabilities\ICanCreateInstances $instanceManager */ -/** @var ConcreteClassA $concreteClass */ -$concreteClass = $instanceManager->createWithName(ExampleInterface::class, 'A'); - -$concreteClass->testMethod(); -// output: -// "concrete class A"; -``` - -## Decorator hooks - -This type of hook is based on the [Decorator Design Pattern](https://refactoring.guru/design-patterns/decorator). - -A decorator class extends a given strategy instance (see [Strategy hooks](#strategy-hooks)]). -To register a decorator, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capabilities/ICanRegisterInstances.php) interface. - -After registration, a caller can automatically create an instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capabilities/ICanCreateInstances.php) interface and the decorator will wrap its logic around the call. - -This is useful in case you want to extend a given class but the given class isn't responsible for these business logic. Or you want to extend an interface without knowing the concrete implementation. -For example profiling logger calls, Friendica is using a [`ProfilerLogger`](../src/Core/Logger/Type/ProfilerLogger.php), which wraps all other logging implementations and traces each log call. - -Normally, a config entry is used to enable/disable decorator. - -### Example - -```php -interface ExampleInterface -{ - public function testMethod(); -} - -public class ConcreteClassA implements ExampleInterface -{ - public function testMethod() - { - echo "concrete class A"; - } -} - -public class DecoratorClassA implements ExampleInterface -{ - /** @var ExampleInterface */ - protected $example; - - public function __construct(ExampleInterface $example) - { - $this->example = $example; - } - - public function testMethod() - { - echo "decorated!\n"; - $this->example->testMethod(); - } -} - -/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterInstances $instanceRegister */ -$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A'); -$instanceRegister->registerDecorator(ExampleInterface::class, DecoratorClassA::class); - -/** @var \Friendica\Core\Hooks\Capabilities\ICanCreateInstances $instanceManager */ -/** @var ConcreteClassA $concreteClass */ -$concreteClass = $instanceManager->createWithName(ExampleInterface::class, 'A'); - -$concreteClass->testMethod(); -// output: -// "decorated!" -// "concrete class A"; -``` - -## hooks.config.php - -To avoid registering all strategies and decorators manually inside the code, Friendica introduced the [`hooks.config.php`](../static/hooks.config.php) file. - -There, you can register all kind of strategies and decorators in one file. - -### [`HookType::STRATEGY`](../src/Core/Hooks/Capabilities/HookType.php) - -For each given interface, a list of key-value pairs can be set, where the key is the concrete implementation class and the value is an array of unique names. - -### [`HookType::DECORATOR`](../src/Core/Hooks/Capabilities/HookType.php) - -For each given interface, a list of concrete decorator classes can be set. - -### Example - -```php -use Friendica\Core\Hooks\Capabilities\HookType as H; - -return [ - H::STRATEGY => [ - ExampleInterface::class => [ - ConcreteClassA::class => ['A'], - ConcreteClassB::class => ['B'], - ], - ], - H::DECORATOR => [ - ExampleInterface::class => [ - DecoratorClassA::class, - ], - ], -]; -``` - -## Addons - -The hook logic is useful for decoupling the Friendica core logic, but its primary goal is to modularize Friendica in creating addons. - -Therefor you can either use the interfaces directly as shown above, or you can place your own `hooks.config.php` file inside a `static` directory directly under your addon core directory. -Friendica will automatically search these config files for each **activated** addon and register the given hooks. diff --git a/doc/StrategyHooks.md b/doc/StrategyHooks.md new file mode 100644 index 000000000..cb355f93f --- /dev/null +++ b/doc/StrategyHooks.md @@ -0,0 +1,89 @@ +Friendica strategy Hooks +=========================================== + +* [Home](help) + +## Strategy hooks + +This type of hook is based on the [Strategy Design Pattern](https://refactoring.guru/design-patterns/strategy). + +A strategy class defines a possible implementation of a given interface based on a unique name. +Every name is possible as long as it's unique and not `null`. +Using an empty name (`''`) is possible as well and should be used as the "default" implementation. +To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capabilities/ICanRegisterInstances.php) interface. + +After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capabilities/ICanCreateInstances.php) interface and the chosen name. + +This is useful in case there are different, possible implementations for the same purpose, like for logging, locking, caching, ... + +Normally, a config entry is used to choose the right implementation at runtime. +And if no config entry is set, the "default" implementation should be used. + +### Example + +```php +interface ExampleInterface +{ + public function testMethod(); +} + +public class ConcreteClassA implements ExampleInterface +{ + public function testMethod() + { + echo "concrete class A"; + } +} + +public class ConcreteClassB implements ExampleInterface +{ + public function testMethod() + { + echo "concrete class B"; + } +} + +/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterInstances $instanceRegister */ +$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A'); +$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassB::class, 'B'); + +/** @var \Friendica\Core\Hooks\Capabilities\ICanCreateInstances $instanceManager */ +/** @var ConcreteClassA $concreteClass */ +$concreteClass = $instanceManager->create(ExampleInterface::class, 'A'); + +$concreteClass->testMethod(); +// output: +// "concrete class A"; +``` + +## hooks.config.php + +To avoid registering all strategies manually inside the code, Friendica introduced the [`hooks.config.php`](../static/hooks.config.php) file. + +There, you can register all kind of strategies in one file. + +### [`HookType::STRATEGY`](../src/Core/Hooks/Capabilities/HookType.php) + +For each given interface, a list of key-value pairs can be set, where the key is the concrete implementation class and the value is an array of unique names. + +### Example + +```php +use Friendica\Core\Hooks\Capabilities\BehavioralHookType as H; + +return [ + H::STRATEGY => [ + ExampleInterface::class => [ + ConcreteClassA::class => ['A'], + ConcreteClassB::class => ['B'], + ], + ], +]; +``` + +## Addons + +The hook logic is useful for decoupling the Friendica core logic, but its primary goal is to modularize Friendica in creating addons. + +Therefor you can either use the interfaces directly as shown above, or you can place your own `hooks.config.php` file inside a `static` directory directly under your addon core directory. +Friendica will automatically search these config files for each **activated** addon and register the given hooks. diff --git a/src/Core/Hooks/Capabilities/HookType.php b/src/Core/Hooks/Capabilities/BehavioralHookType.php similarity index 82% rename from src/Core/Hooks/Capabilities/HookType.php rename to src/Core/Hooks/Capabilities/BehavioralHookType.php index 6fea41e17..6336406e6 100644 --- a/src/Core/Hooks/Capabilities/HookType.php +++ b/src/Core/Hooks/Capabilities/BehavioralHookType.php @@ -21,7 +21,11 @@ namespace Friendica\Core\Hooks\Capabilities; -interface HookType +/** + * An enum of hook types, based on behavioral design patterns + * @see https://refactoring.guru/design-patterns/behavioral-patterns + */ +interface BehavioralHookType { /** * Defines the key for the list of strategy-hooks. @@ -29,11 +33,5 @@ interface HookType * @see https://refactoring.guru/design-patterns/strategy */ const STRATEGY = 'strategy'; - /** - * Defines the key for the list of decorator-hooks. - * - * @see https://refactoring.guru/design-patterns/decorator - */ - const DECORATOR = 'decorator'; - const EVENT = 'event'; + const EVENT = 'event'; } diff --git a/src/Core/Hooks/Capabilities/ICanCreateInstances.php b/src/Core/Hooks/Capabilities/ICanCreateInstances.php index 971430474..f2e4b8b0a 100644 --- a/src/Core/Hooks/Capabilities/ICanCreateInstances.php +++ b/src/Core/Hooks/Capabilities/ICanCreateInstances.php @@ -22,7 +22,7 @@ namespace Friendica\Core\Hooks\Capabilities; /** - * creates special instance and decorator treatments for given classes + * creates special instances for given classes */ interface ICanCreateInstances { @@ -31,27 +31,11 @@ interface ICanCreateInstances * * The instance will be build based on the registered strategy and the (unique) name * - * In case, there are registered decorators for this class as well, all decorators of the list will be wrapped - * around the instance before returning it - * * @param string $class The fully-qualified name of the given class or interface which will get returned * @param string $name An arbitrary identifier to find a concrete instance strategy. * @param array $arguments Additional arguments, which can be passed to the constructor of "$class" at runtime * * @return object The concrete instance of the type "$class" */ - public function createWithName(string $class, string $name, array $arguments = []): object; - - /** - * Returns a new instance of a given class - * - * In case, there are registered decorators for this class as well, all decorators of the list will be wrapped - * around the instance before returning it - * - * @param string $class The fully-qualified name of the given class or interface which will get returned - * @param array $arguments Additional arguments, which can be passed to the constructor of "$class" at runtime - * - * @return object The concrete instance of the type "$class" - */ - public function create(string $class, array $arguments = []): object; + public function create(string $class, string $name, array $arguments = []): object; } diff --git a/src/Core/Hooks/Capabilities/ICanRegisterInstances.php b/src/Core/Hooks/Capabilities/ICanRegisterInstances.php index 23a77ab35..f7689bbee 100644 --- a/src/Core/Hooks/Capabilities/ICanRegisterInstances.php +++ b/src/Core/Hooks/Capabilities/ICanRegisterInstances.php @@ -24,7 +24,7 @@ namespace Friendica\Core\Hooks\Capabilities; use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; /** - * Register strategies and decorator/treatment handling for given classes + * Register strategies for given classes */ interface ICanRegisterInstances { @@ -43,21 +43,4 @@ interface ICanRegisterInstances * @throws HookRegisterArgumentException in case the given class for the interface isn't valid or already set */ public function registerStrategy(string $interface, string $class, ?string $name = null): self; - - /** - * Register a new decorator for a given class or interface - * - * @see https://refactoring.guru/design-patterns/decorator - * - * @note Decorator attach new behaviors to classes without changing them or without letting them know about it. - * - * @param string $class The fully-qualified class or interface name, which gets decorated by a class - * @param string $decoratorClass The fully-qualified name of the class which mimics the given class or interface and adds new functionality - * A placeholder for dependencies is possible as well - * - * @return $this This interface for chain-calls - * - * @throws HookRegisterArgumentException in case the given class for the class or interface isn't valid - */ - public function registerDecorator(string $class, string $decoratorClass): self; } diff --git a/src/Core/Hooks/Model/DiceInstanceManager.php b/src/Core/Hooks/Model/DiceInstanceManager.php index efbee444a..7c35dfe4d 100644 --- a/src/Core/Hooks/Model/DiceInstanceManager.php +++ b/src/Core/Hooks/Model/DiceInstanceManager.php @@ -36,7 +36,6 @@ use Friendica\Core\Hooks\Util\HookFileManager; class DiceInstanceManager implements ICanCreateInstances, ICanRegisterInstances { protected $instance = []; - protected $decorator = []; /** @var Dice */ protected $dice; @@ -60,52 +59,12 @@ class DiceInstanceManager implements ICanCreateInstances, ICanRegisterInstances } /** {@inheritDoc} */ - public function registerDecorator(string $class, string $decoratorClass): ICanRegisterInstances - { - $this->decorator[$class][] = $decoratorClass; - - return $this; - } - - /** {@inheritDoc} */ - public function create(string $class, array $arguments = []): object - { - $instanceClassName = $class; - $instanceRule = $this->dice->getRule($instanceClassName) ?? []; - - $instanceRule = array_replace_recursive($instanceRule, [ - 'constructParams' => $arguments, - ]); - - $this->dice = $this->dice->addRule($instanceClassName, $instanceRule); - - foreach ($this->decorator[$class] ?? [] as $decorator) { - $dependencyRule = $this->dice->getRule($decorator); - for ($i = 0; $i < count($dependencyRule['call'] ?? []); $i++) { - $dependencyRule['call'][$i][1] = [[Dice::INSTANCE => $instanceClassName]]; - } - $dependencyRule['constructParams'] = $arguments; - $dependencyRule['substitutions'] = [ - $class => $instanceClassName, - ]; - - $this->dice = $this->dice->addRule($decorator, $dependencyRule); - - $instanceClassName = $decorator; - } - - return $this->dice->create($instanceClassName); - } - - /** {@inheritDoc} */ - public function createWithName(string $class, string $name, array $arguments = []): object + public function create(string $class, string $name, array $arguments = []): object { if (empty($this->instance[$class][$name])) { throw new HookInstanceException(sprintf('The class with the name %s isn\'t registered for the class or interface %s', $name, $class)); } - $instanceClassName = $this->instance[$class][$name]; - - return $this->create($instanceClassName, $arguments); + return $this->dice->create($this->instance[$class][$name], $arguments); } } diff --git a/src/Core/Hooks/Util/HookFileManager.php b/src/Core/Hooks/Util/HookFileManager.php index e25641e36..b83f2b49c 100644 --- a/src/Core/Hooks/Util/HookFileManager.php +++ b/src/Core/Hooks/Util/HookFileManager.php @@ -22,7 +22,7 @@ namespace Friendica\Core\Hooks\Util; use Friendica\Core\Addon\Capabilities\ICanLoadAddons; -use Friendica\Core\Hooks\Capabilities\HookType; +use Friendica\Core\Hooks\Capabilities\BehavioralHookType; use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; use Friendica\Core\Hooks\Exceptions\HookConfigException; @@ -63,7 +63,7 @@ class HookFileManager foreach ($this->hookConfig as $hookType => $classList) { switch ($hookType) { - case HookType::STRATEGY: + case BehavioralHookType::STRATEGY: foreach ($classList as $interface => $strategy) { foreach ($strategy as $dependencyName => $names) { if (is_array($names)) { @@ -76,17 +76,6 @@ class HookFileManager } } break; - case HookType::DECORATOR: - foreach ($classList as $interface => $decorators) { - if (is_array($decorators)) { - foreach ($decorators as $decorator) { - $instanceRegister->registerDecorator($interface, $decorator); - } - } else { - $instanceRegister->registerDecorator($interface, $decorators); - } - } - break; } } } diff --git a/src/Core/Logger/Factory/Logger.php b/src/Core/Logger/Factory/Logger.php index 3fde878a3..81f8887ef 100644 --- a/src/Core/Logger/Factory/Logger.php +++ b/src/Core/Logger/Factory/Logger.php @@ -24,6 +24,8 @@ namespace Friendica\Core\Logger\Factory; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; use Friendica\Core\Logger\Capabilities\LogChannel; +use Friendica\Core\Logger\Type\ProfilerLogger as ProfilerLoggerClass; +use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Throwable; @@ -41,7 +43,7 @@ class Logger $this->channel = $channel; } - public function create(ICanCreateInstances $createInstances, IManageConfigValues $config): LoggerInterface + public function create(ICanCreateInstances $createInstances, IManageConfigValues $config, Profiler $profiler): LoggerInterface { if (empty($config->get('system', 'debugging') ?? false)) { return new NullLogger(); @@ -50,7 +52,13 @@ class Logger $name = $config->get('system', 'logger_config') ?? ''; try { - return $createInstances->createWithName(LoggerInterface::class, $name, [$this->channel]); + /** @var LoggerInterface $logger */ + $logger = $createInstances->create(LoggerInterface::class, $name, [$this->channel]); + if ($config->get('system', 'profiling') ?? false) { + return new ProfilerLoggerClass($logger, $profiler); + } else { + return $logger; + } } catch (Throwable $e) { // No logger ... return new NullLogger(); diff --git a/static/hooks.config.php b/static/hooks.config.php index bc235913c..d46762f87 100644 --- a/static/hooks.config.php +++ b/static/hooks.config.php @@ -19,7 +19,7 @@ * */ -use Friendica\Core\Hooks\Capabilities\HookType as H; +use Friendica\Core\Hooks\Capabilities\BehavioralHookType as H; use Friendica\Core\Logger\Type; use Psr\Log; @@ -31,9 +31,4 @@ return [ Type\StreamLogger::class => ['stream'], ], ], - H::DECORATOR => [ - Log\LoggerInterface::class => [ - Type\ProfilerLogger::class, - ], - ], ]; diff --git a/tests/Util/Hooks/InstanceMocks/FakeInstance.php b/tests/Util/Hooks/InstanceMocks/FakeInstance.php index 9a0e9dd6f..64fe2c5ad 100644 --- a/tests/Util/Hooks/InstanceMocks/FakeInstance.php +++ b/tests/Util/Hooks/InstanceMocks/FakeInstance.php @@ -21,7 +21,7 @@ namespace Friendica\Test\Util\Hooks\InstanceMocks; -class FakeInstance +class FakeInstance implements IAmADecoratedInterface { protected $aText = null; protected $cBool = null; @@ -39,6 +39,8 @@ class FakeInstance $this->aText = $aText; $this->cBool = $cBool; $this->bText = $bText; + + return ''; } public function getAText(): ?string diff --git a/tests/Util/Hooks/InstanceMocks/FakeInstanceDecorator.php b/tests/Util/Hooks/InstanceMocks/FakeInstanceDecorator.php index af4db96c4..40ab78a25 100644 --- a/tests/Util/Hooks/InstanceMocks/FakeInstanceDecorator.php +++ b/tests/Util/Hooks/InstanceMocks/FakeInstanceDecorator.php @@ -25,14 +25,14 @@ class FakeInstanceDecorator implements IAmADecoratedInterface { public static $countInstance = 0; + const PREFIX = 'prefix1'; + /** @var IAmADecoratedInterface */ protected $orig; - protected $prefix = ''; - public function __construct(IAmADecoratedInterface $orig, string $prefix = '') + public function __construct(IAmADecoratedInterface $orig) { $this->orig = $orig; - $this->prefix = $prefix; self::$countInstance++; } @@ -44,16 +44,16 @@ class FakeInstanceDecorator implements IAmADecoratedInterface public function getAText(): ?string { - return $this->prefix . $this->orig->getAText(); + return static::PREFIX . $this->orig->getAText(); } public function getBText(): ?string { - return $this->prefix . $this->orig->getBText(); + return static::PREFIX . $this->orig->getBText(); } public function getCBool(): ?bool { - return $this->prefix . $this->orig->getCBool(); + return static::PREFIX . $this->orig->getCBool(); } } diff --git a/tests/src/Core/Addon/Model/AddonLoaderTest.php b/tests/src/Core/Addon/Model/AddonLoaderTest.php index 4496cd42f..be125535f 100644 --- a/tests/src/Core/Addon/Model/AddonLoaderTest.php +++ b/tests/src/Core/Addon/Model/AddonLoaderTest.php @@ -54,7 +54,7 @@ class AddonLoaderTest extends MockedTest [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -79,7 +79,7 @@ EOF; 'addon/testaddon1/static/hooks.config.php' => $this->content, ], 'assertion' => [ - \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -94,7 +94,7 @@ EOF; 'addon/testaddon2/static/hooks.config.php' => $this->content, ], 'assertion' => [ - \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => ['', ''], ], @@ -118,7 +118,7 @@ EOF; 'addon/testaddon2/static/hooks.config.php' => $this->content, ], 'assertion' => [ - \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], diff --git a/tests/src/Core/Hooks/Model/InstanceManagerTest.php b/tests/src/Core/Hooks/Model/InstanceManagerTest.php index 200500d63..de2bdc6b8 100644 --- a/tests/src/Core/Hooks/Model/InstanceManagerTest.php +++ b/tests/src/Core/Hooks/Model/InstanceManagerTest.php @@ -22,25 +22,27 @@ namespace Friendica\Test\src\Core\Hooks\Model; use Dice\Dice; +use Friendica\Core\Hooks\Exceptions\HookInstanceException; +use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; use Friendica\Core\Hooks\Model\DiceInstanceManager; +use Friendica\Core\Hooks\Util\HookFileManager; use Friendica\Test\MockedTest; use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstance; use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstanceDecorator; use Friendica\Test\Util\Hooks\InstanceMocks\IAmADecoratedInterface; +use Mockery\MockInterface; class InstanceManagerTest extends MockedTest { - public function testEqualButNotSameInstance() + /** @var HookFileManager|MockInterface */ + protected $hookFileManager; + + protected function setUp(): void { - $instance = new DiceInstanceManager(new Dice()); + parent::setUp(); - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class); - - $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); - $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); - - self::assertEquals($getInstanceA, $getInstanceB); - self::assertNotSame($getInstanceA, $getInstanceB); + $this->hookFileManager = \Mockery::mock(HookFileManager::class); + $this->hookFileManager->shouldReceive('setupHooks')->withAnyArgs(); } protected function tearDown(): void @@ -50,6 +52,19 @@ class InstanceManagerTest extends MockedTest parent::tearDown(); } + public function testEqualButNotSameInstance() + { + $instance = new DiceInstanceManager(new Dice(), $this->hookFileManager); + + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake'); + + $getInstanceA = $instance->create(IAmADecoratedInterface::class, 'fake'); + $getInstanceB = $instance->create(IAmADecoratedInterface::class, 'fake'); + + self::assertEquals($getInstanceA, $getInstanceB); + self::assertNotSame($getInstanceA, $getInstanceB); + } + public function dataTests(): array { return [ @@ -79,9 +94,9 @@ class InstanceManagerTest extends MockedTest /** * @dataProvider dataTests */ - public function testInstanceWithConstructorAnonymArgs(string $aString = null, bool $cBool = null, string $bString = null) + public function testInstanceWithArgs(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new DiceInstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice(), $this->hookFileManager); $args = []; @@ -95,45 +110,12 @@ class InstanceManagerTest extends MockedTest $args[] = $cBool; } - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class, $args); + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake'); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); + $getInstanceA = $instance->create(IAmADecoratedInterface::class, 'fake', $args); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake'); - - self::assertEquals($getInstanceA, $getInstanceB); - self::assertNotSame($getInstanceA, $getInstanceB); - self::assertEquals($aString, $getInstanceA->getAText()); - self::assertEquals($aString, $getInstanceB->getAText()); - self::assertEquals($bString, $getInstanceA->getBText()); - self::assertEquals($bString, $getInstanceB->getBText()); - self::assertEquals($cBool, $getInstanceA->getCBool()); - self::assertEquals($cBool, $getInstanceB->getCBool()); - } - - /** - * @dataProvider dataTests - */ - public function testInstanceConstructorAndGetInstanceWithNamedArgs(string $aString = null, bool $cBool = null, string $bString = null) - { - $instance = new DiceInstanceManager(new Dice()); - - $args = []; - - if (isset($aString)) { - $args[] = $aString; - } - if (isset($cBool)) { - $args[] = $cBool; - } - - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class, $args); - - /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); - /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceB = $instance->create(IAmADecoratedInterface::class, 'fake', $args); self::assertEquals($getInstanceA, $getInstanceB); self::assertNotSame($getInstanceA, $getInstanceB); @@ -150,24 +132,27 @@ class InstanceManagerTest extends MockedTest */ public function testInstanceWithTwoStrategies(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new DiceInstanceManager(new Dice()); + $instance = new DiceInstanceManager(new Dice(), $this->hookFileManager); $args = []; if (isset($aString)) { $args[] = $aString; } + if (isset($bString)) { + $args[] = $bString; + } if (isset($cBool)) { $args[] = $cBool; } - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class, $args); - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake23', FakeInstance::class, $args); + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake'); + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake23'); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceA = $instance->create(IAmADecoratedInterface::class, 'fake', $args); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake23', [$bString]); + $getInstanceB = $instance->create(IAmADecoratedInterface::class, 'fake23', $args); self::assertEquals($getInstanceA, $getInstanceB); self::assertNotSame($getInstanceA, $getInstanceB); @@ -180,79 +165,74 @@ class InstanceManagerTest extends MockedTest } /** - * @dataProvider dataTests + * Test the exception in case the interface was already registered */ - public function testDecorator(string $aString = null, bool $cBool = null, string $bString = null) + public function testDoubleRegister() { - $instance = new DiceInstanceManager(new Dice()); + self::expectException(HookRegisterArgumentException::class); + self::expectExceptionMessage(sprintf('A class with the name %s is already set for the interface %s', 'fake', IAmADecoratedInterface::class)); - $args = []; - - if (isset($aString)) { - $args[] = $aString; - } - if (isset($cBool)) { - $args[] = $cBool; - } - - $prefix = 'prefix1'; - - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class, $args); - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake23', FakeInstance::class, $args); - $instance->registerDecorator(IAmADecoratedInterface::class, FakeInstanceDecorator::class, [$prefix]); - - /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); - /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake23', [$bString]); - - self::assertEquals(2, FakeInstanceDecorator::$countInstance); - self::assertEquals($getInstanceA, $getInstanceB); - self::assertNotSame($getInstanceA, $getInstanceB); - self::assertEquals($prefix . $aString, $getInstanceA->getAText()); - self::assertEquals($prefix . $aString, $getInstanceB->getAText()); - self::assertEquals($prefix . $bString, $getInstanceA->getBText()); - self::assertEquals($prefix . $bString, $getInstanceB->getBText()); - self::assertEquals($prefix . $cBool, $getInstanceA->getCBool()); - self::assertEquals($prefix . $cBool, $getInstanceB->getCBool()); + $instance = new DiceInstanceManager(new Dice(), $this->hookFileManager); + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake'); + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake'); } /** + * Test the exception in case the name of the instance isn't registered + */ + public function testWrongInstanceName() + { + self::expectException(HookInstanceException::class ); + self::expectExceptionMessage(sprintf('The class with the name %s isn\'t registered for the class or interface %s', 'fake', IAmADecoratedInterface::class)); + + $instance = new DiceInstanceManager(new Dice(), $this->hookFileManager); + $instance->create(IAmADecoratedInterface::class, 'fake'); + } + + /** + * Test in case there are already some rules + * * @dataProvider dataTests */ - public function testTwoDecoratorWithPrefix(string $aString = null, bool $cBool = null, string $bString = null) + public function testWithGivenRules(string $aString = null, bool $cBool = null, string $bString = null) { - $instance = new DiceInstanceManager(new Dice()); - $args = []; if (isset($aString)) { $args[] = $aString; } + if (isset($bString)) { + $args[] = $bString; + } + + $dice = (new Dice())->addRules([ + FakeInstance::class => [ + 'constructParams' => $args, + ], + ]); + + $args = []; + if (isset($cBool)) { $args[] = $cBool; } - $prefix = 'prefix1'; + $instance = new DiceInstanceManager($dice, $this->hookFileManager); - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake', FakeInstance::class, $args); - $instance->registerStrategy(IAmADecoratedInterface::class, 'fake23', FakeInstance::class, $args); - $instance->registerDecorator(IAmADecoratedInterface::class, FakeInstanceDecorator::class, [$prefix]); - $instance->registerDecorator(IAmADecoratedInterface::class, FakeInstanceDecorator::class); + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake'); /** @var IAmADecoratedInterface $getInstanceA */ - $getInstanceA = $instance->createWithName(IAmADecoratedInterface::class, 'fake', [$bString]); + $getInstanceA = $instance->create(IAmADecoratedInterface::class, 'fake', $args); /** @var IAmADecoratedInterface $getInstanceB */ - $getInstanceB = $instance->createWithName(IAmADecoratedInterface::class, 'fake23', [$bString]); + $getInstanceB = $instance->create(IAmADecoratedInterface::class, 'fake', $args); - self::assertEquals(4, FakeInstanceDecorator::$countInstance); self::assertEquals($getInstanceA, $getInstanceB); self::assertNotSame($getInstanceA, $getInstanceB); - self::assertEquals($prefix . $aString, $getInstanceA->getAText()); - self::assertEquals($prefix . $aString, $getInstanceB->getAText()); - self::assertEquals($prefix . $bString, $getInstanceA->getBText()); - self::assertEquals($prefix . $bString, $getInstanceB->getBText()); - self::assertEquals($prefix . $cBool, $getInstanceA->getCBool()); - self::assertEquals($prefix . $cBool, $getInstanceB->getCBool()); + self::assertEquals($aString, $getInstanceA->getAText()); + self::assertEquals($aString, $getInstanceB->getAText()); + self::assertEquals($bString, $getInstanceA->getBText()); + self::assertEquals($bString, $getInstanceB->getBText()); + self::assertEquals($cBool, $getInstanceA->getCBool()); + self::assertEquals($cBool, $getInstanceB->getCBool()); } } diff --git a/tests/src/Core/Hooks/Util/HookFileManagerTest.php b/tests/src/Core/Hooks/Util/HookFileManagerTest.php index cbd9a63b1..746bfa7ca 100644 --- a/tests/src/Core/Hooks/Util/HookFileManagerTest.php +++ b/tests/src/Core/Hooks/Util/HookFileManagerTest.php @@ -31,12 +31,12 @@ class HookFileManagerTest extends MockedTest [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], ], - \Friendica\Core\Hooks\Capabilities\HookType::DECORATOR => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::DECORATOR => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class, ], @@ -56,12 +56,12 @@ EOF, [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => '', ], ], - \Friendica\Core\Hooks\Capabilities\HookType::DECORATOR => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::DECORATOR => [ \Psr\Log\LoggerInterface::class => \Psr\Log\NullLogger::class, ], ]; @@ -79,7 +79,7 @@ EOF, [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -87,7 +87,7 @@ return [ ]; EOF, 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => ['null'], ], @@ -104,7 +104,7 @@ EOF, [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -112,7 +112,7 @@ return [ ]; EOF, 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => 'null', ], @@ -130,7 +130,7 @@ EOF, [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -138,7 +138,7 @@ return [ ]; EOF, 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -163,7 +163,7 @@ return [ ]; EOF, 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\HookType::STRATEGY => [ + \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], From 5c57d8de20d489333b40079c40050157248a873e Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 00:13:03 +0200 Subject: [PATCH 141/259] Add license --- .../Core/Hooks/Util/HookFileManagerTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/src/Core/Hooks/Util/HookFileManagerTest.php b/tests/src/Core/Hooks/Util/HookFileManagerTest.php index 746bfa7ca..1cc4b5c90 100644 --- a/tests/src/Core/Hooks/Util/HookFileManagerTest.php +++ b/tests/src/Core/Hooks/Util/HookFileManagerTest.php @@ -1,4 +1,23 @@ . + * + */ namespace Friendica\Test\src\Core\Hooks\Util; From 903ecc2a76525ee9cea754e25ea3525f60ca412b Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 00:15:16 +0200 Subject: [PATCH 142/259] Make PHP-CS happy --- src/Core/Hooks/Model/DiceInstanceManager.php | 2 +- tests/src/Core/Addon/Model/AddonLoaderTest.php | 6 +++--- tests/src/Core/Hooks/Util/HookFileManagerTest.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Core/Hooks/Model/DiceInstanceManager.php b/src/Core/Hooks/Model/DiceInstanceManager.php index 7c35dfe4d..77b9c4d49 100644 --- a/src/Core/Hooks/Model/DiceInstanceManager.php +++ b/src/Core/Hooks/Model/DiceInstanceManager.php @@ -35,7 +35,7 @@ use Friendica\Core\Hooks\Util\HookFileManager; */ class DiceInstanceManager implements ICanCreateInstances, ICanRegisterInstances { - protected $instance = []; + protected $instance = []; /** @var Dice */ protected $dice; diff --git a/tests/src/Core/Addon/Model/AddonLoaderTest.php b/tests/src/Core/Addon/Model/AddonLoaderTest.php index be125535f..3e9a325b1 100644 --- a/tests/src/Core/Addon/Model/AddonLoaderTest.php +++ b/tests/src/Core/Addon/Model/AddonLoaderTest.php @@ -72,7 +72,7 @@ EOF; public function dataHooks(): array { return [ - 'normal' => [ + 'normal' => [ 'structure' => $this->structure, 'enabled' => $this->addons, 'files' => [ @@ -86,7 +86,7 @@ EOF; ], ], ], - 'double' => [ + 'double' => [ 'structure' => $this->structure, 'enabled' => $this->addons, 'files' => [ @@ -101,7 +101,7 @@ EOF; ], ], ], - 'wrongName' => [ + 'wrongName' => [ 'structure' => $this->structure, 'enabled' => $this->addons, 'files' => [ diff --git a/tests/src/Core/Hooks/Util/HookFileManagerTest.php b/tests/src/Core/Hooks/Util/HookFileManagerTest.php index 1cc4b5c90..216a9832f 100644 --- a/tests/src/Core/Hooks/Util/HookFileManagerTest.php +++ b/tests/src/Core/Hooks/Util/HookFileManagerTest.php @@ -62,7 +62,7 @@ return [ ], ]; EOF, - 'addonsArray' => [], + 'addonsArray' => [], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], ], @@ -85,7 +85,7 @@ return [ ], ]; EOF, - 'addonsArray' => [], + 'addonsArray' => [], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], ], From bca6abf4abaa35e290d518de3aea0a73caedffb1 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 01:06:11 +0200 Subject: [PATCH 143/259] Fix logger classes and tests --- src/Core/Logger/Factory/StreamLogger.php | 6 +-- src/Core/Logger/Util/FileSystem.php | 10 ++-- .../src/Core/Addon/Model/AddonLoaderTest.php | 6 +-- .../Core/Hooks/Util/HookFileManagerTest.php | 24 +-------- tests/src/Core/Logger/StreamLoggerTest.php | 54 +++++-------------- 5 files changed, 28 insertions(+), 72 deletions(-) diff --git a/src/Core/Logger/Factory/StreamLogger.php b/src/Core/Logger/Factory/StreamLogger.php index 6da4b8cd8..caad78e3b 100644 --- a/src/Core/Logger/Factory/StreamLogger.php +++ b/src/Core/Logger/Factory/StreamLogger.php @@ -25,10 +25,10 @@ use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Logger\Capabilities\LogChannel; use Friendica\Core\Logger\Exception\LoggerArgumentException; use Friendica\Core\Logger\Exception\LoggerException; +use Friendica\Core\Logger\Exception\LogLevelException; use Friendica\Core\Logger\Type\StreamLogger as StreamLoggerClass; use Friendica\Core\Logger\Util\FileSystem; use Psr\Log\LoggerInterface; -use Psr\Log\LogLevel; use Psr\Log\NullLogger; /** @@ -55,7 +55,7 @@ class StreamLogger extends AbstractLoggerTypeFactory $fileSystem = new FileSystem(); $logfile = $logfile ?? $config->get('system', 'logfile'); - if ((@file_exists($logfile) && !@is_writable($logfile)) && !@is_writable(basename($logfile))) { + if (!@file_exists($logfile) || !@is_writable($logfile)) { throw new LoggerArgumentException(sprintf('%s is not a valid logfile', $logfile)); } @@ -64,7 +64,7 @@ class StreamLogger extends AbstractLoggerTypeFactory if (array_key_exists($loglevel, StreamLoggerClass::levelToInt)) { $loglevel = StreamLoggerClass::levelToInt[$loglevel]; } else { - $loglevel = StreamLoggerClass::levelToInt[LogLevel::NOTICE]; + throw new LogLevelException(sprintf('The level "%s" is not valid.', $loglevel)); } $stream = $fileSystem->createStream($logfile); diff --git a/src/Core/Logger/Util/FileSystem.php b/src/Core/Logger/Util/FileSystem.php index 3793ac4a9..41bb423b4 100644 --- a/src/Core/Logger/Util/FileSystem.php +++ b/src/Core/Logger/Util/FileSystem.php @@ -21,6 +21,8 @@ namespace Friendica\Core\Logger\Util; +use Friendica\Core\Logger\Exception\LoggerUnusableException; + /** * Util class for filesystem manipulation for Logger classes */ @@ -37,6 +39,8 @@ class FileSystem * @param string $file The file * * @return string The directory name (empty if no directory is found, like urls) + * + * @throws LoggerUnusableException */ public function createDir(string $file): string { @@ -57,7 +61,7 @@ class FileSystem restore_error_handler(); if (!$status && !is_dir($dirname)) { - throw new \UnexpectedValueException(sprintf('Directory "%s" cannot get created: ' . $this->errorMessage, $dirname)); + throw new LoggerUnusableException(sprintf('Directory "%s" cannot get created: ' . $this->errorMessage, $dirname)); } return $dirname; @@ -75,7 +79,7 @@ class FileSystem * * @return resource the open stream resource * - * @throws \UnexpectedValueException + * @throws LoggerUnusableException */ public function createStream(string $url) { @@ -89,7 +93,7 @@ class FileSystem restore_error_handler(); if (!is_resource($stream)) { - throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened: ' . $this->errorMessage, $url)); + throw new LoggerUnusableException(sprintf('The stream or file "%s" could not be opened: ' . $this->errorMessage, $url)); } return $stream; diff --git a/tests/src/Core/Addon/Model/AddonLoaderTest.php b/tests/src/Core/Addon/Model/AddonLoaderTest.php index 3e9a325b1..189110fde 100644 --- a/tests/src/Core/Addon/Model/AddonLoaderTest.php +++ b/tests/src/Core/Addon/Model/AddonLoaderTest.php @@ -72,7 +72,7 @@ EOF; public function dataHooks(): array { return [ - 'normal' => [ + 'normal' => [ 'structure' => $this->structure, 'enabled' => $this->addons, 'files' => [ @@ -86,7 +86,7 @@ EOF; ], ], ], - 'double' => [ + 'double' => [ 'structure' => $this->structure, 'enabled' => $this->addons, 'files' => [ @@ -101,7 +101,7 @@ EOF; ], ], ], - 'wrongName' => [ + 'wrongName' => [ 'structure' => $this->structure, 'enabled' => $this->addons, 'files' => [ diff --git a/tests/src/Core/Hooks/Util/HookFileManagerTest.php b/tests/src/Core/Hooks/Util/HookFileManagerTest.php index 216a9832f..f718e8a92 100644 --- a/tests/src/Core/Hooks/Util/HookFileManagerTest.php +++ b/tests/src/Core/Hooks/Util/HookFileManagerTest.php @@ -55,20 +55,12 @@ return [ \Psr\Log\NullLogger::class => [''], ], ], - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::DECORATOR => [ - \Psr\Log\LoggerInterface::class => [ - \Psr\Log\NullLogger::class, - ], - ], ]; EOF, 'addonsArray' => [], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], ], - 'assertDecorators' => [ - [LoggerInterface::class, NullLogger::class], - ], ], 'normalWithString' => [ 'content' => << '', ], ], - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::DECORATOR => [ - \Psr\Log\LoggerInterface::class => \Psr\Log\NullLogger::class, - ], ]; EOF, 'addonsArray' => [], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], ], - 'assertDecorators' => [ - [LoggerInterface::class, NullLogger::class], - ], ], 'withAddons' => [ 'content' => << [], ], 'withAddonsWithString' => [ 'content' => << [], ], // This should work because unique name convention is part of the instance manager logic, not of the file-infrastructure layer 'withAddonsDoubleNamed' => [ @@ -167,7 +151,6 @@ EOF, [LoggerInterface::class, NullLogger::class, ''], [LoggerInterface::class, NullLogger::class, ''], ], - 'assertDecorators' => [], ], 'withWrongContentButAddons' => [ 'content' => << [ [LoggerInterface::class, NullLogger::class, ''], ], - 'assertDecorators' => [], ], ]; } @@ -199,7 +181,7 @@ EOF, /** * @dataProvider dataHooks */ - public function testSetupHooks(string $content, array $addonsArray, array $assertStrategies, array $assertDecorators) + public function testSetupHooks(string $content, array $addonsArray, array $assertStrategies) { vfsStream::newFile('static/hooks.config.php') ->withContent($content) @@ -215,10 +197,6 @@ EOF, $instanceManager->shouldReceive('registerStrategy')->withArgs($assertStrategy)->once(); } - foreach ($assertDecorators as $assertDecorator) { - $instanceManager->shouldReceive('registerDecorator')->withArgs($assertDecorator)->once(); - } - $hookFileManager->setupHooks($instanceManager); self::expectNotToPerformAssertions(); diff --git a/tests/src/Core/Logger/StreamLoggerTest.php b/tests/src/Core/Logger/StreamLoggerTest.php index c8fac4939..a1e0af5bb 100644 --- a/tests/src/Core/Logger/StreamLoggerTest.php +++ b/tests/src/Core/Logger/StreamLoggerTest.php @@ -22,9 +22,7 @@ namespace Friendica\Test\src\Core\Logger; use Friendica\Core\Logger\Exception\LoggerArgumentException; -use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; -use Friendica\Core\Logger\Util\FileSystem; use Friendica\Test\Util\VFSTrait; use Friendica\Core\Logger\Type\StreamLogger; use org\bovigo\vfs\vfsStream; @@ -40,33 +38,26 @@ class StreamLoggerTest extends AbstractLoggerTest */ private $logfile; - /** - * @var \Friendica\Core\Logger\Util\Filesystem - */ - private $fileSystem; - protected function setUp(): void { parent::setUp(); $this->setUpVfsDir(); - - $this->fileSystem = new FileSystem(); } /** * {@@inheritdoc} */ - protected function getInstance($level = LogLevel::DEBUG) + protected function getInstance($level = LogLevel::DEBUG, $logfile = 'friendica.log') { - $this->logfile = vfsStream::newFile('friendica.log') + $this->logfile = vfsStream::newFile($logfile) ->at($this->root); $this->config->shouldReceive('get')->with('system', 'logfile')->andReturn($this->logfile->url())->once(); + $this->config->shouldReceive('get')->with('system', 'loglevel')->andReturn($level)->once(); - $logger = new StreamLogger('test', $this->config, $this->introspection, $this->fileSystem, $level); - - return $logger; + $loggerFactory = new \Friendica\Core\Logger\Factory\StreamLogger($this->introspection, 'test'); + return $loggerFactory->create($this->config); } /** @@ -83,11 +74,12 @@ class StreamLoggerTest extends AbstractLoggerTest public function testNoUrl() { $this->expectException(LoggerArgumentException::class); - $this->expectExceptionMessage("Missing stream URL."); + $this->expectExceptionMessage(' is not a valid logfile'); $this->config->shouldReceive('get')->with('system', 'logfile')->andReturn('')->once(); - $logger = new StreamLogger('test', $this->config, $this->introspection, $this->fileSystem); + $loggerFactory = new \Friendica\Core\Logger\Factory\StreamLogger($this->introspection, 'test'); + $logger = $loggerFactory->create($this->config); $logger->emergency('not working'); } @@ -104,7 +96,8 @@ class StreamLoggerTest extends AbstractLoggerTest $this->config->shouldReceive('get')->with('system', 'logfile')->andReturn($logfile->url())->once(); - $logger = new StreamLogger('test', $this->config, $this->introspection, $this->fileSystem); + $loggerFactory = new \Friendica\Core\Logger\Factory\StreamLogger($this->introspection, 'test'); + $logger = $loggerFactory->create($this->config); $logger->emergency('not working'); } @@ -119,7 +112,8 @@ class StreamLoggerTest extends AbstractLoggerTest static::markTestIncomplete('We need a platform independent way to set directory to readonly'); - $logger = new StreamLogger('test', '/$%/wrong/directory/file.txt', $this->introspection, $this->fileSystem); + $loggerFactory = new \Friendica\Core\Logger\Factory\StreamLogger($this->introspection, 'test'); + $logger = $loggerFactory->create($this->config); $logger->emergency('not working'); } @@ -132,9 +126,7 @@ class StreamLoggerTest extends AbstractLoggerTest $this->expectException(LogLevelException::class); $this->expectExceptionMessageMatches("/The level \".*\" is not valid./"); - $this->config->shouldReceive('get')->with('system', 'logfile')->andReturn('file.text')->once(); - - $logger = new StreamLogger('test', $this->config, $this->introspection, $this->fileSystem, 'NOPE'); + $logger = $this->getInstance('NOPE'); } /** @@ -145,29 +137,11 @@ class StreamLoggerTest extends AbstractLoggerTest $this->expectException(LogLevelException::class); $this->expectExceptionMessageMatches("/The level \".*\" is not valid./"); - $logfile = vfsStream::newFile('friendica.log') - ->at($this->root); - - $this->config->shouldReceive('get')->with('system', 'logfile')->andReturn($logfile->url())->once(); - - $logger = new StreamLogger('test', $this->config, $this->introspection, $this->fileSystem); + $logger = $this->getInstance('NOPE'); $logger->log('NOPE', 'a test'); } - /** - * Test when the file is null - */ - public function testWrongFile() - { - $this->expectException(LoggerArgumentException::class); - $this->expectExceptionMessage("A stream must either be a resource or a string."); - - $this->config->shouldReceive('get')->with('system', 'logfile')->andReturn(null)->once(); - - $logger = new StreamLogger('test', $this->config, $this->introspection, $this->fileSystem); - } - /** * Test a relative path * @doesNotPerformAssertions From 8dbbf882a8b21c8e7c7398db7e0cad8d81f2a6b8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 01:16:29 +0200 Subject: [PATCH 144/259] Fix SyslogLogger and tests --- src/Core/Logger/Factory/SyslogLogger.php | 6 +-- tests/functional/DependencyCheckTest.php | 2 +- .../Logger/SyslogLoggerFactoryWrapper.php | 47 +++++++++++++++++++ tests/src/Core/Logger/SyslogLoggerTest.php | 15 +++--- tests/src/Core/Logger/SyslogLoggerWrapper.php | 8 ++-- 5 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php diff --git a/src/Core/Logger/Factory/SyslogLogger.php b/src/Core/Logger/Factory/SyslogLogger.php index 385625862..7b1712344 100644 --- a/src/Core/Logger/Factory/SyslogLogger.php +++ b/src/Core/Logger/Factory/SyslogLogger.php @@ -23,9 +23,9 @@ namespace Friendica\Core\Logger\Factory; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Logger\Exception\LoggerException; +use Friendica\Core\Logger\Exception\LogLevelException; use Friendica\Core\Logger\Type\SyslogLogger as SyslogLoggerClass; use Psr\Log\LoggerInterface; -use Psr\Log\LogLevel; /** * The logger factory for the SyslogLogger instance @@ -49,10 +49,10 @@ class SyslogLogger extends AbstractLoggerTypeFactory $logFacility = $config->get('system', 'syslog_facility') ?? SyslogLoggerClass::DEFAULT_FACILITY; $loglevel = SyslogLogger::mapLegacyConfigDebugLevel($config->get('system', 'loglevel')); - if (!array_key_exists($loglevel, SyslogLoggerClass::logLevels)) { + if (array_key_exists($loglevel, SyslogLoggerClass::logLevels)) { $loglevel = SyslogLoggerClass::logLevels[$loglevel]; } else { - $loglevel = SyslogLoggerClass::logLevels[LogLevel::NOTICE]; + throw new LogLevelException(sprintf('The level "%s" is not valid.', $loglevel)); } return new SyslogLoggerClass($this->channel, $this->introspection, $loglevel, $logOpts, $logFacility); diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php index 89b8f79a5..4488fe586 100644 --- a/tests/functional/DependencyCheckTest.php +++ b/tests/functional/DependencyCheckTest.php @@ -145,7 +145,7 @@ class DependencyCheckTest extends FixtureTest $config->set('system', 'dlogfile', $this->root->url() . '/friendica.log'); /** @var LoggerInterface $logger */ - $logger = $this->dice->create('$devLogger', [['$channel' => 'dev']]); + $logger = $this->dice->create('$devLogger', ['dev']); self::assertInstanceOf(LoggerInterface::class, $logger); } diff --git a/tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php b/tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php new file mode 100644 index 000000000..30aaa4477 --- /dev/null +++ b/tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php @@ -0,0 +1,47 @@ +. + * + */ + +namespace Friendica\Test\src\Core\Logger; + +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\Logger\Exception\LogLevelException; +use Friendica\Core\Logger\Factory\SyslogLogger; +use Friendica\Core\Logger\Type\SyslogLogger as SyslogLoggerClass; +use Psr\Log\LoggerInterface; +use Psr\Log\LogLevel; + +class SyslogLoggerFactoryWrapper extends SyslogLogger +{ + public function create(IManageConfigValues $config): LoggerInterface + { + $logOpts = $config->get('system', 'syslog_flags') ?? SyslogLoggerClass::DEFAULT_FLAGS; + $logFacility = $config->get('system', 'syslog_facility') ?? SyslogLoggerClass::DEFAULT_FACILITY; + $loglevel = SyslogLogger::mapLegacyConfigDebugLevel($config->get('system', 'loglevel')); + + if (array_key_exists($loglevel, SyslogLoggerClass::logLevels)) { + $loglevel = SyslogLoggerClass::logLevels[$loglevel]; + } else { + throw new LogLevelException(sprintf('The level "%s" is not valid.', $loglevel)); + } + + return new SyslogLoggerWrapper($this->channel, $this->introspection, $loglevel, $logOpts, $logFacility); + } +} diff --git a/tests/src/Core/Logger/SyslogLoggerTest.php b/tests/src/Core/Logger/SyslogLoggerTest.php index 53ace79c0..c22aecc10 100644 --- a/tests/src/Core/Logger/SyslogLoggerTest.php +++ b/tests/src/Core/Logger/SyslogLoggerTest.php @@ -21,8 +21,6 @@ namespace Friendica\Test\src\Core\Logger; -use Friendica\Core\Logger\Exception\LoggerArgumentException; -use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; use Friendica\Core\Logger\Type\SyslogLogger; use Psr\Log\LogLevel; @@ -58,7 +56,10 @@ class SyslogLoggerTest extends AbstractLoggerTest */ protected function getInstance($level = LogLevel::DEBUG) { - $this->logger = new SyslogLoggerWrapper('test', $this->config, $this->introspection, $level); + $this->config->shouldReceive('get')->with('system', 'loglevel')->andReturn($level); + + $loggerFactory = new SyslogLoggerFactoryWrapper($this->introspection, 'test'); + $this->logger = $loggerFactory->create($this->config); return $this->logger; } @@ -71,8 +72,8 @@ class SyslogLoggerTest extends AbstractLoggerTest { $this->expectException(LogLevelException::class); $this->expectExceptionMessageMatches("/The level \".*\" is not valid./"); - - $logger = new SyslogLoggerWrapper('test', $this->config, $this->introspection, 'NOPE'); + + $logger = $this->getInstance('NOPE'); } /** @@ -83,7 +84,7 @@ class SyslogLoggerTest extends AbstractLoggerTest $this->expectException(LogLevelException::class); $this->expectExceptionMessageMatches("/The level \".*\" is not valid./"); - $logger = new SyslogLoggerWrapper('test', $this->config, $this->introspection); + $logger = $this->getInstance(); $logger->log('NOPE', 'a test'); } @@ -94,7 +95,7 @@ class SyslogLoggerTest extends AbstractLoggerTest */ public function testClose() { - $logger = new SyslogLoggerWrapper('test', $this->config, $this->introspection); + $logger = $this->getInstance(); $logger->emergency('test'); $logger->close(); // Reopened itself diff --git a/tests/src/Core/Logger/SyslogLoggerWrapper.php b/tests/src/Core/Logger/SyslogLoggerWrapper.php index 9fd16706a..1e0c4535f 100644 --- a/tests/src/Core/Logger/SyslogLoggerWrapper.php +++ b/tests/src/Core/Logger/SyslogLoggerWrapper.php @@ -21,10 +21,8 @@ namespace Friendica\Test\src\Core\Logger; -use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; use Friendica\Core\Logger\Type\SyslogLogger; -use Friendica\Core\Logger\Util\Introspection; -use Psr\Log\LogLevel; /** * Wraps the SyslogLogger for replacing the syslog call with a string field. @@ -33,9 +31,9 @@ class SyslogLoggerWrapper extends SyslogLogger { private $content; - public function __construct($channel, IManageConfigValues $config, Introspection $introspection, $level = LogLevel::NOTICE) + public function __construct(string $channel, IHaveCallIntrospections $introspection, string $logLevel, string $logOptions, string $logFacility) { - parent::__construct($channel, $config, $introspection, $level); + parent::__construct($channel, $introspection, $logLevel, $logOptions, $logFacility); $this->content = ''; } From 447f9daa9f30a020902656f90a058cf19ec03562 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 01:19:37 +0200 Subject: [PATCH 145/259] Fix PHP-CS --- tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php b/tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php index 30aaa4477..63209cad3 100644 --- a/tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php +++ b/tests/src/Core/Logger/SyslogLoggerFactoryWrapper.php @@ -26,7 +26,6 @@ use Friendica\Core\Logger\Exception\LogLevelException; use Friendica\Core\Logger\Factory\SyslogLogger; use Friendica\Core\Logger\Type\SyslogLogger as SyslogLoggerClass; use Psr\Log\LoggerInterface; -use Psr\Log\LogLevel; class SyslogLoggerFactoryWrapper extends SyslogLogger { From 3a0c18713e5c83824a410547c6c7fd804220f1d1 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 01:41:02 +0200 Subject: [PATCH 146/259] Remove unused ProfilerLogger factory --- src/Core/Logger/Factory/ProfilerLogger.php | 53 ---------------------- static/dependencies.config.php | 6 --- 2 files changed, 59 deletions(-) delete mode 100644 src/Core/Logger/Factory/ProfilerLogger.php diff --git a/src/Core/Logger/Factory/ProfilerLogger.php b/src/Core/Logger/Factory/ProfilerLogger.php deleted file mode 100644 index 8c07b51b6..000000000 --- a/src/Core/Logger/Factory/ProfilerLogger.php +++ /dev/null @@ -1,53 +0,0 @@ -. - * - */ - -namespace Friendica\Core\Logger\Factory; - -use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Logger\Type\ProfilerLogger as ProfilerLoggerClass; -use Friendica\Util\Profiler; -use Psr\Log\LoggerInterface; - -/** - * The logger factory for the ProfilerLogger - * - * @see ProfilerLoggerClass - */ -class ProfilerLogger extends AbstractLoggerTypeFactory -{ - /** - * Wraps a given Logger with profiling information in case profiling is enabled - * - * @param IManageConfigValues $config The system configuration - * @param LoggerInterface $logger The given logger class, which should get wrapped - * @param Profiler $profiler The profiler utility - * - * @return LoggerInterface The PSR-3 compliant logger instance - */ - public function create(IManageConfigValues $config, LoggerInterface $logger, Profiler $profiler): LoggerInterface - { - if ($config->get('system', 'profiling') ?? false) { - return $logger; - } else { - return new ProfilerLoggerClass($logger, $profiler); - } - } -} diff --git a/static/dependencies.config.php b/static/dependencies.config.php index 2b246f845..ce8a5bd9d 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -198,12 +198,6 @@ return [ ['create', [], Dice::CHAIN_CALL], ], ], - \Friendica\Core\Logger\Type\ProfilerLogger::class => [ - 'instanceOf' => \Friendica\Core\Logger\Factory\ProfilerLogger::class, - 'call' => [ - ['create', [], Dice::CHAIN_CALL], - ], - ], \Friendica\Core\Logger\Capabilities\IHaveCallIntrospections::class => [ 'instanceOf' => \Friendica\Core\Logger\Util\Introspection::class, 'constructParams' => [ From d440b9a63f2cc2ddfb567a1332aa928a19212e18 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 01:56:13 +0200 Subject: [PATCH 147/259] Restore LoggerInterface import --- bin/daemon.php | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/daemon.php b/bin/daemon.php index 1f0bb7079..317798a1d 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -38,6 +38,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\DateTimeFormat; +use Psr\Log\LoggerInterface; // Get options $shortopts = 'f'; From bcd2b1c5232a2e3dc95acaed46a704634ab42a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Mon, 17 Jul 2023 14:56:56 +0200 Subject: [PATCH 148/259] Fixed: - allow administrator to choose whether the blocklist is published under `/about` or later any other API (e.g. common is `/api/v1/instance/domain_blocks`). --- src/Module/Friendica.php | 3 +-- static/defaults.config.php | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php index c6e2768bd..2dbe5d7a9 100644 --- a/src/Module/Friendica.php +++ b/src/Module/Friendica.php @@ -94,8 +94,7 @@ class Friendica extends BaseModule $blockList = $this->config->get('system', 'blocklist') ?? []; - $register_policy_int = $this->config->get('config', 'register_policy'); - if (!empty($blockList) && ($register_policy_int !== Register::CLOSED || $this->session->isAuthenticated())) { + if (!empty($blockList) && ($this->config->get('blocklist', 'published') || $this->session->isAuthenticated())) { $blocked = [ 'title' => $this->t('On this server the following remote servers are blocked.'), 'header' => [ diff --git a/static/defaults.config.php b/static/defaults.config.php index e8f44613c..e2ce631d0 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -786,4 +786,9 @@ return [ // Banner for Mastodon API 'mastodon_banner' => '/images/friendica-banner.jpg', ], + 'blocklist' => [ + // published (Boolean) + // Wether the blocklist is published under /about (or any later API) + 'published' => true, + ], ]; From e659a0314086dd700dbe5e754e383ab758725805 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 17 Jul 2023 20:20:21 +0200 Subject: [PATCH 149/259] Apply suggestions from code review Co-authored-by: Hypolite Petovan --- bin/daemon.php | 2 +- bin/worker.php | 2 +- src/Core/Addon/Exception/AddonInvalidConfigFileException.php | 2 +- src/Core/Hooks/Exceptions/HookConfigException.php | 2 +- src/Core/Logger/Exception/LogLevelException.php | 2 +- src/Core/Logger/Exception/LoggerArgumentException.php | 2 +- src/Core/Logger/Exception/LoggerException.php | 2 +- src/Core/Logger/Exception/LoggerUnusableException.php | 2 +- src/Core/Logger/Factory/AbstractLoggerTypeFactory.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/daemon.php b/bin/daemon.php index 317798a1d..11bad2b11 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -63,7 +63,7 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config /** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ $addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); -$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [Logger\Capabilities\LogChannel::DAEMON]]); +$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capabilities\LogChannel::DAEMON]]); DI::init($dice); \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class)); diff --git a/bin/worker.php b/bin/worker.php index 18a41e064..42a8f533d 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -58,7 +58,7 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config /** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ $addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); -$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::WORKER]]); +$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::WORKER]]); DI::init($dice); \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class)); diff --git a/src/Core/Addon/Exception/AddonInvalidConfigFileException.php b/src/Core/Addon/Exception/AddonInvalidConfigFileException.php index 3bb41be53..bf173d0a4 100644 --- a/src/Core/Addon/Exception/AddonInvalidConfigFileException.php +++ b/src/Core/Addon/Exception/AddonInvalidConfigFileException.php @@ -28,7 +28,7 @@ use Throwable; */ class AddonInvalidConfigFileException extends \RuntimeException { - public function __construct($message = "", $code = 0, Throwable $previous = null) + public function __construct($message = '', $code = 0, Throwable $previous = null) { parent::__construct($message, 500, $previous); } diff --git a/src/Core/Hooks/Exceptions/HookConfigException.php b/src/Core/Hooks/Exceptions/HookConfigException.php index ceca721b1..6588787eb 100644 --- a/src/Core/Hooks/Exceptions/HookConfigException.php +++ b/src/Core/Hooks/Exceptions/HookConfigException.php @@ -23,7 +23,7 @@ namespace Friendica\Core\Hooks\Exceptions; class HookConfigException extends \RuntimeException { - public function __construct($message = "", \Throwable $previous = null) + public function __construct($message = '', \Throwable $previous = null) { parent::__construct($message, 500, $previous); } diff --git a/src/Core/Logger/Exception/LogLevelException.php b/src/Core/Logger/Exception/LogLevelException.php index a79db80f5..9cf649a86 100644 --- a/src/Core/Logger/Exception/LogLevelException.php +++ b/src/Core/Logger/Exception/LogLevelException.php @@ -28,7 +28,7 @@ use Throwable; */ class LogLevelException extends \InvalidArgumentException { - public function __construct($message = "", Throwable $previous = null) + public function __construct($message = '', Throwable $previous = null) { parent::__construct($message, 500, $previous); } diff --git a/src/Core/Logger/Exception/LoggerArgumentException.php b/src/Core/Logger/Exception/LoggerArgumentException.php index bbc1fc066..6925be4c7 100644 --- a/src/Core/Logger/Exception/LoggerArgumentException.php +++ b/src/Core/Logger/Exception/LoggerArgumentException.php @@ -28,7 +28,7 @@ use Throwable; */ class LoggerArgumentException extends \InvalidArgumentException { - public function __construct($message = "", Throwable $previous = null) + public function __construct($message = '', Throwable $previous = null) { parent::__construct($message, 500, $previous); } diff --git a/src/Core/Logger/Exception/LoggerException.php b/src/Core/Logger/Exception/LoggerException.php index 742557678..7529f6e78 100644 --- a/src/Core/Logger/Exception/LoggerException.php +++ b/src/Core/Logger/Exception/LoggerException.php @@ -28,7 +28,7 @@ use Throwable; */ class LoggerException extends \Exception { - public function __construct($message = "", Throwable $previous = null) + public function __construct($message = '', Throwable $previous = null) { parent::__construct($message, 500, $previous); } diff --git a/src/Core/Logger/Exception/LoggerUnusableException.php b/src/Core/Logger/Exception/LoggerUnusableException.php index 46e49fd41..401a63482 100644 --- a/src/Core/Logger/Exception/LoggerUnusableException.php +++ b/src/Core/Logger/Exception/LoggerUnusableException.php @@ -28,7 +28,7 @@ use Throwable; */ class LoggerUnusableException extends \RuntimeException { - public function __construct($message = "", Throwable $previous = null) + public function __construct($message = '', Throwable $previous = null) { parent::__construct($message, 500, $previous); } diff --git a/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php b/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php index a6ff5eebb..402176d8e 100644 --- a/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php +++ b/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php @@ -69,7 +69,7 @@ abstract class AbstractLoggerTypeFactory return LogLevel::INFO; // legacy DATA case "4": - // legacy ALL + // legacy ALL case "5": return LogLevel::DEBUG; // default if nothing set From 26aa38341ffe72f48264b2d58d484263a28e074c Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 21 Jul 2023 07:06:55 +0000 Subject: [PATCH 150/259] The access to the profile and the list of followers/followings can now be restricted --- src/Module/Profile/Profile.php | 2 +- src/Protocol/ActivityPub.php | 43 ++++++++++++++++++++++++ src/Protocol/ActivityPub/Transmitter.php | 15 +++++---- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php index 5e5028cb8..7ee953a62 100644 --- a/src/Module/Profile/Profile.php +++ b/src/Module/Profile/Profile.php @@ -84,7 +84,7 @@ class Profile extends BaseProfile $user = $this->database->selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname'] ?? '', 'account_removed' => false]); if ($user) { try { - $data = ActivityPub\Transmitter::getProfile($user['uid']); + $data = ActivityPub\Transmitter::getProfile($user['uid'], !ActivityPub::isAcceptedRequester($user['uid'])); header('Access-Control-Allow-Origin: *'); header('Cache-Control: max-age=23200, stale-while-revalidate=23200'); System::jsonExit($data, 'application/activity+json'); diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index ad1e9367c..4a1030eaa 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -23,10 +23,13 @@ namespace Friendica\Protocol; use Friendica\Core\Logger; use Friendica\Core\Protocol; +use Friendica\Core\System; use Friendica\Model\APContact; +use Friendica\Model\Contact; use Friendica\Model\User; use Friendica\Util\HTTPSignature; use Friendica\Util\JsonLD; +use Friendica\Util\Network; /** * ActivityPub Protocol class @@ -277,4 +280,44 @@ class ActivityPub { return !empty(APContact::getByURL($url, $update)); } + + public static function isAcceptedRequester(int $uid = 0): bool + { + $called_by = System::callstack(1); + + $signer = HTTPSignature::getSigner('', $_SERVER); + if (!$signer) { + Logger::debug('No signer', ['uid' => $uid, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'called_by' => $called_by]); + return false; + } + + $apcontact = APContact::getByURL($signer); + if (empty($apcontact)) { + Logger::debug('APContact not found', ['uid' => $uid, 'handle' => $signer, 'called_by' => $called_by]); + return false; + } + + if (empty($apcontact['gsid'] || empty($apcontact['baseurl']))) { + Logger::debug('No server found', ['uid' => $uid, 'signer' => $signer, 'called_by' => $called_by]); + return false; + } + + // Check added as a precaution. It should not occur. + if (Network::isUrlBlocked($apcontact['baseurl'])) { + Logger::info('Requesting domain is blocked', ['uid' => $uid, 'id' => $apcontact['gsid'], 'url' => $apcontact['baseurl'], 'signer' => $signer, 'called_by' => $called_by]); + return false; + } + + $contact = Contact::getByURL($signer, false, ['id', 'baseurl', 'gsid']); + if (!empty($contact) && Contact\User::isBlocked($contact['id'], $uid)) { + Logger::info('Requesting contact is blocked', ['uid' => $uid, 'id' => $contact['id'], 'signer' => $signer, 'baseurl' => $contact['baseurl'], 'called_by' => $called_by]); + return false; + } + + // @todo Look for user blocked domains + + Logger::debug('Server is an accepted requester', ['uid' => $uid, 'id' => $contact['gsid'], 'url' => $contact['baseurl'], 'signer' => $signer, 'called_by' => $called_by]); + + return true; + } } diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 6c0cbd92b..bda202421 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -195,7 +195,7 @@ class Transmitter } // When we hide our friends we will only show the pure number but don't allow more. - $show_contacts = empty($owner['hide-friends']); + $show_contacts = ActivityPub::isAcceptedRequester($owner['uid']) && empty($owner['hide-friends']); // Allow fetching the contact list when the requester is part of the list. if (($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) && !empty($requester)) { @@ -337,12 +337,13 @@ class Transmitter /** * Return the ActivityPub profile of the given user * - * @param int $uid User ID + * @param int $uid User ID + * @param bool $limited If limited, only the basic information is returned * @return array with profile data * @throws HTTPException\NotFoundException * @throws HTTPException\InternalServerErrorException */ - public static function getProfile(int $uid): array + public static function getProfile(int $uid, bool $limited = false): array { $owner = User::getOwnerDataById($uid); if (!isset($owner['id'])) { @@ -372,16 +373,16 @@ class Transmitter $data['preferredUsername'] = $owner['nick']; $data['name'] = $owner['name']; - if (!empty($owner['country-name'] . $owner['region'] . $owner['locality'])) { + if (!$limited && !empty($owner['country-name'] . $owner['region'] . $owner['locality'])) { $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $owner['country-name'], 'vcard:region' => $owner['region'], 'vcard:locality' => $owner['locality']]; } - if (!empty($owner['about'])) { + if (!$limited && !empty($owner['about'])) { $data['summary'] = BBCode::convertForUriId($owner['uri-id'] ?? 0, $owner['about'], BBCode::EXTERNAL); } - if (!empty($owner['xmpp']) || !empty($owner['matrix'])) { + if (!$limited && (!empty($owner['xmpp']) || !empty($owner['matrix']))) { $data['vcard:hasInstantMessage'] = []; if (!empty($owner['xmpp'])) { @@ -399,7 +400,7 @@ class Transmitter 'owner' => $owner['url'], 'publicKeyPem' => $owner['pubkey']]; $data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox']; - if ($uid != 0) { + if (!$limited && $uid != 0) { $data['icon'] = ['type' => 'Image', 'url' => User::getAvatarUrl($owner)]; $resourceid = Photo::ridFromURI($owner['photo']); From cba656383eb3af306fcd62752620c241a76960f1 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 21 Jul 2023 22:41:36 +0200 Subject: [PATCH 151/259] Adhere feedback - rename hooks.config.php to strategies.config.php - change all corresponding classes and tests --- doc/StrategyHooks.md | 2 +- .../Capabilities/ICanCreateInstances.php | 4 +- ...stances.php => ICanRegisterStrategies.php} | 4 +- src/Core/Hooks/Model/DiceInstanceManager.php | 20 ++--- ...eManager.php => StrategiesFileManager.php} | 46 ++++------- src/Core/Logger/Factory/Logger.php | 4 +- src/DI.php | 2 +- src/Module/Admin/Summary.php | 4 +- static/dependencies.config.php | 9 ++- ...hooks.config.php => strategies.config.php} | 10 +-- .../Core/Hooks/Model/InstanceManagerTest.php | 8 +- ...Test.php => StrategiesFileManagerTest.php} | 80 +++++-------------- 12 files changed, 72 insertions(+), 121 deletions(-) rename src/Core/Hooks/Capabilities/{ICanRegisterInstances.php => ICanRegisterStrategies.php} (93%) rename src/Core/Hooks/Util/{HookFileManager.php => StrategiesFileManager.php} (62%) rename static/{hooks.config.php => strategies.config.php} (83%) rename tests/src/Core/Hooks/Util/{HookFileManagerTest.php => StrategiesFileManagerTest.php} (64%) diff --git a/doc/StrategyHooks.md b/doc/StrategyHooks.md index cb355f93f..39fc1bd8d 100644 --- a/doc/StrategyHooks.md +++ b/doc/StrategyHooks.md @@ -43,7 +43,7 @@ public class ConcreteClassB implements ExampleInterface } } -/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterInstances $instanceRegister */ +/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies $instanceRegister */ $instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A'); $instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassB::class, 'B'); diff --git a/src/Core/Hooks/Capabilities/ICanCreateInstances.php b/src/Core/Hooks/Capabilities/ICanCreateInstances.php index f2e4b8b0a..77d4c4b36 100644 --- a/src/Core/Hooks/Capabilities/ICanCreateInstances.php +++ b/src/Core/Hooks/Capabilities/ICanCreateInstances.php @@ -32,10 +32,10 @@ interface ICanCreateInstances * The instance will be build based on the registered strategy and the (unique) name * * @param string $class The fully-qualified name of the given class or interface which will get returned - * @param string $name An arbitrary identifier to find a concrete instance strategy. + * @param string $strategy An arbitrary identifier to find a concrete instance strategy. * @param array $arguments Additional arguments, which can be passed to the constructor of "$class" at runtime * * @return object The concrete instance of the type "$class" */ - public function create(string $class, string $name, array $arguments = []): object; + public function create(string $class, string $strategy, array $arguments = []): object; } diff --git a/src/Core/Hooks/Capabilities/ICanRegisterInstances.php b/src/Core/Hooks/Capabilities/ICanRegisterStrategies.php similarity index 93% rename from src/Core/Hooks/Capabilities/ICanRegisterInstances.php rename to src/Core/Hooks/Capabilities/ICanRegisterStrategies.php index f7689bbee..911eb3499 100644 --- a/src/Core/Hooks/Capabilities/ICanRegisterInstances.php +++ b/src/Core/Hooks/Capabilities/ICanRegisterStrategies.php @@ -26,7 +26,7 @@ use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; /** * Register strategies for given classes */ -interface ICanRegisterInstances +interface ICanRegisterStrategies { /** * Register a class(strategy) for a given interface with a unique name. @@ -36,7 +36,7 @@ interface ICanRegisterInstances * @param string $interface The interface, which the given class implements * @param string $class The fully-qualified given class name * A placeholder for dependencies is possible as well - * @param ?string $name An arbitrary identifier for the given class, which will be used for factories, dependency injections etc. + * @param ?string $name An arbitrary identifier for the given strategy, which will be used for factories, dependency injections etc. * * @return $this This interface for chain-calls * diff --git a/src/Core/Hooks/Model/DiceInstanceManager.php b/src/Core/Hooks/Model/DiceInstanceManager.php index 77b9c4d49..a8b0b540c 100644 --- a/src/Core/Hooks/Model/DiceInstanceManager.php +++ b/src/Core/Hooks/Model/DiceInstanceManager.php @@ -23,31 +23,31 @@ namespace Friendica\Core\Hooks\Model; use Dice\Dice; use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; -use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; +use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; use Friendica\Core\Hooks\Exceptions\HookInstanceException; use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; -use Friendica\Core\Hooks\Util\HookFileManager; +use Friendica\Core\Hooks\Util\StrategiesFileManager; /** * This class represents an instance register, which uses Dice for creation * * @see Dice */ -class DiceInstanceManager implements ICanCreateInstances, ICanRegisterInstances +class DiceInstanceManager implements ICanCreateInstances, ICanRegisterStrategies { protected $instance = []; /** @var Dice */ protected $dice; - public function __construct(Dice $dice, HookFileManager $hookFileManager) + public function __construct(Dice $dice, StrategiesFileManager $strategiesFileManager) { $this->dice = $dice; - $hookFileManager->setupHooks($this); + $strategiesFileManager->setupStrategies($this); } /** {@inheritDoc} */ - public function registerStrategy(string $interface, string $class, ?string $name = null): ICanRegisterInstances + public function registerStrategy(string $interface, string $class, ?string $name = null): ICanRegisterStrategies { if (!empty($this->instance[$interface][$name])) { throw new HookRegisterArgumentException(sprintf('A class with the name %s is already set for the interface %s', $name, $interface)); @@ -59,12 +59,12 @@ class DiceInstanceManager implements ICanCreateInstances, ICanRegisterInstances } /** {@inheritDoc} */ - public function create(string $class, string $name, array $arguments = []): object + public function create(string $class, string $strategy, array $arguments = []): object { - if (empty($this->instance[$class][$name])) { - throw new HookInstanceException(sprintf('The class with the name %s isn\'t registered for the class or interface %s', $name, $class)); + if (empty($this->instance[$class][$strategy])) { + throw new HookInstanceException(sprintf('The class with the name %s isn\'t registered for the class or interface %s', $strategy, $class)); } - return $this->dice->create($this->instance[$class][$name], $arguments); + return $this->dice->create($this->instance[$class][$strategy], $arguments); } } diff --git a/src/Core/Hooks/Util/HookFileManager.php b/src/Core/Hooks/Util/StrategiesFileManager.php similarity index 62% rename from src/Core/Hooks/Util/HookFileManager.php rename to src/Core/Hooks/Util/StrategiesFileManager.php index b83f2b49c..700c401f2 100644 --- a/src/Core/Hooks/Util/HookFileManager.php +++ b/src/Core/Hooks/Util/StrategiesFileManager.php @@ -22,22 +22,21 @@ namespace Friendica\Core\Hooks\Util; use Friendica\Core\Addon\Capabilities\ICanLoadAddons; -use Friendica\Core\Hooks\Capabilities\BehavioralHookType; -use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; +use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; use Friendica\Core\Hooks\Exceptions\HookConfigException; /** - * Manage all hooks.config.php files + * Manage all strategies.config.php files */ -class HookFileManager +class StrategiesFileManager { const STATIC_DIR = 'static'; - const CONFIG_NAME = 'hooks'; + const CONFIG_NAME = 'strategies'; /** @var ICanLoadAddons */ protected $addonLoader; /** @var array */ - protected $hookConfig = []; + protected $config = []; /** @var string */ protected $basePath; @@ -50,32 +49,21 @@ class HookFileManager /** * Loads all kinds of hooks and registers the corresponding instances * - * @param ICanRegisterInstances $instanceRegister The instance register + * @param ICanRegisterStrategies $instanceRegister The instance register * * @return void */ - public function setupHooks(ICanRegisterInstances $instanceRegister) + public function setupStrategies(ICanRegisterStrategies $instanceRegister) { - // In case it wasn't used before, reload the whole hook config - if (empty($this->hookConfig)) { - $this->reloadHookConfig(); - } - - foreach ($this->hookConfig as $hookType => $classList) { - switch ($hookType) { - case BehavioralHookType::STRATEGY: - foreach ($classList as $interface => $strategy) { - foreach ($strategy as $dependencyName => $names) { - if (is_array($names)) { - foreach ($names as $name) { - $instanceRegister->registerStrategy($interface, $dependencyName, $name); - } - } else { - $instanceRegister->registerStrategy($interface, $dependencyName, $names); - } - } + foreach ($this->config as $interface => $strategy) { + foreach ($strategy as $dependencyName => $names) { + if (is_array($names)) { + foreach ($names as $name) { + $instanceRegister->registerStrategy($interface, $dependencyName, $name); } - break; + } else { + $instanceRegister->registerStrategy($interface, $dependencyName, $names); + } } } } @@ -87,7 +75,7 @@ class HookFileManager * * @return void */ - protected function reloadHookConfig() + public function loadConfig() { // load core hook config $configFile = $this->basePath . '/' . static::STATIC_DIR . '/' . static::CONFIG_NAME . '.config.php'; @@ -102,6 +90,6 @@ class HookFileManager throw new HookConfigException(sprintf('Error loading config file %s.', $configFile)); } - $this->hookConfig = array_merge_recursive($config, $this->addonLoader->getActiveAddonConfig(static::CONFIG_NAME)); + $this->config = array_merge_recursive($config, $this->addonLoader->getActiveAddonConfig(static::CONFIG_NAME)); } } diff --git a/src/Core/Logger/Factory/Logger.php b/src/Core/Logger/Factory/Logger.php index 81f8887ef..c370cc4dd 100644 --- a/src/Core/Logger/Factory/Logger.php +++ b/src/Core/Logger/Factory/Logger.php @@ -43,7 +43,7 @@ class Logger $this->channel = $channel; } - public function create(ICanCreateInstances $createInstances, IManageConfigValues $config, Profiler $profiler): LoggerInterface + public function create(ICanCreateInstances $instanceCreator, IManageConfigValues $config, Profiler $profiler): LoggerInterface { if (empty($config->get('system', 'debugging') ?? false)) { return new NullLogger(); @@ -53,7 +53,7 @@ class Logger try { /** @var LoggerInterface $logger */ - $logger = $createInstances->create(LoggerInterface::class, $name, [$this->channel]); + $logger = $instanceCreator->create(LoggerInterface::class, $name, [$this->channel]); if ($config->get('system', 'profiling') ?? false) { return new ProfilerLoggerClass($logger, $profiler); } else { diff --git a/src/DI.php b/src/DI.php index c62b5e8d7..1917f710d 100644 --- a/src/DI.php +++ b/src/DI.php @@ -297,7 +297,7 @@ abstract class DI static::init($flushDice); } - public static function loggCheck(): ICheckLoggerSettings + public static function logCheck(): ICheckLoggerSettings { return self::$dice->create(LoggerSettingsCheck::class); } diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index 80437305d..99d0e3325 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -126,10 +126,10 @@ class Summary extends BaseAdmin } // Check logfile permission - if (($return = DI::loggCheck()->checkLogfile()) !== null) { + if (($return = DI::logCheck()->checkLogfile()) !== null) { $warningtext[] = $return; } - if (($return = DI::loggCheck()->checkDebugLogfile()) !== null) { + if (($return = DI::logCheck()->checkDebugLogfile()) !== null) { $warningtext[] = $return; } diff --git a/static/dependencies.config.php b/static/dependencies.config.php index ce8a5bd9d..98a9f3077 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -38,7 +38,7 @@ use Friendica\App; use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; -use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; +use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; use Friendica\Core\Hooks\Model\DiceInstanceManager; use Friendica\Core\PConfig; use Friendica\Core\L10n; @@ -91,12 +91,15 @@ return [ [Dice::INSTANCE => Dice::SELF], ] ], - \Friendica\Core\Hooks\Util\HookFileManager::class => [ + \Friendica\Core\Hooks\Util\StrategiesFileManager::class => [ 'constructParams' => [ [Dice::INSTANCE => '$basepath'], ], + 'call' => [ + ['loadConfig'], + ], ], - ICanRegisterInstances::class => [ + ICanRegisterStrategies::class => [ 'instanceOf' => DiceInstanceManager::class, 'constructParams' => [ [Dice::INSTANCE => Dice::SELF], diff --git a/static/hooks.config.php b/static/strategies.config.php similarity index 83% rename from static/hooks.config.php rename to static/strategies.config.php index d46762f87..bb3598c36 100644 --- a/static/hooks.config.php +++ b/static/strategies.config.php @@ -24,11 +24,9 @@ use Friendica\Core\Logger\Type; use Psr\Log; return [ - H::STRATEGY => [ - Log\LoggerInterface::class => [ - Log\NullLogger::class => [''], - Type\SyslogLogger::class => ['syslog'], - Type\StreamLogger::class => ['stream'], - ], + Log\LoggerInterface::class => [ + Log\NullLogger::class => [''], + Type\SyslogLogger::class => ['syslog'], + Type\StreamLogger::class => ['stream'], ], ]; diff --git a/tests/src/Core/Hooks/Model/InstanceManagerTest.php b/tests/src/Core/Hooks/Model/InstanceManagerTest.php index de2bdc6b8..44459eb2e 100644 --- a/tests/src/Core/Hooks/Model/InstanceManagerTest.php +++ b/tests/src/Core/Hooks/Model/InstanceManagerTest.php @@ -25,7 +25,7 @@ use Dice\Dice; use Friendica\Core\Hooks\Exceptions\HookInstanceException; use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; use Friendica\Core\Hooks\Model\DiceInstanceManager; -use Friendica\Core\Hooks\Util\HookFileManager; +use Friendica\Core\Hooks\Util\StrategiesFileManager; use Friendica\Test\MockedTest; use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstance; use Friendica\Test\Util\Hooks\InstanceMocks\FakeInstanceDecorator; @@ -34,15 +34,15 @@ use Mockery\MockInterface; class InstanceManagerTest extends MockedTest { - /** @var HookFileManager|MockInterface */ + /** @var StrategiesFileManager|MockInterface */ protected $hookFileManager; protected function setUp(): void { parent::setUp(); - $this->hookFileManager = \Mockery::mock(HookFileManager::class); - $this->hookFileManager->shouldReceive('setupHooks')->withAnyArgs(); + $this->hookFileManager = \Mockery::mock(StrategiesFileManager::class); + $this->hookFileManager->shouldReceive('setupStrategies')->withAnyArgs(); } protected function tearDown(): void diff --git a/tests/src/Core/Hooks/Util/HookFileManagerTest.php b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php similarity index 64% rename from tests/src/Core/Hooks/Util/HookFileManagerTest.php rename to tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php index f718e8a92..9e1855da1 100644 --- a/tests/src/Core/Hooks/Util/HookFileManagerTest.php +++ b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php @@ -22,16 +22,16 @@ namespace Friendica\Test\src\Core\Hooks\Util; use Friendica\Core\Addon\Capabilities\ICanLoadAddons; -use Friendica\Core\Hooks\Capabilities\ICanRegisterInstances; +use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; use Friendica\Core\Hooks\Exceptions\HookConfigException; -use Friendica\Core\Hooks\Util\HookFileManager; +use Friendica\Core\Hooks\Util\StrategiesFileManager; use Friendica\Test\MockedTest; use Friendica\Test\Util\VFSTrait; use org\bovigo\vfs\vfsStream; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; -class HookFileManagerTest extends MockedTest +class StrategiesFileManagerTest extends MockedTest { use VFSTrait; @@ -50,11 +50,9 @@ class HookFileManagerTest extends MockedTest [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], - ], ]; EOF, 'addonsArray' => [], @@ -67,11 +65,9 @@ EOF, [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => '', ], - ], ]; EOF, 'addonsArray' => [], @@ -84,19 +80,15 @@ EOF, [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], - ], ]; EOF, 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => ['null'], ], - ], ], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], @@ -108,19 +100,15 @@ EOF, [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], - ], ]; EOF, 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => 'null', ], - ], ], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], @@ -133,48 +121,21 @@ EOF, [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], - ], ]; EOF, 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], - ], ], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], [LoggerInterface::class, NullLogger::class, ''], ], ], - 'withWrongContentButAddons' => [ - 'content' => << [ - \Psr\Log\LoggerInterface::class => [ - \Psr\Log\NullLogger::class => [''], - ], - ], -]; -EOF, - 'addonsArray' => [ - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ - \Psr\Log\LoggerInterface::class => [ - \Psr\Log\NullLogger::class => [''], - ], - ], - ], - 'assertStrategies' => [ - [LoggerInterface::class, NullLogger::class, ''], - ], - ], ]; } @@ -183,58 +144,59 @@ EOF, */ public function testSetupHooks(string $content, array $addonsArray, array $assertStrategies) { - vfsStream::newFile('static/hooks.config.php') + vfsStream::newFile(StrategiesFileManager::STATIC_DIR . '/' . StrategiesFileManager::CONFIG_NAME . '.config.php') ->withContent($content) ->at($this->root); $addonLoader = \Mockery::mock(ICanLoadAddons::class); $addonLoader->shouldReceive('getActiveAddonConfig')->andReturn($addonsArray)->once(); - $hookFileManager = new HookFileManager($this->root->url(), $addonLoader); + $hookFileManager = new StrategiesFileManager($this->root->url(), $addonLoader); - $instanceManager = \Mockery::mock(ICanRegisterInstances::class); + $instanceManager = \Mockery::mock(ICanRegisterStrategies::class); foreach ($assertStrategies as $assertStrategy) { $instanceManager->shouldReceive('registerStrategy')->withArgs($assertStrategy)->once(); } - $hookFileManager->setupHooks($instanceManager); + $hookFileManager->loadConfig(); + $hookFileManager->setupStrategies($instanceManager); self::expectNotToPerformAssertions(); } /** - * Test the exception in case the hooks.config.php file is missing + * Test the exception in case the strategies.config.php file is missing */ - public function testMissingHooksFile() + public function testMissingStrategiesFile() { $addonLoader = \Mockery::mock(ICanLoadAddons::class); - $instanceManager = \Mockery::mock(ICanRegisterInstances::class); - $hookFileManager = new HookFileManager($this->root->url(), $addonLoader); + $instanceManager = \Mockery::mock(ICanRegisterStrategies::class); + $hookFileManager = new StrategiesFileManager($this->root->url(), $addonLoader); self::expectException(HookConfigException::class); self::expectExceptionMessage(sprintf('config file %s does not exist.', - $this->root->url() . '/' . HookFileManager::STATIC_DIR . '/' . HookFileManager::CONFIG_NAME . '.config.php')); + $this->root->url() . '/' . StrategiesFileManager::STATIC_DIR . '/' . StrategiesFileManager::CONFIG_NAME . '.config.php')); - $hookFileManager->setupHooks($instanceManager); + $hookFileManager->loadConfig(); } /** - * Test the exception in case the hooks.config.php file is wrong + * Test the exception in case the strategies.config.php file is wrong */ - public function testWrongHooksFile() + public function testWrongStrategiesFile() { $addonLoader = \Mockery::mock(ICanLoadAddons::class); - $instanceManager = \Mockery::mock(ICanRegisterInstances::class); - $hookFileManager = new HookFileManager($this->root->url(), $addonLoader); + $instanceManager = \Mockery::mock(ICanRegisterStrategies::class); + $hookFileManager = new StrategiesFileManager($this->root->url(), $addonLoader); - vfsStream::newFile('static/hooks.config.php') + vfsStream::newFile(StrategiesFileManager::STATIC_DIR . '/' . StrategiesFileManager::CONFIG_NAME . '.config.php') ->withContent("at($this->root); self::expectException(HookConfigException::class); self::expectExceptionMessage(sprintf('Error loading config file %s.', - $this->root->url() . '/' . HookFileManager::STATIC_DIR . '/' . HookFileManager::CONFIG_NAME . '.config.php')); + $this->root->url() . '/' . StrategiesFileManager::STATIC_DIR . '/' . StrategiesFileManager::CONFIG_NAME . '.config.php')); - $hookFileManager->setupHooks($instanceManager); + $hookFileManager->loadConfig(); } } From ede8896721f64d49a733c23eeb9397e4719650e8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 21 Jul 2023 22:47:09 +0200 Subject: [PATCH 152/259] Make PHP-CS happy --- .../Hooks/Util/StrategiesFileManagerTest.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php index 9e1855da1..592f6f1e0 100644 --- a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php +++ b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php @@ -86,9 +86,9 @@ return [ ]; EOF, 'addonsArray' => [ - \Psr\Log\LoggerInterface::class => [ - \Psr\Log\NullLogger::class => ['null'], - ], + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => ['null'], + ], ], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], @@ -106,9 +106,9 @@ return [ ]; EOF, 'addonsArray' => [ - \Psr\Log\LoggerInterface::class => [ - \Psr\Log\NullLogger::class => 'null', - ], + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => 'null', + ], ], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], @@ -127,9 +127,9 @@ return [ ]; EOF, 'addonsArray' => [ - \Psr\Log\LoggerInterface::class => [ - \Psr\Log\NullLogger::class => [''], - ], + \Psr\Log\LoggerInterface::class => [ + \Psr\Log\NullLogger::class => [''], + ], ], 'assertStrategies' => [ [LoggerInterface::class, NullLogger::class, ''], From 579b7065bd7c6957b089e7bdcbf8a67306a6cbbd Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 22 Jul 2023 01:40:21 +0000 Subject: [PATCH 153/259] full instead of limited --- src/Module/Profile/Profile.php | 2 +- src/Protocol/ActivityPub/Transmitter.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php index 7ee953a62..054943c13 100644 --- a/src/Module/Profile/Profile.php +++ b/src/Module/Profile/Profile.php @@ -84,7 +84,7 @@ class Profile extends BaseProfile $user = $this->database->selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname'] ?? '', 'account_removed' => false]); if ($user) { try { - $data = ActivityPub\Transmitter::getProfile($user['uid'], !ActivityPub::isAcceptedRequester($user['uid'])); + $data = ActivityPub\Transmitter::getProfile($user['uid'], ActivityPub::isAcceptedRequester($user['uid'])); header('Access-Control-Allow-Origin: *'); header('Cache-Control: max-age=23200, stale-while-revalidate=23200'); System::jsonExit($data, 'application/activity+json'); diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index bda202421..4b0450a0c 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -337,13 +337,13 @@ class Transmitter /** * Return the ActivityPub profile of the given user * - * @param int $uid User ID - * @param bool $limited If limited, only the basic information is returned + * @param int $uid User ID + * @param bool $full If not full, only the basic information is returned * @return array with profile data * @throws HTTPException\NotFoundException * @throws HTTPException\InternalServerErrorException */ - public static function getProfile(int $uid, bool $limited = false): array + public static function getProfile(int $uid, bool $full = true): array { $owner = User::getOwnerDataById($uid); if (!isset($owner['id'])) { @@ -373,16 +373,16 @@ class Transmitter $data['preferredUsername'] = $owner['nick']; $data['name'] = $owner['name']; - if (!$limited && !empty($owner['country-name'] . $owner['region'] . $owner['locality'])) { + if (!$full && !empty($owner['country-name'] . $owner['region'] . $owner['locality'])) { $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $owner['country-name'], 'vcard:region' => $owner['region'], 'vcard:locality' => $owner['locality']]; } - if (!$limited && !empty($owner['about'])) { + if ($full && !empty($owner['about'])) { $data['summary'] = BBCode::convertForUriId($owner['uri-id'] ?? 0, $owner['about'], BBCode::EXTERNAL); } - if (!$limited && (!empty($owner['xmpp']) || !empty($owner['matrix']))) { + if ($full && (!empty($owner['xmpp']) || !empty($owner['matrix']))) { $data['vcard:hasInstantMessage'] = []; if (!empty($owner['xmpp'])) { @@ -400,7 +400,7 @@ class Transmitter 'owner' => $owner['url'], 'publicKeyPem' => $owner['pubkey']]; $data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox']; - if (!$limited && $uid != 0) { + if ($full && $uid != 0) { $data['icon'] = ['type' => 'Image', 'url' => User::getAvatarUrl($owner)]; $resourceid = Photo::ridFromURI($owner['photo']); From 7538f6a346486a06f16ba6615be19953ca9ac587 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 22 Jul 2023 10:49:42 +0000 Subject: [PATCH 154/259] Issue 13289: Ensure to not respect deactivated connector networks --- database.sql | 33 ++++++++++++++++++++++++++++++++- src/Model/Circle.php | 8 +++++++- src/Model/Contact/Circle.php | 17 +++++++++++++---- src/Module/Admin/Federation.php | 6 +++++- src/Module/Circle.php | 15 ++++++++------- static/dbstructure.config.php | 2 +- static/dbview.config.php | 29 +++++++++++++++++++++++++++++ 7 files changed, 95 insertions(+), 15 deletions(-) diff --git a/database.sql b/database.sql index e9db927f1..5a8cee23c 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2023.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1522 +-- DB_UPDATE_VERSION 1523 -- ------------------------------------------ @@ -1900,6 +1900,37 @@ CREATE VIEW `application-view` AS SELECT FROM `application-token` INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`; +-- +-- VIEW circle-member-view +-- +DROP VIEW IF EXISTS `circle-member-view`; +CREATE VIEW `circle-member-view` AS SELECT + `group_member`.`id` AS `id`, + `group`.`uid` AS `uid`, + `group_member`.`contact-id` AS `contact-id`, + `contact`.`uri-id` AS `contact-uri-id`, + `contact`.`url` AS `contact-link`, + `contact`.`addr` AS `contact-addr`, + `contact`.`name` AS `contact-name`, + `contact`.`nick` AS `contact-nick`, + `contact`.`thumb` AS `contact-avatar`, + `contact`.`network` AS `contact-network`, + `contact`.`blocked` AS `contact-blocked`, + `contact`.`hidden` AS `contact-hidden`, + `contact`.`readonly` AS `contact-readonly`, + `contact`.`archive` AS `contact-archive`, + `contact`.`pending` AS `contact-pending`, + `contact`.`self` AS `contact-self`, + `contact`.`rel` AS `contact-rel`, + `contact`.`contact-type` AS `contact-contact-type`, + `group_member`.`gid` AS `circle-id`, + `group`.`visible` AS `circle-visible`, + `group`.`deleted` AS `circle-deleted`, + `group`.`name` AS `circle-name` + FROM `group_member` + INNER JOIN `contact` ON `group_member`.`contact-id` = `contact`.`id` + INNER JOIN `group` ON `group_member`.`gid` = `group`.`id`; + -- -- VIEW post-user-view -- diff --git a/src/Model/Circle.php b/src/Model/Circle.php index c0b3cf6b4..2b32103db 100644 --- a/src/Model/Circle.php +++ b/src/Model/Circle.php @@ -22,6 +22,7 @@ namespace Friendica\Model; use Friendica\BaseModule; +use Friendica\Content\Widget; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; @@ -565,7 +566,12 @@ class Circle } if ($each == 'circle') { - $count = DBA::count('group_member', ['gid' => $circle['id']]); + $networks = Widget::unavailableNetworks(); + $sql_values = array_merge([$circle['id']], $networks); + $condition = ["`circle-id` = ? AND NOT `contact-network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")"]; + $condition = array_merge($condition, $sql_values); + + $count = DBA::count('circle-member-view', $condition); $circle_name = sprintf('%s (%d)', $circle['name'], $count); } else { $circle_name = $circle['name']; diff --git a/src/Model/Contact/Circle.php b/src/Model/Contact/Circle.php index d3eea5ac5..7cd18acbb 100644 --- a/src/Model/Contact/Circle.php +++ b/src/Model/Contact/Circle.php @@ -21,6 +21,7 @@ namespace Friendica\Model\Contact; +use Friendica\Content\Widget; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -42,6 +43,9 @@ class Circle $return = []; if (intval($gid)) { + $networks = Widget::unavailableNetworks(); + $sql_values = array_merge([$gid, DI::userSession()->getLocalUserId()], $networks); + $stmt = DBA::p('SELECT `circle_member`.`contact-id`, `contact`.* FROM `contact` INNER JOIN `group_member` AS `circle_member` @@ -52,9 +56,9 @@ class Circle AND NOT `contact`.`deleted` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` + AND NOT `contact`.`network` IN (' . substr(str_repeat('?, ', count($networks)), 0, -2) . ') ORDER BY `contact`.`name` ASC', - $gid, - DI::userSession()->getLocalUserId() + $sql_values ); if (DBA::isResult($stmt)) { @@ -77,9 +81,14 @@ class Circle */ public static function listUncircled(int $uid) { - return Contact::selectToArray([], ["`uid` = ? AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `failed` + $networks = Widget::unavailableNetworks(); + $query = "`uid` = ? AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `failed` + AND NOT `network` IN (" . substr(str_repeat('?, ', count($networks)), 0, -2) . ") AND `id` NOT IN (SELECT DISTINCT(`contact-id`) FROM `group_member` AS `circle_member` INNER JOIN `group` AS `circle` ON `circle`.`id` = `circle_member`.`gid` - WHERE `circle`.`uid` = ? AND `contact-id` = `contact`.`id`)", $uid, $uid]); + WHERE `circle`.`uid` = ? AND `contact-id` = `contact`.`id`)"; + $condition = array_merge([$query], [$uid], $networks, [$uid]); + + return Contact::selectToArray([], $condition); } /** diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php index 901176f0a..51b83ccb4 100644 --- a/src/Module/Admin/Federation.php +++ b/src/Module/Admin/Federation.php @@ -42,9 +42,9 @@ class Federation extends BaseAdmin 'akkoma' => ['name' => 'Akkoma', 'color' => '#9574cd'], // Color from the page 'birdsitelive' => ['name' => 'BirdsiteLIVE', 'color' => '#1b6ec2'], // Color from the page 'bookwyrm' => ['name' => 'BookWyrm', 'color' => '#00d1b2'], // Color from the page - 'calckey' => ['name' => 'Calckey', 'color' => '#286983'], // Color from the page 'castopod' => ['name' => 'Castopod', 'color' => '#00564a'], // Background color from the page 'diaspora' => ['name' => 'Diaspora', 'color' => '#a1a1a1'], // logo is black and white, makes a gray + 'calckey' => ['name' => 'firefish (Calckey)', 'color' => '#1c4a5c'], // Color from the page 'foundkey' => ['name' => 'Foundkey', 'color' => '#609926'], // Some random color from the repository 'funkwhale' => ['name' => 'Funkwhale', 'color' => '#4082B4'], // From the homepage 'gancio' => ['name' => 'Gancio', 'color' => '#7253ed'], // Fontcolor from the page @@ -116,6 +116,8 @@ class Federation extends BaseAdmin $version['version'] = $gserver['platform'] . ' ' . $version['version']; } elseif (in_array($gserver['platform'], ['activityrelay', 'pub-relay', 'selective-relay', 'aoderelay'])) { $version['version'] = $gserver['platform'] . '-' . $version['version']; + } elseif (in_array($gserver['platform'], ['calckey', 'firefish'])) { + $version['version'] = $gserver['platform'] . '-' . $version['version']; } $versionCounts[] = $version; @@ -126,6 +128,8 @@ class Federation extends BaseAdmin if ($platform == 'friendika') { $platform = 'friendica'; + } elseif (in_array($platform, ['calckey', 'firefish'])) { + $platform = 'calckey'; } elseif (in_array($platform, ['red matrix', 'redmatrix', 'red'])) { $platform = 'hubzilla'; } elseif (in_array($platform, ['osada', 'mistpark', 'roadhouse', 'streams', 'zap'])) { diff --git a/src/Module/Circle.php b/src/Module/Circle.php index 74d52ee62..a51583ae9 100644 --- a/src/Module/Circle.php +++ b/src/Module/Circle.php @@ -22,6 +22,7 @@ namespace Friendica\Module; use Friendica\BaseModule; +use Friendica\Content\Widget; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; @@ -146,8 +147,6 @@ class Circle extends BaseModule throw new \Friendica\Network\HTTPException\ForbiddenException(); } - $a = DI::app(); - DI::page()['aside'] = Model\Circle::sidebarWidget('contact', 'circle', 'extended', ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : 'everyone')); // With no circle number provided we jump to the unassigned contacts as a starting point @@ -319,11 +318,13 @@ class Circle extends BaseModule if ($nocircle) { $contacts = Model\Contact\Circle::listUncircled(DI::userSession()->getLocalUserId()); } else { - $contacts_stmt = DBA::select('contact', [], - ['rel' => [Model\Contact::FOLLOWER, Model\Contact::FRIEND, Model\Contact::SHARING], - 'uid' => DI::userSession()->getLocalUserId(), 'pending' => false, 'blocked' => false, 'failed' => false, 'self' => false], - ['order' => ['name']] - ); + $networks = Widget::unavailableNetworks(); + $query = "`uid` = ? AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `failed` + AND `rel` IN (?, ?, ?) + AND NOT `network` IN (" . substr(str_repeat('?, ', count($networks)), 0, -2) . ")"; + $condition = array_merge([$query], [DI::userSession()->getLocalUserId(), Model\Contact::FOLLOWER, Model\Contact::FRIEND, Model\Contact::SHARING], $networks); + + $contacts_stmt = DBA::select('contact', [], $condition, ['order' => ['name']]); $contacts = DBA::toArray($contacts_stmt); $context['$desc'] = DI::l10n()->t('Click on a contact to add or remove.'); } diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 1a61d9f21..74a65e0ea 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -56,7 +56,7 @@ use Friendica\Database\DBA; // This file is required several times during the test in DbaDefinition which justifies this condition if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1522); + define('DB_UPDATE_VERSION', 1523); } return [ diff --git a/static/dbview.config.php b/static/dbview.config.php index 43959f363..e8641240c 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -58,6 +58,35 @@ "query" => "FROM `application-token` INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`" ], + "circle-member-view" => [ + "fields" => [ + "id" => ["group_member", "id"], + "uid" => ["group", "uid"], + "contact-id" => ["group_member", "contact-id"], + "contact-uri-id" => ["contact", "uri-id"], + "contact-link" => ["contact", "url"], + "contact-addr" => ["contact", "addr"], + "contact-name" => ["contact", "name"], + "contact-nick" => ["contact", "nick"], + "contact-avatar" => ["contact", "thumb"], + "contact-network" => ["contact", "network"], + "contact-blocked" => ["contact", "blocked"], + "contact-hidden" => ["contact", "hidden"], + "contact-readonly" => ["contact", "readonly"], + "contact-archive" => ["contact", "archive"], + "contact-pending" => ["contact", "pending"], + "contact-self" => ["contact", "self"], + "contact-rel" => ["contact", "rel"], + "contact-contact-type" => ["contact", "contact-type"], + "circle-id" => ["group_member", "gid"], + "circle-visible" => ["group", "visible"], + "circle-deleted" => ["group", "deleted"], + "circle-name" => ["group", "name"], + ], + "query" => "FROM `group_member` + INNER JOIN `contact` ON `group_member`.`contact-id` = `contact`.`id` + INNER JOIN `group` ON `group_member`.`gid` = `group`.`id`" + ], "post-user-view" => [ "fields" => [ "id" => ["post-user", "id"], From f0563df9914fbeb06bbce85603f13a600143f389 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 22 Jul 2023 16:00:09 +0000 Subject: [PATCH 155/259] Fix notice --- src/Protocol/ActivityPub.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index 4a1030eaa..152cca98a 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -316,7 +316,7 @@ class ActivityPub // @todo Look for user blocked domains - Logger::debug('Server is an accepted requester', ['uid' => $uid, 'id' => $contact['gsid'], 'url' => $contact['baseurl'], 'signer' => $signer, 'called_by' => $called_by]); + Logger::debug('Server is an accepted requester', ['uid' => $uid, 'id' => $apcontact['gsid'], 'url' => $apcontact['baseurl'], 'signer' => $signer, 'called_by' => $called_by]); return true; } From 60c7bc90e6c622161d61fca4a3545eabceec1abf Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 23 Jul 2023 13:59:01 +0000 Subject: [PATCH 156/259] Removed unneeded check --- src/Protocol/ActivityPub.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index 152cca98a..570348be2 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -29,7 +29,6 @@ use Friendica\Model\Contact; use Friendica\Model\User; use Friendica\Util\HTTPSignature; use Friendica\Util\JsonLD; -use Friendica\Util\Network; /** * ActivityPub Protocol class @@ -287,13 +286,13 @@ class ActivityPub $signer = HTTPSignature::getSigner('', $_SERVER); if (!$signer) { - Logger::debug('No signer', ['uid' => $uid, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'called_by' => $called_by]); + Logger::debug('No signer or invalid signature', ['uid' => $uid, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'called_by' => $called_by]); return false; } $apcontact = APContact::getByURL($signer); if (empty($apcontact)) { - Logger::debug('APContact not found', ['uid' => $uid, 'handle' => $signer, 'called_by' => $called_by]); + Logger::info('APContact not found', ['uid' => $uid, 'handle' => $signer, 'called_by' => $called_by]); return false; } @@ -302,12 +301,6 @@ class ActivityPub return false; } - // Check added as a precaution. It should not occur. - if (Network::isUrlBlocked($apcontact['baseurl'])) { - Logger::info('Requesting domain is blocked', ['uid' => $uid, 'id' => $apcontact['gsid'], 'url' => $apcontact['baseurl'], 'signer' => $signer, 'called_by' => $called_by]); - return false; - } - $contact = Contact::getByURL($signer, false, ['id', 'baseurl', 'gsid']); if (!empty($contact) && Contact\User::isBlocked($contact['id'], $uid)) { Logger::info('Requesting contact is blocked', ['uid' => $uid, 'id' => $contact['id'], 'signer' => $signer, 'baseurl' => $contact['baseurl'], 'called_by' => $called_by]); From 9e726eadeeccbeda62d340d2d2a4c6d95c47aa73 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 23 Jul 2023 14:27:08 +0000 Subject: [PATCH 157/259] Coded reformatted --- src/Protocol/ActivityPub.php | 45 +++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index 570348be2..4be88b341 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -61,26 +61,29 @@ use Friendica\Util\JsonLD; class ActivityPub { const PUBLIC_COLLECTION = 'https://www.w3.org/ns/activitystreams#Public'; - const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1', - ['vcard' => 'http://www.w3.org/2006/vcard/ns#', - 'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/', - 'diaspora' => 'https://diasporafoundation.org/ns/', - 'litepub' => 'http://litepub.social/ns#', - 'toot' => 'http://joinmastodon.org/ns#', - 'featured' => [ - "@id" => "toot:featured", - "@type" => "@id", - ], - 'schema' => 'http://schema.org#', - 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', - 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag', - 'quoteUrl' => 'as:quoteUrl', - 'conversation' => 'ostatus:conversation', - 'directMessage' => 'litepub:directMessage', - 'discoverable' => 'toot:discoverable', - 'PropertyValue' => 'schema:PropertyValue', - 'value' => 'schema:value', - ]]; + const CONTEXT = [ + 'https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1', + [ + 'vcard' => 'http://www.w3.org/2006/vcard/ns#', + 'dfrn' => 'http://purl.org/macgirvin/dfrn/1.0/', + 'diaspora' => 'https://diasporafoundation.org/ns/', + 'litepub' => 'http://litepub.social/ns#', + 'toot' => 'http://joinmastodon.org/ns#', + 'featured' => [ + "@id" => "toot:featured", + "@type" => "@id", + ], + 'schema' => 'http://schema.org#', + 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', + 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag', + 'quoteUrl' => 'as:quoteUrl', + 'conversation' => 'ostatus:conversation', + 'directMessage' => 'litepub:directMessage', + 'discoverable' => 'toot:discoverable', + 'PropertyValue' => 'schema:PropertyValue', + 'value' => 'schema:value', + ] + ]; const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application', 'Tombstone']; /** * Checks if the web request is done for the AP protocol @@ -119,7 +122,7 @@ class ActivityPub { $accounttype = -1; - switch($apcontact['type']) { + switch ($apcontact['type']) { case 'Person': $accounttype = User::ACCOUNT_TYPE_PERSON; break; From 61af2e8006bbda5e889fa8f8cbb1612ae66402d6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 23 Jul 2023 20:05:10 +0000 Subject: [PATCH 158/259] Issue 13020: Fix OAuth connection with Buffer --- src/Module/OAuth/Authorize.php | 2 +- src/Module/OAuth/Token.php | 6 ++++-- src/Security/OAuth.php | 12 +++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/Module/OAuth/Authorize.php b/src/Module/OAuth/Authorize.php index efa066694..ea91de5a0 100644 --- a/src/Module/OAuth/Authorize.php +++ b/src/Module/OAuth/Authorize.php @@ -91,7 +91,7 @@ class Authorize extends BaseApi } if ($application['redirect_uri'] != 'urn:ietf:wg:oauth:2.0:oob') { - DI::app()->redirect($application['redirect_uri'] . (strpos($application['redirect_uri'], '?') ? '&' : '?') . http_build_query(['code' => $token['code'], 'state' => $request['state']])); + DI::app()->redirect($request['redirect_uri'] . (strpos($request['redirect_uri'], '?') ? '&' : '?') . http_build_query(['code' => $token['code'], 'state' => $request['state']])); } self::$oauth_code = $token['code']; diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php index f97a05bb0..419fbd878 100644 --- a/src/Module/OAuth/Token.php +++ b/src/Module/OAuth/Token.php @@ -30,6 +30,7 @@ use Friendica\Module\BaseApi; use Friendica\Module\Special\HTTPException; use Friendica\Security\OAuth; use Friendica\Util\DateTimeFormat; +use GuzzleHttp\Psr7\Uri; use Psr\Http\Message\ResponseInterface; /** @@ -89,8 +90,9 @@ class Token extends BaseApi $me = null; } elseif ($request['grant_type'] == 'authorization_code') { // For security reasons only allow freshly created tokens - $condition = ["`redirect_uri` = ? AND `id` = ? AND `code` = ? AND `created_at` > ?", - $request['redirect_uri'], $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')]; + $uri = new Uri($request['redirect_uri']); + $condition = ["`redirect_uri` LIKE ? AND `id` = ? AND `code` = ? AND `created_at` > ?", + '%' . $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath() . '%', $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')]; $token = DBA::selectFirst('application-view', ['access_token', 'created_at', 'uid'], $condition); if (!DBA::isResult($token)) { diff --git a/src/Security/OAuth.php b/src/Security/OAuth.php index 2fc8724f7..f11927a53 100644 --- a/src/Security/OAuth.php +++ b/src/Security/OAuth.php @@ -29,6 +29,7 @@ use Friendica\Model\Contact; use Friendica\Model\User; use Friendica\Module\BaseApi; use Friendica\Util\DateTimeFormat; +use GuzzleHttp\Psr7\Uri; /** * OAuth Server @@ -128,8 +129,11 @@ class OAuth if (!empty($client_secret)) { $condition['client_secret'] = $client_secret; } + if (!empty($redirect_uri)) { - $condition['redirect_uri'] = $redirect_uri; + $uri = new Uri($redirect_uri); + $redirect_uri = $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath(); + $condition = DBA::mergeConditions($condition, ["`redirect_uri` LIKE ?", '%' . $redirect_uri . '%']); } $application = DBA::selectFirst('application', [], $condition); @@ -137,6 +141,12 @@ class OAuth Logger::warning('Application not found', $condition); return []; } + + // The redirect_uri could contain several URI that are separated by spaces. + if (($application['redirect_uri'] != $redirect_uri) && !in_array($redirect_uri, explode(' ', $application['redirect_uri']))) { + return []; + } + return $application; } From 6fd4839441d0d88bbc7691249674a905b8c98ddb Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 23 Jul 2023 20:20:46 +0000 Subject: [PATCH 159/259] Reformatted code --- src/Module/OAuth/Token.php | 6 ++++-- src/Security/OAuth.php | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php index 419fbd878..f5aec0802 100644 --- a/src/Module/OAuth/Token.php +++ b/src/Module/OAuth/Token.php @@ -91,8 +91,10 @@ class Token extends BaseApi } elseif ($request['grant_type'] == 'authorization_code') { // For security reasons only allow freshly created tokens $uri = new Uri($request['redirect_uri']); - $condition = ["`redirect_uri` LIKE ? AND `id` = ? AND `code` = ? AND `created_at` > ?", - '%' . $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath() . '%', $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes')]; + $condition = [ + "`redirect_uri` LIKE ? AND `id` = ? AND `code` = ? AND `created_at` > ?", + '%' . $uri->getScheme() . '://' . $uri->getHost() . $uri->getPath() . '%', $application['id'], $request['code'], DateTimeFormat::utc('now - 5 minutes') + ]; $token = DBA::selectFirst('application-view', ['access_token', 'created_at', 'uid'], $condition); if (!DBA::isResult($token)) { diff --git a/src/Security/OAuth.php b/src/Security/OAuth.php index f11927a53..7655398b3 100644 --- a/src/Security/OAuth.php +++ b/src/Security/OAuth.php @@ -146,7 +146,7 @@ class OAuth if (($application['redirect_uri'] != $redirect_uri) && !in_array($redirect_uri, explode(' ', $application['redirect_uri']))) { return []; } - + return $application; } @@ -197,7 +197,8 @@ class OAuth 'write' => (stripos($scope, BaseApi::SCOPE_WRITE) !== false), 'follow' => (stripos($scope, BaseApi::SCOPE_FOLLOW) !== false), 'push' => (stripos($scope, BaseApi::SCOPE_PUSH) !== false), - 'created_at' => DateTimeFormat::utcNow()]; + 'created_at' => DateTimeFormat::utcNow() + ]; foreach ([BaseApi::SCOPE_READ, BaseApi::SCOPE_WRITE, BaseApi::SCOPE_WRITE, BaseApi::SCOPE_PUSH] as $scope) { if ($fields[$scope] && !$application[$scope]) { From 407e6389b3ba1ed2268d06e8dc7798f12f5e9bfc Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Jul 2023 04:33:55 +0000 Subject: [PATCH 160/259] Fix JsonLD parsing problems with GoToSocial --- src/Util/JsonLD.php | 12 +++++------ static/joinmastodon.jsonld | 44 ++++++++++++++++++++++++++++++++++++++ static/schema.jsonld | 7 ++++++ 3 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 static/joinmastodon.jsonld create mode 100644 static/schema.jsonld diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 0a4d5a0b5..beb01f0cc 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -55,6 +55,12 @@ class JsonLD case 'https://funkwhale.audio/ns': $url = DI::basePath() . '/static/funkwhale.audio.jsonld'; break; + case 'http://schema.org': + $url = DI::basePath() . '/static/schema.jsonld'; + break; + case 'http://joinmastodon.org/ns': + $url = DI::basePath() . '/static/joinmastodon.jsonld'; + break; default: switch (parse_url($url, PHP_URL_PATH)) { case '/schemas/litepub-0.1.jsonld'; @@ -177,12 +183,6 @@ class JsonLD if (!in_array('https://w3id.org/security/v1', $json['@context'])) { $json['@context'][] = 'https://w3id.org/security/v1'; } - - // Issue 12419: Workaround for GoToSocial - $pos = array_search('http://joinmastodon.org/ns', $json['@context']); - if (is_int($pos)) { - $json['@context'][$pos] = ['toot' => 'http://joinmastodon.org/ns#']; - } } // Bookwyrm transmits "id" fields with "null", which isn't allowed. diff --git a/static/joinmastodon.jsonld b/static/joinmastodon.jsonld new file mode 100644 index 000000000..0edd4ab0c --- /dev/null +++ b/static/joinmastodon.jsonld @@ -0,0 +1,44 @@ +{ + "@context":[ + "https://www.w3.org/ns/activitystreams", + "https://w3id.org/security/v1", + { + "manuallyApprovesFollowers":"as:manuallyApprovesFollowers", + "toot":"http://joinmastodon.org/ns#", + "featured":{"@id":"toot:featured","@type":"@id"}, + "featuredTags":{"@id":"toot:featuredTags","@type":"@id"}, + "alsoKnownAs":{"@id":"as:alsoKnownAs","@type":"@id"}, + "movedTo":{"@id":"as:movedTo","@type":"@id"}, + "schema":"http://schema.org#", + "PropertyValue":"schema:PropertyValue", + "value":"schema:value", + "discoverable":"toot:discoverable", + "Device":"toot:Device", + "Ed25519Signature":"toot:Ed25519Signature", + "Ed25519Key":"toot:Ed25519Key", + "Curve25519Key":"toot:Curve25519Key", + "EncryptedMessage":"toot:EncryptedMessage", + "publicKeyBase64":"toot:publicKeyBase64", + "deviceId":"toot:deviceId", + "claim":{"@type":"@id","@id":"toot:claim"}, + "fingerprintKey":{"@type":"@id","@id":"toot:fingerprintKey"}, + "identityKey":{"@type":"@id","@id":"toot:identityKey"}, + "devices":{"@type":"@id","@id":"toot:devices"}, + "messageFranking":"toot:messageFranking", + "messageType":"toot:messageType", + "cipherText":"toot:cipherText", + "suspended":"toot:suspended", + "focalPoint":{"@container":"@list","@id":"toot:focalPoint"}, + "ostatus":"http://ostatus.org#", + "atomUri":"ostatus:atomUri", + "inReplyToAtomUri":"ostatus:inReplyToAtomUri", + "conversation":"ostatus:conversation", + "sensitive":"as:sensitive", + "votersCount":"toot:votersCount", + "Hashtag":"as:Hashtag", + "quoteUrl":"as:quoteUrl", + "Emoji":"toot:Emoji", + "vcard":"http://www.w3.org/2006/vcard/ns#" + } + ] +} \ No newline at end of file diff --git a/static/schema.jsonld b/static/schema.jsonld new file mode 100644 index 000000000..594013742 --- /dev/null +++ b/static/schema.jsonld @@ -0,0 +1,7 @@ +{ + "@context": { + "schema": "http://schema.org#", + "value": "schema:value", + "PropertyValue": "schema:PropertyValue" + } +} \ No newline at end of file From bb980468467d740691a081a9fe3334070fa9a7eb Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Jul 2023 15:37:33 +0200 Subject: [PATCH 161/259] Remove useless call to gethostbyname() - This function doesn't return a falsy value even when no IP address was able to be retrieved for the given host name - Address https://github.com/friendica/friendica/issues/13157#issuecomment-1638505285 --- src/Network/HTTPClient/Client/HttpClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/HTTPClient/Client/HttpClient.php b/src/Network/HTTPClient/Client/HttpClient.php index f47418060..d608774ec 100644 --- a/src/Network/HTTPClient/Client/HttpClient.php +++ b/src/Network/HTTPClient/Client/HttpClient.php @@ -73,7 +73,7 @@ class HttpClient implements ICanSendHttpRequests throw new \InvalidArgumentException('Unable to retrieve the host in URL: ' . $url); } - if(!filter_var($host, FILTER_VALIDATE_IP) && !@dns_get_record($host . '.', DNS_A + DNS_AAAA) && !gethostbyname($host)) { + if(!filter_var($host, FILTER_VALIDATE_IP) && !@dns_get_record($host . '.', DNS_A + DNS_AAAA)) { $this->logger->debug('URL cannot be resolved.', ['url' => $url, 'callstack' => System::callstack(20)]); $this->profiler->stopRecording(); return CurlResult::createErrorCurl($this->logger, $url); From 00ddc9cfd76f9e662198c4a443c0754ec7ee9d1e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Jul 2023 20:16:18 +0200 Subject: [PATCH 162/259] Restore `item/drop/{item_id}` route in mod/item --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index cf23df842..e15ca639c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -340,7 +340,7 @@ function item_content(App $a) $args = DI::args(); - if (!$args->has(3)) { + if (!$args->has(2)) { throw new HTTPException\BadRequestException(); } From 8d49ea29d22d1a54e5aa89eb98dd8886df71e80a Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Jul 2023 20:14:26 +0000 Subject: [PATCH 163/259] Fix v1/instance endpoint to make Buffer work --- src/Object/Api/Mastodon/Instance.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Api/Mastodon/Instance.php b/src/Object/Api/Mastodon/Instance.php index e19f6ba13..201218251 100644 --- a/src/Object/Api/Mastodon/Instance.php +++ b/src/Object/Api/Mastodon/Instance.php @@ -89,7 +89,7 @@ class Instance extends BaseDataTransferObject $this->short_description = $this->description = $config->get('config', 'info'); $this->email = implode(',', User::getAdminEmailList()); $this->version = '2.8.0 (compatible; Friendica ' . App::VERSION . ')'; - $this->urls = null; // Not supported + $this->urls = ['streaming_api' => '']; // Not supported $this->stats = new Stats($config, $database); $this->thumbnail = $baseUrl . $config->get('api', 'mastodon_banner'); $this->languages = [$config->get('system', 'language')]; From 592e82934740267fa768bb358f901fd40db39ba3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Jul 2023 22:44:03 +0200 Subject: [PATCH 164/259] Fix wrong field name in Model\Mail --- src/Model/Mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Mail.php b/src/Model/Mail.php index a6cb8a078..78dd6329c 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -233,7 +233,7 @@ class Mail foreach ($images as $image) { $image_rid = Photo::ridFromURI($image); if (!empty($image_rid)) { - Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]); + Photo::update(['allow_cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]); } } } From 7e8a44c15bf3a110d169cebd8d8640dbd5f6f558 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Jul 2023 22:47:27 +0200 Subject: [PATCH 165/259] Remove duplicate fields in Model\Event::getItemArrayForId - Fix formatting in Model\Event --- src/Model/Event.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index ecf21d342..0bf18d776 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -344,7 +344,6 @@ class Event $event['id'] = $event_id; $item['uid'] = $event['uid']; - $item['contact-id'] = $event['cid']; $item['uri'] = $event['uri']; $item['uri-id'] = ItemURI::getIdByURI($event['uri']); $item['guid'] = $event['guid']; @@ -367,7 +366,6 @@ class Event $item['visible'] = 1; $item['verb'] = Activity::POST; $item['object-type'] = Activity\ObjectType::EVENT; - $item['post-type'] = Item::PT_EVENT; $item['origin'] = $event['cid'] === 0 ? 1 : 0; $item['body'] = self::getBBCode($event); $item['event-id'] = $event['id']; @@ -547,8 +545,8 @@ class Event // Query for the event by event id $events = DBA::toArray(DBA::p( "SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event` - LEFT JOIN `post-user` - ON `post-user`.`event-id` = `event`.`id` + LEFT JOIN `post-user` + ON `post-user`.`event-id` = `event`.`id` AND `post-user`.`uid` = `event`.`uid` WHERE `event`.`id` = ? AND `event`.`uid` = ? @@ -932,9 +930,9 @@ class Event // Construct the profile link (magic-auth). $author = [ - 'uid' => 0, + 'uid' => 0, 'id' => $item['author-id'], - 'network' => $item['author-network'], + 'network' => $item['author-network'], 'url' => $item['author-link'], 'alias' => $item['author-alias'] ]; From e468870e8735070fe7454025262a9229b37feb74 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Jul 2023 22:48:37 +0200 Subject: [PATCH 166/259] Fix item.private value in Model\Event::getItemArrayForId - The $event array doesn't have a `private` key because the event table doesn't have a `private` field. --- src/Model/Event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Event.php b/src/Model/Event.php index 0bf18d776..6f7783220 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -362,7 +362,7 @@ class Event $item['allow_gid'] = $event['allow_gid']; $item['deny_cid'] = $event['deny_cid']; $item['deny_gid'] = $event['deny_gid']; - $item['private'] = intval($event['private'] ?? 0); + $item['private'] = $event['allow_cid'] && $event['allow_gid'] && $event['deny_cid'] && $event['deny_gid'] ? 0 : 1; $item['visible'] = 1; $item['verb'] = Activity::POST; $item['object-type'] = Activity\ObjectType::EVENT; From 9e434c15dc1a9a30312cccab93c06d11b31124a2 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Jul 2023 21:27:12 +0000 Subject: [PATCH 167/259] API: Description added at picture upload --- src/Module/Api/Mastodon/Media.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php index e26637601..921ebdaf7 100644 --- a/src/Module/Api/Mastodon/Media.php +++ b/src/Module/Api/Mastodon/Media.php @@ -38,13 +38,20 @@ class Media extends BaseApi self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); + $request = $this->getRequest([ + 'file' => [], // The file to be attached, using multipart form data. + 'thumbnail' => [], // The custom thumbnail of the media to be attached, using multipart form data. + 'description' => '', // A plain-text description of the media, for accessibility purposes. + 'focus' => '', // Two floating points (x,y), comma-delimited ranging from -1.0 to 1.0 + ], $request); + Logger::info('Photo post', ['request' => $request, 'files' => $_FILES]); if (empty($_FILES['file'])) { DI::mstdnError()->UnprocessableEntity(); } - $media = Photo::upload($uid, $_FILES['file']); + $media = Photo::upload($uid, $_FILES['file'], '', null, null, '', '', $request['description']); if (empty($media)) { DI::mstdnError()->UnprocessableEntity(); } From 3111c2fd5cf67b04fcc92951aa422d7cca8b64fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Wed, 26 Jul 2023 09:44:39 +0200 Subject: [PATCH 168/259] Renamed to 'public' after feedback --- src/Module/Friendica.php | 2 +- static/defaults.config.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php index 2dbe5d7a9..e09fd0e0f 100644 --- a/src/Module/Friendica.php +++ b/src/Module/Friendica.php @@ -94,7 +94,7 @@ class Friendica extends BaseModule $blockList = $this->config->get('system', 'blocklist') ?? []; - if (!empty($blockList) && ($this->config->get('blocklist', 'published') || $this->session->isAuthenticated())) { + if (!empty($blockList) && ($this->config->get('blocklist', 'public') || $this->session->isAuthenticated())) { $blocked = [ 'title' => $this->t('On this server the following remote servers are blocked.'), 'header' => [ diff --git a/static/defaults.config.php b/static/defaults.config.php index e2ce631d0..125d8ce7b 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -787,8 +787,8 @@ return [ 'mastodon_banner' => '/images/friendica-banner.jpg', ], 'blocklist' => [ - // published (Boolean) - // Wether the blocklist is published under /about (or any later API) - 'published' => true, + // public (Boolean) + // Wether the blocklist is publicly listed under /about (or in any later API) + 'public' => true, ], ]; From e53b875e79ce6677b76406b41911033a6cb776d7 Mon Sep 17 00:00:00 2001 From: Hannes Heute <5753419+haheute@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:09:31 +0200 Subject: [PATCH 169/259] fix frio alignment --- view/theme/frio/templates/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 77077fdd9..42f69243b 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -278,7 +278,7 @@
  • - {{$nav.about.1}} + {{$nav.about.1}}
    • {{if $nav.tos}} From 148c1c7e1a17b70ff9b75e5dd68ca63e1328843f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Jul 2023 23:13:01 +0200 Subject: [PATCH 170/259] Add new BaseUrl->isLocalUri and BaseUrl->isLocalUrl methods - Deprecate Util\Network->isLocalLink to reduce dependency on DI class --- src/App/BaseURL.php | 10 ++++++++++ src/Util/Network.php | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php index 403030684..cc20343d1 100644 --- a/src/App/BaseURL.php +++ b/src/App/BaseURL.php @@ -127,4 +127,14 @@ class BaseURL extends Uri implements UriInterface $redirectTo = $this->__toString() . '/' . ltrim($toUrl, '/'); System::externalRedirect($redirectTo); } + + public function isLocalUrl(string $url): bool + { + return strpos(Strings::normaliseLink($url), Strings::normaliseLink((string)$this)) === 0; + } + + public function isLocalUri(UriInterface $uri): bool + { + return $this->isLocalUrl((string)$uri); + } } diff --git a/src/Util/Network.php b/src/Util/Network.php index f7ceab543..495510189 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -640,10 +640,11 @@ class Network * @param string $url * * @return bool + * @deprecated since 2023.09, please use BaseUrl->isLocalUrl or BaseUrl->isLocalUri instead. */ public static function isLocalLink(string $url): bool { - return (strpos(Strings::normaliseLink($url), Strings::normaliseLink(DI::baseUrl())) !== false); + return DI::baseUrl()->isLocalUrl($url); } /** From 8c06f965314fd89f65ee0f1b3ac557588175456d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Jul 2023 23:14:15 +0200 Subject: [PATCH 171/259] Rework Module\ToggleMobile to check for local links - Remove dependency on DI class - Remove dependency on request/session superglobals - Remove dependency on App class --- src/Module/ToggleMobile.php | 41 +++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/src/Module/ToggleMobile.php b/src/Module/ToggleMobile.php index 2408ef7f3..193f4566c 100644 --- a/src/Module/ToggleMobile.php +++ b/src/Module/ToggleMobile.php @@ -21,32 +21,43 @@ namespace Friendica\Module; +use Friendica\App; use Friendica\BaseModule; -use Friendica\DI; +use Friendica\Core\L10n; +use Friendica\Core\Session\Capability\IHandleSessions; +use Friendica\Core\System; +use Friendica\Network\HTTPException\BadRequestException; +use Friendica\Util; +use GuzzleHttp\Psr7\Uri; +use Psr\Log\LoggerInterface; /** * Toggles the mobile view (on/off) */ class ToggleMobile extends BaseModule { - protected function content(array $request = []): string + /** @var IHandleSessions */ + private $session; + + public function __construct(IHandleSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Util\Profiler $profiler, Response $response, array $server, array $parameters = []) { - $a = DI::app(); + parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - if (isset($_GET['off'])) { - $_SESSION['show-mobile'] = false; - } else { - $_SESSION['show-mobile'] = true; + $this->session = $session; + } + + protected function rawContent(array $request = []) + { + $address = $request['address'] ?? '' ?: $this->baseUrl; + + $uri = new Uri($address); + + if (!$this->baseUrl->isLocalUri($uri)) { + throw new BadRequestException(); } - if (isset($_GET['address'])) { - $address = $_GET['address']; - } else { - $address = ''; - } + $this->session->set('show-mobile', !isset($request['off'])); - $a->redirect($address); - - return ''; + System::externalRedirect((string)$uri); } } From 8d9e0b4eaec2bfb9629cd75d34cd777709d03b2f Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Fri, 26 May 2023 21:37:08 -0400 Subject: [PATCH 172/259] Fix Mastodon API Reshared statuses are a stub w/content in reblog field --- src/Object/Api/Mastodon/Status.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php index 0a02a4854..122e62f9c 100644 --- a/src/Object/Api/Mastodon/Status.php +++ b/src/Object/Api/Mastodon/Status.php @@ -109,6 +109,7 @@ class Status extends BaseDataTransferObject */ public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $in_reply, array $reblog, FriendicaExtension $friendica, array $quote = null, array $poll = null) { + $reblogged = !empty($reblog); $this->id = (string)$item['uri-id']; $this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::JSON); $this->edited_at = DateTimeFormat::utc($item['edited'], DateTimeFormat::JSON); @@ -135,26 +136,26 @@ class Status extends BaseDataTransferObject $this->uri = $item['uri']; $this->url = $item['plink'] ?? null; - $this->replies_count = $counts->replies; - $this->reblogs_count = $counts->reblogs; - $this->favourites_count = $counts->favourites; + $this->replies_count = $reblogged ? 0 : $counts->replies; + $this->reblogs_count = $reblogged ? 0 : $counts->reblogs; + $this->favourites_count = $reblogged ? 0 : $counts->favourites; $this->favourited = $userAttributes->favourited; $this->reblogged = $userAttributes->reblogged; $this->muted = $userAttributes->muted; $this->bookmarked = $userAttributes->bookmarked; $this->pinned = $userAttributes->pinned; - $this->content = BBCode::convertForUriId($item['uri-id'], BBCode::setMentionsToNicknames($item['raw-body'] ?? $item['body']), BBCode::MASTODON_API); + $this->content = $reblogged ? '' : BBCode::convertForUriId($item['uri-id'], BBCode::setMentionsToNicknames($item['raw-body'] ?? $item['body']), BBCode::MASTODON_API); $this->reblog = $reblog; $this->quote = $quote; $this->application = $application->toArray(); $this->account = $account->toArray(); - $this->media_attachments = $attachments; - $this->mentions = $mentions; - $this->tags = $tags; - $this->emojis = []; - $this->card = $card->toArray() ?: null; - $this->poll = $poll; - $this->friendica = $friendica; + $this->media_attachments = $reblogged ? [] : $attachments; + $this->mentions = $reblogged ? [] : $mentions; + $this->tags = $reblogged ? [] : $tags; + $this->emojis = $reblogged ? [] : []; + $this->card = $reblogged ? null : ($card->toArray() ?: null); + $this->poll = $reblogged ? null : $poll; + $this->friendica = $reblogged ? null : $friendica; } /** From 532a46d1886f431efb159818d5afa709b501f261 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Mon, 29 May 2023 14:03:16 -0400 Subject: [PATCH 173/259] Change selectOriginal post to return earliest post from non-0 user I believe the earliest entry not being uid=0 should be the original post of a reshared post --- src/Model/Post.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Model/Post.php b/src/Model/Post.php index 770ab0831..9e137ae37 100644 --- a/src/Model/Post.php +++ b/src/Model/Post.php @@ -263,7 +263,10 @@ class Post return $result; } - return self::selectFirst($original_fields, ['uri-id' => $result['thr-parent-id'], 'uid' => [0, $result['uid']]], $params); + $final_query_condition = ['uri-id' => $result['thr-parent-id']]; + $final_query_condition = DBA::mergeConditions($final_query_condition, ['uid != 0']); + $final_params = ['order' => ['id']]; + return self::selectFirst($original_fields, $final_query_condition, $final_params); } /** From 7a556d15886bbebd6c1d2019bf8e840e80c8afc0 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Fri, 16 Jun 2023 14:48:12 -0400 Subject: [PATCH 174/259] Fix Mastodon API fav/unfav temporarily by checking if blog in post func --- src/Module/Api/Mastodon/Statuses/Favourite.php | 7 +++++-- src/Module/Api/Mastodon/Statuses/Unfavourite.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php index d1a68862c..2e5159175 100644 --- a/src/Module/Api/Mastodon/Statuses/Favourite.php +++ b/src/Module/Api/Mastodon/Statuses/Favourite.php @@ -42,13 +42,16 @@ class Favourite extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectOriginalForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectOriginalForUser($uid, ['id', 'uri-id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } Item::performActivity($item['id'], 'like', $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php index a3760b454..d95d9e09c 100644 --- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php +++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php @@ -42,13 +42,16 @@ class Unfavourite extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectOriginalForUser($uid, ['id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectOriginalForUser($uid, ['id', 'uri-id'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } Item::performActivity($item['id'], 'unlike', $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } From b0fe1927d59b5d7fbc5c293c0356af9b2f966b30 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Fri, 16 Jun 2023 15:31:39 -0400 Subject: [PATCH 175/259] Fix Mastodon API bookmark, mute, pin, reblog EPs temporarily by checking if blog in post func --- src/Module/Api/Mastodon/Statuses/Bookmark.php | 5 ++++- src/Module/Api/Mastodon/Statuses/Mute.php | 5 ++++- src/Module/Api/Mastodon/Statuses/Pin.php | 5 ++++- src/Module/Api/Mastodon/Statuses/Reblog.php | 7 +++++-- src/Module/Api/Mastodon/Statuses/Unbookmark.php | 5 ++++- src/Module/Api/Mastodon/Statuses/Unmute.php | 5 ++++- src/Module/Api/Mastodon/Statuses/Unpin.php | 5 ++++- src/Module/Api/Mastodon/Statuses/Unreblog.php | 7 +++++-- 8 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php index 59c61f991..9625b5e12 100644 --- a/src/Module/Api/Mastodon/Statuses/Bookmark.php +++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php @@ -65,6 +65,9 @@ class Bookmark extends BaseApi Item::update(['starred' => true], ['id' => $item['id']]); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php index 1f00d39d0..587999bad 100644 --- a/src/Module/Api/Mastodon/Statuses/Mute.php +++ b/src/Module/Api/Mastodon/Statuses/Mute.php @@ -53,6 +53,9 @@ class Mute extends BaseApi Post\ThreadUser::setIgnored($item['uri-id'], $uid, true); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php index 33a0116eb..601f82f2d 100644 --- a/src/Module/Api/Mastodon/Statuses/Pin.php +++ b/src/Module/Api/Mastodon/Statuses/Pin.php @@ -48,6 +48,9 @@ class Pin extends BaseApi Post\Collection::add($item['uri-id'], Post\Collection::FEATURED, $item['author-id'], $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(),$isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php index f1922d727..409f8e788 100644 --- a/src/Module/Api/Mastodon/Statuses/Reblog.php +++ b/src/Module/Api/Mastodon/Statuses/Reblog.php @@ -45,7 +45,7 @@ class Reblog extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectOriginalForUser($uid, ['id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectOriginalForUser($uid, ['id', 'uri-id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -58,6 +58,9 @@ class Reblog extends BaseApi Item::performActivity($item['id'], 'announce', $uid); } - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php index f95fd9445..03a3e6f00 100644 --- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php +++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php @@ -65,6 +65,9 @@ class Unbookmark extends BaseApi Item::update(['starred' => false], ['id' => $item['id']]); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php index 2285422ca..63cd6d722 100644 --- a/src/Module/Api/Mastodon/Statuses/Unmute.php +++ b/src/Module/Api/Mastodon/Statuses/Unmute.php @@ -53,6 +53,9 @@ class Unmute extends BaseApi Post\ThreadUser::setIgnored($item['uri-id'], $uid, false); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php index c80582d15..22610f446 100644 --- a/src/Module/Api/Mastodon/Statuses/Unpin.php +++ b/src/Module/Api/Mastodon/Statuses/Unpin.php @@ -48,6 +48,9 @@ class Unpin extends BaseApi Post\Collection::remove($item['uri-id'], Post\Collection::FEATURED, $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php index 54a18823a..a1544807f 100644 --- a/src/Module/Api/Mastodon/Statuses/Unreblog.php +++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php @@ -44,7 +44,7 @@ class Unreblog extends BaseApi DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectOriginalForUser($uid, ['id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectOriginalForUser($uid, ['id', 'uri-id', 'network'], ['uri-id' => $this->parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -64,6 +64,9 @@ class Unreblog extends BaseApi Item::performActivity($item['id'], 'unannounce', $uid); } - System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes())->toArray()); + // @TODO Remove once mstdnStatus()->createFromUriId is fixed + $isReblog = $item['uri-id'] != $this->parameters['id']; + + System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); } } From f2c02a79b9c34a25c39cb8a0868a45a6a39e1bfe Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 22 Jul 2023 23:57:38 +0200 Subject: [PATCH 176/259] Move Cache to strategies --- src/Core/Cache/Factory/Cache.php | 69 +++++----------------- src/Core/Cache/Type/APCuCache.php | 13 +--- src/Core/Cache/Type/AbstractCache.php | 8 +++ src/Core/Cache/Type/ArrayCache.php | 10 +--- src/Core/Cache/Type/DatabaseCache.php | 10 +--- src/Core/Cache/Type/MemcacheCache.php | 11 +--- src/Core/Cache/Type/MemcachedCache.php | 11 +--- src/Core/Cache/Type/RedisCache.php | 37 ++++++------ static/dependencies.config.php | 14 +++++ static/strategies.config.php | 9 ++- tests/phpunit-addons.xml | 24 ++++++++ tests/src/Core/Cache/DatabaseCacheTest.php | 1 + 12 files changed, 98 insertions(+), 119 deletions(-) create mode 100644 tests/phpunit-addons.xml diff --git a/src/Core/Cache/Factory/Cache.php b/src/Core/Cache/Factory/Cache.php index 107c6ab21..b6124c156 100644 --- a/src/Core/Cache/Factory/Cache.php +++ b/src/Core/Cache/Factory/Cache.php @@ -21,16 +21,14 @@ namespace Friendica\Core\Cache\Factory; -use Friendica\App\BaseURL; use Friendica\Core\Cache\Enum; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Exception\CachePersistenceException; use Friendica\Core\Cache\Exception\InvalidCacheDriverException; use Friendica\Core\Cache\Type; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Database\Database; +use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; use Friendica\Util\Profiler; -use Psr\Log\LoggerInterface; /** * Class CacheFactory @@ -45,39 +43,18 @@ class Cache * @var string The default cache if nothing set */ const DEFAULT_TYPE = Enum\Type::DATABASE; + /** @var ICanCreateInstances */ + protected $instanceCreator; + /** @var IManageConfigValues */ + protected $config; + /** @var Profiler */ + protected $profiler; - /** - * @var IManageConfigValues The IConfiguration to read parameters out of the config - */ - private $config; - - /** - * @var Database The database connection in case that the cache is used the dba connection - */ - private $dba; - - /** - * @var string The hostname, used as Prefix for Caching - */ - private $hostname; - - /** - * @var Profiler The optional profiler if the cached should be profiled - */ - private $profiler; - - /** - * @var LoggerInterface The Friendica Logger - */ - private $logger; - - public function __construct(BaseURL $baseURL, IManageConfigValues $config, Database $dba, Profiler $profiler, LoggerInterface $logger) + public function __construct(ICanCreateInstances $instanceCreator, IManageConfigValues $config, Profiler $profiler) { - $this->hostname = $baseURL->getHost(); - $this->config = $config; - $this->dba = $dba; - $this->profiler = $profiler; - $this->logger = $logger; + $this->config = $config; + $this->instanceCreator = $instanceCreator; + $this->profiler = $profiler; } /** @@ -92,7 +69,7 @@ class Cache */ public function createDistributed(string $type = null): ICanCache { - if ($type === Enum\Type::APCU) { + if ($type === Type\APCuCache::$NAME) { throw new InvalidCacheDriverException('apcu doesn\'t support distributed caching.'); } @@ -117,31 +94,17 @@ class Cache /** * Creates a new Cache instance * - * @param string $type The type of cache + * @param string $strategy The strategy, which cache instance should be used * * @return ICanCache * * @throws InvalidCacheDriverException In case the underlying cache driver isn't valid or not configured properly * @throws CachePersistenceException In case the underlying cache has errors during persistence */ - protected function create(string $type): ICanCache + protected function create(string $strategy): ICanCache { - switch ($type) { - case Enum\Type::MEMCACHE: - $cache = new Type\MemcacheCache($this->hostname, $this->config); - break; - case Enum\Type::MEMCACHED: - $cache = new Type\MemcachedCache($this->hostname, $this->config, $this->logger); - break; - case Enum\Type::REDIS: - $cache = new Type\RedisCache($this->hostname, $this->config); - break; - case Enum\Type::APCU: - $cache = new Type\APCuCache($this->hostname); - break; - default: - $cache = new Type\DatabaseCache($this->hostname, $this->dba); - } + /** @var ICanCache $cache */ + $cache = $this->instanceCreator->create(ICanCache::class, $strategy); $profiling = $this->config->get('system', 'profiling', false); diff --git a/src/Core/Cache/Type/APCuCache.php b/src/Core/Cache/Type/APCuCache.php index 05eb2fa07..02b2d0fbd 100644 --- a/src/Core/Cache/Type/APCuCache.php +++ b/src/Core/Cache/Type/APCuCache.php @@ -23,7 +23,6 @@ namespace Friendica\Core\Cache\Type; use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\Capability\ICanCacheInMemory; -use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Cache\Exception\InvalidCacheDriverException; /** @@ -31,12 +30,12 @@ use Friendica\Core\Cache\Exception\InvalidCacheDriverException; */ class APCuCache extends AbstractCache implements ICanCacheInMemory { + public static $NAME = 'apcu'; + use CompareSetTrait; use CompareDeleteTrait; /** - * @param string $hostname - * * @throws InvalidCacheDriverException */ public function __construct(string $hostname) @@ -173,12 +172,4 @@ class APCuCache extends AbstractCache implements ICanCacheInMemory return true; } - - /** - * {@inheritDoc} - */ - public function getName(): string - { - return Type::APCU; - } } diff --git a/src/Core/Cache/Type/AbstractCache.php b/src/Core/Cache/Type/AbstractCache.php index 5c00542a7..36e301ad2 100644 --- a/src/Core/Cache/Type/AbstractCache.php +++ b/src/Core/Cache/Type/AbstractCache.php @@ -28,6 +28,8 @@ use Friendica\Core\Cache\Capability\ICanCache; */ abstract class AbstractCache implements ICanCache { + public static $NAME = ''; + /** * @var string The hostname */ @@ -105,4 +107,10 @@ abstract class AbstractCache implements ICanCache return $result; } } + + /** {@inheritDoc} */ + public function getName(): string + { + return static::$NAME; + } } diff --git a/src/Core/Cache/Type/ArrayCache.php b/src/Core/Cache/Type/ArrayCache.php index 8886a886a..ad87eaf23 100644 --- a/src/Core/Cache/Type/ArrayCache.php +++ b/src/Core/Cache/Type/ArrayCache.php @@ -29,6 +29,8 @@ use Friendica\Core\Cache\Enum; */ class ArrayCache extends AbstractCache implements ICanCacheInMemory { + public static $NAME = 'array'; + use CompareDeleteTrait; /** @var array Array with the cached data */ @@ -108,12 +110,4 @@ class ArrayCache extends AbstractCache implements ICanCacheInMemory return false; } } - - /** - * {@inheritDoc} - */ - public function getName(): string - { - return Enum\Type::ARRAY; - } } diff --git a/src/Core/Cache/Type/DatabaseCache.php b/src/Core/Cache/Type/DatabaseCache.php index fa7968b65..18541e0d2 100644 --- a/src/Core/Cache/Type/DatabaseCache.php +++ b/src/Core/Cache/Type/DatabaseCache.php @@ -32,6 +32,8 @@ use Friendica\Util\DateTimeFormat; */ class DatabaseCache extends AbstractCache implements ICanCache { + public static $NAME = 'database'; + /** * @var Database */ @@ -154,12 +156,4 @@ class DatabaseCache extends AbstractCache implements ICanCache throw new CachePersistenceException('Cannot clear cache', $exception); } } - - /** - * {@inheritDoc} - */ - public function getName(): string - { - return Enum\Type::DATABASE; - } } diff --git a/src/Core/Cache/Type/MemcacheCache.php b/src/Core/Cache/Type/MemcacheCache.php index d19e7deb1..09394a1dd 100644 --- a/src/Core/Cache/Type/MemcacheCache.php +++ b/src/Core/Cache/Type/MemcacheCache.php @@ -23,7 +23,6 @@ namespace Friendica\Core\Cache\Type; use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\Capability\ICanCacheInMemory; -use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Cache\Exception\CachePersistenceException; use Friendica\Core\Cache\Exception\InvalidCacheDriverException; use Friendica\Core\Config\Capability\IManageConfigValues; @@ -34,6 +33,8 @@ use Memcache; */ class MemcacheCache extends AbstractCache implements ICanCacheInMemory { + static $NAME = 'memcached'; + use CompareSetTrait; use CompareDeleteTrait; use MemcacheCommandTrait; @@ -169,12 +170,4 @@ class MemcacheCache extends AbstractCache implements ICanCacheInMemory $cacheKey = $this->getCacheKey($key); return $this->memcache->add($cacheKey, serialize($value), MEMCACHE_COMPRESSED, $ttl); } - - /** - * {@inheritDoc} - */ - public function getName(): string - { - return Type::MEMCACHE; - } } diff --git a/src/Core/Cache/Type/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php index 6d994ddf5..45a7a0f1c 100644 --- a/src/Core/Cache/Type/MemcachedCache.php +++ b/src/Core/Cache/Type/MemcachedCache.php @@ -23,7 +23,6 @@ namespace Friendica\Core\Cache\Type; use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\Capability\ICanCacheInMemory; -use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Cache\Exception\CachePersistenceException; use Friendica\Core\Cache\Exception\InvalidCacheDriverException; use Friendica\Core\Config\Capability\IManageConfigValues; @@ -35,6 +34,8 @@ use Psr\Log\LoggerInterface; */ class MemcachedCache extends AbstractCache implements ICanCacheInMemory { + static $NAME = 'memcached'; + use CompareSetTrait; use CompareDeleteTrait; use MemcacheCommandTrait; @@ -185,12 +186,4 @@ class MemcachedCache extends AbstractCache implements ICanCacheInMemory $cacheKey = $this->getCacheKey($key); return $this->memcached->add($cacheKey, $value, $ttl); } - - /** - * {@inheritDoc} - */ - public function getName(): string - { - return Type::MEMCACHED; - } } diff --git a/src/Core/Cache/Type/RedisCache.php b/src/Core/Cache/Type/RedisCache.php index b1fb9ba9c..36c60a12c 100644 --- a/src/Core/Cache/Type/RedisCache.php +++ b/src/Core/Cache/Type/RedisCache.php @@ -21,10 +21,8 @@ namespace Friendica\Core\Cache\Type; -use Exception; use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\Capability\ICanCacheInMemory; -use Friendica\Core\Cache\Enum\Type; use Friendica\Core\Cache\Exception\CachePersistenceException; use Friendica\Core\Cache\Exception\InvalidCacheDriverException; use Friendica\Core\Config\Capability\IManageConfigValues; @@ -35,6 +33,8 @@ use Redis; */ class RedisCache extends AbstractCache implements ICanCacheInMemory { + public static $NAME = 'redis'; + /** * @var Redis */ @@ -59,18 +59,23 @@ class RedisCache extends AbstractCache implements ICanCacheInMemory $redis_pw = $config->get('system', 'redis_password'); $redis_db = $config->get('system', 'redis_db', 0); - if (!empty($redis_port) && !@$this->redis->connect($redis_host, $redis_port)) { - throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available'); - } elseif (!@$this->redis->connect($redis_host)) { - throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ' isn\'t available'); - } + try { - if (!empty($redis_pw) && !$this->redis->auth($redis_pw)) { - throw new CachePersistenceException('Cannot authenticate redis server at ' . $redis_host . ':' . $redis_port); - } + if (!empty($redis_port) && !@$this->redis->connect($redis_host, $redis_port)) { + throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available'); + } else if (!@$this->redis->connect($redis_host)) { + throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ' isn\'t available'); + } - if ($redis_db !== 0 && !$this->redis->select($redis_db)) { - throw new CachePersistenceException('Cannot switch to redis db ' . $redis_db . ' at ' . $redis_host . ':' . $redis_port); + if (!empty($redis_pw) && !$this->redis->auth($redis_pw)) { + throw new CachePersistenceException('Cannot authenticate redis server at ' . $redis_host . ':' . $redis_port); + } + + if ($redis_db !== 0 && !$this->redis->select($redis_db)) { + throw new CachePersistenceException('Cannot switch to redis db ' . $redis_db . ' at ' . $redis_host . ':' . $redis_port); + } + } catch (\RedisException $exception) { + throw new CachePersistenceException('Redis connection fails unexpectedly', $exception); } } @@ -211,12 +216,4 @@ class RedisCache extends AbstractCache implements ICanCacheInMemory $this->redis->unwatch(); return false; } - - /** - * {@inheritDoc} - */ - public function getName(): string - { - return Type::REDIS; - } } diff --git a/static/dependencies.config.php b/static/dependencies.config.php index 98a9f3077..c3f30ad8d 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -178,6 +178,20 @@ return [ $_SERVER, ], ], + '$hostname' => [ + 'instanceOf' => App\BaseURL::class, + 'constructParams' => [ + $_SERVER, + ], + 'call' => [ + ['getHost', [], Dice::CHAIN_CALL], + ], + ], + Cache\Type\AbstractCache::class => [ + 'constructParams' => [ + [Dice::INSTANCE => '$hostname'], + ], + ], App\Page::class => [ 'constructParams' => [ [Dice::INSTANCE => '$basepath'], diff --git a/static/strategies.config.php b/static/strategies.config.php index bb3598c36..5d84a7e47 100644 --- a/static/strategies.config.php +++ b/static/strategies.config.php @@ -19,7 +19,7 @@ * */ -use Friendica\Core\Hooks\Capabilities\BehavioralHookType as H; +use Friendica\Core\Cache; use Friendica\Core\Logger\Type; use Psr\Log; @@ -29,4 +29,11 @@ return [ Type\SyslogLogger::class => ['syslog'], Type\StreamLogger::class => ['stream'], ], + Cache\Capability\ICanCache::class => [ + Cache\Type\APCuCache::class => ['apcu'], + Cache\Type\DatabaseCache::class => ['database', ''], + Cache\Type\MemcacheCache::class => ['memcache'], + Cache\Type\MemcachedCache::class => ['memcached'], + Cache\Type\RedisCache::class => ['redis'], + ] ]; diff --git a/tests/phpunit-addons.xml b/tests/phpunit-addons.xml new file mode 100644 index 000000000..3793249ab --- /dev/null +++ b/tests/phpunit-addons.xml @@ -0,0 +1,24 @@ + + + + ../addon/*/tests/ + + + + + ../addon/ + + + ../addon/*/tests/ + ../addon/*/view/ + ../addon/*/vendor/ + + + diff --git a/tests/src/Core/Cache/DatabaseCacheTest.php b/tests/src/Core/Cache/DatabaseCacheTest.php index 98afa9e24..63cc7e445 100644 --- a/tests/src/Core/Cache/DatabaseCacheTest.php +++ b/tests/src/Core/Cache/DatabaseCacheTest.php @@ -21,6 +21,7 @@ namespace Friendica\Test\src\Core\Cache; +use Friendica\App\BaseURL; use Friendica\Core\Cache; use Friendica\Test\DatabaseTestTrait; use Friendica\Test\Util\CreateDatabaseTrait; From 58f56c7d7d902349cdfdde76a22301c8cd689b19 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 23 Jul 2023 03:15:59 +0200 Subject: [PATCH 177/259] Move KeyValuePairStorage to strategies --- .../Factory/KeyValueStorage.php | 34 +++++++++++++++++++ src/Core/Lock/Type/AbstractLock.php | 2 +- static/dependencies.config.php | 5 ++- static/strategies.config.php | 6 +++- 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 src/Core/KeyValueStorage/Factory/KeyValueStorage.php diff --git a/src/Core/KeyValueStorage/Factory/KeyValueStorage.php b/src/Core/KeyValueStorage/Factory/KeyValueStorage.php new file mode 100644 index 000000000..1bce84f4e --- /dev/null +++ b/src/Core/KeyValueStorage/Factory/KeyValueStorage.php @@ -0,0 +1,34 @@ +. + * + */ + +namespace Friendica\Core\KeyValueStorage\Factory; + +use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; +use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; + +class KeyValueStorage +{ + public function create(ICanCreateInstances $instanceCreator): IManageKeyValuePairs + { + /** @var IManageKeyValuePairs */ + return $instanceCreator->create(IManageKeyValuePairs::class, ''); + } +} diff --git a/src/Core/Lock/Type/AbstractLock.php b/src/Core/Lock/Type/AbstractLock.php index 3c47c0171..25eb47fe9 100644 --- a/src/Core/Lock/Type/AbstractLock.php +++ b/src/Core/Lock/Type/AbstractLock.php @@ -36,7 +36,7 @@ abstract class AbstractLock implements ICanLock /** * Check if we've locally acquired a lock * - * @param string key The Name of the lock + * @param string $key The Name of the lock * * @return bool Returns true if the lock is set */ diff --git a/static/dependencies.config.php b/static/dependencies.config.php index c3f30ad8d..9c1ead905 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -291,7 +291,10 @@ return [ ], ], \Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class => [ - 'instanceOf' => \Friendica\Core\KeyValueStorage\Type\DBKeyValueStorage::class, + 'instanceOf' => \Friendica\Core\KeyValueStorage\Factory\KeyValueStorage::class, + 'call' => [ + ['create', [], Dice::CHAIN_CALL], + ], ], Network\HTTPClient\Capability\ICanSendHttpRequests::class => [ 'instanceOf' => Network\HTTPClient\Factory\HttpClient::class, diff --git a/static/strategies.config.php b/static/strategies.config.php index 5d84a7e47..35afe2e51 100644 --- a/static/strategies.config.php +++ b/static/strategies.config.php @@ -21,6 +21,7 @@ use Friendica\Core\Cache; use Friendica\Core\Logger\Type; +use Friendica\Core\KeyValueStorage; use Psr\Log; return [ @@ -35,5 +36,8 @@ return [ Cache\Type\MemcacheCache::class => ['memcache'], Cache\Type\MemcachedCache::class => ['memcached'], Cache\Type\RedisCache::class => ['redis'], - ] + ], + KeyValueStorage\Capabilities\IManageKeyValuePairs::class => [ + KeyValueStorage\Type\DBKeyValueStorage::class => ['database', ''], + ], ]; From 8ed94037d5022d75a9104ceebf06409d6c51c505 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 23 Jul 2023 03:19:38 +0200 Subject: [PATCH 178/259] Move PConfig to strategies --- src/Core/PConfig/Factory/PConfig.php | 22 +++++----------------- static/strategies.config.php | 5 +++++ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/Core/PConfig/Factory/PConfig.php b/src/Core/PConfig/Factory/PConfig.php index cde97759e..4195619bc 100644 --- a/src/Core/PConfig/Factory/PConfig.php +++ b/src/Core/PConfig/Factory/PConfig.php @@ -22,28 +22,16 @@ namespace Friendica\Core\PConfig\Factory; use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; -use Friendica\Core\PConfig\Repository; -use Friendica\Core\PConfig\Type; -use Friendica\Core\PConfig\ValueObject; class PConfig { - /** - * @param IManageConfigValues $config The config - * @param ValueObject\Cache $pConfigCache The personal config cache - * @param Repository\PConfig $configRepo The configuration model - * - * @return IManagePersonalConfigValues - */ - public function create(IManageConfigValues $config, ValueObject\Cache $pConfigCache, Repository\PConfig $configRepo): IManagePersonalConfigValues + public function create(ICanCreateInstances $instanceCreator, IManageConfigValues $config): IManagePersonalConfigValues { - if ($config->get('system', 'config_adapter') === 'preload') { - $configuration = new Type\PreloadPConfig($pConfigCache, $configRepo); - } else { - $configuration = new Type\JitPConfig($pConfigCache, $configRepo); - } + $strategy = $config->get('system', 'config_adapter'); - return $configuration; + /** @var IManagePersonalConfigValues */ + return $instanceCreator->create(IManagePersonalConfigValues::class, $strategy); } } diff --git a/static/strategies.config.php b/static/strategies.config.php index 35afe2e51..339a59a87 100644 --- a/static/strategies.config.php +++ b/static/strategies.config.php @@ -22,6 +22,7 @@ use Friendica\Core\Cache; use Friendica\Core\Logger\Type; use Friendica\Core\KeyValueStorage; +use Friendica\Core\PConfig; use Psr\Log; return [ @@ -40,4 +41,8 @@ return [ KeyValueStorage\Capabilities\IManageKeyValuePairs::class => [ KeyValueStorage\Type\DBKeyValueStorage::class => ['database', ''], ], + PConfig\Capability\IManagePersonalConfigValues::class => [ + PConfig\Type\JitPConfig::class => ['jit'], + PConfig\Type\PreloadPConfig::class => ['preload', ''], + ], ]; From 8cc9471a7b29afb17c546ad42838df5e8d29a344 Mon Sep 17 00:00:00 2001 From: Hannes Heute <5753419+haheute@users.noreply.github.com> Date: Wed, 26 Jul 2023 19:59:08 +0200 Subject: [PATCH 179/259] added class in the mobile menu, too --- view/theme/frio/templates/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 42f69243b..e58ab73ac 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -411,7 +411,7 @@ From 9f18222a061342e3587ee6f38c4543d00948c0b8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 23 Jul 2023 03:21:41 +0200 Subject: [PATCH 180/259] Unify "Capability" --- bin/auth_ejabberd.php | 6 +++--- bin/console.php | 6 +++--- bin/daemon.php | 6 +++--- bin/worker.php | 6 +++--- doc/StrategyHooks.md | 12 ++++++------ index.php | 4 ++-- src/Console/PostUpdate.php | 2 +- src/Content/Item.php | 2 +- .../{Capabilities => Capability}/ICanLoadAddons.php | 2 +- src/Core/Addon/Model/AddonLoader.php | 2 +- src/Core/Cache/Factory/Cache.php | 2 +- .../BehavioralHookType.php | 2 +- .../ICanCreateInstances.php | 2 +- .../ICanRegisterStrategies.php | 2 +- src/Core/Hooks/Model/DiceInstanceManager.php | 4 ++-- src/Core/Hooks/Util/StrategiesFileManager.php | 4 ++-- .../IManageKeyValuePairs.php | 2 +- src/Core/KeyValueStorage/Factory/KeyValueStorage.php | 4 ++-- .../KeyValueStorage/Type/AbstractKeyValueStorage.php | 2 +- .../ICheckLoggerSettings.php | 2 +- .../IHaveCallIntrospections.php | 2 +- .../{Capabilities => Capability}/LogChannel.php | 2 +- .../Logger/Factory/AbstractLoggerTypeFactory.php | 2 +- src/Core/Logger/Factory/Logger.php | 4 ++-- src/Core/Logger/Factory/StreamLogger.php | 2 +- src/Core/Logger/Type/AbstractLogger.php | 2 +- src/Core/Logger/Type/StreamLogger.php | 2 +- src/Core/Logger/Type/SyslogLogger.php | 2 +- src/Core/Logger/Util/Introspection.php | 2 +- src/Core/Logger/Util/LoggerSettingsCheck.php | 2 +- src/Core/PConfig/Factory/PConfig.php | 2 +- src/DI.php | 6 +++--- src/Module/Friendica.php | 2 +- src/Module/Statistics.php | 4 ++-- static/dependencies.config.php | 12 ++++++------ static/strategies.config.php | 4 ++-- tests/src/Core/Addon/Model/AddonLoaderTest.php | 8 ++++---- .../Core/Hooks/Util/StrategiesFileManagerTest.php | 4 ++-- .../Core/KeyValueStorage/DBKeyValueStorageTest.php | 2 +- .../src/Core/KeyValueStorage/KeyValueStorageTest.php | 2 +- tests/src/Core/Logger/SyslogLoggerWrapper.php | 2 +- 41 files changed, 72 insertions(+), 72 deletions(-) rename src/Core/Addon/{Capabilities => Capability}/ICanLoadAddons.php (96%) rename src/Core/Hooks/{Capabilities => Capability}/BehavioralHookType.php (96%) rename src/Core/Hooks/{Capabilities => Capability}/ICanCreateInstances.php (97%) rename src/Core/Hooks/{Capabilities => Capability}/ICanRegisterStrategies.php (97%) rename src/Core/KeyValueStorage/{Capabilities => Capability}/IManageKeyValuePairs.php (97%) rename src/Core/Logger/{Capabilities => Capability}/ICheckLoggerSettings.php (96%) rename src/Core/Logger/{Capabilities => Capability}/IHaveCallIntrospections.php (96%) rename src/Core/Logger/{Capabilities => Capability}/LogChannel.php (97%) diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php index b923009e6..3a9553246 100755 --- a/bin/auth_ejabberd.php +++ b/bin/auth_ejabberd.php @@ -58,7 +58,7 @@ if (php_sapi_name() !== 'cli') { use Dice\Dice; use Friendica\App\Mode; -use Friendica\Core\Logger\Capabilities\LogChannel; +use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Security\ExAuth; use Psr\Log\LoggerInterface; @@ -79,8 +79,8 @@ chdir($directory); require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ -$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); $dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::AUTH_JABBERED]]); diff --git a/bin/console.php b/bin/console.php index b2cde1082..b797e6ba9 100755 --- a/bin/console.php +++ b/bin/console.php @@ -26,15 +26,15 @@ if (php_sapi_name() !== 'cli') { } use Dice\Dice; -use Friendica\Core\Logger\Capabilities\LogChannel; +use Friendica\Core\Logger\Capability\LogChannel; use Friendica\DI; use Psr\Log\LoggerInterface; require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ -$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); $dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::CONSOLE]]); diff --git a/bin/daemon.php b/bin/daemon.php index 11bad2b11..cd774fe25 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -60,10 +60,10 @@ if (!file_exists('index.php') && (sizeof($_SERVER['argv']) != 0)) { require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ -$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); -$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capabilities\LogChannel::DAEMON]]); +$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]); DI::init($dice); \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class)); diff --git a/bin/worker.php b/bin/worker.php index 42a8f533d..c855f9bc5 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -29,7 +29,7 @@ if (php_sapi_name() !== 'cli') { use Dice\Dice; use Friendica\App; use Friendica\App\Mode; -use Friendica\Core\Logger\Capabilities\LogChannel; +use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Core\Update; use Friendica\Core\Worker; use Friendica\DI; @@ -55,8 +55,8 @@ if (!file_exists("index.php") && (sizeof($_SERVER["argv"]) != 0)) { require dirname(__DIR__) . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php'); -/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ -$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); $dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::WORKER]]); diff --git a/doc/StrategyHooks.md b/doc/StrategyHooks.md index 39fc1bd8d..2960ceeaa 100644 --- a/doc/StrategyHooks.md +++ b/doc/StrategyHooks.md @@ -10,9 +10,9 @@ This type of hook is based on the [Strategy Design Pattern](https://refactoring. A strategy class defines a possible implementation of a given interface based on a unique name. Every name is possible as long as it's unique and not `null`. Using an empty name (`''`) is possible as well and should be used as the "default" implementation. -To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capabilities/ICanRegisterInstances.php) interface. +To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capability/ICanRegisterInstances.php) interface. -After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capabilities/ICanCreateInstances.php) interface and the chosen name. +After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capability/ICanCreateInstances.php) interface and the chosen name. This is useful in case there are different, possible implementations for the same purpose, like for logging, locking, caching, ... @@ -43,11 +43,11 @@ public class ConcreteClassB implements ExampleInterface } } -/** @var \Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies $instanceRegister */ +/** @var \Friendica\Core\Hooks\Capability\ICanRegisterStrategies $instanceRegister */ $instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A'); $instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassB::class, 'B'); -/** @var \Friendica\Core\Hooks\Capabilities\ICanCreateInstances $instanceManager */ +/** @var \Friendica\Core\Hooks\Capability\ICanCreateInstances $instanceManager */ /** @var ConcreteClassA $concreteClass */ $concreteClass = $instanceManager->create(ExampleInterface::class, 'A'); @@ -62,14 +62,14 @@ To avoid registering all strategies manually inside the code, Friendica introduc There, you can register all kind of strategies in one file. -### [`HookType::STRATEGY`](../src/Core/Hooks/Capabilities/HookType.php) +### [`HookType::STRATEGY`](../src/Core/Hooks/Capability/HookType.php) For each given interface, a list of key-value pairs can be set, where the key is the concrete implementation class and the value is an array of unique names. ### Example ```php -use Friendica\Core\Hooks\Capabilities\BehavioralHookType as H; +use Friendica\Core\Hooks\Capability\BehavioralHookType as H; return [ H::STRATEGY => [ diff --git a/index.php b/index.php index ce82470b6..87778308a 100644 --- a/index.php +++ b/index.php @@ -30,8 +30,8 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) { require __DIR__ . '/vendor/autoload.php'; $dice = (new Dice())->addRules(include __DIR__ . '/static/dependencies.config.php'); -/** @var \Friendica\Core\Addon\Capabilities\ICanLoadAddons $addonLoader */ -$addonLoader = $dice->create(\Friendica\Core\Addon\Capabilities\ICanLoadAddons::class); +/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */ +$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class); $dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies')); $dice = $dice->addRule(Friendica\App\Mode::class, ['call' => [['determineRunMode', [false, $_SERVER], Dice::CHAIN_CALL]]]); diff --git a/src/Console/PostUpdate.php b/src/Console/PostUpdate.php index 742197e73..42cc63e10 100644 --- a/src/Console/PostUpdate.php +++ b/src/Console/PostUpdate.php @@ -22,7 +22,7 @@ namespace Friendica\Console; use Friendica\App; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\L10n; use Friendica\Core\Update; diff --git a/src/Content/Item.php b/src/Content/Item.php index f7dda6c65..c25e5296f 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -544,7 +544,7 @@ class Item unset($item['owner-name']); unset($item['owner-avatar']); } - + $item['postopts'] = ''; } diff --git a/src/Core/Addon/Capabilities/ICanLoadAddons.php b/src/Core/Addon/Capability/ICanLoadAddons.php similarity index 96% rename from src/Core/Addon/Capabilities/ICanLoadAddons.php rename to src/Core/Addon/Capability/ICanLoadAddons.php index 9c9d1e841..42af1a7b3 100644 --- a/src/Core/Addon/Capabilities/ICanLoadAddons.php +++ b/src/Core/Addon/Capability/ICanLoadAddons.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Addon\Capabilities; +namespace Friendica\Core\Addon\Capability; /** * Interface for loading Addons specific content diff --git a/src/Core/Addon/Model/AddonLoader.php b/src/Core/Addon/Model/AddonLoader.php index 952246af0..e808f2177 100644 --- a/src/Core/Addon/Model/AddonLoader.php +++ b/src/Core/Addon/Model/AddonLoader.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Addon\Model; -use Friendica\Core\Addon\Capabilities\ICanLoadAddons; +use Friendica\Core\Addon\Capability\ICanLoadAddons; use Friendica\Core\Addon\Exception\AddonInvalidConfigFileException; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Util\Strings; diff --git a/src/Core/Cache/Factory/Cache.php b/src/Core/Cache/Factory/Cache.php index b6124c156..02cdb1a79 100644 --- a/src/Core/Cache/Factory/Cache.php +++ b/src/Core/Cache/Factory/Cache.php @@ -27,7 +27,7 @@ use Friendica\Core\Cache\Exception\CachePersistenceException; use Friendica\Core\Cache\Exception\InvalidCacheDriverException; use Friendica\Core\Cache\Type; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; +use Friendica\Core\Hooks\Capability\ICanCreateInstances; use Friendica\Util\Profiler; /** diff --git a/src/Core/Hooks/Capabilities/BehavioralHookType.php b/src/Core/Hooks/Capability/BehavioralHookType.php similarity index 96% rename from src/Core/Hooks/Capabilities/BehavioralHookType.php rename to src/Core/Hooks/Capability/BehavioralHookType.php index 6336406e6..6de875e55 100644 --- a/src/Core/Hooks/Capabilities/BehavioralHookType.php +++ b/src/Core/Hooks/Capability/BehavioralHookType.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Hooks\Capabilities; +namespace Friendica\Core\Hooks\Capability; /** * An enum of hook types, based on behavioral design patterns diff --git a/src/Core/Hooks/Capabilities/ICanCreateInstances.php b/src/Core/Hooks/Capability/ICanCreateInstances.php similarity index 97% rename from src/Core/Hooks/Capabilities/ICanCreateInstances.php rename to src/Core/Hooks/Capability/ICanCreateInstances.php index 77d4c4b36..55740d276 100644 --- a/src/Core/Hooks/Capabilities/ICanCreateInstances.php +++ b/src/Core/Hooks/Capability/ICanCreateInstances.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Hooks\Capabilities; +namespace Friendica\Core\Hooks\Capability; /** * creates special instances for given classes diff --git a/src/Core/Hooks/Capabilities/ICanRegisterStrategies.php b/src/Core/Hooks/Capability/ICanRegisterStrategies.php similarity index 97% rename from src/Core/Hooks/Capabilities/ICanRegisterStrategies.php rename to src/Core/Hooks/Capability/ICanRegisterStrategies.php index 911eb3499..875665764 100644 --- a/src/Core/Hooks/Capabilities/ICanRegisterStrategies.php +++ b/src/Core/Hooks/Capability/ICanRegisterStrategies.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Hooks\Capabilities; +namespace Friendica\Core\Hooks\Capability; use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; diff --git a/src/Core/Hooks/Model/DiceInstanceManager.php b/src/Core/Hooks/Model/DiceInstanceManager.php index a8b0b540c..194fc6e5c 100644 --- a/src/Core/Hooks/Model/DiceInstanceManager.php +++ b/src/Core/Hooks/Model/DiceInstanceManager.php @@ -22,8 +22,8 @@ namespace Friendica\Core\Hooks\Model; use Dice\Dice; -use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; -use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; +use Friendica\Core\Hooks\Capability\ICanCreateInstances; +use Friendica\Core\Hooks\Capability\ICanRegisterStrategies; use Friendica\Core\Hooks\Exceptions\HookInstanceException; use Friendica\Core\Hooks\Exceptions\HookRegisterArgumentException; use Friendica\Core\Hooks\Util\StrategiesFileManager; diff --git a/src/Core/Hooks/Util/StrategiesFileManager.php b/src/Core/Hooks/Util/StrategiesFileManager.php index 700c401f2..d6651ac98 100644 --- a/src/Core/Hooks/Util/StrategiesFileManager.php +++ b/src/Core/Hooks/Util/StrategiesFileManager.php @@ -21,8 +21,8 @@ namespace Friendica\Core\Hooks\Util; -use Friendica\Core\Addon\Capabilities\ICanLoadAddons; -use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; +use Friendica\Core\Addon\Capability\ICanLoadAddons; +use Friendica\Core\Hooks\Capability\ICanRegisterStrategies; use Friendica\Core\Hooks\Exceptions\HookConfigException; /** diff --git a/src/Core/KeyValueStorage/Capabilities/IManageKeyValuePairs.php b/src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php similarity index 97% rename from src/Core/KeyValueStorage/Capabilities/IManageKeyValuePairs.php rename to src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php index c9d215c49..5d9c8455e 100644 --- a/src/Core/KeyValueStorage/Capabilities/IManageKeyValuePairs.php +++ b/src/Core/KeyValueStorage/Capability/IManageKeyValuePairs.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\KeyValueStorage\Capabilities; +namespace Friendica\Core\KeyValueStorage\Capability; use Friendica\Core\KeyValueStorage\Exceptions\KeyValueStoragePersistenceException; diff --git a/src/Core/KeyValueStorage/Factory/KeyValueStorage.php b/src/Core/KeyValueStorage/Factory/KeyValueStorage.php index 1bce84f4e..ee6cb1731 100644 --- a/src/Core/KeyValueStorage/Factory/KeyValueStorage.php +++ b/src/Core/KeyValueStorage/Factory/KeyValueStorage.php @@ -21,8 +21,8 @@ namespace Friendica\Core\KeyValueStorage\Factory; -use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\Hooks\Capability\ICanCreateInstances; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; class KeyValueStorage { diff --git a/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php b/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php index a6924b61f..6b1666527 100644 --- a/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php +++ b/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php @@ -21,7 +21,7 @@ namespace Friendica\Core\KeyValueStorage\Type; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; /** * An abstract helper class for Key-Value storage classes diff --git a/src/Core/Logger/Capabilities/ICheckLoggerSettings.php b/src/Core/Logger/Capability/ICheckLoggerSettings.php similarity index 96% rename from src/Core/Logger/Capabilities/ICheckLoggerSettings.php rename to src/Core/Logger/Capability/ICheckLoggerSettings.php index fb93d18e8..abdbc3b50 100644 --- a/src/Core/Logger/Capabilities/ICheckLoggerSettings.php +++ b/src/Core/Logger/Capability/ICheckLoggerSettings.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Logger\Capabilities; +namespace Friendica\Core\Logger\Capability; /** * Whenever a logging specific check is necessary, use this interface to encapsulate and centralize this logic diff --git a/src/Core/Logger/Capabilities/IHaveCallIntrospections.php b/src/Core/Logger/Capability/IHaveCallIntrospections.php similarity index 96% rename from src/Core/Logger/Capabilities/IHaveCallIntrospections.php rename to src/Core/Logger/Capability/IHaveCallIntrospections.php index 83d75f976..918232af3 100644 --- a/src/Core/Logger/Capabilities/IHaveCallIntrospections.php +++ b/src/Core/Logger/Capability/IHaveCallIntrospections.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Logger\Capabilities; +namespace Friendica\Core\Logger\Capability; interface IHaveCallIntrospections { diff --git a/src/Core/Logger/Capabilities/LogChannel.php b/src/Core/Logger/Capability/LogChannel.php similarity index 97% rename from src/Core/Logger/Capabilities/LogChannel.php rename to src/Core/Logger/Capability/LogChannel.php index 31915168b..c3b631644 100644 --- a/src/Core/Logger/Capabilities/LogChannel.php +++ b/src/Core/Logger/Capability/LogChannel.php @@ -19,7 +19,7 @@ * */ -namespace Friendica\Core\Logger\Capabilities; +namespace Friendica\Core\Logger\Capability; /** * An enum class for the Log channels diff --git a/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php b/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php index 402176d8e..86dfeae63 100644 --- a/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php +++ b/src/Core/Logger/Factory/AbstractLoggerTypeFactory.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Logger\Factory; -use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; +use Friendica\Core\Logger\Capability\IHaveCallIntrospections; use Psr\Log\LogLevel; /** diff --git a/src/Core/Logger/Factory/Logger.php b/src/Core/Logger/Factory/Logger.php index c370cc4dd..f1086f585 100644 --- a/src/Core/Logger/Factory/Logger.php +++ b/src/Core/Logger/Factory/Logger.php @@ -22,8 +22,8 @@ namespace Friendica\Core\Logger\Factory; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; -use Friendica\Core\Logger\Capabilities\LogChannel; +use Friendica\Core\Hooks\Capability\ICanCreateInstances; +use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Core\Logger\Type\ProfilerLogger as ProfilerLoggerClass; use Friendica\Util\Profiler; use Psr\Log\LoggerInterface; diff --git a/src/Core/Logger/Factory/StreamLogger.php b/src/Core/Logger/Factory/StreamLogger.php index caad78e3b..7f32d66b1 100644 --- a/src/Core/Logger/Factory/StreamLogger.php +++ b/src/Core/Logger/Factory/StreamLogger.php @@ -22,7 +22,7 @@ namespace Friendica\Core\Logger\Factory; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Logger\Capabilities\LogChannel; +use Friendica\Core\Logger\Capability\LogChannel; use Friendica\Core\Logger\Exception\LoggerArgumentException; use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; diff --git a/src/Core/Logger/Type/AbstractLogger.php b/src/Core/Logger/Type/AbstractLogger.php index 77a61e920..e592ee86d 100644 --- a/src/Core/Logger/Type/AbstractLogger.php +++ b/src/Core/Logger/Type/AbstractLogger.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Logger\Type; -use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; +use Friendica\Core\Logger\Capability\IHaveCallIntrospections; use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Util\Strings; use Psr\Log\LoggerInterface; diff --git a/src/Core/Logger/Type/StreamLogger.php b/src/Core/Logger/Type/StreamLogger.php index 87f1a3937..e09a32047 100644 --- a/src/Core/Logger/Type/StreamLogger.php +++ b/src/Core/Logger/Type/StreamLogger.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Logger\Type; -use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; +use Friendica\Core\Logger\Capability\IHaveCallIntrospections; use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; use Friendica\Util\DateTimeFormat; diff --git a/src/Core/Logger/Type/SyslogLogger.php b/src/Core/Logger/Type/SyslogLogger.php index 88dc1964d..fb8cb97ae 100644 --- a/src/Core/Logger/Type/SyslogLogger.php +++ b/src/Core/Logger/Type/SyslogLogger.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Logger\Type; -use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; +use Friendica\Core\Logger\Capability\IHaveCallIntrospections; use Friendica\Core\Logger\Exception\LoggerException; use Friendica\Core\Logger\Exception\LogLevelException; use Psr\Log\LogLevel; diff --git a/src/Core/Logger/Util/Introspection.php b/src/Core/Logger/Util/Introspection.php index e0f7e8554..0b703da82 100644 --- a/src/Core/Logger/Util/Introspection.php +++ b/src/Core/Logger/Util/Introspection.php @@ -22,7 +22,7 @@ namespace Friendica\Core\Logger\Util; use Friendica\App\Request; -use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; +use Friendica\Core\Logger\Capability\IHaveCallIntrospections; /** * Get Introspection information about the current call diff --git a/src/Core/Logger/Util/LoggerSettingsCheck.php b/src/Core/Logger/Util/LoggerSettingsCheck.php index 7782216da..cb598d5f2 100644 --- a/src/Core/Logger/Util/LoggerSettingsCheck.php +++ b/src/Core/Logger/Util/LoggerSettingsCheck.php @@ -23,7 +23,7 @@ namespace Friendica\Core\Logger\Util; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; -use Friendica\Core\Logger\Capabilities\ICheckLoggerSettings; +use Friendica\Core\Logger\Capability\ICheckLoggerSettings; use Friendica\Core\Logger\Exception\LoggerUnusableException; /** {@inheritDoc} */ diff --git a/src/Core/PConfig/Factory/PConfig.php b/src/Core/PConfig/Factory/PConfig.php index 4195619bc..059675289 100644 --- a/src/Core/PConfig/Factory/PConfig.php +++ b/src/Core/PConfig/Factory/PConfig.php @@ -22,7 +22,7 @@ namespace Friendica\Core\PConfig\Factory; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; +use Friendica\Core\Hooks\Capability\ICanCreateInstances; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; class PConfig diff --git a/src/DI.php b/src/DI.php index 1917f710d..34cf1c68d 100644 --- a/src/DI.php +++ b/src/DI.php @@ -22,7 +22,7 @@ namespace Friendica; use Dice\Dice; -use Friendica\Core\Logger\Capabilities\ICheckLoggerSettings; +use Friendica\Core\Logger\Capability\ICheckLoggerSettings; use Friendica\Core\Logger\Util\LoggerSettingsCheck; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\Core\Session\Capability\IHandleUserSessions; @@ -210,9 +210,9 @@ abstract class DI return self::$dice->create(Core\Config\Util\ConfigFileManager::class); } - public static function keyValue(): Core\KeyValueStorage\Capabilities\IManageKeyValuePairs + public static function keyValue(): Core\KeyValueStorage\Capability\IManageKeyValuePairs { - return self::$dice->create(Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class); + return self::$dice->create(Core\KeyValueStorage\Capability\IManageKeyValuePairs::class); } /** diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php index c6e2768bd..1bd6bd411 100644 --- a/src/Module/Friendica.php +++ b/src/Module/Friendica.php @@ -26,7 +26,7 @@ use Friendica\BaseModule; use Friendica\Core\Addon; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Core\Session\Capability\IHandleUserSessions; diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php index 514f10bb7..e69f75421 100644 --- a/src/Module/Statistics.php +++ b/src/Module/Statistics.php @@ -25,7 +25,7 @@ use Friendica\App; use Friendica\BaseModule; use Friendica\Core\Addon; use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Network\HTTPException\NotFoundException; @@ -38,7 +38,7 @@ class Statistics extends BaseModule protected $config; /** @var IManageKeyValuePairs */ protected $keyValue; - + public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManageConfigValues $config, IManageKeyValuePairs $keyValue, Response $response, array $server, array $parameters = []) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); diff --git a/static/dependencies.config.php b/static/dependencies.config.php index 9c1ead905..3dfde6b5f 100644 --- a/static/dependencies.config.php +++ b/static/dependencies.config.php @@ -37,8 +37,8 @@ use Dice\Dice; use Friendica\App; use Friendica\Core\Cache; use Friendica\Core\Config; -use Friendica\Core\Hooks\Capabilities\ICanCreateInstances; -use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; +use Friendica\Core\Hooks\Capability\ICanCreateInstances; +use Friendica\Core\Hooks\Capability\ICanRegisterStrategies; use Friendica\Core\Hooks\Model\DiceInstanceManager; use Friendica\Core\PConfig; use Friendica\Core\L10n; @@ -63,7 +63,7 @@ return [ // one instance for the whole execution 'shared' => true, ], - \Friendica\Core\Addon\Capabilities\ICanLoadAddons::class => [ + \Friendica\Core\Addon\Capability\ICanLoadAddons::class => [ 'instanceOf' => \Friendica\Core\Addon\Model\AddonLoader::class, 'constructParams' => [ [Dice::INSTANCE => '$basepath'], @@ -215,10 +215,10 @@ return [ ['create', [], Dice::CHAIN_CALL], ], ], - \Friendica\Core\Logger\Capabilities\IHaveCallIntrospections::class => [ + \Friendica\Core\Logger\Capability\IHaveCallIntrospections::class => [ 'instanceOf' => \Friendica\Core\Logger\Util\Introspection::class, 'constructParams' => [ - \Friendica\Core\Logger\Capabilities\IHaveCallIntrospections::IGNORE_CLASS_LIST, + \Friendica\Core\Logger\Capability\IHaveCallIntrospections::IGNORE_CLASS_LIST, ], ], '$devLogger' => [ @@ -290,7 +290,7 @@ return [ ['getBackend', [], Dice::CHAIN_CALL], ], ], - \Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class => [ + \Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs::class => [ 'instanceOf' => \Friendica\Core\KeyValueStorage\Factory\KeyValueStorage::class, 'call' => [ ['create', [], Dice::CHAIN_CALL], diff --git a/static/strategies.config.php b/static/strategies.config.php index 339a59a87..8df0c0478 100644 --- a/static/strategies.config.php +++ b/static/strategies.config.php @@ -38,11 +38,11 @@ return [ Cache\Type\MemcachedCache::class => ['memcached'], Cache\Type\RedisCache::class => ['redis'], ], - KeyValueStorage\Capabilities\IManageKeyValuePairs::class => [ + KeyValueStorage\Capability\IManageKeyValuePairs::class => [ KeyValueStorage\Type\DBKeyValueStorage::class => ['database', ''], ], PConfig\Capability\IManagePersonalConfigValues::class => [ - PConfig\Type\JitPConfig::class => ['jit'], + PConfig\Type\JitPConfig::class => ['jit'], PConfig\Type\PreloadPConfig::class => ['preload', ''], ], ]; diff --git a/tests/src/Core/Addon/Model/AddonLoaderTest.php b/tests/src/Core/Addon/Model/AddonLoaderTest.php index 189110fde..f49333b32 100644 --- a/tests/src/Core/Addon/Model/AddonLoaderTest.php +++ b/tests/src/Core/Addon/Model/AddonLoaderTest.php @@ -54,7 +54,7 @@ class AddonLoaderTest extends MockedTest [ + \Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -79,7 +79,7 @@ EOF; 'addon/testaddon1/static/hooks.config.php' => $this->content, ], 'assertion' => [ - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ + \Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], @@ -94,7 +94,7 @@ EOF; 'addon/testaddon2/static/hooks.config.php' => $this->content, ], 'assertion' => [ - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ + \Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => ['', ''], ], @@ -118,7 +118,7 @@ EOF; 'addon/testaddon2/static/hooks.config.php' => $this->content, ], 'assertion' => [ - \Friendica\Core\Hooks\Capabilities\BehavioralHookType::STRATEGY => [ + \Friendica\Core\Hooks\Capability\BehavioralHookType::STRATEGY => [ \Psr\Log\LoggerInterface::class => [ \Psr\Log\NullLogger::class => [''], ], diff --git a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php index 592f6f1e0..ebb213fa7 100644 --- a/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php +++ b/tests/src/Core/Hooks/Util/StrategiesFileManagerTest.php @@ -21,8 +21,8 @@ namespace Friendica\Test\src\Core\Hooks\Util; -use Friendica\Core\Addon\Capabilities\ICanLoadAddons; -use Friendica\Core\Hooks\Capabilities\ICanRegisterStrategies; +use Friendica\Core\Addon\Capability\ICanLoadAddons; +use Friendica\Core\Hooks\Capability\ICanRegisterStrategies; use Friendica\Core\Hooks\Exceptions\HookConfigException; use Friendica\Core\Hooks\Util\StrategiesFileManager; use Friendica\Test\MockedTest; diff --git a/tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php b/tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php index 80a0f16de..3a3b25536 100644 --- a/tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php +++ b/tests/src/Core/KeyValueStorage/DBKeyValueStorageTest.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Core\KeyValueStorage; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\KeyValueStorage\Type\DBKeyValueStorage; use Friendica\Database\Database; use Friendica\Test\Util\CreateDatabaseTrait; diff --git a/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php b/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php index 6ccc0f5f4..ddb0acc4d 100644 --- a/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php +++ b/tests/src/Core/KeyValueStorage/KeyValueStorageTest.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Core\KeyValueStorage; -use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs; +use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Test\MockedTest; abstract class KeyValueStorageTest extends MockedTest diff --git a/tests/src/Core/Logger/SyslogLoggerWrapper.php b/tests/src/Core/Logger/SyslogLoggerWrapper.php index 1e0c4535f..dce28b164 100644 --- a/tests/src/Core/Logger/SyslogLoggerWrapper.php +++ b/tests/src/Core/Logger/SyslogLoggerWrapper.php @@ -21,7 +21,7 @@ namespace Friendica\Test\src\Core\Logger; -use Friendica\Core\Logger\Capabilities\IHaveCallIntrospections; +use Friendica\Core\Logger\Capability\IHaveCallIntrospections; use Friendica\Core\Logger\Type\SyslogLogger; /** From bbfec06a3d0a922aba054feb0f17aef1c90edd15 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 26 Jul 2023 21:43:03 +0200 Subject: [PATCH 181/259] Add "getName()" test --- tests/src/Core/Cache/CacheTest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php index 615a1095d..dbcc56e22 100644 --- a/tests/src/Core/Cache/CacheTest.php +++ b/tests/src/Core/Cache/CacheTest.php @@ -23,6 +23,7 @@ namespace Friendica\Test\src\Core\Cache; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Capability\ICanCacheInMemory; +use Friendica\Core\Cache\Type\AbstractCache; use Friendica\Test\MockedTest; use Friendica\Util\PidFile; @@ -246,4 +247,13 @@ abstract class CacheTest extends MockedTest self::assertTrue($this->instance->set('key space', 'value')); self::assertEquals('value', $this->instance->get('key space')); } + + public function testGetName() + { + if (property_exists($this->instance, '$NAME')) { + self::assertEquals($this->instance::$NAME, $this->instance->getName()); + } else { + self::expectNotToPerformAssertions(); + } + } } From 9ff89a970a87582520e2051230da04c7e7a93de6 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 26 Jul 2023 22:42:40 +0200 Subject: [PATCH 182/259] Rename NAME to constant --- src/Core/Cache/Factory/Cache.php | 2 +- src/Core/Cache/Type/APCuCache.php | 2 +- src/Core/Cache/Type/AbstractCache.php | 4 ++-- src/Core/Cache/Type/ArrayCache.php | 2 +- src/Core/Cache/Type/DatabaseCache.php | 2 +- src/Core/Cache/Type/MemcacheCache.php | 2 +- src/Core/Cache/Type/MemcachedCache.php | 2 +- src/Core/Cache/Type/RedisCache.php | 2 +- tests/src/Core/Cache/CacheTest.php | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Core/Cache/Factory/Cache.php b/src/Core/Cache/Factory/Cache.php index 02cdb1a79..000233df7 100644 --- a/src/Core/Cache/Factory/Cache.php +++ b/src/Core/Cache/Factory/Cache.php @@ -69,7 +69,7 @@ class Cache */ public function createDistributed(string $type = null): ICanCache { - if ($type === Type\APCuCache::$NAME) { + if ($type === Type\APCuCache::NAME) { throw new InvalidCacheDriverException('apcu doesn\'t support distributed caching.'); } diff --git a/src/Core/Cache/Type/APCuCache.php b/src/Core/Cache/Type/APCuCache.php index 02b2d0fbd..f35815c15 100644 --- a/src/Core/Cache/Type/APCuCache.php +++ b/src/Core/Cache/Type/APCuCache.php @@ -30,7 +30,7 @@ use Friendica\Core\Cache\Exception\InvalidCacheDriverException; */ class APCuCache extends AbstractCache implements ICanCacheInMemory { - public static $NAME = 'apcu'; + const NAME = 'apcu'; use CompareSetTrait; use CompareDeleteTrait; diff --git a/src/Core/Cache/Type/AbstractCache.php b/src/Core/Cache/Type/AbstractCache.php index 36e301ad2..211f28b9a 100644 --- a/src/Core/Cache/Type/AbstractCache.php +++ b/src/Core/Cache/Type/AbstractCache.php @@ -28,7 +28,7 @@ use Friendica\Core\Cache\Capability\ICanCache; */ abstract class AbstractCache implements ICanCache { - public static $NAME = ''; + const NAME = ''; /** * @var string The hostname @@ -111,6 +111,6 @@ abstract class AbstractCache implements ICanCache /** {@inheritDoc} */ public function getName(): string { - return static::$NAME; + return static::NAME; } } diff --git a/src/Core/Cache/Type/ArrayCache.php b/src/Core/Cache/Type/ArrayCache.php index ad87eaf23..34246afff 100644 --- a/src/Core/Cache/Type/ArrayCache.php +++ b/src/Core/Cache/Type/ArrayCache.php @@ -29,7 +29,7 @@ use Friendica\Core\Cache\Enum; */ class ArrayCache extends AbstractCache implements ICanCacheInMemory { - public static $NAME = 'array'; + const NAME = 'array'; use CompareDeleteTrait; diff --git a/src/Core/Cache/Type/DatabaseCache.php b/src/Core/Cache/Type/DatabaseCache.php index 18541e0d2..4959d6a75 100644 --- a/src/Core/Cache/Type/DatabaseCache.php +++ b/src/Core/Cache/Type/DatabaseCache.php @@ -32,7 +32,7 @@ use Friendica\Util\DateTimeFormat; */ class DatabaseCache extends AbstractCache implements ICanCache { - public static $NAME = 'database'; + const NAME = 'database'; /** * @var Database diff --git a/src/Core/Cache/Type/MemcacheCache.php b/src/Core/Cache/Type/MemcacheCache.php index 09394a1dd..fccaff6c0 100644 --- a/src/Core/Cache/Type/MemcacheCache.php +++ b/src/Core/Cache/Type/MemcacheCache.php @@ -33,7 +33,7 @@ use Memcache; */ class MemcacheCache extends AbstractCache implements ICanCacheInMemory { - static $NAME = 'memcached'; + const NAME = 'memcached'; use CompareSetTrait; use CompareDeleteTrait; diff --git a/src/Core/Cache/Type/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php index 45a7a0f1c..160c5a16f 100644 --- a/src/Core/Cache/Type/MemcachedCache.php +++ b/src/Core/Cache/Type/MemcachedCache.php @@ -34,7 +34,7 @@ use Psr\Log\LoggerInterface; */ class MemcachedCache extends AbstractCache implements ICanCacheInMemory { - static $NAME = 'memcached'; + const NAME = 'memcached'; use CompareSetTrait; use CompareDeleteTrait; diff --git a/src/Core/Cache/Type/RedisCache.php b/src/Core/Cache/Type/RedisCache.php index 36c60a12c..be2a7ff08 100644 --- a/src/Core/Cache/Type/RedisCache.php +++ b/src/Core/Cache/Type/RedisCache.php @@ -33,7 +33,7 @@ use Redis; */ class RedisCache extends AbstractCache implements ICanCacheInMemory { - public static $NAME = 'redis'; + const NAME = 'redis'; /** * @var Redis diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php index dbcc56e22..775a29374 100644 --- a/tests/src/Core/Cache/CacheTest.php +++ b/tests/src/Core/Cache/CacheTest.php @@ -250,8 +250,8 @@ abstract class CacheTest extends MockedTest public function testGetName() { - if (property_exists($this->instance, '$NAME')) { - self::assertEquals($this->instance::$NAME, $this->instance->getName()); + if (defined(get_class($this->instance) . '::NAME')) { + self::assertEquals($this->instance::NAME, $this->instance->getName()); } else { self::expectNotToPerformAssertions(); } From acf52a9783c1c56ca740ef903388ab254043340d Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 26 Jul 2023 23:02:09 +0200 Subject: [PATCH 183/259] Added a lot of constants :-) --- src/Core/Cache/Enum/Type.php | 35 ------------------- src/Core/Cache/Factory/Cache.php | 2 +- src/Core/Cache/Type/MemcacheCache.php | 2 +- src/Core/Hooks/Util/StrategiesFileManager.php | 5 +++ .../Type/AbstractKeyValueStorage.php | 2 ++ .../Type/DBKeyValueStorage.php | 1 + src/Core/Lock/Enum/Type.php | 4 +-- src/Core/Lock/Factory/Lock.php | 26 +++++++------- src/Core/Logger/Type/AbstractLogger.php | 2 ++ src/Core/Logger/Type/StreamLogger.php | 2 ++ src/Core/Logger/Type/SyslogLogger.php | 2 ++ .../PConfig/Type/AbstractPConfigValues.php | 2 ++ src/Core/PConfig/Type/JitPConfig.php | 2 ++ src/Core/PConfig/Type/PreloadPConfig.php | 2 ++ src/Core/Session/Factory/Session.php | 4 +-- static/strategies.config.php | 23 ++++++------ 16 files changed, 51 insertions(+), 65 deletions(-) delete mode 100644 src/Core/Cache/Enum/Type.php diff --git a/src/Core/Cache/Enum/Type.php b/src/Core/Cache/Enum/Type.php deleted file mode 100644 index 98ed9e41f..000000000 --- a/src/Core/Cache/Enum/Type.php +++ /dev/null @@ -1,35 +0,0 @@ -. - * - */ - -namespace Friendica\Core\Cache\Enum; - -/** - * Enumeration for cache types - */ -abstract class Type -{ - const APCU = 'apcu'; - const REDIS = 'redis'; - const ARRAY = 'array'; - const MEMCACHE = 'memcache'; - const DATABASE = 'database'; - const MEMCACHED = 'memcached'; -} diff --git a/src/Core/Cache/Factory/Cache.php b/src/Core/Cache/Factory/Cache.php index 000233df7..189c574aa 100644 --- a/src/Core/Cache/Factory/Cache.php +++ b/src/Core/Cache/Factory/Cache.php @@ -42,7 +42,7 @@ class Cache /** * @var string The default cache if nothing set */ - const DEFAULT_TYPE = Enum\Type::DATABASE; + const DEFAULT_TYPE = Type\DatabaseCache::NAME; /** @var ICanCreateInstances */ protected $instanceCreator; /** @var IManageConfigValues */ diff --git a/src/Core/Cache/Type/MemcacheCache.php b/src/Core/Cache/Type/MemcacheCache.php index fccaff6c0..e8d3b07c8 100644 --- a/src/Core/Cache/Type/MemcacheCache.php +++ b/src/Core/Cache/Type/MemcacheCache.php @@ -33,7 +33,7 @@ use Memcache; */ class MemcacheCache extends AbstractCache implements ICanCacheInMemory { - const NAME = 'memcached'; + const NAME = 'memcache'; use CompareSetTrait; use CompareDeleteTrait; diff --git a/src/Core/Hooks/Util/StrategiesFileManager.php b/src/Core/Hooks/Util/StrategiesFileManager.php index d6651ac98..860166fb6 100644 --- a/src/Core/Hooks/Util/StrategiesFileManager.php +++ b/src/Core/Hooks/Util/StrategiesFileManager.php @@ -30,6 +30,11 @@ use Friendica\Core\Hooks\Exceptions\HookConfigException; */ class StrategiesFileManager { + /** + * The default hook-file-key of strategies + * -> it's an empty string to cover empty/missing config values + */ + const STRATEGY_DEFAULT_KEY = ''; const STATIC_DIR = 'static'; const CONFIG_NAME = 'strategies'; diff --git a/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php b/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php index 6b1666527..5d1b1f9d4 100644 --- a/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php +++ b/src/Core/KeyValueStorage/Type/AbstractKeyValueStorage.php @@ -28,6 +28,8 @@ use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; */ abstract class AbstractKeyValueStorage implements IManageKeyValuePairs { + const NAME = ''; + /** {@inheritDoc} */ public function get(string $key) { diff --git a/src/Core/KeyValueStorage/Type/DBKeyValueStorage.php b/src/Core/KeyValueStorage/Type/DBKeyValueStorage.php index d31f3c1ce..cc152f0c9 100644 --- a/src/Core/KeyValueStorage/Type/DBKeyValueStorage.php +++ b/src/Core/KeyValueStorage/Type/DBKeyValueStorage.php @@ -30,6 +30,7 @@ use Friendica\Database\Database; */ class DBKeyValueStorage extends AbstractKeyValueStorage { + const NAME = 'database'; const DB_KEY_VALUE_TABLE = 'key-value'; /** @var Database */ diff --git a/src/Core/Lock/Enum/Type.php b/src/Core/Lock/Enum/Type.php index 9e6e9194d..3a623b637 100644 --- a/src/Core/Lock/Enum/Type.php +++ b/src/Core/Lock/Enum/Type.php @@ -21,7 +21,7 @@ namespace Friendica\Core\Lock\Enum; -use Friendica\Core\Cache\Enum\Type as CacheType; +use Friendica\Core\Cache\Type\DatabaseCache; /** * Enumeration for lock types @@ -30,6 +30,6 @@ use Friendica\Core\Cache\Enum\Type as CacheType; */ abstract class Type { - const DATABASE = CacheType::DATABASE; + const DATABASE = DatabaseCache::NAME; const SEMAPHORE = 'semaphore'; } diff --git a/src/Core/Lock/Factory/Lock.php b/src/Core/Lock/Factory/Lock.php index bc4650c97..a60bc5a96 100644 --- a/src/Core/Lock/Factory/Lock.php +++ b/src/Core/Lock/Factory/Lock.php @@ -23,10 +23,10 @@ namespace Friendica\Core\Lock\Factory; use Friendica\Core\Cache\Factory\Cache; use Friendica\Core\Cache\Capability\ICanCacheInMemory; -use Friendica\Core\Cache\Enum; +use Friendica\Core\Cache\Type as CacheType; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Lock\Capability\ICanLock; -use Friendica\Core\Lock\Type; +use Friendica\Core\Lock\Type as LockType; use Friendica\Database\Database; use Psr\Log\LoggerInterface; @@ -78,20 +78,20 @@ class Lock try { switch ($lock_type) { - case Enum\Type::MEMCACHE: - case Enum\Type::MEMCACHED: - case Enum\Type::REDIS: - case Enum\Type::APCU: + case CacheType\MemcacheCache::NAME: + case CacheType\MemcachedCache::NAME: + case CacheType\RedisCache::NAME: + case CacheType\APCuCache::NAME: $cache = $this->cacheFactory->createLocal($lock_type); if ($cache instanceof ICanCacheInMemory) { - return new Type\CacheLock($cache); + return new LockType\CacheLock($cache); } else { throw new \Exception(sprintf('Incompatible cache driver \'%s\' for lock used', $lock_type)); } case 'database': - return new Type\DatabaseLock($this->dba); + return new LockType\DatabaseLock($this->dba); case 'semaphore': - return new Type\SemaphoreLock(); + return new LockType\SemaphoreLock(); default: return self::useAutoDriver(); } @@ -116,7 +116,7 @@ class Lock // 1. Try to use Semaphores for - local - locking if (function_exists('sem_get')) { try { - return new Type\SemaphoreLock(); + return new LockType\SemaphoreLock(); } catch (\Exception $exception) { $this->logger->warning('Using Semaphore driver for locking failed.', ['exception' => $exception]); } @@ -124,11 +124,11 @@ class Lock // 2. Try to use Cache Locking (don't use the DB-Cache Locking because it works different!) $cache_type = $this->config->get('system', 'cache_driver', 'database'); - if ($cache_type != Enum\Type::DATABASE) { + if ($cache_type != CacheType\DatabaseCache::NAME) { try { $cache = $this->cacheFactory->createLocal($cache_type); if ($cache instanceof ICanCacheInMemory) { - return new Type\CacheLock($cache); + return new LockType\CacheLock($cache); } } catch (\Exception $exception) { $this->logger->warning('Using Cache driver for locking failed.', ['exception' => $exception]); @@ -136,6 +136,6 @@ class Lock } // 3. Use Database Locking as a Fallback - return new Type\DatabaseLock($this->dba); + return new LockType\DatabaseLock($this->dba); } } diff --git a/src/Core/Logger/Type/AbstractLogger.php b/src/Core/Logger/Type/AbstractLogger.php index e592ee86d..7de0e4160 100644 --- a/src/Core/Logger/Type/AbstractLogger.php +++ b/src/Core/Logger/Type/AbstractLogger.php @@ -38,6 +38,8 @@ use Psr\Log\LogLevel; */ abstract class AbstractLogger implements LoggerInterface { + const NAME = ''; + /** * The output channel of this logger * @var string diff --git a/src/Core/Logger/Type/StreamLogger.php b/src/Core/Logger/Type/StreamLogger.php index e09a32047..8cadd8cc7 100644 --- a/src/Core/Logger/Type/StreamLogger.php +++ b/src/Core/Logger/Type/StreamLogger.php @@ -32,6 +32,8 @@ use Psr\Log\LogLevel; */ class StreamLogger extends AbstractLogger { + const NAME = 'stream'; + /** * The minimum loglevel at which this logger will be triggered * @var string diff --git a/src/Core/Logger/Type/SyslogLogger.php b/src/Core/Logger/Type/SyslogLogger.php index fb8cb97ae..556351a7e 100644 --- a/src/Core/Logger/Type/SyslogLogger.php +++ b/src/Core/Logger/Type/SyslogLogger.php @@ -32,6 +32,8 @@ use Psr\Log\LogLevel; */ class SyslogLogger extends AbstractLogger { + const NAME = 'syslog'; + const IDENT = 'Friendica'; /** @var int The default syslog flags */ diff --git a/src/Core/PConfig/Type/AbstractPConfigValues.php b/src/Core/PConfig/Type/AbstractPConfigValues.php index 39be8f4e7..e567cbaed 100644 --- a/src/Core/PConfig/Type/AbstractPConfigValues.php +++ b/src/Core/PConfig/Type/AbstractPConfigValues.php @@ -34,6 +34,8 @@ use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues; */ abstract class AbstractPConfigValues implements IManagePersonalConfigValues { + const NAME = ''; + /** * @var Cache */ diff --git a/src/Core/PConfig/Type/JitPConfig.php b/src/Core/PConfig/Type/JitPConfig.php index c5c20577e..b851015e7 100644 --- a/src/Core/PConfig/Type/JitPConfig.php +++ b/src/Core/PConfig/Type/JitPConfig.php @@ -33,6 +33,8 @@ use Friendica\Core\PConfig\ValueObject; */ class JitPConfig extends AbstractPConfigValues { + const NAME = 'jit'; + /** * @var array Array of already loaded db values (even if there was no value) */ diff --git a/src/Core/PConfig/Type/PreloadPConfig.php b/src/Core/PConfig/Type/PreloadPConfig.php index b3b709286..6ae028c5e 100644 --- a/src/Core/PConfig/Type/PreloadPConfig.php +++ b/src/Core/PConfig/Type/PreloadPConfig.php @@ -32,6 +32,8 @@ use Friendica\Core\PConfig\ValueObject; */ class PreloadPConfig extends AbstractPConfigValues { + const NAME = 'preload'; + /** @var array */ private $config_loaded; diff --git a/src/Core/Session/Factory/Session.php b/src/Core/Session/Factory/Session.php index 239b050e7..e12dbd9af 100644 --- a/src/Core/Session/Factory/Session.php +++ b/src/Core/Session/Factory/Session.php @@ -22,8 +22,8 @@ namespace Friendica\Core\Session\Factory; use Friendica\App; -use Friendica\Core\Cache\Enum; use Friendica\Core\Cache\Factory\Cache; +use Friendica\Core\Cache\Type\DatabaseCache; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Session\Capability\IHandleSessions; use Friendica\Core\Session\Type; @@ -74,7 +74,7 @@ class Session $cache = $cacheFactory->createDistributed(); // In case we're using the db as cache driver, use the native db session, not the cache - if ($config->get('system', 'cache_driver') === Enum\Type::DATABASE) { + if ($config->get('system', 'cache_driver') === DatabaseCache::NAME) { $handler = new Handler\Database($dba, $logger, $server); } else { $handler = new Handler\Cache($cache, $logger); diff --git a/static/strategies.config.php b/static/strategies.config.php index 8df0c0478..18872dc1d 100644 --- a/static/strategies.config.php +++ b/static/strategies.config.php @@ -20,6 +20,7 @@ */ use Friendica\Core\Cache; +use Friendica\Core\Hooks\Util\StrategiesFileManager; use Friendica\Core\Logger\Type; use Friendica\Core\KeyValueStorage; use Friendica\Core\PConfig; @@ -27,22 +28,22 @@ use Psr\Log; return [ Log\LoggerInterface::class => [ - Log\NullLogger::class => [''], - Type\SyslogLogger::class => ['syslog'], - Type\StreamLogger::class => ['stream'], + Log\NullLogger::class => [StrategiesFileManager::STRATEGY_DEFAULT_KEY], + Type\SyslogLogger::class => [Type\SyslogLogger::NAME], + Type\StreamLogger::class => [Type\StreamLogger::NAME], ], Cache\Capability\ICanCache::class => [ - Cache\Type\APCuCache::class => ['apcu'], - Cache\Type\DatabaseCache::class => ['database', ''], - Cache\Type\MemcacheCache::class => ['memcache'], - Cache\Type\MemcachedCache::class => ['memcached'], - Cache\Type\RedisCache::class => ['redis'], + Cache\Type\DatabaseCache::class => [Cache\Type\DatabaseCache::NAME, StrategiesFileManager::STRATEGY_DEFAULT_KEY], + Cache\Type\APCuCache::class => [Cache\Type\APCuCache::NAME], + Cache\Type\MemcacheCache::class => [Cache\Type\MemcacheCache::NAME], + Cache\Type\MemcachedCache::class => [Cache\Type\MemcachedCache::NAME], + Cache\Type\RedisCache::class => [Cache\Type\RedisCache::NAME], ], KeyValueStorage\Capability\IManageKeyValuePairs::class => [ - KeyValueStorage\Type\DBKeyValueStorage::class => ['database', ''], + KeyValueStorage\Type\DBKeyValueStorage::class => [KeyValueStorage\Type\DBKeyValueStorage::NAME, StrategiesFileManager::STRATEGY_DEFAULT_KEY], ], PConfig\Capability\IManagePersonalConfigValues::class => [ - PConfig\Type\JitPConfig::class => ['jit'], - PConfig\Type\PreloadPConfig::class => ['preload', ''], + PConfig\Type\JitPConfig::class => [PConfig\Type\JitPConfig::NAME], + PConfig\Type\PreloadPConfig::class => [PConfig\Type\PreloadPConfig::NAME, StrategiesFileManager::STRATEGY_DEFAULT_KEY], ], ]; From 0c6efe50c320b8f6e7610e400688d751afd257b8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Jul 2023 17:16:30 +0200 Subject: [PATCH 184/259] Remove unused parameter --- src/Core/Cache/Factory/Cache.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Core/Cache/Factory/Cache.php b/src/Core/Cache/Factory/Cache.php index 189c574aa..0c54bfe63 100644 --- a/src/Core/Cache/Factory/Cache.php +++ b/src/Core/Cache/Factory/Cache.php @@ -21,7 +21,6 @@ namespace Friendica\Core\Cache\Factory; -use Friendica\Core\Cache\Enum; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Exception\CachePersistenceException; use Friendica\Core\Cache\Exception\InvalidCacheDriverException; @@ -58,22 +57,16 @@ class Cache } /** - * This method creates a CacheDriver for distributed caching with the given cache driver name - * - * @param string|null $type The cache type to create (default is per config) + * This method creates a CacheDriver for distributed caching * * @return ICanCache The instance of the CacheDriver * * @throws InvalidCacheDriverException In case the underlying cache driver isn't valid or not configured properly * @throws CachePersistenceException In case the underlying cache has errors during persistence */ - public function createDistributed(string $type = null): ICanCache + public function createDistributed(): ICanCache { - if ($type === Type\APCuCache::NAME) { - throw new InvalidCacheDriverException('apcu doesn\'t support distributed caching.'); - } - - return $this->create($type ?? $this->config->get('system', 'distributed_cache_driver', self::DEFAULT_TYPE)); + return $this->create($this->config->get('system', 'distributed_cache_driver', self::DEFAULT_TYPE)); } /** From 5291401de01f73a8aa1f4cad578672afa271f88e Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Jul 2023 17:45:31 +0200 Subject: [PATCH 185/259] rename woodpecker "pipeline" to "steps" --- .woodpecker/.code_standards_check.yml | 2 +- .woodpecker/.continuous-deployment.yml | 2 +- .woodpecker/.database_checks.yml | 2 +- .woodpecker/.license_check.yml | 2 +- .woodpecker/.messages.po_check.yml | 4 ++-- .woodpecker/.phpunit.yml | 2 +- .woodpecker/.releaser.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml index f81ab960f..0c951d701 100644 --- a/.woodpecker/.code_standards_check.yml +++ b/.woodpecker/.code_standards_check.yml @@ -1,4 +1,4 @@ -pipeline: +steps: restore_cache: image: meltwater/drone-cache:dev settings: diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index 767fffde3..3d49ed37e 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -11,7 +11,7 @@ labels: skip_clone: true -pipeline: +steps: clone: image: alpine/git commands: diff --git a/.woodpecker/.database_checks.yml b/.woodpecker/.database_checks.yml index 04bdeed62..daeff7ac3 100644 --- a/.woodpecker/.database_checks.yml +++ b/.woodpecker/.database_checks.yml @@ -6,7 +6,7 @@ matrix: branches: exclude: [ stable ] -pipeline: +steps: db_version_match: image: friendicaci/transifex commands: diff --git a/.woodpecker/.license_check.yml b/.woodpecker/.license_check.yml index 777986544..e7545f5f4 100644 --- a/.woodpecker/.license_check.yml +++ b/.woodpecker/.license_check.yml @@ -1,4 +1,4 @@ -pipeline: +steps: check: image: friendicaci/php-cs commands: diff --git a/.woodpecker/.messages.po_check.yml b/.woodpecker/.messages.po_check.yml index c5b283e1d..9c2509594 100644 --- a/.woodpecker/.messages.po_check.yml +++ b/.woodpecker/.messages.po_check.yml @@ -1,4 +1,4 @@ -pipeline: +steps: build_xgettext: image: friendicaci/transifex commands: @@ -9,4 +9,4 @@ pipeline: - /check-messages.sh branches: - exclude: [ stable ] \ No newline at end of file + exclude: [ stable ] diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index 8f89e4b5b..290da6b70 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -15,7 +15,7 @@ matrix: labels: location: opensocial -pipeline: +steps: php-lint: image: php:${PHP_MAJOR_VERSION} group: lint diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index 482ea5429..2562e7872 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -9,7 +9,7 @@ labels: skip_clone: true -pipeline: +steps: clone: image: alpine/git commands: From bed13f71bda93c64c2eadf6179faec570f4e3bf9 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Jul 2023 18:55:06 +0200 Subject: [PATCH 186/259] use default_key --- src/Core/KeyValueStorage/Factory/KeyValueStorage.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Core/KeyValueStorage/Factory/KeyValueStorage.php b/src/Core/KeyValueStorage/Factory/KeyValueStorage.php index ee6cb1731..467006614 100644 --- a/src/Core/KeyValueStorage/Factory/KeyValueStorage.php +++ b/src/Core/KeyValueStorage/Factory/KeyValueStorage.php @@ -22,6 +22,7 @@ namespace Friendica\Core\KeyValueStorage\Factory; use Friendica\Core\Hooks\Capability\ICanCreateInstances; +use Friendica\Core\Hooks\Util\StrategiesFileManager; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; class KeyValueStorage @@ -29,6 +30,6 @@ class KeyValueStorage public function create(ICanCreateInstances $instanceCreator): IManageKeyValuePairs { /** @var IManageKeyValuePairs */ - return $instanceCreator->create(IManageKeyValuePairs::class, ''); + return $instanceCreator->create(IManageKeyValuePairs::class, StrategiesFileManager::STRATEGY_DEFAULT_KEY); } } From 8ee58aaf181c0512b957ac9fa6718e3932b38134 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Jul 2023 19:02:08 +0200 Subject: [PATCH 187/259] try making php-lint faster.. --- .woodpecker/.phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index 290da6b70..302bd911d 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -20,7 +20,7 @@ steps: image: php:${PHP_MAJOR_VERSION} group: lint commands: - - ./bin/composer.phar run lint + - find . -name \*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l restore_cache: image: meltwater/drone-cache:dev settings: From e231907b3c00223909bfbef19998a42d3e198a4a Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Jul 2023 19:07:29 +0200 Subject: [PATCH 188/259] add opensocial as location for db-based execution --- .woodpecker/.database_checks.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.woodpecker/.database_checks.yml b/.woodpecker/.database_checks.yml index daeff7ac3..7d2553674 100644 --- a/.woodpecker/.database_checks.yml +++ b/.woodpecker/.database_checks.yml @@ -6,6 +6,10 @@ matrix: branches: exclude: [ stable ] +# This forces CI executions at the "opensocial" labeled location (because of much more power...) +labels: + location: opensocial + steps: db_version_match: image: friendicaci/transifex From 06df62a2b5a99676c72ca0effb7fda379293f0af Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Jul 2023 20:12:25 +0200 Subject: [PATCH 189/259] Fix Woodpecker --- .woodpecker/.continuous-deployment.yml | 2 +- .woodpecker/.releaser.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index 3d49ed37e..4ff956b3b 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -15,7 +15,7 @@ steps: clone: image: alpine/git commands: - - git clone $CI_REPO_LINK . + - git clone $CI_REPO_CLONE_URL . - git checkout $CI_COMMIT_BRANCH - git fetch origin $CI_COMMIT_REF - git merge $CI_COMMIT_SHA diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index 2562e7872..006bcfec3 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -13,7 +13,7 @@ steps: clone: image: alpine/git commands: - - git clone $CI_REPO_LINK . + - git clone $CI_REPO_CLONE_URL . - git checkout $CI_COMMIT_BRANCH - git fetch origin $CI_COMMIT_REF - git merge $CI_COMMIT_SHA From 6bcf5cb82328441c4543b898005b88fb5ff9cf3a Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 29 Jul 2023 13:20:02 +0200 Subject: [PATCH 190/259] Make InstanceManager strategy naming convention case insensitive. --- src/Core/Hooks/Model/DiceInstanceManager.php | 8 ++++---- .../Core/Hooks/Model/InstanceManagerTest.php | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/Core/Hooks/Model/DiceInstanceManager.php b/src/Core/Hooks/Model/DiceInstanceManager.php index 194fc6e5c..07ea72979 100644 --- a/src/Core/Hooks/Model/DiceInstanceManager.php +++ b/src/Core/Hooks/Model/DiceInstanceManager.php @@ -49,11 +49,11 @@ class DiceInstanceManager implements ICanCreateInstances, ICanRegisterStrategies /** {@inheritDoc} */ public function registerStrategy(string $interface, string $class, ?string $name = null): ICanRegisterStrategies { - if (!empty($this->instance[$interface][$name])) { + if (!empty($this->instance[$interface][strtolower($name)])) { throw new HookRegisterArgumentException(sprintf('A class with the name %s is already set for the interface %s', $name, $interface)); } - $this->instance[$interface][$name] = $class; + $this->instance[$interface][strtolower($name)] = $class; return $this; } @@ -61,10 +61,10 @@ class DiceInstanceManager implements ICanCreateInstances, ICanRegisterStrategies /** {@inheritDoc} */ public function create(string $class, string $strategy, array $arguments = []): object { - if (empty($this->instance[$class][$strategy])) { + if (empty($this->instance[$class][strtolower($strategy)])) { throw new HookInstanceException(sprintf('The class with the name %s isn\'t registered for the class or interface %s', $strategy, $class)); } - return $this->dice->create($this->instance[$class][$strategy], $arguments); + return $this->dice->create($this->instance[$class][strtolower($strategy)], $arguments); } } diff --git a/tests/src/Core/Hooks/Model/InstanceManagerTest.php b/tests/src/Core/Hooks/Model/InstanceManagerTest.php index 44459eb2e..c9746d26a 100644 --- a/tests/src/Core/Hooks/Model/InstanceManagerTest.php +++ b/tests/src/Core/Hooks/Model/InstanceManagerTest.php @@ -235,4 +235,23 @@ class InstanceManagerTest extends MockedTest self::assertEquals($cBool, $getInstanceA->getCBool()); self::assertEquals($cBool, $getInstanceB->getCBool()); } + + /** + * @see https://github.com/friendica/friendica/issues/13318 + */ + public function testCaseInsensitiveNames() + { + $instance = new DiceInstanceManager(new Dice(), $this->hookFileManager); + + $instance->registerStrategy(IAmADecoratedInterface::class, FakeInstance::class, 'fake'); + + // CamelCase + self::assertInstanceOf(FakeInstance::class, $instance->create(IAmADecoratedInterface::class, 'Fake')); + // UPPER CASE + self::assertInstanceOf(FakeInstance::class, $instance->create(IAmADecoratedInterface::class, 'FAKE')); + // lower case + self::assertInstanceOf(FakeInstance::class, $instance->create(IAmADecoratedInterface::class, 'fake')); + // UnKnOwN + self::assertInstanceOf(FakeInstance::class, $instance->create(IAmADecoratedInterface::class, 'fAkE')); + } } From 367d9149aae536ee2a8a2ef8f8711896e77f6e5d Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 29 Jul 2023 13:51:03 +0200 Subject: [PATCH 191/259] test --- tests/src/Core/Hooks/Model/InstanceManagerTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/src/Core/Hooks/Model/InstanceManagerTest.php b/tests/src/Core/Hooks/Model/InstanceManagerTest.php index c9746d26a..7c5bea802 100644 --- a/tests/src/Core/Hooks/Model/InstanceManagerTest.php +++ b/tests/src/Core/Hooks/Model/InstanceManagerTest.php @@ -254,4 +254,5 @@ class InstanceManagerTest extends MockedTest // UnKnOwN self::assertInstanceOf(FakeInstance::class, $instance->create(IAmADecoratedInterface::class, 'fAkE')); } + } From 639d160c24da1ee7e0f96e9e10fabc3fac56599a Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 30 Jul 2023 17:46:37 +0000 Subject: [PATCH 192/259] Improvements for relais like relay.fedi.buzz --- src/Console/Relay.php | 8 ++------ src/Model/APContact.php | 8 ++++++++ src/Protocol/Relay.php | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Console/Relay.php b/src/Console/Relay.php index 52682241e..11d1dbf82 100644 --- a/src/Console/Relay.php +++ b/src/Console/Relay.php @@ -23,8 +23,8 @@ namespace Friendica\Console; use Asika\SimpleConsole\CommandArgsException; use Friendica\Model\APContact; -use Friendica\Model\Contact; use Friendica\Protocol\ActivityPub\Transmitter; +use Friendica\Protocol\Relay as ProtocolRelay; /** * tool to control the list of ActivityPub relay servers from the CLI @@ -90,13 +90,9 @@ HELP; } if ((count($this->args) == 1) && ($this->getArgument(0) == 'list')) { - $contacts = $this->dba->select('apcontact', ['url'], - ["`type` IN (?, ?) AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)", - 'Application', 'Service', 0, Contact::FRIEND]); - while ($contact = $this->dba->fetch($contacts)) { + foreach (ProtocolRelay::getList(['url']) as $contact) { $this->out($contact['url']); } - $this->dba->close($contacts); } elseif (count($this->args) == 0) { throw new CommandArgsException('too few arguments'); } elseif (count($this->args) == 1) { diff --git a/src/Model/APContact.php b/src/Model/APContact.php index 2a5b89928..c49017b59 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -584,6 +584,14 @@ class APContact */ public static function isRelay(array $apcontact): bool { + if (in_array($apcontact['type'], ['Person', 'Organization'])) { + return false; + } + + if (($apcontact['type'] == 'Service') && empty($apcontact['outbox']) && empty($apcontact['sharedinbox']) && empty($apcontact['following']) && empty($apcontact['followers']) && empty($apcontact['statuses_count'])) { + return true; + } + if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') { return false; } diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php index c5131fb3f..ae8ecbbb2 100644 --- a/src/Protocol/Relay.php +++ b/src/Protocol/Relay.php @@ -354,7 +354,7 @@ class Relay public static function getList(array $fields = []): array { return DBA::selectToArray('apcontact', $fields, - ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)", 'Application', 0, Contact::FRIEND]); + ["`type` IN (?, ?) AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)", 'Application', 'Service', 0, Contact::FRIEND]); } /** From 7ad8894871cd09d4006660b729789bc53fe8dc6a Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 1 Aug 2023 14:27:56 +0000 Subject: [PATCH 193/259] Improvements for Youtube posta via API --- src/Content/Text/BBCode.php | 45 +++++++++++++++++++++++----- src/Module/Api/Mastodon/Statuses.php | 42 ++++++++++++++++---------- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index f40160c9d..ab7300da1 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1158,6 +1158,40 @@ class BBCode return $match[1] . '[url=' . $data['url'] . ']' . $data['nick'] . '[/url]'; } + /** + * Normalize links to Youtube and Vimeo to a unified format. + * + * @param string $text + * @return string + */ + private static function normalizeVideoLinks(string $text): string + { + $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); + $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); + $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/shorts\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); + $text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); + + $text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text); + $text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text); + + return $text; + } + + /** + * Expand Youtube and Vimeo links to + * + * @param string $text + * @return string + */ + public static function expandVideoLinks(string $text): string + { + $text = self::normalizeVideoLinks($text); + $text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '[url=https://www.youtube.com/watch?v=$1]https://www.youtube.com/watch?v=$1[/url]', $text); + $text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '[url=https://vimeo.com/$1]https://vimeo.com/$1[/url]', $text); + + return $text; + } + /** * Converts a BBCode message for a given URI-ID to a HTML message * @@ -1655,12 +1689,9 @@ class BBCode // Backward compatibility, [iframe] support has been removed in version 2020.12 $text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '$1', $text); - // Youtube extensions - $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); - $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); - $text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/shorts\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); - $text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism", '[youtube]$1[/youtube]', $text); + $text = self::normalizeVideoLinks($text); + // Youtube extensions if ($try_oembed) { $text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $text); } else { @@ -1671,9 +1702,7 @@ class BBCode ); } - $text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text); - $text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism", '[vimeo]$1[/vimeo]', $text); - + // Vimeo extensions if ($try_oembed) { $text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $text); } else { diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php index dad0451fc..a8f1dc1c6 100644 --- a/src/Module/Api/Mastodon/Statuses.php +++ b/src/Module/Api/Mastodon/Statuses.php @@ -76,16 +76,9 @@ class Statuses extends BaseApi throw new HTTPException\NotFoundException('Item with URI ID ' . $this->parameters['id'] . ' not found for user ' . $uid . '.'); } - // The imput is defined as text. So we can use Markdown for some enhancements - $body = Markdown::toBBCode($request['status']); - - if (DI::pConfig()->get($uid, 'system', 'api_auto_attach', false) && preg_match("/\[url=[^\[\]]*\](.*)\[\/url\]\z/ism", $body, $matches)) { - $body = preg_replace("/\[url=[^\[\]]*\].*\[\/url\]\z/ism", PageInfo::getFooterFromUrl($matches[1]), $body); - } - $item['title'] = ''; $item['uid'] = $post['uid']; - $item['body'] = $body; + $item['body'] = $this->formatStatus($request['status'], $uid); $item['network'] = $post['network']; $item['gravity'] = $post['gravity']; $item['verb'] = $post['verb']; @@ -190,13 +183,6 @@ class Statuses extends BaseApi $owner = User::getOwnerDataById($uid); - // The imput is defined as text. So we can use Markdown for some enhancements - $body = Markdown::toBBCode($request['status']); - - if (DI::pConfig()->get($uid, 'system', 'api_auto_attach', false) && preg_match("/\[url=[^\[\]]*\](.*)\[\/url\]\z/ism", $body, $matches)) { - $body = preg_replace("/\[url=[^\[\]]*\].*\[\/url\]\z/ism", PageInfo::getFooterFromUrl($matches[1]), $body); - } - $item = []; $item['network'] = Protocol::DFRN; $item['uid'] = $uid; @@ -204,7 +190,7 @@ class Statuses extends BaseApi $item['contact-id'] = $owner['id']; $item['author-id'] = $item['owner-id'] = Contact::getPublicIdByUserId($uid); $item['title'] = ''; - $item['body'] = $body; + $item['body'] = $this->formatStatus($request['status'], $uid); $item['app'] = $this->getApp(); switch ($request['visibility']) { @@ -415,4 +401,28 @@ class Statuses extends BaseApi } return $item; } + + /** + * Format the status via Markdown and a link description if enabled for this user + * + * @param string $status + * @param integer $uid + * @return string + */ + private function formatStatus(string $status, int $uid): string + { + // The input is defined as text. So we can use Markdown for some enhancements + $status = Markdown::toBBCode($status); + + if (!DI::pConfig()->get($uid, 'system', 'api_auto_attach', false)) { + return $status; + } + + $status = BBCode::expandVideoLinks($status); + if (preg_match("/\[url=[^\[\]]*\](.*)\[\/url\]\z/ism", $status, $matches)) { + $status = preg_replace("/\[url=[^\[\]]*\].*\[\/url\]\z/ism", PageInfo::getFooterFromUrl($matches[1]), $status); + } + + return $status; + } } From 6f9e15ea578e1ab73c0328c928444c0169f961bc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 2 Aug 2023 16:29:50 +0200 Subject: [PATCH 194/259] Remove escaping exception for form field values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - This could allow code injection from a malicious query leading to a form page - Thanks to Laura Pîrcălăboiu for the report --- view/templates/field_combobox.tpl | 7 +++---- view/templates/field_openid.tpl | 3 +-- view/templates/field_password.tpl | 3 +-- view/theme/frio/templates/field_colorinput.tpl | 3 +-- view/theme/frio/templates/field_fileinput.tpl | 3 +-- view/theme/frio/templates/field_openid.tpl | 3 +-- view/theme/frio/templates/field_password.tpl | 3 +-- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl index 3e6e06052..b62bf2dba 100644 --- a/view/templates/field_combobox.tpl +++ b/view/templates/field_combobox.tpl @@ -1,4 +1,3 @@ -
    {{* html5 don't work on Chrome, Safari and IE9 @@ -6,13 +5,13 @@ {{foreach $field.4 as $opt=>$val}} *}} - - + + - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl index 3c7d02bb8..033a1f8e5 100644 --- a/view/templates/field_openid.tpl +++ b/view/templates/field_openid.tpl @@ -1,7 +1,6 @@ -
    - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl index 07241fb11..57149fe52 100644 --- a/view/templates/field_password.tpl +++ b/view/templates/field_password.tpl @@ -1,7 +1,6 @@ -
    - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl index 2c530a2e4..f812ff234 100644 --- a/view/theme/frio/templates/field_colorinput.tpl +++ b/view/theme/frio/templates/field_colorinput.tpl @@ -1,9 +1,8 @@ -
    - +
    {{if $field.3}} {{$field.3 nofilter}} diff --git a/view/theme/frio/templates/field_fileinput.tpl b/view/theme/frio/templates/field_fileinput.tpl index dd6825f2e..96ae45596 100644 --- a/view/theme/frio/templates/field_fileinput.tpl +++ b/view/theme/frio/templates/field_fileinput.tpl @@ -1,8 +1,7 @@ -
    - +
    {{if $field.3}} diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl index bae9cb4fc..c36dbfabc 100644 --- a/view/theme/frio/templates/field_openid.tpl +++ b/view/theme/frio/templates/field_openid.tpl @@ -1,7 +1,6 @@ -
    - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl index 25a7d0c4c..0fb27ca88 100644 --- a/view/theme/frio/templates/field_password.tpl +++ b/view/theme/frio/templates/field_password.tpl @@ -1,7 +1,6 @@ -
    - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} From ecfbf317ae2ba703d31a58ee945eb4923527b33e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 2 Aug 2023 16:58:14 +0200 Subject: [PATCH 195/259] Fix reference to username field in Contact::updateSelfFromUserID - Profile isn't updated with the display name in the account settings --- src/Model/Contact.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 3ca84515a..17be0b0cf 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -799,7 +799,7 @@ class Contact return false; } - $fields = ['uid', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey']; + $fields = ['uid', 'username', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey']; $user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]); if (!DBA::isResult($user)) { return false; @@ -818,7 +818,7 @@ class Contact $url = DI::baseUrl() . '/profile/' . $user['nickname']; $fields = [ - 'name' => $profile['name'], + 'name' => $user['username'], 'nick' => $user['nickname'], 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), @@ -841,7 +841,6 @@ class Contact 'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'], ]; - $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); if (DBA::isResult($avatar)) { if ($update_avatar) { From f984e385c89f53a4eeaf06642da856b5ed304688 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 2 Aug 2023 16:59:08 +0200 Subject: [PATCH 196/259] Escape HTML in system messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Thanks to Laura Pîrcălăboiu for the report --- src/Module/Notifications/Ping.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php index 120035d55..e54bd577b 100644 --- a/src/Module/Notifications/Ping.php +++ b/src/Module/Notifications/Ping.php @@ -52,6 +52,7 @@ use Friendica\Network\HTTPException; use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; use Friendica\Util\Profiler; +use Friendica\Util\Strings; use GuzzleHttp\Psr7\Uri; use Psr\Log\LoggerInterface; @@ -296,8 +297,8 @@ class Ping extends BaseModule $data['notifications'] = $navNotifications; $data['sysmsgs'] = [ - 'notice' => $this->systemMessages->flushNotices(), - 'info' => $this->systemMessages->flushInfos(), + 'notice' => array_map([Strings::class, 'escapeHtml'], $this->systemMessages->flushNotices()), + 'info' => array_map([Strings::class, 'escapeHtml'], $this->systemMessages->flushInfos()), ]; if (isset($_GET['callback'])) { From cc7fce3d363691774cd1f140588db351fa60e3db Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 2 Aug 2023 16:59:46 +0200 Subject: [PATCH 197/259] Escape HTML in display names for inclusion in syndication link tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Thanks to Laura Pîrcălăboiu for the report --- src/Module/Profile/Conversations.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Module/Profile/Conversations.php b/src/Module/Profile/Conversations.php index b53c2d1ab..cda8f03f9 100644 --- a/src/Module/Profile/Conversations.php +++ b/src/Module/Profile/Conversations.php @@ -103,10 +103,10 @@ class Conversations extends BaseProfile $this->page['htmlhead'] .= '' . "\n"; } - $this->page['htmlhead'] .= '' . "\n"; - $this->page['htmlhead'] .= '' . "\n"; - $this->page['htmlhead'] .= '' . "\n"; - $this->page['htmlhead'] .= '' . "\n"; + $this->page['htmlhead'] .= '' . "\n"; + $this->page['htmlhead'] .= '' . "\n"; + $this->page['htmlhead'] .= '' . "\n"; + $this->page['htmlhead'] .= '' . "\n"; $category = $datequery = $datequery2 = ''; From 6478b5ba5ff534e1b8cf03668245ee354a08199b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 2 Aug 2023 20:31:14 +0200 Subject: [PATCH 198/259] [Composer] Add suggested extensions --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/composer.json b/composer.json index 60094d5bd..9a86ebc2c 100644 --- a/composer.json +++ b/composer.json @@ -77,6 +77,12 @@ "npm-asset/textcomplete": "^0.18.2", "npm-asset/typeahead.js": "^0.11.1" }, + "suggest": { + "ext-imagick": "For faster image processing", + "ext-redis": "To use Redis as a locking or caching provider", + "ext-pdo": "To use PDO as a database driver, has priority over mysqli unless database.disable_pdo is set", + "ext-mysqli": "To use mysqli as a databse driver" + }, "repositories": [ { "type": "vcs", From 762bd7a8473f445f1e89ab386f55f71c94221f98 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 2 Aug 2023 20:42:44 +0200 Subject: [PATCH 199/259] Add support for Unix domain sockets to Redis in setting defaults - Add support for port = 0 in Redis driver --- src/Core/Cache/Type/RedisCache.php | 21 +++++++++++++-------- static/defaults.config.php | 6 +++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Core/Cache/Type/RedisCache.php b/src/Core/Cache/Type/RedisCache.php index be2a7ff08..a6ce7c44b 100644 --- a/src/Core/Cache/Type/RedisCache.php +++ b/src/Core/Cache/Type/RedisCache.php @@ -57,22 +57,27 @@ class RedisCache extends AbstractCache implements ICanCacheInMemory $redis_host = $config->get('system', 'redis_host'); $redis_port = $config->get('system', 'redis_port'); $redis_pw = $config->get('system', 'redis_password'); - $redis_db = $config->get('system', 'redis_db', 0); + $redis_db = (int)$config->get('system', 'redis_db', 0); try { - - if (!empty($redis_port) && !@$this->redis->connect($redis_host, $redis_port)) { - throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available'); - } else if (!@$this->redis->connect($redis_host)) { - throw new CachePersistenceException('Expected Redis server at ' . $redis_host . ' isn\'t available'); + if (is_numeric($redis_port) && $redis_port > -1) { + $connection_string = $redis_host . ':' . $redis_port; + if (!@$this->redis->connect($redis_host, $redis_port)) { + throw new CachePersistenceException('Expected Redis server at ' . $connection_string . " isn't available"); + } + } else { + $connection_string = $redis_host; + if (!@$this->redis->connect($redis_host)) { + throw new CachePersistenceException('Expected Redis server at ' . $connection_string . ' isn\'t available'); + } } if (!empty($redis_pw) && !$this->redis->auth($redis_pw)) { - throw new CachePersistenceException('Cannot authenticate redis server at ' . $redis_host . ':' . $redis_port); + throw new CachePersistenceException('Cannot authenticate redis server at ' . $connection_string); } if ($redis_db !== 0 && !$this->redis->select($redis_db)) { - throw new CachePersistenceException('Cannot switch to redis db ' . $redis_db . ' at ' . $redis_host . ':' . $redis_port); + throw new CachePersistenceException('Cannot switch to redis db ' . $redis_db . ' at ' . $connection_string); } } catch (\RedisException $exception) { throw new CachePersistenceException('Redis connection fails unexpectedly', $exception); diff --git a/static/defaults.config.php b/static/defaults.config.php index e8f44613c..6c9e2dd3c 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -543,11 +543,11 @@ return [ 'pushpoll_frequency' => 3, // redis_host (String) - // Host name of the redis daemon. + // Host name or the path to the Unix domain socket of the Redis daemon. 'redis_host' => '127.0.0.1', - // redis_port (String) - // Port number of the redis daemon. + // redis_port (Integer) + // Port number of the Redis daemon, should be -1 for unix domain socket 'redis_port' => 6379, // redis_db (Integer) From d0a2357fbdd45c7e3301dfb64a23614ebe372a4b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 26 Jul 2023 07:15:24 +0200 Subject: [PATCH 200/259] Add constants for the Fetch Further Information field --- database.sql | 2 +- .../Entity/LocalRelationship.php | 9 ++++++++- .../Factory/LocalRelationship.php | 2 +- src/Module/Contact/Profile.php | 8 ++++---- src/Protocol/Feed.php | 16 ++++++++++++---- static/dbstructure.config.php | 2 +- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/database.sql b/database.sql index 5a8cee23c..5af28131a 100644 --- a/database.sql +++ b/database.sql @@ -1835,7 +1835,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` ( `info` mediumtext COMMENT '', `notify_new_posts` boolean COMMENT '', `remote_self` boolean COMMENT '', - `fetch_further_information` tinyint unsigned COMMENT '', + `fetch_further_information` tinyint unsigned COMMENT '0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both', `ffi_keyword_denylist` text COMMENT '', `subhub` boolean COMMENT '', `hub-verify` varbinary(383) COMMENT '', diff --git a/src/Contact/LocalRelationship/Entity/LocalRelationship.php b/src/Contact/LocalRelationship/Entity/LocalRelationship.php index 8a9c48745..287768b8c 100644 --- a/src/Contact/LocalRelationship/Entity/LocalRelationship.php +++ b/src/Contact/LocalRelationship/Entity/LocalRelationship.php @@ -47,6 +47,12 @@ use Friendica\Model\Contact; */ class LocalRelationship extends \Friendica\BaseEntity { + // Fetch Further Information options, not a binary flag + const FFI_NONE = 0; + const FFI_INFORMATION = 1; + const FFI_KEYWORD = 3; + const FFI_BOTH = 2; + /** @var int */ protected $userId; /** @var int */ @@ -70,6 +76,7 @@ class LocalRelationship extends \Friendica\BaseEntity /** @var bool */ protected $isRemoteSelf; /** @var int */ + /** @var int One of FFI_* */ protected $fetchFurtherInformation; /** @var string */ protected $ffiKeywordDenylist; @@ -84,7 +91,7 @@ class LocalRelationship extends \Friendica\BaseEntity /** @var int */ protected $priority; - public function __construct(int $userId, int $contactId, bool $blocked = false, bool $ignored = false, bool $collapsed = false, bool $hidden = false, bool $pending = false, int $rel = Contact::NOTHING, string $info = '', bool $notifyNewPosts = false, bool $isRemoteSelf = false, int $fetchFurtherInformation = 0, string $ffiKeywordDenylist = '', bool $subhub = false, string $hubVerify = '', string $protocol = Protocol::PHANTOM, ?int $rating = null, ?int $priority = null) + public function __construct(int $userId, int $contactId, bool $blocked = false, bool $ignored = false, bool $collapsed = false, bool $hidden = false, bool $pending = false, int $rel = Contact::NOTHING, string $info = '', bool $notifyNewPosts = false, bool $isRemoteSelf = false, int $fetchFurtherInformation = self::FFI_NONE, string $ffiKeywordDenylist = '', bool $subhub = false, string $hubVerify = '', string $protocol = Protocol::PHANTOM, ?int $rating = null, ?int $priority = null) { $this->userId = $userId; $this->contactId = $contactId; diff --git a/src/Contact/LocalRelationship/Factory/LocalRelationship.php b/src/Contact/LocalRelationship/Factory/LocalRelationship.php index 455dbe1c3..6885d68b2 100644 --- a/src/Contact/LocalRelationship/Factory/LocalRelationship.php +++ b/src/Contact/LocalRelationship/Factory/LocalRelationship.php @@ -46,7 +46,7 @@ class LocalRelationship extends BaseFactory implements ICanCreateFromTableRow $row['info'] ?? '', $row['notify_new_posts'] ?? false, $row['remote_self'] ?? false, - $row['fetch_further_information'] ?? 0, + $row['fetch_further_information'] ?? Entity\LocalRelationship::FFI_NONE, $row['ffi_keyword_denylist'] ?? '', $row['subhub'] ?? false, $row['hub-verify'] ?? '', diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php index 2f8daf28e..294484a54 100644 --- a/src/Module/Contact/Profile.php +++ b/src/Module/Contact/Profile.php @@ -283,10 +283,10 @@ class Profile extends BaseModule $localRelationship->fetchFurtherInformation, $this->t('Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn\'t contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags.'), [ - '0' => $this->t('Disabled'), - '1' => $this->t('Fetch information'), - '3' => $this->t('Fetch keywords'), - '2' => $this->t('Fetch information and keywords') + Entity\LocalRelationship::FFI_NONE => $this->t('Disabled'), + Entity\LocalRelationship::FFI_INFORMATION => $this->t('Fetch information'), + Entity\LocalRelationship::FFI_KEYWORD => $this->t('Fetch keywords'), + Entity\LocalRelationship::FFI_BOTH => $this->t('Fetch information and keywords') ] ]; } diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index fced3526d..fdfe9be7d 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -25,6 +25,7 @@ use DOMDocument; use DOMElement; use DOMXPath; use Friendica\App; +use Friendica\Contact\LocalRelationship\Entity\LocalRelationship; use Friendica\Content\PageInfo; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; @@ -566,8 +567,10 @@ class Feed continue; } + $fetch_further_information = $contact['fetch_further_information'] ?? LocalRelationship::FFI_NONE; + $preview = ''; - if (!empty($contact['fetch_further_information']) && ($contact['fetch_further_information'] < 3)) { + if (in_array($fetch_further_information, [LocalRelationship::FFI_INFORMATION, LocalRelationship::FFI_BOTH])) { // Handle enclosures and treat them as preview picture foreach ($attachments as $attachment) { if ($attachment['mimetype'] == 'image/jpeg') { @@ -611,7 +614,12 @@ class Feed } } - $data = PageInfo::queryUrl($item['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_denylist'] ?? ''); + $data = PageInfo::queryUrl( + $item['plink'], + false, + $fetch_further_information == LocalRelationship::FFI_BOTH, + $contact['ffi_keyword_denylist'] ?? '' + ); if (!empty($data)) { // Take the data that was provided by the feed if the query is empty @@ -630,7 +638,7 @@ class Feed // We always strip the title since it will be added in the page information $item['title'] = ''; $item['body'] = $item['body'] . "\n" . PageInfo::getFooterFromData($data, false); - $taglist = $contact['fetch_further_information'] == 2 ? PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '') : []; + $taglist = $fetch_further_information == LocalRelationship::FFI_BOTH ? PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '') : []; $item['object-type'] = Activity\ObjectType::BOOKMARK; $attachments = []; @@ -662,7 +670,7 @@ class Feed $item['body'] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item['body']; } - if (!empty($contact['fetch_further_information']) && ($contact['fetch_further_information'] == 3)) { + if ($fetch_further_information == LocalRelationship::FFI_KEYWORD) { if (empty($taglist)) { $taglist = PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? ''); } diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 74a65e0ea..09d90e27c 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -1827,7 +1827,7 @@ return [ "info" => ["type" => "mediumtext", "comment" => ""], "notify_new_posts" => ["type" => "boolean", "comment" => ""], "remote_self" => ["type" => "boolean", "comment" => ""], - "fetch_further_information" => ["type" => "tinyint unsigned", "comment" => ""], + "fetch_further_information" => ["type" => "tinyint unsigned", "comment" => "0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both"], "ffi_keyword_denylist" => ["type" => "text", "comment" => ""], "subhub" => ["type" => "boolean", "comment" => ""], "hub-verify" => ["type" => "varbinary(383)", "comment" => ""], From 33b8680dfda73c31f70215955e73390d1ac73315 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 26 Jul 2023 07:27:55 +0200 Subject: [PATCH 201/259] [Database 1524] Fix contact-user.remote_self field type from boolean to integer - Move MIRROR_* constants to LocalRelationship entity - Convert boolean LocalRelationship->isRemoteSelf field to integer LocalRelationship->remoteSelf --- database.sql | 4 ++-- .../Entity/LocalRelationship.php | 15 +++++++++------ .../Factory/LocalRelationship.php | 2 +- .../Repository/LocalRelationship.php | 2 +- src/Model/Contact.php | 13 +++++++++---- src/Module/Contact/Profile.php | 2 +- static/dbstructure.config.php | 4 ++-- update.php | 16 ++++++++++++++++ 8 files changed, 41 insertions(+), 17 deletions(-) diff --git a/database.sql b/database.sql index 5af28131a..74b7552c3 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2023.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1523 +-- DB_UPDATE_VERSION 1524 -- ------------------------------------------ @@ -1834,7 +1834,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` ( `rel` tinyint unsigned COMMENT 'The kind of the relation between the user and the contact', `info` mediumtext COMMENT '', `notify_new_posts` boolean COMMENT '', - `remote_self` boolean COMMENT '', + `remote_self` tinyint unsigned COMMENT '0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare', `fetch_further_information` tinyint unsigned COMMENT '0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both', `ffi_keyword_denylist` text COMMENT '', `subhub` boolean COMMENT '', diff --git a/src/Contact/LocalRelationship/Entity/LocalRelationship.php b/src/Contact/LocalRelationship/Entity/LocalRelationship.php index 287768b8c..4fc7ae366 100644 --- a/src/Contact/LocalRelationship/Entity/LocalRelationship.php +++ b/src/Contact/LocalRelationship/Entity/LocalRelationship.php @@ -36,7 +36,7 @@ use Friendica\Model\Contact; * @property-read int $rel * @property-read string $info * @property-read bool $notifyNewPosts - * @property-read bool $isRemoteSelf + * @property-read int $remoteSelf * @property-read int $fetchFurtherInformation * @property-read string $ffiKeywordDenylist * @property-read bool $subhub @@ -53,6 +53,10 @@ class LocalRelationship extends \Friendica\BaseEntity const FFI_KEYWORD = 3; const FFI_BOTH = 2; + const MIRROR_DEACTIVATED = 0; + const MIRROR_OWN_POST = 2; + const MIRROR_NATIVE_RESHARE = 3; + /** @var int */ protected $userId; /** @var int */ @@ -73,9 +77,8 @@ class LocalRelationship extends \Friendica\BaseEntity protected $info; /** @var bool */ protected $notifyNewPosts; - /** @var bool */ - protected $isRemoteSelf; - /** @var int */ + /** @var int One of MIRROR_* */ + protected $remoteSelf; /** @var int One of FFI_* */ protected $fetchFurtherInformation; /** @var string */ @@ -91,7 +94,7 @@ class LocalRelationship extends \Friendica\BaseEntity /** @var int */ protected $priority; - public function __construct(int $userId, int $contactId, bool $blocked = false, bool $ignored = false, bool $collapsed = false, bool $hidden = false, bool $pending = false, int $rel = Contact::NOTHING, string $info = '', bool $notifyNewPosts = false, bool $isRemoteSelf = false, int $fetchFurtherInformation = self::FFI_NONE, string $ffiKeywordDenylist = '', bool $subhub = false, string $hubVerify = '', string $protocol = Protocol::PHANTOM, ?int $rating = null, ?int $priority = null) + public function __construct(int $userId, int $contactId, bool $blocked = false, bool $ignored = false, bool $collapsed = false, bool $hidden = false, bool $pending = false, int $rel = Contact::NOTHING, string $info = '', bool $notifyNewPosts = false, int $remoteSelf = self::MIRROR_DEACTIVATED, int $fetchFurtherInformation = self::FFI_NONE, string $ffiKeywordDenylist = '', bool $subhub = false, string $hubVerify = '', string $protocol = Protocol::PHANTOM, ?int $rating = null, ?int $priority = null) { $this->userId = $userId; $this->contactId = $contactId; @@ -103,7 +106,7 @@ class LocalRelationship extends \Friendica\BaseEntity $this->rel = $rel; $this->info = $info; $this->notifyNewPosts = $notifyNewPosts; - $this->isRemoteSelf = $isRemoteSelf; + $this->remoteSelf = $remoteSelf; $this->fetchFurtherInformation = $fetchFurtherInformation; $this->ffiKeywordDenylist = $ffiKeywordDenylist; $this->subhub = $subhub; diff --git a/src/Contact/LocalRelationship/Factory/LocalRelationship.php b/src/Contact/LocalRelationship/Factory/LocalRelationship.php index 6885d68b2..54fc86215 100644 --- a/src/Contact/LocalRelationship/Factory/LocalRelationship.php +++ b/src/Contact/LocalRelationship/Factory/LocalRelationship.php @@ -45,7 +45,7 @@ class LocalRelationship extends BaseFactory implements ICanCreateFromTableRow $row['rel'] ?? Contact::NOTHING, $row['info'] ?? '', $row['notify_new_posts'] ?? false, - $row['remote_self'] ?? false, + $row['remote_self'] ?? Entity\LocalRelationship::MIRROR_DEACTIVATED, $row['fetch_further_information'] ?? Entity\LocalRelationship::FFI_NONE, $row['ffi_keyword_denylist'] ?? '', $row['subhub'] ?? false, diff --git a/src/Contact/LocalRelationship/Repository/LocalRelationship.php b/src/Contact/LocalRelationship/Repository/LocalRelationship.php index a80a4f897..490a84e44 100644 --- a/src/Contact/LocalRelationship/Repository/LocalRelationship.php +++ b/src/Contact/LocalRelationship/Repository/LocalRelationship.php @@ -100,7 +100,7 @@ class LocalRelationship extends \Friendica\BaseRepository 'rel' => $localRelationship->rel, 'info' => $localRelationship->info, 'notify_new_posts' => $localRelationship->notifyNewPosts, - 'remote_self' => $localRelationship->isRemoteSelf, + 'remote_self' => $localRelationship->remoteSelf, 'fetch_further_information' => $localRelationship->fetchFurtherInformation, 'ffi_keyword_denylist' => $localRelationship->ffiKeywordDenylist, 'subhub' => $localRelationship->subhub, diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 17be0b0cf..23e1f2cbf 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -23,6 +23,7 @@ namespace Friendica\Model; use Friendica\Contact\Avatar; use Friendica\Contact\Introduction\Exception\IntroductionNotFoundException; +use Friendica\Contact\LocalRelationship\Entity\LocalRelationship; use Friendica\Content\Conversation as ConversationContent; use Friendica\Content\Pager; use Friendica\Content\Text\HTML; @@ -111,10 +112,14 @@ class Contact * @} */ - const MIRROR_DEACTIVATED = 0; - const MIRROR_FORWARDED = 1; // Deprecated, now does the same like MIRROR_OWN_POST - const MIRROR_OWN_POST = 2; - const MIRROR_NATIVE_RESHARE = 3; + /** @deprecated Use Entity\LocalRelationship::MIRROR_DEACTIVATED instead */ + const MIRROR_DEACTIVATED = LocalRelationship::MIRROR_DEACTIVATED; + /** @deprecated Now does the same as MIRROR_OWN_POST */ + const MIRROR_FORWARDED = 1; + /** @deprecated Use Entity\LocalRelationship::MIRROR_OWN_POST instead */ + const MIRROR_OWN_POST = LocalRelationship::MIRROR_OWN_POST; + /** @deprecated Use Entity\LocalRelationship::MIRROR_NATIVE_RESHARE instead */ + const MIRROR_NATIVE_RESHARE = LocalRelationship::MIRROR_NATIVE_RESHARE; /** * @param array $fields Array of selected fields, empty for all diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php index 294484a54..090f7cd86 100644 --- a/src/Module/Contact/Profile.php +++ b/src/Module/Contact/Profile.php @@ -394,7 +394,7 @@ class Profile extends BaseModule '$remote_self' => [ 'remote_self', $this->t('Mirror postings from this contact'), - $localRelationship->isRemoteSelf, + $localRelationship->remoteSelf, $this->t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'), $remote_self_options ], diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 09d90e27c..970aeb9cc 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -56,7 +56,7 @@ use Friendica\Database\DBA; // This file is required several times during the test in DbaDefinition which justifies this condition if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1523); + define('DB_UPDATE_VERSION', 1524); } return [ @@ -1826,7 +1826,7 @@ return [ "rel" => ["type" => "tinyint unsigned", "comment" => "The kind of the relation between the user and the contact"], "info" => ["type" => "mediumtext", "comment" => ""], "notify_new_posts" => ["type" => "boolean", "comment" => ""], - "remote_self" => ["type" => "boolean", "comment" => ""], + "remote_self" => ["type" => "tinyint unsigned", "comment" => "0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare"], "fetch_further_information" => ["type" => "tinyint unsigned", "comment" => "0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both"], "ffi_keyword_denylist" => ["type" => "text", "comment" => ""], "subhub" => ["type" => "boolean", "comment" => ""], diff --git a/update.php b/update.php index 14219bcdc..980ec721a 100644 --- a/update.php +++ b/update.php @@ -1333,3 +1333,19 @@ function update_1520(): int return Update::SUCCESS; } + +/** + * user-contact.remote_self was wrongly declared as boolean, possibly truncating integer values from contact.remote_self + * + * @return int + * @throws Exception + */ +function update_1524(): int +{ + $contacts = DBA::select('contact', ['uid', 'uri-id', 'remote_self'], ["`uid` != ?", 0]); + while ($contact = DBA::fetch($contacts)) { + Contact\User::insertForContactArray($contact); + } + + return Update::SUCCESS; +} From a905cdfd095a5bb1a1f78654f7ce2c23d2b1347b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 26 Jul 2023 07:49:55 +0200 Subject: [PATCH 202/259] Prevent polling contact of blocked users --- src/Worker/PollContacts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Worker/PollContacts.php b/src/Worker/PollContacts.php index ba908cb8f..81ce0f8f0 100644 --- a/src/Worker/PollContacts.php +++ b/src/Worker/PollContacts.php @@ -45,10 +45,10 @@ class PollContacts if (!empty($abandon_days)) { $condition = DBA::mergeConditions($condition, - ["`uid` != ? AND `uid` IN (SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed` AND `last-activity` > ?)", 0, DateTimeFormat::utc('now - ' . $abandon_days . ' days')]); + ["`uid` != ? AND `uid` IN (SELECT `uid` FROM `user` WHERE NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `last-activity` > ?)", 0, DateTimeFormat::utc('now - ' . $abandon_days . ' days')]); } else { $condition = DBA::mergeConditions($condition, - ["`uid` != ? AND `uid` IN (SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`)", 0]); + ["`uid` != ? AND `uid` IN (SELECT `uid` FROM `user` WHERE NOT `blocked` AND NOT `account_expired` AND NOT `account_removed`)", 0]); } $contacts = DBA::select('contact', ['id', 'nick', 'name', 'network', 'archive', 'last-update', 'priority', 'rating'], $condition); From eff605b1f33b9a39f23983bef941c427b37f7641 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 26 Jul 2023 07:50:15 +0200 Subject: [PATCH 203/259] Prevent post mirroring by blocked users --- src/Model/Item.php | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 9028c9f85..a2304056d 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -21,6 +21,7 @@ namespace Friendica\Model; +use Friendica\Contact\LocalRelationship\Entity\LocalRelationship; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Hook; @@ -2333,12 +2334,7 @@ class Item return; } - $cdata = Contact::getPublicAndUserContactID($item['author-id'], $item['uid']); - if (empty($cdata['user']) || ($cdata['user'] != $item['contact-id'])) { - return; - } - - if (!DBA::exists('contact', ['id' => $cdata['user'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) { + if (!DBA::exists('contact', ['id' => $cdata['user'], 'remote_self' => LocalRelationship::MIRROR_NATIVE_RESHARE])) { return; } @@ -2346,6 +2342,10 @@ class Item return; } + if (User::getById($item['uid'], ['blocked'])['blocked'] ?? false) { + return; + } + Logger::info('Automatically reshare item', ['uid' => $item['uid'], 'id' => $item['id'], 'guid' => $item['guid'], 'uri-id' => $item['uri-id']]); self::performActivity($item['id'], 'announce', $item['uid']); @@ -2353,7 +2353,7 @@ class Item public static function isRemoteSelf(array $contact, array &$datarray): bool { - if ($contact['remote_self'] != Contact::MIRROR_OWN_POST) { + if ($contact['remote_self'] != LocalRelationship::MIRROR_OWN_POST) { return false; } @@ -2380,6 +2380,11 @@ class Item return false; } + if (User::getById($contact['uid'], ['blocked'])['blocked'] ?? false) { + Logger::info('User is blocked', ['contact' => $contact]); + return false; + } + $datarray2 = $datarray; Logger::info('remote-self start', ['contact' => $contact['url'], 'remote_self' => $contact['remote_self'], 'item' => $datarray]); @@ -3222,7 +3227,7 @@ class Item $shared_html = substr($s, $pos + strlen(BBCode::SHARED_ANCHOR)); $s = substr($s, 0, $pos); } - + $s = self::addGallery($s, $attachments, $item['uri-id']); $s = self::addVisualAttachments($attachments, $item, $s, false); $s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links); @@ -3628,9 +3633,9 @@ class Item } $author = [ - 'uid' => 0, + 'uid' => 0, 'id' => $item['author-id'], - 'network' => $item['author-network'], + 'network' => $item['author-network'], 'url' => $item['author-link'], 'alias' => $item['author-alias'] ]; @@ -3721,9 +3726,9 @@ class Item if (!empty($plink) && ($item['private'] == self::PRIVATE)) { $author = [ - 'uid' => 0, + 'uid' => 0, 'id' => $item['author-id'], - 'network' => $item['author-network'], + 'network' => $item['author-network'], 'url' => $item['author-link'], 'alias' => $item['author-alias'], ]; From 8fcdd87473a46e9c79b99bb45aeaac0119ed6fe5 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 2 Aug 2023 21:48:31 +0000 Subject: [PATCH 204/259] Fix the tag detection for relay posts --- src/Protocol/ActivityPub/Processor.php | 2 +- src/Protocol/Relay.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index a76ef6307..3d020a747 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -1658,7 +1658,7 @@ class Processor $tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []); if (!empty($tags)) { foreach ($tags as $tag) { - if ($tag['type'] != 'Hashtag') { + if (($tag['type'] != 'Hashtag') && !strpos($tag['type'], ':Hashtag')) { continue; } $messageTags[] = ltrim(mb_strtolower($tag['name']), '#'); diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php index ae8ecbbb2..2002aa9bb 100644 --- a/src/Protocol/Relay.php +++ b/src/Protocol/Relay.php @@ -136,16 +136,16 @@ class Relay } if (!self::isWantedLanguage($body)) { - Logger::info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer]); + Logger::info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]); return false; } if ($scope == self::SCOPE_ALL) { - Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url, 'causer' => $causer]); + Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]); return true; } - Logger::info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer]); + Logger::info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]); return false; } From 911ed3d6ba98149ed6d400d554e7a0e10bd1c273 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 3 Aug 2023 05:46:08 +0000 Subject: [PATCH 205/259] Fix: Pagination in search result works again --- view/theme/frio/templates/search_item.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index ef02e1064..2d130cab8 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -1,4 +1,8 @@
    + + + +
    {{* Put additional actions in a top-right dropdown menu *}} From 858151807f5398c67d38ab3e50ddfd6e6b808810 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 3 Aug 2023 20:36:19 +0000 Subject: [PATCH 206/259] Improved logging --- src/Module/Search/Index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php index 9ec8c9dd6..f1d99bdf1 100644 --- a/src/Module/Search/Index.php +++ b/src/Module/Search/Index.php @@ -173,7 +173,7 @@ class Index extends BaseSearch $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage); if ($tag) { - Logger::info('Start tag search.', ['q' => $search]); + Logger::info('Start tag search.', ['q' => $search, 'start' => $pager->getStart(), 'items' => $pager->getItemsPerPage(), 'last' => $last_uriid]); $uriids = Tag::getURIIdListByTag($search, DI::userSession()->getLocalUserId(), $pager->getStart(), $pager->getItemsPerPage(), $last_uriid); $count = Tag::countByTag($search, DI::userSession()->getLocalUserId()); } else { @@ -185,7 +185,7 @@ class Index extends BaseSearch if (!empty($uriids)) { $condition = ["(`uid` = ? OR (`uid` = ? AND NOT `global`))", 0, DI::userSession()->getLocalUserId()]; $condition = DBA::mergeConditions($condition, ['uri-id' => $uriids]); - $params = ['order' => ['id' => true]]; + $params = ['order' => ['uri-id' => true]]; $items = Post::toArray(Post::selectForUser(DI::userSession()->getLocalUserId(), Item::DISPLAY_FIELDLIST, $condition, $params)); } From 97aecc8fc140f592d388617ef39937bc6ac40569 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 9 Aug 2023 20:29:45 +0000 Subject: [PATCH 207/259] The twitter addon is no import connector anymore --- mod/item.php | 1 + src/Content/ContactSelector.php | 3 ++- src/Content/Widget.php | 6 +----- src/Model/Nodeinfo.php | 16 ++++------------ src/Module/NodeInfo110.php | 4 ---- src/Module/NodeInfo120.php | 4 ---- src/Module/NodeInfo210.php | 4 ---- src/Module/Statistics.php | 2 +- 8 files changed, 9 insertions(+), 31 deletions(-) diff --git a/mod/item.php b/mod/item.php index e15ca639c..72c2ed8c5 100644 --- a/mod/item.php +++ b/mod/item.php @@ -266,6 +266,7 @@ function item_process(array $post, array $request, bool $preview, string $return $post['uri-id'] = -1; $post['author-network'] = Protocol::DFRN; $post['author-updated'] = ''; + $post['author-alias'] = ''; $post['author-gsid'] = 0; $post['author-uri-id'] = ItemURI::getIdByURI($post['author-link']); $post['owner-updated'] = ''; diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index e4585cd29..5d33aa59e 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -220,7 +220,8 @@ class ContactSelector 'GNU Social' => 'gnu-social', 'gnusocial' => 'gnu-social', 'hubzilla' => 'hubzilla', 'mastodon' => 'mastodon', 'peertube' => 'peertube', 'pixelfed' => 'pixelfed', 'pleroma' => 'pleroma', 'red' => 'hubzilla', 'redmatrix' => 'hubzilla', - 'socialhome' => 'social-home', 'wordpress' => 'wordpress', 'lemmy' => 'users']; + 'socialhome' => 'social-home', 'wordpress' => 'wordpress', 'lemmy' => 'users', + 'firefish' => 'fire', 'calckey' => 'calculator', 'kbin' => 'check']; $search = array_keys($nets); $replace = array_values($nets); diff --git a/src/Content/Widget.php b/src/Content/Widget.php index c8c0230c6..ce4548d1a 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -102,7 +102,7 @@ class Widget public static function unavailableNetworks(): array { // Always hide content from these networks - $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::ZOT]; + $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::TWITTER, Protocol::ZOT]; if (!Addon::isEnabled("discourse")) { $networks[] = Protocol::DISCOURSE; @@ -116,10 +116,6 @@ class Widget $networks[] = Protocol::PUMPIO; } - if (!Addon::isEnabled("twitter")) { - $networks[] = Protocol::TWITTER; - } - if (!Addon::isEnabled("tumblr")) { $networks[] = Protocol::TUMBLR; } diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php index 4dbe06c9b..825afb4a9 100644 --- a/src/Model/Nodeinfo.php +++ b/src/Model/Nodeinfo.php @@ -109,8 +109,9 @@ class Nodeinfo 'outbound' => [], ]; - if (Addon::isEnabled('blogger')) { - $services['outbound'][] = 'blogger'; + if (Addon::isEnabled('bluesky')) { + $services['inbound'][] = 'bluesky'; + $services['outbound'][] = 'bluesky'; } if (Addon::isEnabled('dwpost')) { $services['outbound'][] = 'dreamwidth'; @@ -125,18 +126,9 @@ class Nodeinfo if (Addon::isEnabled('libertree')) { $services['outbound'][] = 'libertree'; } - if (Addon::isEnabled('buffer')) { - $services['outbound'][] = 'linkedin'; - } if (Addon::isEnabled('ljpost')) { $services['outbound'][] = 'livejournal'; } - if (Addon::isEnabled('buffer')) { - $services['outbound'][] = 'pinterest'; - } - if (Addon::isEnabled('posterous')) { - $services['outbound'][] = 'posterous'; - } if (Addon::isEnabled('pumpio')) { $services['inbound'][] = 'pumpio'; $services['outbound'][] = 'pumpio'; @@ -147,7 +139,7 @@ class Nodeinfo if (Addon::isEnabled('tumblr')) { $services['outbound'][] = 'tumblr'; } - if (Addon::isEnabled('twitter') || Addon::isEnabled('buffer')) { + if (Addon::isEnabled('twitter')) { $services['outbound'][] = 'twitter'; } if (Addon::isEnabled('wppost')) { diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php index aee7ade5b..85785ccca 100644 --- a/src/Module/NodeInfo110.php +++ b/src/Module/NodeInfo110.php @@ -88,10 +88,6 @@ class NodeInfo110 extends BaseModule $nodeinfo['metadata']['services'] = $nodeinfo['services']; - if (Addon::isEnabled('twitter')) { - $nodeinfo['metadata']['services']['inbound'][] = 'twitter'; - } - $nodeinfo['metadata']['explicitContent'] = $this->config->get('system', 'explicit_content', false) == true; $this->response->setType(ICanCreateResponses::TYPE_JSON); diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php index a5547be3f..9fc72c528 100644 --- a/src/Module/NodeInfo120.php +++ b/src/Module/NodeInfo120.php @@ -72,10 +72,6 @@ class NodeInfo120 extends BaseModule $nodeinfo['protocols'][] = 'ostatus'; } - if (Addon::isEnabled('twitter')) { - $nodeinfo['services']['inbound'][] = 'twitter'; - } - $nodeinfo['services']['inbound'][] = 'atom1.0'; $nodeinfo['services']['inbound'][] = 'rss2.0'; $nodeinfo['services']['outbound'][] = 'atom1.0'; diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php index e7112846c..a1a6e0b19 100644 --- a/src/Module/NodeInfo210.php +++ b/src/Module/NodeInfo210.php @@ -71,10 +71,6 @@ class NodeInfo210 extends BaseModule $nodeinfo['protocols'][] = 'ostatus'; } - if (Addon::isEnabled('twitter')) { - $nodeinfo['services']['inbound'][] = 'twitter'; - } - $nodeinfo['services']['inbound'][] = 'atom1.0'; $nodeinfo['services']['inbound'][] = 'rss2.0'; $nodeinfo['services']['outbound'][] = 'atom1.0'; diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php index e69f75421..dc2055782 100644 --- a/src/Module/Statistics.php +++ b/src/Module/Statistics.php @@ -59,7 +59,7 @@ class Statistics extends BaseModule /// @todo mark the "service" addons and load them dynamically here $services = [ 'appnet' => Addon::isEnabled('appnet'), - 'buffer' => Addon::isEnabled('buffer'), + 'bluesky' => Addon::isEnabled('bluesky'), 'dreamwidth' => Addon::isEnabled('dreamwidth'), 'gnusocial' => Addon::isEnabled('gnusocial'), 'libertree' => Addon::isEnabled('libertree'), From 0a45bdd3b71ec0f8744abb3830858a91a4bca146 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 10 Aug 2023 21:06:08 +0000 Subject: [PATCH 208/259] Preparations for a moderator role --- .../Session/Capability/IHandleUserSessions.php | 7 +++++++ src/Core/Session/Model/UserSession.php | 6 ++++++ src/Model/User.php | 14 ++++++++++++++ src/Module/BaseModeration.php | 6 +++--- src/Module/Notifications/Ping.php | 2 +- 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/Core/Session/Capability/IHandleUserSessions.php b/src/Core/Session/Capability/IHandleUserSessions.php index 5734eafdf..3b135b521 100644 --- a/src/Core/Session/Capability/IHandleUserSessions.php +++ b/src/Core/Session/Capability/IHandleUserSessions.php @@ -93,6 +93,13 @@ interface IHandleUserSessions extends IHandleSessions */ public function isSiteAdmin(): bool; + /** + * Check if current user is a moderator. + * + * @return bool true if user is a moderator + */ + public function isModerator(): bool; + /** * Returns User ID of the managed user in case it's a different identity * diff --git a/src/Core/Session/Model/UserSession.php b/src/Core/Session/Model/UserSession.php index 8dfc3d832..c1a38dffa 100644 --- a/src/Core/Session/Model/UserSession.php +++ b/src/Core/Session/Model/UserSession.php @@ -139,6 +139,12 @@ class UserSession implements IHandleUserSessions return User::isSiteAdmin($this->getLocalUserId()); } + /** {@inheritDoc} */ + public function isModerator(): bool + { + return User::isModerator($this->getLocalUserId()); + } + /** {@inheritDoc} */ public function setVisitorsContacts(string $my_url) { diff --git a/src/Model/User.php b/src/Model/User.php index 89d75849f..18da3e956 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -880,6 +880,20 @@ class User ]); } + /** + * Returns if the given uid is valid and a moderator + * + * @param int $uid + * + * @return bool + * @throws Exception + */ + public static function isModerator(int $uid): bool + { + // @todo Replace with a moderator check in the future + return self::isSiteAdmin($uid); + } + /** * Checks if a nickname is in the list of the forbidden nicknames * diff --git a/src/Module/BaseModeration.php b/src/Module/BaseModeration.php index 3de46b319..a575e51f7 100644 --- a/src/Module/BaseModeration.php +++ b/src/Module/BaseModeration.php @@ -82,12 +82,12 @@ abstract class BaseModeration extends BaseModule } } - if (!$this->app->isSiteAdmin()) { - throw new HTTPException\ForbiddenException($this->t('You don\'t have access to administration pages.')); + if (!$this->session->isModerator()) { + throw new HTTPException\ForbiddenException($this->t('You don\'t have access to moderation pages.')); } if ($this->session->getSubManagedUserId()) { - throw new HTTPException\ForbiddenException($this->t('Submanaged account can\'t access the administration pages. Please log back in as the main account.')); + throw new HTTPException\ForbiddenException($this->t('Submanaged account can\'t access the moderation pages. Please log back in as the main account.')); } } diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php index e54bd577b..603d6408c 100644 --- a/src/Module/Notifications/Ping.php +++ b/src/Module/Notifications/Ping.php @@ -175,7 +175,7 @@ class Ping extends BaseModule $myurl = $this->session->getMyUrl(); $mail_count = $this->database->count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", $this->session->getLocalUserId(), $myurl]); - if (intval($this->config->get('config', 'register_policy')) === Register::APPROVE && $this->app->isSiteAdmin()) { + if (intval($this->config->get('config', 'register_policy')) === Register::APPROVE && $this->session->isSiteAdmin()) { $registrations = \Friendica\Model\Register::getPending(); $register_count = count($registrations); } From 241624027f70a48c51aa012b1532c2f9ba67bfb5 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 10 Aug 2023 21:10:12 +0000 Subject: [PATCH 209/259] Add a ChatGPT role for the built in robots.txt --- src/Module/RobotsTxt.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php index 49aab1471..415a8ab47 100644 --- a/src/Module/RobotsTxt.php +++ b/src/Module/RobotsTxt.php @@ -45,6 +45,11 @@ class RobotsTxt extends BaseModule foreach ($allDisallowed as $disallowed) { echo 'Disallow: ' . $disallowed . PHP_EOL; } + + echo PHP_EOL; + echo 'User-agent: ChatGPT-User' . PHP_EOL; + echo 'Disallow: /' . PHP_EOL; + System::exit(); } } From 794378ed295a03230539757fe72a5d0cfb40ec9e Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 10 Aug 2023 21:12:35 +0000 Subject: [PATCH 210/259] New function to resize an image to not exceed a given file size --- src/Model/Photo.php | 83 +++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 51 deletions(-) diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 2235137be..f39321154 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -989,6 +989,35 @@ class Photo return DBA::exists('photo', ['resource-id' => $guid]); } + /** + * Resize to a given maximum file size + * + * @param Image $image + * @param integer $maximagesize + * @return Image + */ + public static function resizeToFileSize(Image $image, int $maximagesize): Image + { + $filesize = strlen($image->asString()); + $width = $image->getWidth(); + $height = $image->getHeight(); + + if ($maximagesize && ($filesize > $maximagesize)) { + // Scale down to multiples of 640 until the maximum size isn't exceeded anymore + foreach ([5120, 2560, 1280, 640, 320] as $pixels) { + if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) { + Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]); + $image->scaleDown($pixels); + $filesize = strlen($image->asString()); + $width = $image->getWidth(); + $height = $image->getHeight(); + } + } + } + + return $image; + } + /** * Tries to resize image to wanted maximum size * @@ -1002,31 +1031,8 @@ class Photo $image->scaleDown($max_length); Logger::info('File upload: Scaling picture to new size', ['max-length' => $max_length]); } - - $filesize = strlen($image->asString()); - $width = $image->getWidth(); - $height = $image->getHeight(); - - $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); - - if ($maximagesize && ($filesize > $maximagesize)) { - // Scale down to multiples of 640 until the maximum size isn't exceeded anymore - foreach ([5120, 2560, 1280, 640] as $pixels) { - if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) { - Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]); - $image->scaleDown($pixels); - $filesize = strlen($image->asString()); - $width = $image->getWidth(); - $height = $image->getHeight(); - } - } - if ($filesize > $maximagesize) { - Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]); - return null; - } - } - - return $image; + + return self::resizeToFileSize($image, Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'))); } /** @@ -1237,32 +1243,7 @@ class Photo */ public static function storeWithPreview(Image $image, int $uid, string $resource_id, string $filename, int $filesize, string $album, string $description, string $allow_cid, string $allow_gid, string $deny_cid, string $deny_gid): int { - if ($filesize == 0) { - $filesize = strlen($image->asString()); - } - - $width = $image->getWidth(); - $height = $image->getHeight(); - - $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); - - if ($maximagesize && $filesize > $maximagesize) { - // Scale down to multiples of 640 until the maximum size isn't exceeded anymore - foreach ([5120, 2560, 1280, 640, 320] as $pixels) { - if ($filesize > $maximagesize && max($width, $height) > $pixels) { - DI::logger()->info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]); - $image->scaleDown($pixels); - $filesize = strlen($image->asString()); - $width = $image->getWidth(); - $height = $image->getHeight(); - } - } - - if ($filesize > $maximagesize) { - DI::logger()->notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]); - return -1; - } - } + $image = self::resizeToFileSize($image, Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'))); $width = $image->getWidth(); $height = $image->getHeight(); From d8333af805ac9c761d7edfb0d5794661a10e6e2e Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 10 Aug 2023 21:16:43 +0000 Subject: [PATCH 211/259] Updated messages.po --- view/lang/C/messages.po | 418 ++++++++++++++++++++-------------------- 1 file changed, 214 insertions(+), 204 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index a017e59dc..7a49e009d 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-16 16:40+0000\n" +"POT-Creation-Date: 2023-08-10 21:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,12 +45,12 @@ msgid "Item not found." msgstr "" #: mod/item.php:451 mod/message.php:67 mod/message.php:113 mod/notes.php:45 -#: mod/photos.php:152 mod/photos.php:670 src/Model/Event.php:522 +#: mod/photos.php:152 mod/photos.php:670 src/Model/Event.php:520 #: src/Module/Attach.php:55 src/Module/BaseApi.php:99 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52 #: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84 #: src/Module/Calendar/Export.php:82 src/Module/Calendar/Show.php:82 -#: src/Module/Circle.php:40 src/Module/Circle.php:83 +#: src/Module/Circle.php:41 src/Module/Circle.php:84 #: src/Module/Contact/Advanced.php:60 src/Module/Contact/Follow.php:87 #: src/Module/Contact/Follow.php:160 src/Module/Contact/MatchInterests.php:86 #: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66 @@ -388,7 +388,7 @@ msgid "Save" msgstr "" #: mod/photos.php:67 mod/photos.php:132 mod/photos.php:578 -#: src/Model/Event.php:514 src/Model/Profile.php:234 +#: src/Model/Event.php:512 src/Model/Profile.php:234 #: src/Module/Calendar/Export.php:74 src/Module/Calendar/Show.php:74 #: src/Module/DFRN/Poll.php:43 src/Module/Feed.php:65 src/Module/HCard.php:51 #: src/Module/Profile/Common.php:62 src/Module/Profile/Common.php:71 @@ -943,7 +943,7 @@ msgstr "" msgid "Enter user nickname: " msgstr "" -#: src/Console/User.php:182 src/Model/User.php:681 +#: src/Console/User.php:182 src/Model/User.php:692 #: src/Module/Api/Twitter/ContactEndpoint.php:74 #: src/Module/Moderation/Users/Active.php:71 #: src/Module/Moderation/Users/Blocked.php:71 @@ -1608,7 +1608,7 @@ msgstr "" #: src/Content/GroupManager.php:152 src/Content/Nav.php:276 #: src/Content/Text/HTML.php:880 src/Content/Widget.php:541 -#: src/Model/User.php:1229 +#: src/Model/User.php:1254 msgid "Groups" msgstr "" @@ -1651,31 +1651,31 @@ msgstr "" msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:422 src/Model/Contact.php:1206 +#: src/Content/Item.php:422 src/Model/Contact.php:1205 msgid "View Status" msgstr "" -#: src/Content/Item.php:423 src/Content/Item.php:443 src/Model/Contact.php:1155 -#: src/Model/Contact.php:1198 src/Model/Contact.php:1207 +#: src/Content/Item.php:423 src/Content/Item.php:443 src/Model/Contact.php:1154 +#: src/Model/Contact.php:1197 src/Model/Contact.php:1206 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:233 msgid "View Profile" msgstr "" -#: src/Content/Item.php:424 src/Model/Contact.php:1208 +#: src/Content/Item.php:424 src/Model/Contact.php:1207 msgid "View Photos" msgstr "" -#: src/Content/Item.php:425 src/Model/Contact.php:1199 -#: src/Model/Contact.php:1209 +#: src/Content/Item.php:425 src/Model/Contact.php:1198 +#: src/Model/Contact.php:1208 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:426 src/Model/Contact.php:1200 -#: src/Model/Contact.php:1210 +#: src/Content/Item.php:426 src/Model/Contact.php:1199 +#: src/Model/Contact.php:1209 msgid "View Contact" msgstr "" -#: src/Content/Item.php:427 src/Model/Contact.php:1211 +#: src/Content/Item.php:427 src/Model/Contact.php:1210 msgid "Send PM" msgstr "" @@ -1705,7 +1705,7 @@ msgid "Languages" msgstr "" #: src/Content/Item.php:440 src/Content/Widget.php:80 -#: src/Model/Contact.php:1201 src/Model/Contact.php:1212 +#: src/Model/Contact.php:1200 src/Model/Contact.php:1211 #: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195 msgid "Connect/Follow" msgstr "" @@ -1895,7 +1895,7 @@ msgstr "" #: src/Content/Nav.php:299 src/Module/Admin/Tos.php:78 #: src/Module/BaseAdmin.php:95 src/Module/Register.php:176 -#: src/Module/Tos.php:100 +#: src/Module/Tos.php:101 msgid "Terms of Service" msgstr "" @@ -2008,11 +2008,11 @@ msgstr "" msgid "Site map" msgstr "" -#: src/Content/OEmbed.php:317 +#: src/Content/OEmbed.php:316 msgid "Embedding disabled" msgstr "" -#: src/Content/OEmbed.php:441 +#: src/Content/OEmbed.php:440 msgid "Embedded content" msgstr "" @@ -2032,8 +2032,8 @@ msgstr "" msgid "last" msgstr "" -#: src/Content/Text/BBCode.php:696 src/Content/Text/BBCode.php:1602 -#: src/Content/Text/BBCode.php:1603 +#: src/Content/Text/BBCode.php:696 src/Content/Text/BBCode.php:1636 +#: src/Content/Text/BBCode.php:1637 msgid "Image/photo" msgstr "" @@ -2048,23 +2048,23 @@ msgstr "" msgid "Link to source" msgstr "" -#: src/Content/Text/BBCode.php:1509 src/Content/Text/HTML.php:904 +#: src/Content/Text/BBCode.php:1543 src/Content/Text/HTML.php:904 msgid "Click to open/close" msgstr "" -#: src/Content/Text/BBCode.php:1542 +#: src/Content/Text/BBCode.php:1576 msgid "$1 wrote:" msgstr "" -#: src/Content/Text/BBCode.php:1607 src/Content/Text/BBCode.php:1608 +#: src/Content/Text/BBCode.php:1641 src/Content/Text/BBCode.php:1642 msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:1872 +#: src/Content/Text/BBCode.php:1901 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:1891 +#: src/Content/Text/BBCode.php:1920 msgid "Invalid link protocol" msgstr "" @@ -2147,7 +2147,7 @@ msgstr "" msgid "Local Directory" msgstr "" -#: src/Content/Widget.php:219 src/Model/Circle.php:594 +#: src/Content/Widget.php:219 src/Model/Circle.php:600 #: src/Module/Contact.php:401 src/Module/Welcome.php:76 msgid "Circles" msgstr "" @@ -2164,7 +2164,7 @@ msgstr "" msgid "Relationships" msgstr "" -#: src/Content/Widget.php:253 src/Module/Circle.php:293 +#: src/Content/Widget.php:253 src/Module/Circle.php:292 #: src/Module/Contact.php:345 msgid "All Contacts" msgstr "" @@ -2212,7 +2212,7 @@ msgstr "" msgid "Organisations" msgstr "" -#: src/Content/Widget.php:540 src/Model/Contact.php:1676 +#: src/Content/Widget.php:540 src/Model/Contact.php:1675 msgid "News" msgstr "" @@ -2281,7 +2281,7 @@ msgid "Matrix:" msgstr "" #: src/Content/Widget/VCard.php:111 src/Model/Event.php:82 -#: src/Model/Event.php:109 src/Model/Event.php:473 src/Model/Event.php:965 +#: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:963 #: src/Model/Profile.php:373 src/Module/Contact/Profile.php:379 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187 #: src/Module/Profile/Profile.php:221 @@ -2293,8 +2293,8 @@ msgstr "" msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:118 src/Model/Contact.php:1202 -#: src/Model/Contact.php:1213 src/Model/Profile.php:465 +#: src/Content/Widget/VCard.php:118 src/Model/Contact.php:1201 +#: src/Model/Contact.php:1212 src/Model/Profile.php:465 #: src/Module/Contact/Profile.php:429 msgid "Unfollow" msgstr "" @@ -2678,142 +2678,142 @@ msgstr "" msgid "Could not connect to database." msgstr "" -#: src/Core/L10n.php:408 src/Model/Event.php:432 +#: src/Core/L10n.php:408 src/Model/Event.php:430 #: src/Module/Settings/Display.php:222 msgid "Monday" msgstr "" -#: src/Core/L10n.php:408 src/Model/Event.php:433 +#: src/Core/L10n.php:408 src/Model/Event.php:431 #: src/Module/Settings/Display.php:223 msgid "Tuesday" msgstr "" -#: src/Core/L10n.php:408 src/Model/Event.php:434 +#: src/Core/L10n.php:408 src/Model/Event.php:432 #: src/Module/Settings/Display.php:224 msgid "Wednesday" msgstr "" -#: src/Core/L10n.php:408 src/Model/Event.php:435 +#: src/Core/L10n.php:408 src/Model/Event.php:433 #: src/Module/Settings/Display.php:225 msgid "Thursday" msgstr "" -#: src/Core/L10n.php:408 src/Model/Event.php:436 +#: src/Core/L10n.php:408 src/Model/Event.php:434 #: src/Module/Settings/Display.php:226 msgid "Friday" msgstr "" -#: src/Core/L10n.php:408 src/Model/Event.php:437 +#: src/Core/L10n.php:408 src/Model/Event.php:435 #: src/Module/Settings/Display.php:227 msgid "Saturday" msgstr "" -#: src/Core/L10n.php:408 src/Model/Event.php:431 +#: src/Core/L10n.php:408 src/Model/Event.php:429 #: src/Module/Settings/Display.php:221 msgid "Sunday" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:452 +#: src/Core/L10n.php:412 src/Model/Event.php:450 msgid "January" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:453 +#: src/Core/L10n.php:412 src/Model/Event.php:451 msgid "February" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:454 +#: src/Core/L10n.php:412 src/Model/Event.php:452 msgid "March" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:455 +#: src/Core/L10n.php:412 src/Model/Event.php:453 msgid "April" msgstr "" -#: src/Core/L10n.php:412 src/Core/L10n.php:431 src/Model/Event.php:443 +#: src/Core/L10n.php:412 src/Core/L10n.php:431 src/Model/Event.php:441 msgid "May" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:456 +#: src/Core/L10n.php:412 src/Model/Event.php:454 msgid "June" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:457 +#: src/Core/L10n.php:412 src/Model/Event.php:455 msgid "July" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:458 +#: src/Core/L10n.php:412 src/Model/Event.php:456 msgid "August" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:459 +#: src/Core/L10n.php:412 src/Model/Event.php:457 msgid "September" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:460 +#: src/Core/L10n.php:412 src/Model/Event.php:458 msgid "October" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:461 +#: src/Core/L10n.php:412 src/Model/Event.php:459 msgid "November" msgstr "" -#: src/Core/L10n.php:412 src/Model/Event.php:462 +#: src/Core/L10n.php:412 src/Model/Event.php:460 msgid "December" msgstr "" -#: src/Core/L10n.php:427 src/Model/Event.php:424 +#: src/Core/L10n.php:427 src/Model/Event.php:422 msgid "Mon" msgstr "" -#: src/Core/L10n.php:427 src/Model/Event.php:425 +#: src/Core/L10n.php:427 src/Model/Event.php:423 msgid "Tue" msgstr "" -#: src/Core/L10n.php:427 src/Model/Event.php:426 +#: src/Core/L10n.php:427 src/Model/Event.php:424 msgid "Wed" msgstr "" -#: src/Core/L10n.php:427 src/Model/Event.php:427 +#: src/Core/L10n.php:427 src/Model/Event.php:425 msgid "Thu" msgstr "" -#: src/Core/L10n.php:427 src/Model/Event.php:428 +#: src/Core/L10n.php:427 src/Model/Event.php:426 msgid "Fri" msgstr "" -#: src/Core/L10n.php:427 src/Model/Event.php:429 +#: src/Core/L10n.php:427 src/Model/Event.php:427 msgid "Sat" msgstr "" -#: src/Core/L10n.php:427 src/Model/Event.php:423 +#: src/Core/L10n.php:427 src/Model/Event.php:421 msgid "Sun" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:439 +#: src/Core/L10n.php:431 src/Model/Event.php:437 msgid "Jan" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:440 +#: src/Core/L10n.php:431 src/Model/Event.php:438 msgid "Feb" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:441 +#: src/Core/L10n.php:431 src/Model/Event.php:439 msgid "Mar" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:442 +#: src/Core/L10n.php:431 src/Model/Event.php:440 msgid "Apr" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:444 +#: src/Core/L10n.php:431 src/Model/Event.php:442 msgid "Jun" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:445 +#: src/Core/L10n.php:431 src/Model/Event.php:443 msgid "Jul" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:446 +#: src/Core/L10n.php:431 src/Model/Event.php:444 msgid "Aug" msgstr "" @@ -2821,15 +2821,15 @@ msgstr "" msgid "Sep" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:448 +#: src/Core/L10n.php:431 src/Model/Event.php:446 msgid "Oct" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:449 +#: src/Core/L10n.php:431 src/Model/Event.php:447 msgid "Nov" msgstr "" -#: src/Core/L10n.php:431 src/Model/Event.php:450 +#: src/Core/L10n.php:431 src/Model/Event.php:448 msgid "Dec" msgstr "" @@ -3007,122 +3007,122 @@ msgstr "" msgid "Legacy module file not found: %s" msgstr "" -#: src/Model/Circle.php:105 +#: src/Model/Circle.php:106 msgid "" "A deleted circle with this name was revived. Existing item permissions " "may apply to this circle and any future members. If this is " "not what you intended, please create another circle with a different name." msgstr "" -#: src/Model/Circle.php:542 +#: src/Model/Circle.php:543 msgid "Everybody" msgstr "" -#: src/Model/Circle.php:561 +#: src/Model/Circle.php:562 msgid "edit" msgstr "" -#: src/Model/Circle.php:593 +#: src/Model/Circle.php:599 msgid "add" msgstr "" -#: src/Model/Circle.php:598 +#: src/Model/Circle.php:604 msgid "Edit circle" msgstr "" -#: src/Model/Circle.php:599 src/Module/Circle.php:194 +#: src/Model/Circle.php:605 src/Module/Circle.php:193 msgid "Contacts not in any circle" msgstr "" -#: src/Model/Circle.php:601 +#: src/Model/Circle.php:607 msgid "Create a new circle" msgstr "" -#: src/Model/Circle.php:602 src/Module/Circle.php:179 src/Module/Circle.php:202 -#: src/Module/Circle.php:277 +#: src/Model/Circle.php:608 src/Module/Circle.php:178 src/Module/Circle.php:201 +#: src/Module/Circle.php:276 msgid "Circle Name: " msgstr "" -#: src/Model/Circle.php:603 +#: src/Model/Circle.php:609 msgid "Edit circles" msgstr "" -#: src/Model/Contact.php:1219 src/Module/Moderation/Users/Pending.php:102 +#: src/Model/Contact.php:1218 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:1672 +#: src/Model/Contact.php:1671 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1680 +#: src/Model/Contact.php:1679 msgid "Group" msgstr "" -#: src/Model/Contact.php:2989 +#: src/Model/Contact.php:2988 msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2994 src/Module/Friendica.php:102 +#: src/Model/Contact.php:2993 src/Module/Friendica.php:102 msgid "Blocked domain" msgstr "" -#: src/Model/Contact.php:2999 +#: src/Model/Contact.php:2998 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:3008 +#: src/Model/Contact.php:3007 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:3026 +#: src/Model/Contact.php:3025 #, php-format msgid "Expected network %s does not match actual network %s" msgstr "" -#: src/Model/Contact.php:3043 +#: src/Model/Contact.php:3042 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:3045 +#: src/Model/Contact.php:3044 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:3048 +#: src/Model/Contact.php:3047 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:3051 +#: src/Model/Contact.php:3050 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:3054 +#: src/Model/Contact.php:3053 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:3055 +#: src/Model/Contact.php:3054 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:3061 +#: src/Model/Contact.php:3060 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:3066 +#: src/Model/Contact.php:3065 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:3132 +#: src/Model/Contact.php:3131 msgid "Unable to retrieve contact information." msgstr "" @@ -3130,99 +3130,99 @@ msgstr "" msgid "l F d, Y \\@ g:i A \\G\\M\\TP (e)" msgstr "" -#: src/Model/Event.php:75 src/Model/Event.php:92 src/Model/Event.php:471 -#: src/Model/Event.php:947 +#: src/Model/Event.php:75 src/Model/Event.php:92 src/Model/Event.php:469 +#: src/Model/Event.php:945 msgid "Starts:" msgstr "" -#: src/Model/Event.php:78 src/Model/Event.php:98 src/Model/Event.php:472 -#: src/Model/Event.php:951 +#: src/Model/Event.php:78 src/Model/Event.php:98 src/Model/Event.php:470 +#: src/Model/Event.php:949 msgid "Finishes:" msgstr "" -#: src/Model/Event.php:421 +#: src/Model/Event.php:419 msgid "all-day" msgstr "" -#: src/Model/Event.php:447 +#: src/Model/Event.php:445 msgid "Sept" msgstr "" -#: src/Model/Event.php:464 src/Module/Calendar/Show.php:128 +#: src/Model/Event.php:462 src/Module/Calendar/Show.php:128 #: src/Util/Temporal.php:343 msgid "today" msgstr "" -#: src/Model/Event.php:465 src/Module/Calendar/Show.php:129 +#: src/Model/Event.php:463 src/Module/Calendar/Show.php:129 #: src/Module/Settings/Display.php:232 src/Util/Temporal.php:353 msgid "month" msgstr "" -#: src/Model/Event.php:466 src/Module/Calendar/Show.php:130 +#: src/Model/Event.php:464 src/Module/Calendar/Show.php:130 #: src/Module/Settings/Display.php:233 src/Util/Temporal.php:354 msgid "week" msgstr "" -#: src/Model/Event.php:467 src/Module/Calendar/Show.php:131 +#: src/Model/Event.php:465 src/Module/Calendar/Show.php:131 #: src/Module/Settings/Display.php:234 src/Util/Temporal.php:355 msgid "day" msgstr "" -#: src/Model/Event.php:469 +#: src/Model/Event.php:467 msgid "No events to display" msgstr "" -#: src/Model/Event.php:518 src/Module/DFRN/Poll.php:47 src/Module/Feed.php:69 +#: src/Model/Event.php:516 src/Module/DFRN/Poll.php:47 src/Module/Feed.php:69 #: src/Module/Update/Profile.php:56 msgid "Access to this profile has been restricted." msgstr "" -#: src/Model/Event.php:560 src/Module/Calendar/Event/Show.php:67 +#: src/Model/Event.php:558 src/Module/Calendar/Event/Show.php:67 msgid "Event not found." msgstr "" -#: src/Model/Event.php:639 +#: src/Model/Event.php:637 msgid "l, F j" msgstr "" -#: src/Model/Event.php:666 +#: src/Model/Event.php:664 msgid "Edit event" msgstr "" -#: src/Model/Event.php:667 +#: src/Model/Event.php:665 msgid "Duplicate event" msgstr "" -#: src/Model/Event.php:668 +#: src/Model/Event.php:666 msgid "Delete event" msgstr "" -#: src/Model/Event.php:898 src/Module/Debug/Localtime.php:38 +#: src/Model/Event.php:896 src/Module/Debug/Localtime.php:38 msgid "l F d, Y \\@ g:i A" msgstr "" -#: src/Model/Event.php:899 +#: src/Model/Event.php:897 msgid "D g:i A" msgstr "" -#: src/Model/Event.php:900 +#: src/Model/Event.php:898 msgid "g:i A" msgstr "" -#: src/Model/Event.php:966 src/Model/Event.php:968 +#: src/Model/Event.php:964 src/Model/Event.php:966 msgid "Show map" msgstr "" -#: src/Model/Event.php:967 +#: src/Model/Event.php:965 msgid "Hide map" msgstr "" -#: src/Model/Event.php:1060 +#: src/Model/Event.php:1058 #, php-format msgid "%s's birthday" msgstr "" -#: src/Model/Event.php:1061 +#: src/Model/Event.php:1059 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -3459,145 +3459,145 @@ msgstr "" msgid "Contact information and Social Networks" msgstr "" -#: src/Model/User.php:214 src/Model/User.php:1142 +#: src/Model/User.php:225 src/Model/User.php:1167 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: src/Model/User.php:590 src/Model/User.php:623 +#: src/Model/User.php:601 src/Model/User.php:634 msgid "Login failed" msgstr "" -#: src/Model/User.php:655 +#: src/Model/User.php:666 msgid "Not enough information to authenticate" msgstr "" -#: src/Model/User.php:776 +#: src/Model/User.php:787 msgid "Password can't be empty" msgstr "" -#: src/Model/User.php:818 +#: src/Model/User.php:829 msgid "Empty passwords are not allowed." msgstr "" -#: src/Model/User.php:822 +#: src/Model/User.php:833 msgid "" "The new password has been exposed in a public data dump, please choose " "another." msgstr "" -#: src/Model/User.php:826 +#: src/Model/User.php:837 msgid "The password length is limited to 72 characters." msgstr "" -#: src/Model/User.php:830 +#: src/Model/User.php:841 msgid "The password can't contain white spaces nor accentuated letters" msgstr "" -#: src/Model/User.php:1025 +#: src/Model/User.php:1050 msgid "Passwords do not match. Password unchanged." msgstr "" -#: src/Model/User.php:1032 +#: src/Model/User.php:1057 msgid "An invitation is required." msgstr "" -#: src/Model/User.php:1036 +#: src/Model/User.php:1061 msgid "Invitation could not be verified." msgstr "" -#: src/Model/User.php:1044 +#: src/Model/User.php:1069 msgid "Invalid OpenID url" msgstr "" -#: src/Model/User.php:1057 src/Security/Authentication.php:241 +#: src/Model/User.php:1082 src/Security/Authentication.php:241 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: src/Model/User.php:1057 src/Security/Authentication.php:241 +#: src/Model/User.php:1082 src/Security/Authentication.php:241 msgid "The error message was:" msgstr "" -#: src/Model/User.php:1063 +#: src/Model/User.php:1088 msgid "Please enter the required information." msgstr "" -#: src/Model/User.php:1077 +#: src/Model/User.php:1102 #, php-format msgid "" "system.username_min_length (%s) and system.username_max_length (%s) are " "excluding each other, swapping values." msgstr "" -#: src/Model/User.php:1084 +#: src/Model/User.php:1109 #, php-format msgid "Username should be at least %s character." msgid_plural "Username should be at least %s characters." msgstr[0] "" msgstr[1] "" -#: src/Model/User.php:1088 +#: src/Model/User.php:1113 #, php-format msgid "Username should be at most %s character." msgid_plural "Username should be at most %s characters." msgstr[0] "" msgstr[1] "" -#: src/Model/User.php:1096 +#: src/Model/User.php:1121 msgid "That doesn't appear to be your full (First Last) name." msgstr "" -#: src/Model/User.php:1101 +#: src/Model/User.php:1126 msgid "Your email domain is not among those allowed on this site." msgstr "" -#: src/Model/User.php:1105 +#: src/Model/User.php:1130 msgid "Not a valid email address." msgstr "" -#: src/Model/User.php:1108 +#: src/Model/User.php:1133 msgid "The nickname was blocked from registration by the nodes admin." msgstr "" -#: src/Model/User.php:1112 src/Model/User.php:1118 +#: src/Model/User.php:1137 src/Model/User.php:1143 msgid "Cannot use that email." msgstr "" -#: src/Model/User.php:1124 +#: src/Model/User.php:1149 msgid "Your nickname can only contain a-z, 0-9 and _." msgstr "" -#: src/Model/User.php:1132 src/Model/User.php:1189 +#: src/Model/User.php:1157 src/Model/User.php:1214 msgid "Nickname is already registered. Please choose another." msgstr "" -#: src/Model/User.php:1176 src/Model/User.php:1180 +#: src/Model/User.php:1201 src/Model/User.php:1205 msgid "An error occurred during registration. Please try again." msgstr "" -#: src/Model/User.php:1203 +#: src/Model/User.php:1228 msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: src/Model/User.php:1210 +#: src/Model/User.php:1235 msgid "An error occurred creating your self contact. Please try again." msgstr "" -#: src/Model/User.php:1215 +#: src/Model/User.php:1240 msgid "Friends" msgstr "" -#: src/Model/User.php:1219 +#: src/Model/User.php:1244 msgid "" "An error occurred creating your default contact circle. Please try again." msgstr "" -#: src/Model/User.php:1263 +#: src/Model/User.php:1288 msgid "Profile Photos" msgstr "" -#: src/Model/User.php:1458 +#: src/Model/User.php:1483 #, php-format msgid "" "\n" @@ -3605,7 +3605,7 @@ msgid "" "\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: src/Model/User.php:1461 +#: src/Model/User.php:1486 #, php-format msgid "" "\n" @@ -3643,12 +3643,12 @@ msgid "" "\t\tThank you and welcome to %4$s." msgstr "" -#: src/Model/User.php:1494 src/Model/User.php:1601 +#: src/Model/User.php:1519 src/Model/User.php:1626 #, php-format msgid "Registration details for %s" msgstr "" -#: src/Model/User.php:1514 +#: src/Model/User.php:1539 #, php-format msgid "" "\n" @@ -3664,12 +3664,12 @@ msgid "" "\t\t" msgstr "" -#: src/Model/User.php:1533 +#: src/Model/User.php:1558 #, php-format msgid "Registration at %s" msgstr "" -#: src/Model/User.php:1557 +#: src/Model/User.php:1582 #, php-format msgid "" "\n" @@ -3678,7 +3678,7 @@ msgid "" "\t\t\t" msgstr "" -#: src/Model/User.php:1565 +#: src/Model/User.php:1590 #, php-format msgid "" "\n" @@ -3742,7 +3742,7 @@ msgid "Enable" msgstr "" #: src/Module/Admin/Addons/Details.php:111 src/Module/Admin/Addons/Index.php:67 -#: src/Module/Admin/Federation.php:210 src/Module/Admin/Logs/Settings.php:85 +#: src/Module/Admin/Federation.php:214 src/Module/Admin/Logs/Settings.php:85 #: src/Module/Admin/Logs/View.php:83 src/Module/Admin/Queue.php:72 #: src/Module/Admin/Site.php:398 src/Module/Admin/Storage.php:138 #: src/Module/Admin/Summary.php:196 src/Module/Admin/Themes/Details.php:90 @@ -3878,71 +3878,71 @@ msgstr "" msgid "Other" msgstr "" -#: src/Module/Admin/Federation.php:150 src/Module/Admin/Federation.php:399 +#: src/Module/Admin/Federation.php:154 src/Module/Admin/Federation.php:403 msgid "unknown" msgstr "" -#: src/Module/Admin/Federation.php:183 +#: src/Module/Admin/Federation.php:187 #, php-format msgid "%2$s total system" msgid_plural "%2$s total systems" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:184 +#: src/Module/Admin/Federation.php:188 #, php-format msgid "%2$s active user last month" msgid_plural "%2$s active users last month" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:185 +#: src/Module/Admin/Federation.php:189 #, php-format msgid "%2$s active user last six months" msgid_plural "%2$s active users last six months" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:186 +#: src/Module/Admin/Federation.php:190 #, php-format msgid "%2$s registered user" msgid_plural "%2$s registered users" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:187 +#: src/Module/Admin/Federation.php:191 #, php-format msgid "%2$s locally created post or comment" msgid_plural "%2$s locally created posts and comments" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:190 +#: src/Module/Admin/Federation.php:194 #, php-format msgid "%2$s post per user" msgid_plural "%2$s posts per user" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:195 +#: src/Module/Admin/Federation.php:199 #, php-format msgid "%2$s user per system" msgid_plural "%2$s users per system" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:205 +#: src/Module/Admin/Federation.php:209 msgid "" "This page offers you some numbers to the known part of the federated social " "network your Friendica node is part of. These numbers are not complete but " "only reflect the part of the network your node is aware of." msgstr "" -#: src/Module/Admin/Federation.php:211 src/Module/BaseAdmin.php:87 +#: src/Module/Admin/Federation.php:215 src/Module/BaseAdmin.php:87 msgid "Federation Statistics" msgstr "" -#: src/Module/Admin/Federation.php:215 +#: src/Module/Admin/Federation.php:219 #, php-format msgid "" "Currently this node is aware of %2$s node (%3$s active users last month, " @@ -5420,11 +5420,11 @@ msgstr "" msgid "Please login to continue." msgstr "" -#: src/Module/BaseAdmin.php:63 src/Module/BaseModeration.php:86 +#: src/Module/BaseAdmin.php:63 msgid "You don't have access to administration pages." msgstr "" -#: src/Module/BaseAdmin.php:67 src/Module/BaseModeration.php:90 +#: src/Module/BaseAdmin.php:67 msgid "" "Submanaged account can't access the administration pages. Please log back in " "as the main account." @@ -5517,6 +5517,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#: src/Module/BaseModeration.php:86 +msgid "You don't have access to moderation pages." +msgstr "" + +#: src/Module/BaseModeration.php:90 +msgid "" +"Submanaged account can't access the moderation pages. Please log back in as " +"the main account." +msgstr "" + #: src/Module/BaseModeration.php:112 src/Module/Moderation/Users/Index.php:148 #: src/Module/Moderation/Users/Index.php:158 msgid "Users" @@ -5746,23 +5756,23 @@ msgstr "" msgid "list" msgstr "" -#: src/Module/Circle.php:56 +#: src/Module/Circle.php:57 msgid "Could not create circle." msgstr "" -#: src/Module/Circle.php:67 src/Module/Circle.php:215 src/Module/Circle.php:239 +#: src/Module/Circle.php:68 src/Module/Circle.php:214 src/Module/Circle.php:238 msgid "Circle not found." msgstr "" -#: src/Module/Circle.php:73 +#: src/Module/Circle.php:74 msgid "Circle name was not changed." msgstr "" -#: src/Module/Circle.php:91 +#: src/Module/Circle.php:92 msgid "Unknown circle." msgstr "" -#: src/Module/Circle.php:97 src/Module/Circle.php:106 +#: src/Module/Circle.php:98 src/Module/Circle.php:107 #: src/Module/Contact/Advanced.php:70 src/Module/Contact/Advanced.php:109 #: src/Module/Contact/Contacts.php:71 src/Module/Contact/Conversations.php:84 #: src/Module/Contact/Conversations.php:89 @@ -5775,76 +5785,76 @@ msgstr "" msgid "Contact not found." msgstr "" -#: src/Module/Circle.php:101 src/Module/Contact/Contacts.php:66 +#: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66 #: src/Module/Conversation/Network.php:189 msgid "Invalid contact." msgstr "" -#: src/Module/Circle.php:110 src/Module/Contact/Revoke.php:73 +#: src/Module/Circle.php:111 src/Module/Contact/Revoke.php:73 msgid "Contact is deleted." msgstr "" -#: src/Module/Circle.php:116 +#: src/Module/Circle.php:117 msgid "Unable to add the contact to the circle." msgstr "" -#: src/Module/Circle.php:119 +#: src/Module/Circle.php:120 msgid "Contact successfully added to circle." msgstr "" -#: src/Module/Circle.php:123 +#: src/Module/Circle.php:124 msgid "Unable to remove the contact from the circle." msgstr "" -#: src/Module/Circle.php:126 +#: src/Module/Circle.php:127 msgid "Contact successfully removed from circle." msgstr "" -#: src/Module/Circle.php:130 +#: src/Module/Circle.php:131 msgid "Bad request." msgstr "" -#: src/Module/Circle.php:171 +#: src/Module/Circle.php:170 msgid "Save Circle" msgstr "" -#: src/Module/Circle.php:172 +#: src/Module/Circle.php:171 msgid "Filter" msgstr "" -#: src/Module/Circle.php:178 +#: src/Module/Circle.php:177 msgid "Create a circle of contacts/friends." msgstr "" -#: src/Module/Circle.php:220 +#: src/Module/Circle.php:219 msgid "Unable to remove circle." msgstr "" -#: src/Module/Circle.php:271 +#: src/Module/Circle.php:270 msgid "Delete Circle" msgstr "" -#: src/Module/Circle.php:281 +#: src/Module/Circle.php:280 msgid "Edit Circle Name" msgstr "" -#: src/Module/Circle.php:291 +#: src/Module/Circle.php:290 msgid "Members" msgstr "" -#: src/Module/Circle.php:294 +#: src/Module/Circle.php:293 msgid "Circle is empty" msgstr "" -#: src/Module/Circle.php:307 +#: src/Module/Circle.php:306 msgid "Remove contact from circle" msgstr "" -#: src/Module/Circle.php:328 +#: src/Module/Circle.php:329 msgid "Click on a contact to add or remove." msgstr "" -#: src/Module/Circle.php:342 +#: src/Module/Circle.php:343 msgid "Add contact to circle" msgstr "" @@ -8347,11 +8357,11 @@ msgstr "" msgid "Show unread" msgstr "" -#: src/Module/Notifications/Ping.php:245 +#: src/Module/Notifications/Ping.php:246 msgid "{0} requested registration" msgstr "" -#: src/Module/Notifications/Ping.php:254 +#: src/Module/Notifications/Ping.php:255 #, php-format msgid "{0} and %d others requested registration" msgstr "" @@ -8370,7 +8380,7 @@ msgstr "" msgid "Unsupported or missing response type" msgstr "" -#: src/Module/OAuth/Authorize.php:59 src/Module/OAuth/Token.php:77 +#: src/Module/OAuth/Authorize.php:59 src/Module/OAuth/Token.php:78 msgid "Incomplete request data" msgstr "" @@ -8381,11 +8391,11 @@ msgid "" "close this window: %s" msgstr "" -#: src/Module/OAuth/Token.php:82 +#: src/Module/OAuth/Token.php:83 msgid "Invalid data or unknown client" msgstr "" -#: src/Module/OAuth/Token.php:104 +#: src/Module/OAuth/Token.php:108 msgid "Unsupported or missing grant type" msgstr "" @@ -10723,7 +10733,7 @@ msgstr "" msgid "Exception thrown in %s:%d" msgstr "" -#: src/Module/Tos.php:57 src/Module/Tos.php:106 +#: src/Module/Tos.php:58 src/Module/Tos.php:107 msgid "" "At the time of registration, and for providing communications between the " "user account and their contacts, the user has to provide a display name (pen " @@ -10736,14 +10746,14 @@ msgid "" "settings, it is not necessary for communication." msgstr "" -#: src/Module/Tos.php:58 src/Module/Tos.php:107 +#: src/Module/Tos.php:59 src/Module/Tos.php:108 msgid "" "This data is required for communication and is passed on to the nodes of the " "communication partners and is stored there. Users can enter additional " "private data that may be transmitted to the communication partners accounts." msgstr "" -#: src/Module/Tos.php:59 src/Module/Tos.php:108 +#: src/Module/Tos.php:60 src/Module/Tos.php:109 #, php-format msgid "" "At any point in time a logged in user can export their account data from the " @@ -10754,11 +10764,11 @@ msgid "" "communication partners." msgstr "" -#: src/Module/Tos.php:62 src/Module/Tos.php:105 +#: src/Module/Tos.php:63 src/Module/Tos.php:106 msgid "Privacy Statement" msgstr "" -#: src/Module/Tos.php:102 +#: src/Module/Tos.php:103 msgid "Rules" msgstr "" From a966993c54c186e21d6a10c2414cbbfa170ec03b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 12 Aug 2023 10:18:53 +0200 Subject: [PATCH 212/259] [frio] Add a
    tag to the home page default template - This is required to make page wrapper display correctly --- view/theme/frio/php/default.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index a75207a20..74c30f6f7 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -137,12 +137,12 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; '; } else { echo ' -
    '; +
    '; if (!empty($page['content'])) { echo $page['content']; } echo ' -
    +
    '; } ?> From 32e6126552cfbd5fa88e099f2a7779df79a94f8f Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 14 Aug 2023 19:30:29 +0200 Subject: [PATCH 213/259] Update db_user-contact.md --- doc/database/db_user-contact.md | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md index 71fdc14e4..ac89aab1d 100644 --- a/doc/database/db_user-contact.md +++ b/doc/database/db_user-contact.md @@ -6,28 +6,28 @@ User specific public contact data Fields ------ -| Field | Description | Type | Null | Key | Default | Extra | -| ------------------------- | ------------------------------------------------------------ | ------------------ | ---- | --- | ------- | ----- | -| cid | Contact id of the linked public contact | int unsigned | NO | PRI | 0 | | -| uid | User id | mediumint unsigned | NO | PRI | 0 | | -| uri-id | Id of the item-uri table entry that contains the contact url | int unsigned | YES | | NULL | | -| blocked | Contact is completely blocked for this user | boolean | YES | | NULL | | -| ignored | Posts from this contact are ignored | boolean | YES | | NULL | | -| collapsed | Posts from this contact are collapsed | boolean | YES | | NULL | | -| hidden | This contact is hidden from the others | boolean | YES | | NULL | | -| is-blocked | User is blocked by this contact | boolean | YES | | NULL | | -| pending | | boolean | YES | | NULL | | -| rel | The kind of the relation between the user and the contact | tinyint unsigned | YES | | NULL | | -| info | | mediumtext | YES | | NULL | | -| notify_new_posts | | boolean | YES | | NULL | | -| remote_self | | boolean | YES | | NULL | | -| fetch_further_information | | tinyint unsigned | YES | | NULL | | -| ffi_keyword_denylist | | text | YES | | NULL | | -| subhub | | boolean | YES | | NULL | | -| hub-verify | | varbinary(383) | YES | | NULL | | -| protocol | Protocol of the contact | char(4) | YES | | NULL | | -| rating | Automatically detected feed poll frequency | tinyint | YES | | NULL | | -| priority | Feed poll priority | tinyint unsigned | YES | | NULL | | +| Field | Description | Type | Null | Key | Default | Extra | +| ------------------------- | ----------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- | +| cid | Contact id of the linked public contact | int unsigned | NO | PRI | 0 | | +| uid | User id | mediumint unsigned | NO | PRI | 0 | | +| uri-id | Id of the item-uri table entry that contains the contact url | int unsigned | YES | | NULL | | +| blocked | Contact is completely blocked for this user | boolean | YES | | NULL | | +| ignored | Posts from this contact are ignored | boolean | YES | | NULL | | +| collapsed | Posts from this contact are collapsed | boolean | YES | | NULL | | +| hidden | This contact is hidden from the others | boolean | YES | | NULL | | +| is-blocked | User is blocked by this contact | boolean | YES | | NULL | | +| pending | | boolean | YES | | NULL | | +| rel | The kind of the relation between the user and the contact | tinyint unsigned | YES | | NULL | | +| info | | mediumtext | YES | | NULL | | +| notify_new_posts | | boolean | YES | | NULL | | +| remote_self | 0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare | tinyint unsigned | YES | | NULL | | +| fetch_further_information | 0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both | tinyint unsigned | YES | | NULL | | +| ffi_keyword_denylist | | text | YES | | NULL | | +| subhub | | boolean | YES | | NULL | | +| hub-verify | | varbinary(383) | YES | | NULL | | +| protocol | Protocol of the contact | char(4) | YES | | NULL | | +| rating | Automatically detected feed poll frequency | tinyint | YES | | NULL | | +| priority | Feed poll priority | tinyint unsigned | YES | | NULL | | Indexes ------------ From 735835193d577285ced8396df333dc0a2013c335 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 14 Aug 2023 17:17:25 -0400 Subject: [PATCH 214/259] Add a Message-ID header if none is set in Util\Emailer - Address anti-spam detection rule --- src/Util/Emailer.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php index 5e4d98d4c..1accc574c 100644 --- a/src/Util/Emailer.php +++ b/src/Util/Emailer.php @@ -126,7 +126,7 @@ class Emailer * @return bool * @throws InternalServerErrorException */ - public function send(IEmail $email) + public function send(IEmail $email): bool { Hook::callAll('emailer_send_prepare', $email); @@ -151,7 +151,7 @@ class Emailer } $fromName = Email::encodeHeader(html_entity_decode($email->getFromName(), ENT_QUOTES, 'UTF-8'), 'UTF-8'); - $fromAddress = $email->getFromAddress(); + $fromAddress = $email->getFromAddress(); $replyTo = $email->getReplyTo(); $messageSubject = Email::encodeHeader(html_entity_decode($email->getSubject(), ENT_QUOTES, 'UTF-8'), 'UTF-8'); @@ -161,12 +161,17 @@ class Emailer . rand(100000000, 999999999) . '=:' . rand(10000, 99999); + $messageHeader = $email->getAdditionalMailHeaderString(); + if ($countMessageId === 0) { + $messageHeader .= 'Message-ID: baseUrl->getHost() . '>' . "\r\n"; + } + // generate a multipart/alternative message header - $messageHeader = $email->getAdditionalMailHeaderString() . - "From: $fromName <{$fromAddress}>\r\n" . - "Reply-To: $fromName <{$replyTo}>\r\n" . - "MIME-Version: 1.0\r\n" . - "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; + $messageHeader .= + "From: $fromName <{$fromAddress}>\r\n" . + "Reply-To: $fromName <{$replyTo}>\r\n" . + "MIME-Version: 1.0\r\n" . + "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; // assemble the final multipart message body with the text and html types included $textBody = chunk_split(base64_encode($email->getMessage(true))); From 7faba0de5e3dad58c0782c6331cf88f874862197 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 15 Aug 2023 02:13:50 +0000 Subject: [PATCH 215/259] New function for the number of retrials / Daily reload of hooks --- src/Core/Worker.php | 11 +++++++++++ src/Worker/Cron.php | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/Core/Worker.php b/src/Core/Worker.php index 00885f692..7075b4b23 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -1365,6 +1365,17 @@ class Worker return $new_retrial; } + /** + * Get the number of retrials for the current worker task + * + * @return integer + */ + public static function getRetrial(): int + { + $queue = DI::app()->getQueue(); + return $queue['retrial'] ?? 0; + } + /** * Defers the current worker entry * diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index 73d158070..18ede945c 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -21,6 +21,7 @@ namespace Friendica\Worker; +use Friendica\Core\Addon; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Worker; @@ -146,6 +147,8 @@ class Cron // Update "blocked" status of servers Worker::add(Worker::PRIORITY_LOW, 'UpdateBlockedServers'); + Addon::reload(); + DI::keyValue()->set('last_cron_daily', time()); } From 0985ddb3ff76d24d8e157b7b41d86a5c98ed297a Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Tue, 15 Aug 2023 15:23:31 -0400 Subject: [PATCH 216/259] Add PR and Issue Numbers for TODO for createFromUriId hack in Mastodon API --- src/Module/Api/Mastodon/Statuses/Bookmark.php | 4 +++- src/Module/Api/Mastodon/Statuses/Favourite.php | 4 +++- src/Module/Api/Mastodon/Statuses/Mute.php | 4 +++- src/Module/Api/Mastodon/Statuses/Pin.php | 4 +++- src/Module/Api/Mastodon/Statuses/Reblog.php | 4 +++- src/Module/Api/Mastodon/Statuses/Unbookmark.php | 4 +++- src/Module/Api/Mastodon/Statuses/Unfavourite.php | 4 +++- src/Module/Api/Mastodon/Statuses/Unmute.php | 4 +++- src/Module/Api/Mastodon/Statuses/Unpin.php | 4 +++- src/Module/Api/Mastodon/Statuses/Unreblog.php | 4 +++- 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php index 9625b5e12..7f32c9a43 100644 --- a/src/Module/Api/Mastodon/Statuses/Bookmark.php +++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php @@ -65,7 +65,9 @@ class Bookmark extends BaseApi Item::update(['starred' => true], ['id' => $item['id']]); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php index 2e5159175..3543a3ba8 100644 --- a/src/Module/Api/Mastodon/Statuses/Favourite.php +++ b/src/Module/Api/Mastodon/Statuses/Favourite.php @@ -49,7 +49,9 @@ class Favourite extends BaseApi Item::performActivity($item['id'], 'like', $uid); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php index 587999bad..a99cd6863 100644 --- a/src/Module/Api/Mastodon/Statuses/Mute.php +++ b/src/Module/Api/Mastodon/Statuses/Mute.php @@ -53,7 +53,9 @@ class Mute extends BaseApi Post\ThreadUser::setIgnored($item['uri-id'], $uid, true); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php index 601f82f2d..5d9a18113 100644 --- a/src/Module/Api/Mastodon/Statuses/Pin.php +++ b/src/Module/Api/Mastodon/Statuses/Pin.php @@ -48,7 +48,9 @@ class Pin extends BaseApi Post\Collection::add($item['uri-id'], Post\Collection::FEATURED, $item['author-id'], $uid); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(),$isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php index 409f8e788..98cbd417d 100644 --- a/src/Module/Api/Mastodon/Statuses/Reblog.php +++ b/src/Module/Api/Mastodon/Statuses/Reblog.php @@ -58,7 +58,9 @@ class Reblog extends BaseApi Item::performActivity($item['id'], 'announce', $uid); } - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php index 03a3e6f00..556db2b4b 100644 --- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php +++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php @@ -65,7 +65,9 @@ class Unbookmark extends BaseApi Item::update(['starred' => false], ['id' => $item['id']]); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php index d95d9e09c..99358be55 100644 --- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php +++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php @@ -49,7 +49,9 @@ class Unfavourite extends BaseApi Item::performActivity($item['id'], 'unlike', $uid); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php index 63cd6d722..b6d9c2b19 100644 --- a/src/Module/Api/Mastodon/Statuses/Unmute.php +++ b/src/Module/Api/Mastodon/Statuses/Unmute.php @@ -53,7 +53,9 @@ class Unmute extends BaseApi Post\ThreadUser::setIgnored($item['uri-id'], $uid, false); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php index 22610f446..75b1d6fa5 100644 --- a/src/Module/Api/Mastodon/Statuses/Unpin.php +++ b/src/Module/Api/Mastodon/Statuses/Unpin.php @@ -48,7 +48,9 @@ class Unpin extends BaseApi Post\Collection::remove($item['uri-id'], Post\Collection::FEATURED, $uid); - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php index a1544807f..6730e0fb5 100644 --- a/src/Module/Api/Mastodon/Statuses/Unreblog.php +++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php @@ -64,7 +64,9 @@ class Unreblog extends BaseApi Item::performActivity($item['id'], 'unannounce', $uid); } - // @TODO Remove once mstdnStatus()->createFromUriId is fixed + // @TODO Remove once mstdnStatus()->createFromUriId is fixed so that it returns posts not reshared posts if given an ID to an original post that has been reshared + // Introduced in this PR: https://github.com/friendica/friendica/pull/13175 + // Issue tracking the behavior of createFromUriId: https://github.com/friendica/friendica/issues/13350 $isReblog = $item['uri-id'] != $this->parameters['id']; System::jsonExit(DI::mstdnStatus()->createFromUriId($this->parameters['id'], $uid, self::appSupportsQuotes(), $isReblog)->toArray()); From 2183c5e60cc557ebc3decbb215ce1eb586f05ec9 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 15 Aug 2023 20:22:15 +0000 Subject: [PATCH 217/259] New parameter for textareas to make them readonly --- view/templates/field_textarea.tpl | 2 +- view/theme/frio/templates/field_textarea.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl index edd48d1d0..f5221b569 100644 --- a/view/templates/field_textarea.tpl +++ b/view/templates/field_textarea.tpl @@ -1,7 +1,7 @@
    - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl index 72bcc232a..ef9838f56 100644 --- a/view/theme/frio/templates/field_textarea.tpl +++ b/view/theme/frio/templates/field_textarea.tpl @@ -2,7 +2,7 @@ {{if $field.1}} {{/if}} - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} From ba967386f4f2c1d5977f1ac4ac4473ad892e366b Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Wed, 16 Aug 2023 14:37:24 -0400 Subject: [PATCH 218/259] Revert Post::selectOriginal to original logic --- src/Model/Post.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Model/Post.php b/src/Model/Post.php index 9e137ae37..770ab0831 100644 --- a/src/Model/Post.php +++ b/src/Model/Post.php @@ -263,10 +263,7 @@ class Post return $result; } - $final_query_condition = ['uri-id' => $result['thr-parent-id']]; - $final_query_condition = DBA::mergeConditions($final_query_condition, ['uid != 0']); - $final_params = ['order' => ['id']]; - return self::selectFirst($original_fields, $final_query_condition, $final_params); + return self::selectFirst($original_fields, ['uri-id' => $result['thr-parent-id'], 'uid' => [0, $result['uid']]], $params); } /** From 5d7985dcff4bc0a4ca1c3b76076e43de771de4bb Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 17 Aug 2023 07:28:17 -0400 Subject: [PATCH 219/259] Move default header image credits to static/defaults.config.php --- src/Model/Contact.php | 6 ------ static/defaults.config.php | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 23e1f2cbf..c6001ebb4 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1899,12 +1899,6 @@ class Contact switch ($platform) { case 'friendica': case 'friendika': - /** - * Picture credits - * @author Lostinlight - * @license CC0 https://creativecommons.org/share-your-work/public-domain/cc0/ - * @link https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg - */ $header = DI::baseUrl() . '/images/friendica-banner.jpg'; break; case 'diaspora': diff --git a/static/defaults.config.php b/static/defaults.config.php index 4562da898..33ed8211b 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -783,7 +783,12 @@ return [ ], 'api' => [ // mastodon_banner (String) - // Banner for Mastodon API + // Default banner image for Mastodon API, must be a relative path from the base Friendica folder + // + // Default picture credits: + // Author: Lostinlight + // License: CC0 https://creativecommons.org/share-your-work/public-domain/cc0/ + // Link to original work: https://gitlab.com/lostinlight/per_aspera_ad_astra/-/blob/master/friendica-404/friendica-promo-bubbles.jpg 'mastodon_banner' => '/images/friendica-banner.jpg', ], 'blocklist' => [ From dad3404ac5439f2e166e1b50c43bc6c5be43c97a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 17 Aug 2023 07:35:19 -0400 Subject: [PATCH 220/259] Replace remaining references to default banner image by api.mastodon_banner configuration value - Ensure leading slash is present at every place the configuration value is used --- src/Contact/Header.php | 47 ++++++++++++++++++++++++++ src/Model/Contact.php | 3 +- src/Module/Api/Mastodon/InstanceV2.php | 11 ++++-- src/Module/Photo.php | 3 +- src/Object/Api/Mastodon/Instance.php | 3 +- 5 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 src/Contact/Header.php diff --git a/src/Contact/Header.php b/src/Contact/Header.php new file mode 100644 index 000000000..d5116d290 --- /dev/null +++ b/src/Contact/Header.php @@ -0,0 +1,47 @@ +. + * + */ + +namespace Friendica\Contact; + +use Friendica\Core\Config\Capability\IManageConfigValues; + +class Header +{ + /** @var IManageConfigValues */ + private $config; + + public function __construct(IManageConfigValues $config) + { + $this->config = $config; + } + + /** + * Returns the Mastodon banner path relative to the Friendica folder. + * + * Ensures the existence of a leading slash. + * + * @return string + */ + public function getMastodonBannerPath(): string + { + return '/' . ltrim($this->config->get('api', 'mastodon_banner'), '/'); + } +} diff --git a/src/Model/Contact.php b/src/Model/Contact.php index c6001ebb4..d91abe9bc 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -22,6 +22,7 @@ namespace Friendica\Model; use Friendica\Contact\Avatar; +use Friendica\Contact\Header; use Friendica\Contact\Introduction\Exception\IntroductionNotFoundException; use Friendica\Contact\LocalRelationship\Entity\LocalRelationship; use Friendica\Content\Conversation as ConversationContent; @@ -1899,7 +1900,7 @@ class Contact switch ($platform) { case 'friendica': case 'friendika': - $header = DI::baseUrl() . '/images/friendica-banner.jpg'; + $header = DI::baseUrl() . (new Header(DI::config()))->getMastodonBannerPath(); break; case 'diaspora': /** diff --git a/src/Module/Api/Mastodon/InstanceV2.php b/src/Module/Api/Mastodon/InstanceV2.php index 402e0ae93..bf5cbcfb5 100644 --- a/src/Module/Api/Mastodon/InstanceV2.php +++ b/src/Module/Api/Mastodon/InstanceV2.php @@ -23,6 +23,7 @@ namespace Friendica\Module\Api\Mastodon; use Exception; use Friendica\App; +use Friendica\Contact\Header; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; use Friendica\Core\System; @@ -49,6 +50,9 @@ class InstanceV2 extends BaseApi /** @var IManageConfigValues */ private $config; + /** @var Header */ + private $contactHeader; + public function __construct( App $app, L10n $l10n, @@ -64,8 +68,9 @@ class InstanceV2 extends BaseApi ) { parent::__construct($app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->database = $database; - $this->config = $config; + $this->database = $database; + $this->config = $config; + $this->contactHeader = new Header($config); } /** @@ -82,7 +87,7 @@ class InstanceV2 extends BaseApi $version = '2.8.0 (compatible; Friendica ' . App::VERSION . ')'; $description = $this->config->get('config', 'info'); $usage = $this->buildUsageInfo(); - $thumbnail = new InstanceEntity\Thumbnail($this->baseUrl->withPath('images/friendica-banner.jpg')); + $thumbnail = new InstanceEntity\Thumbnail($this->baseUrl . $this->contactHeader->getMastodonBannerPath()); $languages = [$this->config->get('system', 'language')]; $configuration = $this->buildConfigurationInfo(); $registration = $this->buildRegistrationsInfo(); diff --git a/src/Module/Photo.php b/src/Module/Photo.php index 954b3f3ee..c8e0656d2 100644 --- a/src/Module/Photo.php +++ b/src/Module/Photo.php @@ -22,6 +22,7 @@ namespace Friendica\Module; use Friendica\BaseModule; +use Friendica\Contact\Header; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\DBA; @@ -482,6 +483,6 @@ class Photo extends BaseApi if (!empty($photo)) { return $photo; } - return MPhoto::createPhotoForImageData(file_get_contents(DI::basePath() . '/images/friendica-banner.jpg')); + return MPhoto::createPhotoForImageData(file_get_contents(DI::basePath() . (new Header(DI::config()))->getMastodonBannerPath())); } } diff --git a/src/Object/Api/Mastodon/Instance.php b/src/Object/Api/Mastodon/Instance.php index 201218251..a7549afd8 100644 --- a/src/Object/Api/Mastodon/Instance.php +++ b/src/Object/Api/Mastodon/Instance.php @@ -24,6 +24,7 @@ namespace Friendica\Object\Api\Mastodon; use Friendica\App; use Friendica\App\BaseURL; use Friendica\BaseDataTransferObject; +use Friendica\Contact\Header; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Database\Database; use Friendica\DI; @@ -91,7 +92,7 @@ class Instance extends BaseDataTransferObject $this->version = '2.8.0 (compatible; Friendica ' . App::VERSION . ')'; $this->urls = ['streaming_api' => '']; // Not supported $this->stats = new Stats($config, $database); - $this->thumbnail = $baseUrl . $config->get('api', 'mastodon_banner'); + $this->thumbnail = $baseUrl . (new Header($config))->getMastodonBannerPath(); $this->languages = [$config->get('system', 'language')]; $this->max_toot_chars = (int)$config->get('config', 'api_import_size', $config->get('config', 'max_import_size')); $this->registrations = ($register_policy != Register::CLOSED); From f59e11281cc9e0b92bbb545838b4d8e63db7d316 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 20 Aug 2023 05:57:39 +0000 Subject: [PATCH 221/259] Issue 12815: JsonLD parsing problems with data-integrity --- src/Util/JsonLD.php | 3 + static/security-data-integrity-v1.jsonld | 72 ++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 static/security-data-integrity-v1.jsonld diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index beb01f0cc..8f492bdcf 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -49,6 +49,9 @@ class JsonLD case 'https://w3id.org/identity/v1': $url = DI::basePath() . '/static/identity-v1.jsonld'; break; + case 'https://w3id.org/security/data-integrity/v1': + $url = DI::basePath() . '/static/security-data-integrity-v1.jsonld'; + break; case 'https://www.w3.org/ns/activitystreams': $url = DI::basePath() . '/static/activitystreams.jsonld'; break; diff --git a/static/security-data-integrity-v1.jsonld b/static/security-data-integrity-v1.jsonld new file mode 100644 index 000000000..24c054e39 --- /dev/null +++ b/static/security-data-integrity-v1.jsonld @@ -0,0 +1,72 @@ +{ + "@context": { + "id": "@id", + "type": "@type", + "proof": { + "@id": "https://w3id.org/security#proof", + "@type": "@id" + }, + "DataIntegrityProof": { + "@id": "https://w3id.org/security#DataIntegrityProof", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "challenge": "https://w3id.org/security#challenge", + "created": { + "@id": "http://purl.org/dc/terms/created", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "domain": "https://w3id.org/security#domain", + "expires": { + "@id": "https://w3id.org/security#expiration", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "nonce": "https://w3id.org/security#nonce", + "proofPurpose": { + "@id": "https://w3id.org/security#proofPurpose", + "@type": "@vocab", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "assertionMethod": { + "@id": "https://w3id.org/security#assertionMethod", + "@type": "@id", + "@container": "@set" + }, + "authentication": { + "@id": "https://w3id.org/security#authenticationMethod", + "@type": "@id", + "@container": "@set" + }, + "capabilityInvocation": { + "@id": "https://w3id.org/security#capabilityInvocationMethod", + "@type": "@id", + "@container": "@set" + }, + "capabilityDelegation": { + "@id": "https://w3id.org/security#capabilityDelegationMethod", + "@type": "@id", + "@container": "@set" + }, + "keyAgreement": { + "@id": "https://w3id.org/security#keyAgreementMethod", + "@type": "@id", + "@container": "@set" + } + } + }, + "cryptosuite": "https://w3id.org/security#cryptosuite", + "proofValue": { + "@id": "https://w3id.org/security#proofValue", + "@type": "https://w3id.org/security#multibase" + }, + "verificationMethod": { + "@id": "https://w3id.org/security#verificationMethod", + "@type": "@id" + } + } + } + } +} \ No newline at end of file From 12d6080a48fe8c5be3fcdd75864ae4376ae458fe Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 20 Aug 2023 12:13:25 +0000 Subject: [PATCH 222/259] Added another context --- src/Util/JsonLD.php | 11 +++++++---- static/security-multikey-v1.jsonld | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 static/security-multikey-v1.jsonld diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 8f492bdcf..63787db08 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -46,12 +46,15 @@ class JsonLD case 'https://w3id.org/security/v1': $url = DI::basePath() . '/static/security-v1.jsonld'; break; - case 'https://w3id.org/identity/v1': - $url = DI::basePath() . '/static/identity-v1.jsonld'; - break; case 'https://w3id.org/security/data-integrity/v1': $url = DI::basePath() . '/static/security-data-integrity-v1.jsonld'; break; + case 'https://w3id.org/security/multikey/v1': + $url = DI::basePath() . '/static/security-multikey-v1.jsonld'; + break; + case 'https://w3id.org/identity/v1': + $url = DI::basePath() . '/static/identity-v1.jsonld'; + break; case 'https://www.w3.org/ns/activitystreams': $url = DI::basePath() . '/static/activitystreams.jsonld'; break; @@ -98,7 +101,7 @@ class JsonLD $result = DI::cache()->get('documentLoader:' . $url); if (!is_null($result)) { - return $result; + //return $result; } $data = jsonld_default_document_loader($url); diff --git a/static/security-multikey-v1.jsonld b/static/security-multikey-v1.jsonld new file mode 100644 index 000000000..21f74601c --- /dev/null +++ b/static/security-multikey-v1.jsonld @@ -0,0 +1,30 @@ +{ + "@context": { + "id": "@id", + "type": "@type", + "Multikey": { + "@id": "https://w3id.org/security#Multikey", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "controller": { + "@id": "https://w3id.org/security#controller", + "@type": "@id" + }, + "revoked": { + "@id": "https://w3id.org/security#revoked", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "publicKeyMultibase": { + "@id": "https://w3id.org/security#publicKeyMultibase", + "@type": "https://w3id.org/security#multibase" + }, + "secretKeyMultibase": { + "@id": "https://w3id.org/security#secretKeyMultibase", + "@type": "https://w3id.org/security#multibase" + } + } + } + } +} \ No newline at end of file From 4097808b95dcdac41fd4146a560eb6f941891c94 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 20 Aug 2023 12:39:05 +0000 Subject: [PATCH 223/259] Resture previous state --- src/Util/JsonLD.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php index 63787db08..427205958 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -101,7 +101,7 @@ class JsonLD $result = DI::cache()->get('documentLoader:' . $url); if (!is_null($result)) { - //return $result; + return $result; } $data = jsonld_default_document_loader($url); From d3cc9998669def21d493aaa7b114ba5fd5f63858 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 20 Aug 2023 12:41:42 +0000 Subject: [PATCH 224/259] GPTBot added to the default robots.txt --- src/Module/RobotsTxt.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php index 415a8ab47..a084c1f4a 100644 --- a/src/Module/RobotsTxt.php +++ b/src/Module/RobotsTxt.php @@ -38,6 +38,8 @@ class RobotsTxt extends BaseModule '/search', '/help', '/proxy', + '/photo', + '/avatar', ]; header('Content-Type: text/plain'); @@ -50,6 +52,10 @@ class RobotsTxt extends BaseModule echo 'User-agent: ChatGPT-User' . PHP_EOL; echo 'Disallow: /' . PHP_EOL; + echo PHP_EOL; + echo 'User-agent: GPTBot' . PHP_EOL; + echo 'Disallow: /' . PHP_EOL; + System::exit(); } } From 7e971a2ec64fe6fc276cc083da29332a83fdf076 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 11 Aug 2023 00:46:27 +0200 Subject: [PATCH 225/259] Remove DI dependency from Module\Settings\Profile\Index - Replace obsolete base settings/profile/index template by vier version - Group translation labels in settings/profile/index template variables --- src/Module/Settings/Profile/Index.php | 278 ++++++++++-------- .../Repository/PermissionSet.php | 2 +- view/templates/settings/profile/index.tpl | 218 +++++++------- .../frio/templates/settings/profile/index.tpl | 30 +- .../vier/templates/settings/profile/index.tpl | 179 ----------- 5 files changed, 283 insertions(+), 424 deletions(-) delete mode 100644 view/theme/vier/templates/settings/profile/index.tpl diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php index c8b27e394..c18c72a4e 100644 --- a/src/Module/Settings/Profile/Index.php +++ b/src/Module/Settings/Profile/Index.php @@ -21,43 +21,75 @@ namespace Friendica\Module\Settings\Profile; +use Friendica\App; use Friendica\Core\ACL; use Friendica\Core\Hook; +use Friendica\Core\L10n; use Friendica\Core\Protocol; use Friendica\Core\Renderer; +use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\Theme; use Friendica\Database\DBA; -use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Profile; -use Friendica\Profile\ProfileField\Collection\ProfileFields; -use Friendica\Profile\ProfileField\Entity\ProfileField; +use Friendica\Module\Response; +use Friendica\Navigation\SystemMessages; +use Friendica\Profile\ProfileField; use Friendica\Model\User; use Friendica\Module\BaseSettings; use Friendica\Module\Security\Login; use Friendica\Network\HTTPException; +use Friendica\Security\PermissionSet; +use Friendica\Util\ACLFormatter; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Profiler; use Friendica\Util\Temporal; use Friendica\Core\Worker; +use Psr\Log\LoggerInterface; class Index extends BaseSettings { + /** @var ProfileField\Repository\ProfileField */ + private $profileFieldRepo; + /** @var ProfileField\Factory\ProfileField */ + private $profileFieldFactory; + /** @var SystemMessages */ + private $systemMessages; + /** @var PermissionSet\Repository\PermissionSet */ + private $permissionSetRepo; + /** @var PermissionSet\Factory\PermissionSet */ + private $permissionSetFactory; + /** @var ACLFormatter */ + private $aclFormatter; + + public function __construct(ACLFormatter $aclFormatter, PermissionSet\Factory\PermissionSet $permissionSetFactory, PermissionSet\Repository\PermissionSet $permissionSetRepo, SystemMessages $systemMessages, ProfileField\Factory\ProfileField $profileFieldFactory, ProfileField\Repository\ProfileField $profileFieldRepo, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + { + parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + + $this->profileFieldRepo = $profileFieldRepo; + $this->profileFieldFactory = $profileFieldFactory; + $this->systemMessages = $systemMessages; + $this->permissionSetRepo = $permissionSetRepo; + $this->permissionSetFactory = $permissionSetFactory; + $this->aclFormatter = $aclFormatter; + } + protected function post(array $request = []) { - if (!DI::userSession()->getLocalUserId()) { + if (!$this->session->getLocalUserId()) { return; } - $profile = Profile::getByUID(DI::userSession()->getLocalUserId()); - if (!DBA::isResult($profile)) { + $profile = Profile::getByUID($this->session->getLocalUserId()); + if (!$profile) { return; } self::checkFormSecurityTokenRedirectOnError('/settings/profile', 'settings_profile'); - Hook::callAll('profile_post', $_POST); + Hook::callAll('profile_post', $request); - $dob = trim($_POST['dob'] ?? ''); + $dob = trim($request['dob'] ?? ''); if ($dob && !in_array($dob, ['0000-00-00', DBA::NULL_DATE])) { $y = substr($dob, 0, 4); @@ -79,35 +111,35 @@ class Index extends BaseSettings } } - $name = trim($_POST['name'] ?? ''); - if (!strlen($name)) { - DI::sysmsg()->addNotice(DI::l10n()->t('Profile Name is required.')); + $name = trim($request['name'] ?? ''); + if (!$name) { + $this->systemMessages->addNotice($this->t('Display Name is required.')); return; } - $about = trim($_POST['about']); - $address = trim($_POST['address']); - $locality = trim($_POST['locality']); - $region = trim($_POST['region']); - $postal_code = trim($_POST['postal_code']); - $country_name = trim($_POST['country_name']); - $pub_keywords = self::cleanKeywords(trim($_POST['pub_keywords'])); - $prv_keywords = self::cleanKeywords(trim($_POST['prv_keywords'])); - $xmpp = trim($_POST['xmpp']); - $matrix = trim($_POST['matrix']); - $homepage = trim($_POST['homepage']); + $about = trim($request['about']); + $address = trim($request['address']); + $locality = trim($request['locality']); + $region = trim($request['region']); + $postal_code = trim($request['postal_code']); + $country_name = trim($request['country_name']); + $pub_keywords = self::cleanKeywords(trim($request['pub_keywords'])); + $prv_keywords = self::cleanKeywords(trim($request['prv_keywords'])); + $xmpp = trim($request['xmpp']); + $matrix = trim($request['matrix']); + $homepage = trim($request['homepage']); if ((strpos($homepage, 'http') !== 0) && (strlen($homepage))) { // neither http nor https in URL, add them $homepage = 'http://' . $homepage; } - $profileFieldsNew = self::getProfileFieldsFromInput( - DI::userSession()->getLocalUserId(), - $_REQUEST['profile_field'], - $_REQUEST['profile_field_order'] + $profileFieldsNew = $this->getProfileFieldsFromInput( + $this->session->getLocalUserId(), + $request['profile_field'], + $request['profile_field_order'] ); - DI::profileField()->saveCollectionForUser(DI::userSession()->getLocalUserId(), $profileFieldsNew); + $this->profileFieldRepo->saveCollectionForUser($this->session->getLocalUserId(), $profileFieldsNew); $result = Profile::update( [ @@ -125,23 +157,23 @@ class Index extends BaseSettings 'pub_keywords' => $pub_keywords, 'prv_keywords' => $prv_keywords, ], - DI::userSession()->getLocalUserId() + $this->session->getLocalUserId() ); - Worker::add(Worker::PRIORITY_MEDIUM, 'CheckRelMeProfileLink', DI::userSession()->getLocalUserId()); + Worker::add(Worker::PRIORITY_MEDIUM, 'CheckRelMeProfileLink', $this->session->getLocalUserId()); if (!$result) { - DI::sysmsg()->addNotice(DI::l10n()->t('Profile couldn\'t be updated.')); + $this->systemMessages->addNotice($this->t("Profile couldn't be updated.")); return; } - DI::baseUrl()->redirect('settings/profile'); + $this->baseUrl->redirect('settings/profile'); } protected function content(array $request = []): string { - if (!DI::userSession()->getLocalUserId()) { - DI::sysmsg()->addNotice(DI::l10n()->t('You must be logged in to use this module')); + if (!$this->session->getLocalUserId()) { + $this->systemMessages->addNotice($this->t('You must be logged in to use this module')); return Login::form(); } @@ -149,147 +181,145 @@ class Index extends BaseSettings $o = ''; - $profile = User::getOwnerDataById(DI::userSession()->getLocalUserId()); - if (!DBA::isResult($profile)) { + $owner = User::getOwnerDataById($this->session->getLocalUserId()); + if (!$owner) { throw new HTTPException\NotFoundException(); } - $a = DI::app(); - - DI::page()->registerFooterScript('view/asset/es-jquery-sortable/source/js/jquery-sortable-min.js'); - DI::page()->registerFooterScript(Theme::getPathForFile('js/module/settings/profile/index.js')); + $this->page->registerFooterScript('view/asset/es-jquery-sortable/source/js/jquery-sortable-min.js'); + $this->page->registerFooterScript(Theme::getPathForFile('js/module/settings/profile/index.js')); $custom_fields = []; - $profileFields = DI::profileField()->selectByUserId(DI::userSession()->getLocalUserId()); + $profileFields = $this->profileFieldRepo->selectByUserId($this->session->getLocalUserId()); foreach ($profileFields as $profileField) { - /** @var ProfileField $profileField */ $defaultPermissions = $profileField->permissionSet->withAllowedContacts( Contact::pruneUnavailable($profileField->permissionSet->allow_cid) ); $custom_fields[] = [ - 'id' => $profileField->id, + 'id' => $profileField->id, 'legend' => $profileField->label, 'fields' => [ - 'label' => ['profile_field[' . $profileField->id . '][label]', DI::l10n()->t('Label:'), $profileField->label], - 'value' => ['profile_field[' . $profileField->id . '][value]', DI::l10n()->t('Value:'), $profileField->value], - 'acl' => ACL::getFullSelectorHTML( - DI::page(), - $a->getLoggedInUserId(), + 'label' => ['profile_field[' . $profileField->id . '][label]', $this->t('Label:'), $profileField->label], + 'value' => ['profile_field[' . $profileField->id . '][value]', $this->t('Value:'), $profileField->value], + 'acl' => ACL::getFullSelectorHTML( + $this->page, + $this->session->getLocalUserId(), false, $defaultPermissions->toArray(), ['network' => Protocol::DFRN], 'profile_field[' . $profileField->id . ']' ), ], - 'permissions' => DI::l10n()->t('Field Permissions'), - 'permdesc' => DI::l10n()->t("(click to open/close)"), + + 'permissions' => $this->t('Field Permissions'), + 'permdesc' => $this->t("(click to open/close)"), ]; - }; + } $custom_fields[] = [ - 'id' => 'new', - 'legend' => DI::l10n()->t('Add a new profile field'), + 'id' => 'new', + 'legend' => $this->t('Add a new profile field'), 'fields' => [ - 'label' => ['profile_field[new][label]', DI::l10n()->t('Label:')], - 'value' => ['profile_field[new][value]', DI::l10n()->t('Value:')], - 'acl' => ACL::getFullSelectorHTML( - DI::page(), - $a->getLoggedInUserId(), + 'label' => ['profile_field[new][label]', $this->t('Label:')], + 'value' => ['profile_field[new][value]', $this->t('Value:')], + 'acl' => ACL::getFullSelectorHTML( + $this->page, + $this->session->getLocalUserId(), false, ['allow_cid' => []], ['network' => Protocol::DFRN], 'profile_field[new]' ), ], - 'permissions' => DI::l10n()->t('Field Permissions'), - 'permdesc' => DI::l10n()->t("(click to open/close)"), + + 'permissions' => $this->t('Field Permissions'), + 'permdesc' => $this->t("(click to open/close)"), ]; - DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/profile/index_head.tpl'), [ - ]); + $this->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/profile/index_head.tpl')); - $personal_account = ($profile['account-type'] != User::ACCOUNT_TYPE_COMMUNITY); + $personal_account = ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY); - if ($profile['homepage_verified']) { - $homepage_help_text = DI::l10n()->t('The homepage is verified. A rel="me" link back to your Friendica profile page was found on the homepage.'); + if ($owner['homepage_verified']) { + $homepage_help_text = $this->t('The homepage is verified. A rel="me" link back to your Friendica profile page was found on the homepage.'); } else { - $homepage_help_text = DI::l10n()->t('To verify your homepage, add a rel="me" link to it, pointing to your profile URL (%s).', $profile['url']); + $homepage_help_text = $this->t('To verify your homepage, add a rel="me" link to it, pointing to your profile URL (%s).', $owner['url']); } $tpl = Renderer::getMarkupTemplate('settings/profile/index.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$personal_account' => $personal_account, - - '$form_security_token' => self::getFormSecurityToken('settings_profile'), - '$form_security_token_photo' => self::getFormSecurityToken('settings_profile_photo'), - - '$profile_action' => DI::l10n()->t('Profile Actions'), - '$banner' => DI::l10n()->t('Edit Profile Details'), - '$submit' => DI::l10n()->t('Submit'), - '$profpic' => DI::l10n()->t('Change Profile Photo'), - '$profpiclink' => '/profile/' . $profile['nickname'] . '/photos', - '$viewprof' => DI::l10n()->t('View Profile'), - - '$lbl_personal_section' => DI::l10n()->t('Personal'), - '$lbl_picture_section' => DI::l10n()->t('Profile picture'), - '$lbl_location_section' => DI::l10n()->t('Location'), - '$lbl_miscellaneous_section' => DI::l10n()->t('Miscellaneous'), - '$lbl_custom_fields_section' => DI::l10n()->t('Custom Profile Fields'), - - '$lbl_profile_photo' => DI::l10n()->t('Upload Profile Photo'), - - '$baseurl' => DI::baseUrl(), - '$nickname' => $profile['nickname'], - '$name' => ['name', DI::l10n()->t('Display name:'), $profile['name']], - '$about' => ['about', DI::l10n()->t('Description:'), $profile['about']], - '$dob' => Temporal::getDateofBirthField($profile['dob'], $profile['timezone']), - '$address' => ['address', DI::l10n()->t('Street Address:'), $profile['address']], - '$locality' => ['locality', DI::l10n()->t('Locality/City:'), $profile['locality']], - '$region' => ['region', DI::l10n()->t('Region/State:'), $profile['region']], - '$postal_code' => ['postal_code', DI::l10n()->t('Postal/Zip Code:'), $profile['postal-code']], - '$country_name' => ['country_name', DI::l10n()->t('Country:'), $profile['country-name']], - '$age' => ((intval($profile['dob'])) ? '(' . DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($profile['dob'], $profile['timezone'])) . ')' : ''), - '$xmpp' => ['xmpp', DI::l10n()->t('XMPP (Jabber) address:'), $profile['xmpp'], DI::l10n()->t('The XMPP address will be published so that people can follow you there.')], - '$matrix' => ['matrix', DI::l10n()->t('Matrix (Element) address:'), $profile['matrix'], DI::l10n()->t('The Matrix address will be published so that people can follow you there.')], - '$homepage' => ['homepage', DI::l10n()->t('Homepage URL:'), $profile['homepage'], $homepage_help_text], - '$pub_keywords' => ['pub_keywords', DI::l10n()->t('Public Keywords:'), $profile['pub_keywords'], DI::l10n()->t('(Used for suggesting potential friends, can be seen by others)')], - '$prv_keywords' => ['prv_keywords', DI::l10n()->t('Private Keywords:'), $profile['prv_keywords'], DI::l10n()->t('(Used for searching profiles, never shown to others)')], - '$custom_fields_description' => DI::l10n()->t("

    Custom fields appear on your profile page.

    + '$l10n' => [ + 'profile_action' => $this->t('Profile Actions'), + 'banner' => $this->t('Edit Profile Details'), + 'submit' => $this->t('Submit'), + 'profpic' => $this->t('Change Profile Photo'), + 'viewprof' => $this->t('View Profile'), + 'personal_section' => $this->t('Personal'), + 'picture_section' => $this->t('Profile picture'), + 'location_section' => $this->t('Location'), + 'miscellaneous_section' => $this->t('Miscellaneous'), + 'custom_fields_section' => $this->t('Custom Profile Fields'), + 'profile_photo' => $this->t('Upload Profile Photo'), + 'custom_fields_description' => $this->t('

    Custom fields appear on your profile page.

    You can use BBCodes in the field values.

    Reorder by dragging the field title.

    Empty the label field to remove a custom field.

    -

    Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected circles.

    ", - 'profile/' . $profile['nickname'] . '/profile' - ), +

    Non-public fields can only be seen by the selected Friendica contacts or the Friendica contacts in the selected circles.

    ', + 'profile/' . $owner['nickname'] . '/profile' + ), + ], + + '$personal_account' => $personal_account, + + '$form_security_token' => self::getFormSecurityToken('settings_profile'), + '$form_security_token_photo' => self::getFormSecurityToken('settings_profile_photo'), + + '$profpiclink' => '/profile/' . $owner['nickname'] . '/photos', + + '$nickname' => $owner['nickname'], + '$name' => ['name', $this->t('Display name:'), $owner['name']], + '$about' => ['about', $this->t('Description:'), $owner['about']], + '$dob' => Temporal::getDateofBirthField($owner['dob'], $owner['timezone']), + '$address' => ['address', $this->t('Street Address:'), $owner['address']], + '$locality' => ['locality', $this->t('Locality/City:'), $owner['locality']], + '$region' => ['region', $this->t('Region/State:'), $owner['region']], + '$postal_code' => ['postal_code', $this->t('Postal/Zip Code:'), $owner['postal-code']], + '$country_name' => ['country_name', $this->t('Country:'), $owner['country-name']], + '$age' => ((intval($owner['dob'])) ? '(' . $this->t('Age: ') . $this->tt('%d year old', '%d years old', Temporal::getAgeByTimezone($owner['dob'], $owner['timezone'])) . ')' : ''), + '$xmpp' => ['xmpp', $this->t('XMPP (Jabber) address:'), $owner['xmpp'], $this->t('The XMPP address will be published so that people can follow you there.')], + '$matrix' => ['matrix', $this->t('Matrix (Element) address:'), $owner['matrix'], $this->t('The Matrix address will be published so that people can follow you there.')], + '$homepage' => ['homepage', $this->t('Homepage URL:'), $owner['homepage'], $homepage_help_text], + '$pub_keywords' => ['pub_keywords', $this->t('Public Keywords:'), $owner['pub_keywords'], $this->t('(Used for suggesting potential friends, can be seen by others)')], + '$prv_keywords' => ['prv_keywords', $this->t('Private Keywords:'), $owner['prv_keywords'], $this->t('(Used for searching profiles, never shown to others)')], '$custom_fields' => $custom_fields, ]); - $arr = ['profile' => $profile, 'entry' => $o]; + $arr = ['profile' => $owner, 'entry' => $o]; Hook::callAll('profile_edit', $arr); return $o; } - private static function getProfileFieldsFromInput(int $uid, array $profileFieldInputs, array $profileFieldOrder): ProfileFields + private function getProfileFieldsFromInput(int $uid, array $profileFieldInputs, array $profileFieldOrder): ProfileField\Collection\ProfileFields { - $profileFields = new ProfileFields(); + $profileFields = new ProfileField\Collection\ProfileFields(); // Returns an associative array of id => order values $profileFieldOrder = array_flip($profileFieldOrder); // Creation of the new field if (!empty($profileFieldInputs['new']['label'])) { - $permissionSet = DI::permissionSet()->selectOrCreate(DI::permissionSetFactory()->createFromString( + $permissionSet = $this->permissionSetRepo->selectOrCreate($this->permissionSetFactory->createFromString( $uid, - DI::aclFormatter()->toString($profileFieldInputs['new']['contact_allow'] ?? ''), - DI::aclFormatter()->toString($profileFieldInputs['new']['circle_allow'] ?? ''), - DI::aclFormatter()->toString($profileFieldInputs['new']['contact_deny'] ?? ''), - DI::aclFormatter()->toString($profileFieldInputs['new']['circle_deny'] ?? '') + $this->aclFormatter->toString($profileFieldInputs['new']['contact_allow'] ?? ''), + $this->aclFormatter->toString($profileFieldInputs['new']['circle_allow'] ?? ''), + $this->aclFormatter->toString($profileFieldInputs['new']['contact_deny'] ?? ''), + $this->aclFormatter->toString($profileFieldInputs['new']['circle_deny'] ?? '') )); - $profileFields->append(DI::profileFieldFactory()->createFromValues( + $profileFields->append($this->profileFieldFactory->createFromValues( $uid, $profileFieldOrder['new'], $profileFieldInputs['new']['label'], @@ -302,15 +332,15 @@ class Index extends BaseSettings unset($profileFieldOrder['new']); foreach ($profileFieldInputs as $id => $profileFieldInput) { - $permissionSet = DI::permissionSet()->selectOrCreate(DI::permissionSetFactory()->createFromString( + $permissionSet = $this->permissionSetRepo->selectOrCreate($this->permissionSetFactory->createFromString( $uid, - DI::aclFormatter()->toString($profileFieldInput['contact_allow'] ?? ''), - DI::aclFormatter()->toString($profileFieldInput['circle_allow'] ?? ''), - DI::aclFormatter()->toString($profileFieldInput['contact_deny'] ?? ''), - DI::aclFormatter()->toString($profileFieldInput['circle_deny'] ?? '') + $this->aclFormatter->toString($profileFieldInput['contact_allow'] ?? ''), + $this->aclFormatter->toString($profileFieldInput['circle_allow'] ?? ''), + $this->aclFormatter->toString($profileFieldInput['contact_deny'] ?? ''), + $this->aclFormatter->toString($profileFieldInput['circle_deny'] ?? '') )); - $profileFields->append(DI::profileFieldFactory()->createFromValues( + $profileFields->append($this->profileFieldFactory->createFromValues( $uid, $profileFieldOrder[$id], $profileFieldInput['label'], @@ -322,22 +352,20 @@ class Index extends BaseSettings return $profileFields; } - private static function cleanKeywords($keywords) + private static function cleanKeywords($keywords): string { $keywords = str_replace(',', ' ', $keywords); $keywords = explode(' ', $keywords); $cleaned = []; foreach ($keywords as $keyword) { - $keyword = trim(strtolower($keyword)); + $keyword = trim($keyword); $keyword = trim($keyword, '#'); if ($keyword != '') { $cleaned[] = $keyword; } } - $keywords = implode(', ', $cleaned); - - return $keywords; + return implode(', ', $cleaned); } } diff --git a/src/Security/PermissionSet/Repository/PermissionSet.php b/src/Security/PermissionSet/Repository/PermissionSet.php index 58cf6e42f..5abfb9305 100644 --- a/src/Security/PermissionSet/Repository/PermissionSet.php +++ b/src/Security/PermissionSet/Repository/PermissionSet.php @@ -211,7 +211,7 @@ class PermissionSet extends BaseRepository } /** - * Selects or creates a PermissionSet based on it's fields + * Selects or creates a PermissionSet based on its fields * * @param Entity\PermissionSet $permissionSet * diff --git a/view/templates/settings/profile/index.tpl b/view/templates/settings/profile/index.tpl index 69812c5a8..6540ab3c6 100644 --- a/view/templates/settings/profile/index.tpl +++ b/view/templates/settings/profile/index.tpl @@ -1,121 +1,131 @@ -

    {{$banner}}

    + -{{$default nofilter}} +

    {{$l10n.banner}}

    -
    -
    + + + + +
    +

    {{$l10n.picture_section}} »

    + +
    +
    + +
    -
    - - -
    -
    -
    - - -
    -
    -
    - {{$dob nofilter}} -
    -
    - {{$hide_friends nofilter}} -
    - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - -
    -
    -
    - - -
    -
    {{$homepage.3}}
    -
    -
    - - -
    -
    {{$xmpp.3}}
    -
    -
    - - -
    -
    {{$matrix.3}}
    -
    -
    - - -
    -
    {{$pub_keywords.3}}
    -
    -
    - - -
    -
    {{$prv_keywords.3}}
    -
    -
    - -
    -
    + +
    +

    {{$l10n.personal_section}} »

    + + +
    +

    {{$l10n.location_section}} »

    + +
    + +
    +

    {{$l10n.custom_fields_section}} »

    +
    -
    - -

    {{$banner}}

    - - - - -
    -
    - - - -
    -

    {{$lbl_picture_section}} »

    - -
    -
    - -
    - - - -
    -

    {{$lbl_personal_section}} »

    - -
    - -
    -

    {{$lbl_location_section}} »

    - -
    - -
    -

    {{$lbl_custom_fields_section}} »

    - -
    -
    -
    - From e31d90eadb8321f82513d9f64c7ec8ed2fa9c8bf Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 11 Aug 2023 01:05:02 +0200 Subject: [PATCH 226/259] Replace references to profile.name by user.username --- src/Model/Contact.php | 6 ++--- src/Model/Profile.php | 10 ++++----- src/Model/User.php | 22 ++++--------------- src/Module/Settings/Account.php | 2 +- src/Module/Settings/Profile/Index.php | 9 ++++---- view/templates/settings/profile/index.tpl | 2 +- .../frio/templates/settings/profile/index.tpl | 2 +- 7 files changed, 19 insertions(+), 34 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index d91abe9bc..35ca4e49e 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -788,10 +788,10 @@ class Contact /** * Updates the self-contact for the provided user id * - * @param int $uid - * @param bool $update_avatar Force the avatar update + * @param int $uid + * @param bool $update_avatar Force the avatar update * @return bool "true" if updated - * @throws HTTPException\InternalServerErrorException + * @throws \Exception */ public static function updateSelfFromUserID(int $uid, bool $update_avatar = false): bool { diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 0602df10a..c1a350673 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -37,6 +37,7 @@ use Friendica\DI; use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Network\HTTPClient\Client\HttpClientOptions; use Friendica\Network\HTTPException; +use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Protocol\Activity; use Friendica\Protocol\Diaspora; use Friendica\Security\PermissionSet\Entity\PermissionSet; @@ -93,10 +94,11 @@ class Profile /** * Update a profile entry and distribute the changes if needed * - * @param array $fields Profile fields to update - * @param integer $uid User id + * @param array $fields Profile fields to update + * @param integer $uid User id * * @return boolean Whether update was successful + * @throws \Exception */ public static function update(array $fields, int $uid): bool { @@ -116,10 +118,6 @@ class Profile return false; } - if ($old_owner['name'] != $owner['name']) { - User::update(['username' => $owner['name']], $uid); - } - $profile_fields = ['postal-code', 'dob', 'prv_keywords', 'homepage']; foreach ($profile_fields as $field) { if ($old_owner[$field] != $owner[$field]) { diff --git a/src/Model/User.php b/src/Model/User.php index 18da3e956..af7a81a15 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -37,6 +37,7 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Module; use Friendica\Network\HTTPClient\Client\HttpClientAccept; +use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Security\TwoFactor\Model\AppSpecificPassword; use Friendica\Network\HTTPException; use Friendica\Object\Image; @@ -1328,33 +1329,18 @@ class User /** * Update a user entry and distribute the changes if needed * - * @param array $fields + * @param array $fields * @param integer $uid * @return boolean + * @throws Exception */ public static function update(array $fields, int $uid): bool { - $old_owner = self::getOwnerDataById($uid); - if (empty($old_owner)) { - return false; - } - if (!DBA::update('user', $fields, ['uid' => $uid])) { return false; } - $update = Contact::updateSelfFromUserID($uid); - - $owner = self::getOwnerDataById($uid); - if (empty($owner)) { - return false; - } - - if ($old_owner['name'] != $owner['name']) { - Profile::update(['name' => $owner['name']], $uid); - } - - if ($update) { + if (Contact::updateSelfFromUserID($uid)) { Profile::publishUpdate($uid); } diff --git a/src/Module/Settings/Account.php b/src/Module/Settings/Account.php index 1039b92e2..8ff00addb 100644 --- a/src/Module/Settings/Account.php +++ b/src/Module/Settings/Account.php @@ -573,7 +573,7 @@ class Account extends BaseSettings '$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''], '$h_basic' => DI::l10n()->t('Basic Settings'), - '$username' => ['username', DI::l10n()->t('Full Name:'), $username, '', false, 'autocomplete="off"'], + '$username' => ['username', DI::l10n()->t('Display name:'), $username, '', false, 'autocomplete="off"'], '$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', 'autocomplete="off"', 'email'], '$timezone' => ['timezone_select', DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''], '$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices], diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php index c18c72a4e..38d816833 100644 --- a/src/Module/Settings/Profile/Index.php +++ b/src/Module/Settings/Profile/Index.php @@ -111,8 +111,8 @@ class Index extends BaseSettings } } - $name = trim($request['name'] ?? ''); - if (!$name) { + $username = trim($request['username'] ?? ''); + if (!$username) { $this->systemMessages->addNotice($this->t('Display Name is required.')); return; } @@ -141,9 +141,10 @@ class Index extends BaseSettings $this->profileFieldRepo->saveCollectionForUser($this->session->getLocalUserId(), $profileFieldsNew); + User::update(['username' => $username], $this->session->getLocalUserId()); + $result = Profile::update( [ - 'name' => $name, 'about' => $about, 'dob' => $dob, 'address' => $address, @@ -279,7 +280,7 @@ class Index extends BaseSettings '$profpiclink' => '/profile/' . $owner['nickname'] . '/photos', '$nickname' => $owner['nickname'], - '$name' => ['name', $this->t('Display name:'), $owner['name']], + '$username' => ['username', $this->t('Display name:'), $owner['name']], '$about' => ['about', $this->t('Description:'), $owner['about']], '$dob' => Temporal::getDateofBirthField($owner['dob'], $owner['timezone']), '$address' => ['address', $this->t('Street Address:'), $owner['address']], diff --git a/view/templates/settings/profile/index.tpl b/view/templates/settings/profile/index.tpl index 6540ab3c6..64c9daee0 100644 --- a/view/templates/settings/profile/index.tpl +++ b/view/templates/settings/profile/index.tpl @@ -48,7 +48,7 @@

    {{$l10n.personal_section}} »