From 79792898d488cddb9be5674e58e8184d6c37ba59 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 22 Aug 2021 19:18:28 +0200 Subject: [PATCH 01/23] 2021.09 CHANGELOG as of 2021-08-22 --- CHANGELOG | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 02935eac4b..ebd271a562 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,49 @@ Version 2021.09 (unreleased) Friendica Core - Simplified the proxy mechanism. The proxy cache directory (/proxy) can now be removed [annando] - DFRN is now always handled with the Diaspora transport layer. The legacy DFRN transport layer is removed [annando] - Legacy OAuth server is removed [annando] - Scheduled posts are now possible [annando] - The minimal PHP version in the composer is increased to version 7.2 [annando] + Updates to the translation DE, HU [translation teams] + Updates to the documentation [foss-, nupplaphil] + General code cleanup [annando, MrPetovan, nupplaphil] + Enhanced the proxy mechanism [annando] + Enhanced the desktop notifications [annando] + Enhanced the Mastodon compatible API [annando] + Enhanced the UI to follow new contacts [MrPetovan] + Enhanced remote AP follow of new contacts [annando] + Enhanced the installer [tobiasd] + Enhanced the handling of attachments by the addon hooks [MrPetovan] + Enhanced the federation with PeerTube [MrPetovan] + Enhanced the federation with Diaspora* [annando] + Enhanced the federation with Mastodon [MrPetovan, realkinetix] + Enhanced the interaction with items in various places [annando] + Enhanced the storage back-end handling [nupplaphil] + Enhanced the handling of zmg BBCode elements [annando] + Enhanced the display of logs in the admin panel [fabrixxm] + Removed the legacy DFRN transport layer, DFRN is now always using the Diaspora* transport layer [annando] + Removed the legacy OAuth server [annando] + Bumped the minimal PHP version to 7.2 [annando] + Added user option to control how postings are shortened [annando] + Added Persian to the possible detected languages of a postings [MrPetovan] + Added Matrix account profile field [annando] + Added scheduled postings [annando] + Added transmission of push subscriptions [annando] + + Friendica Addons + Updates to the translation JA, ZH CN [translation teams] + advancedcontentfilter + allow filtering by attachments [MrPetovan] + blockbot + some good guys and bad guys added [annando] + irc + switch from freenode to libera.chat [tobiasd] + langfilter + improved performance [annando] + nitter + handle mobile links as well [tobiasd] + improve settings [tobiasd] + rendertime + rename "Parser" to "session" [annando] + + Closed Issues + 9378, 10262, 10491, 10514, 10558, 10568, 10587, 10603, 10617 Version 2021.07 (2021-07-04) Friendica Core From e2951fb8d7fe69ef48baa14f06978aa3239a57f5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 2 Sep 2021 09:17:55 +0200 Subject: [PATCH 02/23] CHANGELOG wording of some labels unified --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index ebd271a562..6788f646f3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Version 2021.09 (unreleased) Updates to the translation DE, HU [translation teams] Updates to the documentation [foss-, nupplaphil] General code cleanup [annando, MrPetovan, nupplaphil] + Unification of setting label wordings towards activating something [heluecht] Enhanced the proxy mechanism [annando] Enhanced the desktop notifications [annando] Enhanced the Mastodon compatible API [annando] From 2c8d1aa3e86350c513cf292afe381330c8e39b7b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 5 Sep 2021 08:10:29 +0200 Subject: [PATCH 03/23] 2021.09 CHANGELOG some work on translations has been done --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6788f646f3..cc50227456 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ Version 2021.09 (unreleased) Friendica Core - Updates to the translation DE, HU [translation teams] + Updates to the translation DE, HU, RU [translation teams] Updates to the documentation [foss-, nupplaphil] General code cleanup [annando, MrPetovan, nupplaphil] Unification of setting label wordings towards activating something [heluecht] @@ -18,6 +18,7 @@ Version 2021.09 (unreleased) Enhanced the storage back-end handling [nupplaphil] Enhanced the handling of zmg BBCode elements [annando] Enhanced the display of logs in the admin panel [fabrixxm] + Fixed a bug in the L10n functions not showing plural forms [annando] Removed the legacy DFRN transport layer, DFRN is now always using the Diaspora* transport layer [annando] Removed the legacy OAuth server [annando] Bumped the minimal PHP version to 7.2 [annando] From 3e11d15ec631ec9403071b1a2011aa114628b0c5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 13 Sep 2021 09:48:14 +0200 Subject: [PATCH 04/23] 2021.09 CHANGELOG some work on translations has been done, closed issues --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index cc50227456..c98b432bed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -45,7 +45,8 @@ Version 2021.09 (unreleased) rename "Parser" to "session" [annando] Closed Issues - 9378, 10262, 10491, 10514, 10558, 10568, 10587, 10603, 10617 + 6101, 9378, 9723, 10262, 10491, 10502, 10514, 10558, 10568, 10587, + 10603, 10617, 10640, 10651, 10672, 10699 Version 2021.07 (2021-07-04) Friendica Core From 7cf5ed6b9dc8d6c296adff012488e1b82993a4fb Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 13 Sep 2021 14:16:25 +0200 Subject: [PATCH 05/23] 2021.09 CHANGELOG some work on translations has been done --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index c98b432bed..b8cc377758 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ Version 2021.09 (unreleased) Friendica Core - Updates to the translation DE, HU, RU [translation teams] + Updates to the translation DE, FR, HU, RU [translation teams] Updates to the documentation [foss-, nupplaphil] General code cleanup [annando, MrPetovan, nupplaphil] Unification of setting label wordings towards activating something [heluecht] @@ -27,6 +27,7 @@ Version 2021.09 (unreleased) Added Matrix account profile field [annando] Added scheduled postings [annando] Added transmission of push subscriptions [annando] + Added the possibility to put the config files in a different directory [nupplaphil] Friendica Addons Updates to the translation JA, ZH CN [translation teams] From d8a733da326ee269e3ed7158bfdbbe45830352b9 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 18 Sep 2021 13:02:08 +0200 Subject: [PATCH 06/23] 2021.09 CHANGELOG more issues closed --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b8cc377758..b35948be99 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ Version 2021.09 (unreleased) Enhanced the handling of zmg BBCode elements [annando] Enhanced the display of logs in the admin panel [fabrixxm] Fixed a bug in the L10n functions not showing plural forms [annando] + Fixed a bug in following IMAP accounts [annando] Removed the legacy DFRN transport layer, DFRN is now always using the Diaspora* transport layer [annando] Removed the legacy OAuth server [annando] Bumped the minimal PHP version to 7.2 [annando] @@ -47,7 +48,7 @@ Version 2021.09 (unreleased) Closed Issues 6101, 9378, 9723, 10262, 10491, 10502, 10514, 10558, 10568, 10587, - 10603, 10617, 10640, 10651, 10672, 10699 + 10603, 10617, 10640, 10651, 10672, 10692, 10698, 10699, 10705 Version 2021.07 (2021-07-04) Friendica Core From 5d9e71e1874c066b8814d01b818f3f7f514ef5b4 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 18 Sep 2021 15:15:37 +0200 Subject: [PATCH 07/23] 2021.09 CHANGELOG bumped PHP version to 7.3 see #10715 --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b35948be99..0846f19990 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,7 +22,7 @@ Version 2021.09 (unreleased) Fixed a bug in following IMAP accounts [annando] Removed the legacy DFRN transport layer, DFRN is now always using the Diaspora* transport layer [annando] Removed the legacy OAuth server [annando] - Bumped the minimal PHP version to 7.2 [annando] + Bumped the minimal PHP version to 7.3 Added user option to control how postings are shortened [annando] Added Persian to the possible detected languages of a postings [MrPetovan] Added Matrix account profile field [annando] From 11943bbec4c5d8292e59f41790d9898f730376e8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 18 Sep 2021 15:50:14 +0200 Subject: [PATCH 08/23] 2021.09 CHANGELOG some more work has been done --- CHANGELOG | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0846f19990..33301877b3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,8 @@ Version 2021.09 (unreleased) Enhanced the display of logs in the admin panel [fabrixxm] Fixed a bug in the L10n functions not showing plural forms [annando] Fixed a bug in following IMAP accounts [annando] + Fixed a bug preventing photos to be deleted [annando] + Fixed a bug preventing the display of the accounts avatar [annando] Removed the legacy DFRN transport layer, DFRN is now always using the Diaspora* transport layer [annando] Removed the legacy OAuth server [annando] Bumped the minimal PHP version to 7.3 @@ -47,8 +49,8 @@ Version 2021.09 (unreleased) rename "Parser" to "session" [annando] Closed Issues - 6101, 9378, 9723, 10262, 10491, 10502, 10514, 10558, 10568, 10587, - 10603, 10617, 10640, 10651, 10672, 10692, 10698, 10699, 10705 + 6101, 9378, 9723, 9871, 10262, 10491, 10502, 10514, 10558, 10568, + 10587, 10603, 10617, 10640, 10651, 10672, 10692, 10698, 10699, 10705 Version 2021.07 (2021-07-04) Friendica Core From 827b8e75c6c1f6044328e256ee3e7eb59f2ce064 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 19 Sep 2021 11:03:35 +0200 Subject: [PATCH 09/23] 2021.09 CHANGELOG PHP7.3 was a misunderstanding, min version is 7.2 --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 33301877b3..c8dfdac4fa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -24,7 +24,7 @@ Version 2021.09 (unreleased) Fixed a bug preventing the display of the accounts avatar [annando] Removed the legacy DFRN transport layer, DFRN is now always using the Diaspora* transport layer [annando] Removed the legacy OAuth server [annando] - Bumped the minimal PHP version to 7.3 + Bumped the minimal PHP version to 7.2 Added user option to control how postings are shortened [annando] Added Persian to the possible detected languages of a postings [MrPetovan] Added Matrix account profile field [annando] @@ -63,7 +63,7 @@ Version 2021.07 (2021-07-04) Enhanced the possibilities to download the calendar [annando] Enhanced the Vagrant development box setup [fabrixxm] Enhanced the console commands [fabrixxm, mexon] - Enhances the support of PHP8 [nupplaphil, MrPetovan] + Enhanced the support of PHP8 [nupplaphil, MrPetovan] Enhanced the link detection [annando] Enhanced the worker task display in the admin panel [tobiasd] Enhanced the installation wizard [tobiasd] From f032f66b38ae4283203d4f95e9f9f097351baeea Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Sep 2021 10:06:42 +0000 Subject: [PATCH 10/23] Display the public contacts for profile visitors --- src/Content/Widget/ContactBlock.php | 21 +++++++++++---------- src/Model/Profile.php | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php index c755a7d4f6..50c60031df 100644 --- a/src/Content/Widget/ContactBlock.php +++ b/src/Content/Widget/ContactBlock.php @@ -44,10 +44,16 @@ class ContactBlock * @hook contact_block_end (contacts=>array, output=>string) * @return string */ - public static function getHTML(array $profile) + public static function getHTML(array $profile, int $visitor_uid = null) { $o = ''; + if (is_null($visitor_uid) || ($visitor_uid == $profile['uid'])) { + $contact_uid = $profile['uid']; + } else { + $contact_uid = 0; + } + $shown = DI::pConfig()->get($profile['uid'], 'system', 'display_friend_count', 24); if ($shown == 0) { return $o; @@ -82,7 +88,7 @@ class ContactBlock $rel = [Contact::FOLLOWER, Contact::FRIEND]; } - $contact_ids_stmt = DBA::select('contact', ['id'], [ + $personal_contacts = DBA::selectToArray('contact', ['uri-id'], [ 'uid' => $profile['uid'], 'self' => false, 'blocked' => false, @@ -93,13 +99,10 @@ class ContactBlock 'network' => Protocol::FEDERATED, ], ['limit' => $shown]); - if (DBA::isResult($contact_ids_stmt)) { - $contact_ids = []; - while($contact = DBA::fetch($contact_ids_stmt)) { - $contact_ids[] = $contact["id"]; - } + $contact_ids = array_column($personal_contacts, 'uri-id'); - $contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'avatar', 'network'], ['id' => $contact_ids]); + if (!empty($contact_ids)) { + $contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'avatar', 'network'], ['uri-id' => $contact_ids, 'uid' => $contact_uid]); if (DBA::isResult($contacts_stmt)) { $contacts_title = DI::l10n()->tt('%d Contact', '%d Contacts', $total); @@ -113,8 +116,6 @@ class ContactBlock DBA::close($contacts_stmt); } - - DBA::close($contact_ids_stmt); } $tpl = Renderer::getMarkupTemplate('widget/contacts.tpl'); diff --git a/src/Model/Profile.php b/src/Model/Profile.php index a1e97d1ee4..4e984baa6f 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -406,7 +406,7 @@ class Profile } if (!$block && $show_contacts) { - $contact_block = ContactBlock::getHTML($profile); + $contact_block = ContactBlock::getHTML($profile, local_user()); if (is_array($profile) && !$profile['hide-friends']) { $contact_count = DBA::count('contact', [ From 9c73e49db7298d227828b9b9ca32ed9d69c6d57e Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Sep 2021 10:53:19 +0000 Subject: [PATCH 11/23] Make posts on the profile page writable --- include/conversation.php | 4 ++-- src/Object/Thread.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 1cb2c745cc..507add97d6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -312,7 +312,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o . "'; \r\n"; } } elseif ($mode === 'profile') { - $items = conversation_add_children($items, false, $order, $uid); + $items = conversation_add_children($items, false, $order, local_user()); if (!$update) { $tab = 'posts'; @@ -400,7 +400,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o $formSecurityToken = BaseModule::getFormSecurityToken('contact_action'); if (!empty($items)) { - if (in_array($mode, ['community', 'contacts'])) { + if (in_array($mode, ['community', 'contacts', 'profile'])) { $writable = true; } else { $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], Protocol::FEDERATED); diff --git a/src/Object/Thread.php b/src/Object/Thread.php index 7d59759a0d..a2504a2ad1 100644 --- a/src/Object/Thread.php +++ b/src/Object/Thread.php @@ -80,7 +80,7 @@ class Thread break; case 'profile': $this->profile_owner = $a->getProfileOwner(); - $this->writable = Security::canWriteToUserWall($this->profile_owner); + $this->writable = Security::canWriteToUserWall($this->profile_owner) || $writable; break; case 'display': $this->profile_owner = $a->getProfileOwner(); From cdbba71df75c0dfb7f816333761b629276b40799 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 19 Sep 2021 13:30:45 +0200 Subject: [PATCH 12/23] Add database version check --- .drone.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.drone.yml b/.drone.yml index a5ce0744ac..ab2875e980 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,6 +15,22 @@ steps: --- kind: pipeline type: docker +name: Integrity checks + +steps: + - name: Check database version + image: alpine + commands: + - export DBSTRUCTURE_VERSION="$(sed -rn "s/.*'DB_UPDATE_VERSION', ([0-9]+).*/\1/p" static/dbstructure.config.php)" + - export DATABASE_VERSION="$(sed -rn 's/.*DB_UPDATE_VERSION ([0-9]+).*/\1/p' database.sql)" + - echo "Database $DATABASE_VERSION - DB-Structure $DBSTRUCTURE_VERSION" + - if [[ "$DBSTRUCTURE_VERSION" != "$DATABASE_VERSION" ]]; then + echo "Database version mismatch."; + exit 1; + fi +--- +kind: pipeline +type: docker name: php7.3-lint steps: From 325342a8869cf0a9eb0ca9c8fc8bd96e37aba2a7 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Sep 2021 17:56:44 +0000 Subject: [PATCH 13/23] Renamed variable --- src/Content/Widget/ContactBlock.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php index 50c60031df..751aa92178 100644 --- a/src/Content/Widget/ContactBlock.php +++ b/src/Content/Widget/ContactBlock.php @@ -99,10 +99,10 @@ class ContactBlock 'network' => Protocol::FEDERATED, ], ['limit' => $shown]); - $contact_ids = array_column($personal_contacts, 'uri-id'); + $contact_uriids = array_column($personal_contacts, 'uri-id'); - if (!empty($contact_ids)) { - $contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'avatar', 'network'], ['uri-id' => $contact_ids, 'uid' => $contact_uid]); + if (!empty($contact_uriids)) { + $contacts_stmt = DBA::select('contact', ['id', 'uid', 'addr', 'url', 'name', 'thumb', 'avatar', 'network'], ['uri-id' => $contact_uriids, 'uid' => $contact_uid]); if (DBA::isResult($contacts_stmt)) { $contacts_title = DI::l10n()->tt('%d Contact', '%d Contacts', $total); From b922e706a8f79ab85b774f9267bc2aecf61b6e31 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 20 Sep 2021 08:02:56 +0200 Subject: [PATCH 14/23] 2021.09 CHANGELOG another bug fixed --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c8dfdac4fa..ab753379e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ Version 2021.09 (unreleased) Fixed a bug in following IMAP accounts [annando] Fixed a bug preventing photos to be deleted [annando] Fixed a bug preventing the display of the accounts avatar [annando] + Fixed a bug preventing following accounts from profiles visited [annando] Removed the legacy DFRN transport layer, DFRN is now always using the Diaspora* transport layer [annando] Removed the legacy OAuth server [annando] Bumped the minimal PHP version to 7.2 From a1d1a291634fc5cb76587376b457444c7ebfad90 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 21 Sep 2021 18:55:18 +0200 Subject: [PATCH 15/23] 2021.09 CHANGELOG one numbered issue more is closed --- CHANGELOG | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ab753379e8..538f66002d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -50,8 +50,9 @@ Version 2021.09 (unreleased) rename "Parser" to "session" [annando] Closed Issues - 6101, 9378, 9723, 9871, 10262, 10491, 10502, 10514, 10558, 10568, - 10587, 10603, 10617, 10640, 10651, 10672, 10692, 10698, 10699, 10705 + 6101, 8038, 9378, 9723, 9871, 10262, 10491, 10502, 10514, 10558, + 10568, 10587, 10603, 10617, 10640, 10651, 10672, 10692, 10698, + 10699, 10705 Version 2021.07 (2021-07-04) Friendica Core From 7ac76639c5d0fc5f738608e7bf2ccff420b2714c Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 22 Sep 2021 02:41:24 +0000 Subject: [PATCH 16/23] AVoid warning when fetching page data --- src/Util/ParseUrl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index 391b96767e..d40a0a4e91 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -1116,7 +1116,7 @@ class ParseUrl } $content = JsonLD::fetchElement($jsonld, 'image', 'url', '@type', 'ImageObject'); - if (!empty($content)) { + if (!empty($content) && is_string($content)) { $jsonldinfo['author_img'] = trim($content); } From 840d9823d4b9dda0053a6a97fa203a0154ba156d Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 22 Sep 2021 03:25:01 +0000 Subject: [PATCH 17/23] Log unexpected value --- src/Util/ParseUrl.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index d40a0a4e91..5891649525 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -1116,6 +1116,10 @@ class ParseUrl } $content = JsonLD::fetchElement($jsonld, 'image', 'url', '@type', 'ImageObject'); + if (!empty($content) && !is_string($content)) { + Logger::notice('Unexpected return value for the author image', ['content' => $content]); + } + if (!empty($content) && is_string($content)) { $jsonldinfo['author_img'] = trim($content); } From 7f7f0eb10cd6c230156c44ea81eaca6a5179735e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 22 Sep 2021 23:09:46 -0400 Subject: [PATCH 18/23] Improve compacting error logging in Util\JsonLD - Exceptions thrown by friendica/json-ld are nested and their string representation shows all the exception chain --- 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 f91d84ad5c..6ffe9a0a0f 100644 --- a/src/Util/JsonLD.php +++ b/src/Util/JsonLD.php @@ -165,7 +165,7 @@ class JsonLD } catch (Exception $e) { $compacted = false; - Logger::error('compacting error', ['line' => $e->getLine(), 'message' => $e->getMessage()]); + Logger::notice('compacting error', ['line' => $e->getLine(), 'exception' => $e]); } $json = json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true); From 9b78d872879bafaa8c3260d9e869734e9d9b3a2a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 23 Sep 2021 17:13:48 +0200 Subject: [PATCH 19/23] RU translation updates THX Alexander An --- view/lang/ru/messages.po | 62 ++++++++++++++++++++-------------------- view/lang/ru/strings.php | 34 +++++++++++++++++++--- 2 files changed, 61 insertions(+), 35 deletions(-) diff --git a/view/lang/ru/messages.po b/view/lang/ru/messages.po index 82fc9dfa08..acfe196799 100644 --- a/view/lang/ru/messages.po +++ b/view/lang/ru/messages.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-10 00:27+0000\n" -"PO-Revision-Date: 2021-09-11 07:34+0000\n" +"PO-Revision-Date: 2021-09-22 05:47+0000\n" "Last-Translator: Alexander An \n" "Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n" "MIME-Version: 1.0\n" @@ -174,7 +174,7 @@ msgstr "" #: include/conversation.php:680 #, php-format msgid "%s is participating in this thread." -msgstr "%s участвует в этой ветке." +msgstr "%s участвует в этом обсуждении" #: include/conversation.php:683 msgid "Stored" @@ -204,7 +204,7 @@ msgstr "" #: include/conversation.php:844 view/theme/frio/theme.php:323 msgid "Follow Thread" -msgstr "Подписаться на тему" +msgstr "Подписаться на обсуждение" #: include/conversation.php:845 src/Model/Contact.php:1050 msgid "View Status" @@ -481,7 +481,7 @@ msgstr "Категории (список через запятую)" #: include/conversation.php:1143 src/Module/Item/Compose.php:172 msgid "Scheduled at" -msgstr "" +msgstr "Запланировано на" #: include/conversation.php:1147 mod/editpost.php:108 msgid "Permission settings" @@ -4636,7 +4636,7 @@ msgstr "" #: src/Model/Notification.php:189 #, php-format msgid "%1$s had started following you" -msgstr "" +msgstr "%1$s подписались на вас" #: src/Model/Notification.php:259 #, php-format @@ -4681,7 +4681,7 @@ msgstr "" #: src/Model/Notification.php:297 #, php-format msgid "%1$s commented in your thread %2$s" -msgstr "" +msgstr "%1$s ответил в вашем обсуждении %2$s" #: src/Model/Notification.php:301 #, php-format @@ -4691,27 +4691,27 @@ msgstr "" #: src/Model/Notification.php:307 #, php-format msgid "%1$s commented in their thread %2$s" -msgstr "" +msgstr "%1$s ответил в своём обсуждении %2$s" #: src/Model/Notification.php:309 #, php-format msgid "%1$s commented in their thread" -msgstr "" +msgstr "%1$s ответил в своём обсуждении" #: src/Model/Notification.php:311 #, php-format msgid "%1$s commented in the thread %2$s from %3$s" -msgstr "" +msgstr "%1$s ответил в обсуждении %2$s от %3$s" #: src/Model/Notification.php:313 #, php-format msgid "%1$s commented in the thread from %3$s" -msgstr "" +msgstr "%1$s ответил в обсуждении от %3$s" #: src/Model/Notification.php:318 #, php-format msgid "%1$s commented on your thread %2$s" -msgstr "" +msgstr "%1$s ответил в вашем обсуждении %2$s" #: src/Model/Notification.php:323 #, php-format @@ -7057,16 +7057,16 @@ msgstr "" #: src/Module/Api/Mastodon/Statuses/Bookmark.php:51 msgid "Only starting posts can be bookmarked" -msgstr "" +msgstr "Только заглавные записи могут быть добавлены в закладки" #: src/Module/Api/Mastodon/Statuses/Mute.php:50 msgid "Only starting posts can be muted" -msgstr "" +msgstr "Только заглавные записи можно заглушить" #: src/Module/Api/Mastodon/Statuses/Pin.php:50 #: src/Module/Api/Mastodon/Statuses/Unpin.php:50 msgid "Only starting posts can be pinned" -msgstr "" +msgstr "Только заглавные записи можно закрепить" #: src/Module/Api/Mastodon/Statuses/Reblog.php:53 #, php-format @@ -7218,11 +7218,11 @@ msgstr "Только вы можете это видеть" #: src/Module/BaseProfile.php:115 src/Module/Profile/Schedule.php:82 msgid "Scheduled Posts" -msgstr "" +msgstr "Запланированные записи" #: src/Module/BaseProfile.php:118 msgid "Posts that are scheduled for publishing" -msgstr "" +msgstr "Записи, публикация которых запланирована" #: src/Module/BaseProfile.php:137 src/Module/BaseProfile.php:140 msgid "Tips for New Members" @@ -7589,7 +7589,7 @@ msgstr "Пакетные действия" #: src/Module/Contact.php:886 msgid "Conversations started by this contact" -msgstr "" +msgstr "Диалоги этого контакта" #: src/Module/Contact.php:891 msgid "Posts and Comments" @@ -8902,7 +8902,7 @@ msgstr "Комментарии %s" #: src/Module/Profile/Schedule.php:84 msgid "Scheduled" -msgstr "" +msgstr "Запланировано" #: src/Module/Profile/Schedule.php:85 msgid "Content" @@ -9402,11 +9402,11 @@ msgstr "Автоматически подгружать новые записи, #: src/Module/Settings/Display.php:215 msgid "Enable Smart Threading" -msgstr "" +msgstr "Включить умное ветвление обсуждений" #: src/Module/Settings/Display.php:215 msgid "Enable the automatic suppression of extraneous thread indentation." -msgstr "" +msgstr "Включить автоматическое удаление излишних отступов в ветках обсуждений." #: src/Module/Settings/Display.php:216 msgid "Display the Dislike feature" @@ -10263,7 +10263,7 @@ msgstr "Редактировать" #: src/Object/Post.php:214 msgid "Pinned item" -msgstr "" +msgstr "Закреплённая запись" #: src/Object/Post.php:218 msgid "Delete globally" @@ -10296,11 +10296,11 @@ msgstr "Возможно" #: src/Object/Post.php:303 msgid "Ignore thread" -msgstr "Игнорировать тему" +msgstr "Игнорировать обсуждение" #: src/Object/Post.php:304 msgid "Unignore thread" -msgstr "Не игнорировать тему" +msgstr "Не игнорировать обсуждение" #: src/Object/Post.php:305 msgid "Toggle ignore status" @@ -10308,31 +10308,31 @@ msgstr "Переключить игнорирование" #: src/Object/Post.php:315 msgid "Add star" -msgstr "" +msgstr "Добавить в Избранное" #: src/Object/Post.php:316 msgid "Remove star" -msgstr "" +msgstr "Убрать из Избранного" #: src/Object/Post.php:317 msgid "Toggle star status" -msgstr "" +msgstr "Добавить/убрать из Избранного" #: src/Object/Post.php:328 msgid "Pin" -msgstr "" +msgstr "Закрепить" #: src/Object/Post.php:329 msgid "Unpin" -msgstr "" +msgstr "Открепить" #: src/Object/Post.php:330 msgid "Toggle pin status" -msgstr "" +msgstr "Закрепить/открепить" #: src/Object/Post.php:333 msgid "Pinned" -msgstr "" +msgstr "Закреплено" #: src/Object/Post.php:338 msgid "Add tag" @@ -10755,7 +10755,7 @@ msgstr "" #: view/theme/frio/config.php:166 msgid "Pink" -msgstr "" +msgstr "Розовый" #: view/theme/frio/config.php:167 msgid "Copy or paste schemestring" diff --git a/view/lang/ru/strings.php b/view/lang/ru/strings.php index 59d9aa8aff..a308cca7ab 100644 --- a/view/lang/ru/strings.php +++ b/view/lang/ru/strings.php @@ -40,10 +40,10 @@ $a->strings["You are following %s."] = "Вы подписаны на %s."; $a->strings["Tagged"] = "Отмечено"; $a->strings["%s reshared this."] = "%s поделился этим."; $a->strings["Reshared"] = "Репост"; -$a->strings["%s is participating in this thread."] = "%s участвует в этой ветке."; +$a->strings["%s is participating in this thread."] = "%s участвует в этом обсуждении"; $a->strings["Relayed"] = "Ретранслировано"; $a->strings["Fetched"] = "Загружено"; -$a->strings["Follow Thread"] = "Подписаться на тему"; +$a->strings["Follow Thread"] = "Подписаться на обсуждение"; $a->strings["View Status"] = "Просмотреть статус"; $a->strings["View Profile"] = "Просмотреть профиль"; $a->strings["View Photos"] = "Просмотреть фото"; @@ -100,6 +100,7 @@ $a->strings["Clear browser location"] = "Очистить местонахожд $a->strings["clear location"] = "убрать местонахождение"; $a->strings["Set title"] = "Установить заголовок"; $a->strings["Categories (comma-separated list)"] = "Категории (список через запятую)"; +$a->strings["Scheduled at"] = "Запланировано на"; $a->strings["Permission settings"] = "Настройки разрешений"; $a->strings["Permissions"] = "Разрешения"; $a->strings["Public post"] = "Публичное сообщение"; @@ -975,6 +976,13 @@ $a->strings["Content warning: %s"] = "Предупреждение о конте $a->strings["bytes"] = "байт"; $a->strings["View on separate page"] = "Посмотреть в отдельной вкладке"; $a->strings["[no subject]"] = "[без темы]"; +$a->strings["%1\$s had started following you"] = "%1\$s подписались на вас"; +$a->strings["%1\$s commented in your thread %2\$s"] = "%1\$s ответил в вашем обсуждении %2\$s"; +$a->strings["%1\$s commented in their thread %2\$s"] = "%1\$s ответил в своём обсуждении %2\$s"; +$a->strings["%1\$s commented in their thread"] = "%1\$s ответил в своём обсуждении"; +$a->strings["%1\$s commented in the thread %2\$s from %3\$s"] = "%1\$s ответил в обсуждении %2\$s от %3\$s"; +$a->strings["%1\$s commented in the thread from %3\$s"] = "%1\$s ответил в обсуждении от %3\$s"; +$a->strings["%1\$s commented on your thread %2\$s"] = "%1\$s ответил в вашем обсуждении %2\$s"; $a->strings["Edit profile"] = "Редактировать профиль"; $a->strings["Change profile photo"] = "Изменить фото профиля"; $a->strings["Homepage:"] = "Домашняя страничка:"; @@ -1405,6 +1413,9 @@ $a->strings["Request date"] = "Запрос даты"; $a->strings["No registrations."] = "Нет регистраций."; $a->strings["Note from the user"] = "Сообщение от пользователя"; $a->strings["Deny"] = "Отклонить"; +$a->strings["Only starting posts can be bookmarked"] = "Только заглавные записи могут быть добавлены в закладки"; +$a->strings["Only starting posts can be muted"] = "Только заглавные записи можно заглушить"; +$a->strings["Only starting posts can be pinned"] = "Только заглавные записи можно закрепить"; $a->strings["Contact not found"] = "Контакт не найден"; $a->strings["Profile not found"] = "Профиль не найден"; $a->strings["No installed applications."] = "Нет установленных приложений."; @@ -1427,6 +1438,8 @@ $a->strings["Diagnostics"] = "Диагностика"; $a->strings["User registrations waiting for confirmation"] = "Регистрации пользователей, ожидающие подтверждения"; $a->strings["Profile Details"] = "Информация о вас"; $a->strings["Only You Can See This"] = "Только вы можете это видеть"; +$a->strings["Scheduled Posts"] = "Запланированные записи"; +$a->strings["Posts that are scheduled for publishing"] = "Записи, публикация которых запланирована"; $a->strings["Tips for New Members"] = "Советы для новых участников"; $a->strings["People Search - %s"] = "Поиск по людям - %s"; $a->strings["Forum Search - %s"] = "Поиск по форумам - %s"; @@ -1510,6 +1523,7 @@ $a->strings["Search your contacts"] = "Поиск ваших контактов" $a->strings["Results for: %s"] = "Результаты для: %s"; $a->strings["Update"] = "Обновление"; $a->strings["Batch Actions"] = "Пакетные действия"; +$a->strings["Conversations started by this contact"] = "Диалоги этого контакта"; $a->strings["Posts and Comments"] = "Записи и комментарии"; $a->strings["View all known contacts"] = "Показать все известные контакты"; $a->strings["Advanced Contact Settings"] = "Дополнительные Настройки Контакта"; @@ -1764,6 +1778,7 @@ $a->strings["View as"] = "Посмотреть как"; $a->strings["%s's timeline"] = "Лента %s"; $a->strings["%s's posts"] = "Записи %s"; $a->strings["%s's comments"] = "Комментарии %s"; +$a->strings["Scheduled"] = "Запланировано"; $a->strings["Only parent users can create additional accounts."] = "Только основные пользователи могут создавать дополнительные учётные записи."; $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Если вы не знакомы с OpenID, пожалуйста, оставьте это поле пустым и заполните остальные элементы."; $a->strings["Your OpenID (optional): "] = "Ваш OpenID (необязательно):"; @@ -1858,6 +1873,8 @@ $a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Минимум $a->strings["Auto update may add new posts at the top of the post stream pages, which can affect the scroll position and perturb normal reading if it happens anywhere else the top of the page."] = "Автообновление может загружать новые записи в начало ленты, что может изменить положение прокрутки и помешать чтению, если вы находитесь не в начале страницы."; $a->strings["Infinite scroll"] = "Бесконечная прокрутка"; $a->strings["Automatic fetch new items when reaching the page end."] = "Автоматически подгружать новые записи, когда вы оказываетесь в конце страницы."; +$a->strings["Enable Smart Threading"] = "Включить умное ветвление обсуждений"; +$a->strings["Enable the automatic suppression of extraneous thread indentation."] = "Включить автоматическое удаление излишних отступов в ветках обсуждений."; $a->strings["Beginning of week:"] = "Начало недели:"; $a->strings["Profile Name is required."] = "Необходимо имя профиля."; $a->strings["Profile couldn't be updated."] = "Профиль не получилось обновить."; @@ -1962,6 +1979,7 @@ $a->strings["%s posted an update."] = "%s отправил/а/ обновлен $a->strings["This entry was edited"] = "Эта запись была отредактирована"; $a->strings["Private Message"] = "Личное сообщение"; $a->strings["Edit"] = "Редактировать"; +$a->strings["Pinned item"] = "Закреплённая запись"; $a->strings["Delete globally"] = "Удалить везде"; $a->strings["Remove locally"] = "Убрать для себя"; $a->strings["Block %s"] = "Заблокировать %s"; @@ -1969,9 +1987,16 @@ $a->strings["Save to folder"] = "Сохранить в папку"; $a->strings["I will attend"] = "Я буду"; $a->strings["I will not attend"] = "Меня не будет"; $a->strings["I might attend"] = "Возможно"; -$a->strings["Ignore thread"] = "Игнорировать тему"; -$a->strings["Unignore thread"] = "Не игнорировать тему"; +$a->strings["Ignore thread"] = "Игнорировать обсуждение"; +$a->strings["Unignore thread"] = "Не игнорировать обсуждение"; $a->strings["Toggle ignore status"] = "Переключить игнорирование"; +$a->strings["Add star"] = "Добавить в Избранное"; +$a->strings["Remove star"] = "Убрать из Избранного"; +$a->strings["Toggle star status"] = "Добавить/убрать из Избранного"; +$a->strings["Pin"] = "Закрепить"; +$a->strings["Unpin"] = "Открепить"; +$a->strings["Toggle pin status"] = "Закрепить/открепить"; +$a->strings["Pinned"] = "Закреплено"; $a->strings["Add tag"] = "Добавить тег"; $a->strings["Quote share this"] = "Поделиться с комментарием"; $a->strings["Quote Share"] = "Цитировать"; @@ -2034,3 +2059,4 @@ $a->strings["minutes"] = "мин."; $a->strings["second"] = "секунда"; $a->strings["seconds"] = "сек."; $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s назад"; +$a->strings["Pink"] = "Розовый"; From 142fad533e536034556862150b3276b0c7877edf Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 25 Sep 2021 19:16:41 +0200 Subject: [PATCH 20/23] CHANGELOG set release date --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 538f66002d..e758721226 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Version 2021.09 (unreleased) +Version 2021.09 (2021-09-25) Friendica Core Updates to the translation DE, FR, HU, RU [translation teams] Updates to the documentation [foss-, nupplaphil] From 1adbdfb8d1d0a476fb416ffaf3012a7a0f13deb1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 25 Sep 2021 19:18:27 +0200 Subject: [PATCH 21/23] set the version of Friendica to 2021.09 --- VERSION | 2 +- boot.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index e0b18b8b3b..76c052bfad 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2021.09-rc +2021.09 diff --git a/boot.php b/boot.php index 9c3be4a429..4d485595ec 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Siberian Iris'); -define('FRIENDICA_VERSION', '2021.09-rc'); +define('FRIENDICA_VERSION', '2021.09'); define('DFRN_PROTOCOL_VERSION', '2.23'); define('NEW_TABLE_STRUCTURE_VERSION', 1288); From 944957a00913727d203efac3e0f0d961d2719d6b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 25 Sep 2021 19:21:35 +0200 Subject: [PATCH 22/23] pumped version to 2021.12-dev --- VERSION | 2 +- boot.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 76c052bfad..9fb7221fc5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2021.09 +2021.12-dev diff --git a/boot.php b/boot.php index 4d485595ec..a4d0fe5c73 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Siberian Iris'); -define('FRIENDICA_VERSION', '2021.09'); +define('FRIENDICA_VERSION', '2021.12-dev'); define('DFRN_PROTOCOL_VERSION', '2.23'); define('NEW_TABLE_STRUCTURE_VERSION', 1288); From 00382dd39e052a239be56828472354c9a14c87f0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 25 Sep 2021 19:22:11 +0200 Subject: [PATCH 23/23] opened CHANGELOG for 2021.12 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e758721226..67429b3960 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 2021.12 (unreleased) + Version 2021.09 (2021-09-25) Friendica Core Updates to the translation DE, FR, HU, RU [translation teams]