From 0c82974986e2a30832463ad02ce22499ada92890 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Oct 2023 06:44:37 +0000 Subject: [PATCH 1/3] Check more fields for the language --- src/Model/Item.php | 6 +++--- src/Model/Post/Engagement.php | 13 +------------ src/Protocol/ActivityPub/Processor.php | 16 ++++++++++++++-- src/Protocol/Relay.php | 8 +++++--- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 27bb58c78..d3ae8aa6c 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1212,8 +1212,6 @@ class Item // Check for hashtags in the body and repair or add hashtag links $item['body'] = self::setHashtags($item['body']); - $item['language'] = self::getLanguage($item); - $notify_type = Delivery::POST; // Filling item related side tables @@ -1262,6 +1260,8 @@ class Item } } + $item['language'] = self::getLanguage($item); + $inserted = Post::insert($item['uri-id'], $item); if ($item['gravity'] == self::GRAVITY_PARENT) { @@ -1991,7 +1991,7 @@ class Item return ''; } - $languages = self::getLanguageArray(trim($item['title'] . "\n" . $item['body']), 3, $item['uri-id'], $item['author-id']); + $languages = self::getLanguageArray($item['title'] . ' ' . ($item['content-warning'] ?? '') . ' ' . $item['body'], 3, $item['uri-id'], $item['author-id']); if (empty($languages)) { return ''; } diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index 9ffd48aa0..017c34d19 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -158,18 +158,7 @@ class Engagement $body .= ' ' . $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body']; - $body = preg_replace("~\[url\=.*\]https?:.*\[\/url\]~", '', $body); - - $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body, [Post\Media::IMAGE]); - $text = BBCode::toPlaintext($body, false); - $text = preg_replace(Strings::autoLinkRegEx(), '', $text); - - do { - $oldtext = $text; - $text = str_replace([' ', "\n", "\r"], ' ', $text); - } while ($oldtext != $text); - - return $text; + return BBCode::toSearchText($body, $item['uri-id']); } private static function getMediaType(int $uri_id): int diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 3d020a747..081596bcd 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -1652,7 +1652,19 @@ class Processor $attributed_to = JsonLD::fetchElement($activity['as:object'], 'as:attributedTo', '@id'); $authorid = Contact::getIdForURL($attributed_to); - $body = HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value') ?? ''); + $content = JsonLD::fetchElement($activity['as:object'], 'as:name', '@value') ?? ''; + $content .= ' ' . JsonLD::fetchElement($activity['as:object'], 'as:summary', '@value') ?? ''; + $content .= ' ' . HTML::toBBCode(JsonLD::fetchElement($activity['as:object'], 'as:content', '@value') ?? ''); + + $attachments = JsonLD::fetchElementArray($activity['as:object'], 'as:attachment') ?? []; + foreach ($attachments as $media) { + if (!empty($media['as:summary'])) { + $content .= ' ' . JsonLD::fetchElement($media, 'as:summary', '@value'); + } + if (!empty($media['as:name'])) { + $content .= ' ' . JsonLD::fetchElement($media, 'as:name', '@value'); + } + } $messageTags = []; $tags = Receiver::processTags(JsonLD::fetchElementArray($activity['as:object'], 'as:tag') ?? []); @@ -1665,7 +1677,7 @@ class Processor } } - return Relay::isSolicitedPost($messageTags, $body, $authorid, $id, Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0); + return Relay::isSolicitedPost($messageTags, $content, $authorid, $id, Protocol::ACTIVITYPUB, $activity['thread-completion'] ?? 0); } /** diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php index 57bd71255..c4432e59a 100644 --- a/src/Protocol/Relay.php +++ b/src/Protocol/Relay.php @@ -125,7 +125,7 @@ class Relay } } - if (!self::isWantedLanguage($body)) { + if (!self::isWantedLanguage($body, 0, $authorid)) { Logger::info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]); return false; } @@ -166,12 +166,14 @@ class Relay * Detect the language of a post and decide if the post should be accepted * * @param string $body + * @param int $uri_id + * @param int $author_id * @return boolean */ - public static function isWantedLanguage(string $body) + public static function isWantedLanguage(string $body, int $uri_id = 0, int $author_id = 0) { $languages = []; - foreach (Item::getLanguageArray($body, 10) as $language => $reliability) { + foreach (Item::getLanguageArray($body, 10, $uri_id, $author_id) as $language => $reliability) { if ($reliability > 0) { $languages[] = $language; } From 51ad2f522a724cdc786f003ad3f7b0685e802610 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Oct 2023 07:26:24 +0000 Subject: [PATCH 2/3] Messages.po updated --- view/lang/C/messages.po | 66 ++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 249c15e2f..415fdc21c 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-07 19:00+0200\n" +"POT-Creation-Date: 2023-10-08 07:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1380,7 +1380,7 @@ msgstr "" msgid "Public post" msgstr "" -#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:132 +#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:134 #: src/Model/Profile.php:479 src/Module/Admin/Logs/View.php:92 #: src/Module/Post/Edit.php:181 msgid "Message" @@ -2188,8 +2188,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:994 src/Model/Item.php:3760 -#: src/Model/Item.php:3766 src/Model/Item.php:3767 +#: src/Content/Text/BBCode.php:994 src/Model/Item.php:3761 +#: src/Model/Item.php:3767 src/Model/Item.php:3768 msgid "Link to source" msgstr "" @@ -2221,7 +2221,7 @@ msgstr "" msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:128 +#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:130 #: src/Model/Profile.php:473 src/Module/Contact/Profile.php:471 msgid "Follow" msgstr "" @@ -2435,17 +2435,17 @@ msgstr "" msgid "Mention" msgstr "" -#: src/Content/Widget/VCard.php:121 src/Model/Profile.php:376 +#: src/Content/Widget/VCard.php:123 src/Model/Profile.php:376 #: src/Module/Contact/Profile.php:408 src/Module/Profile/Profile.php:199 msgid "XMPP:" msgstr "" -#: src/Content/Widget/VCard.php:122 src/Model/Profile.php:377 +#: src/Content/Widget/VCard.php:124 src/Model/Profile.php:377 #: src/Module/Contact/Profile.php:410 src/Module/Profile/Profile.php:203 msgid "Matrix:" msgstr "" -#: src/Content/Widget/VCard.php:123 src/Model/Event.php:82 +#: src/Content/Widget/VCard.php:125 src/Model/Event.php:82 #: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:963 #: src/Model/Profile.php:371 src/Module/Contact/Profile.php:406 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187 @@ -2453,12 +2453,12 @@ msgstr "" msgid "Location:" msgstr "" -#: src/Content/Widget/VCard.php:126 src/Model/Profile.php:486 +#: src/Content/Widget/VCard.php:128 src/Model/Profile.php:486 #: src/Module/Notifications/Introductions.php:201 msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:130 src/Model/Contact.php:1237 +#: src/Content/Widget/VCard.php:132 src/Model/Contact.php:1237 #: src/Model/Contact.php:1249 src/Model/Profile.php:475 #: src/Module/Contact/Profile.php:463 msgid "Unfollow" @@ -2724,8 +2724,8 @@ msgstr "" #: src/Core/Installer.php:511 msgid "" -"The web installer needs to be able to create a file called \"local.config." -"php\" in the \"config\" folder of your web server and it is unable to do so." +"The web installer needs to be able to create a file called \"local.config.php" +"\" in the \"config\" folder of your web server and it is unable to do so." msgstr "" #: src/Core/Installer.php:512 @@ -3429,44 +3429,44 @@ msgstr "" msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3667 +#: src/Model/Item.php:3668 msgid "bytes" msgstr "" -#: src/Model/Item.php:3698 +#: src/Model/Item.php:3699 #, 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:3700 +#: src/Model/Item.php:3701 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3705 +#: src/Model/Item.php:3706 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3707 +#: src/Model/Item.php:3708 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3709 +#: src/Model/Item.php:3710 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3743 src/Model/Item.php:3744 +#: src/Model/Item.php:3744 src/Model/Item.php:3745 msgid "View on separate page" msgstr "" @@ -5351,9 +5351,9 @@ msgstr "" #: src/Module/Admin/Summary.php:98 msgid "" -"The last update failed. Please run \"php bin/console.php dbstructure " -"update\" from the command line and have a look at the errors that might " -"appear. (Some of the errors are possibly inside the logfile.)" +"The last update failed. Please run \"php bin/console.php dbstructure update" +"\" from the command line and have a look at the errors that might appear. " +"(Some of the errors are possibly inside the logfile.)" msgstr "" #: src/Module/Admin/Summary.php:102 @@ -5504,8 +5504,8 @@ msgstr "" #, php-format msgid "" "Show some informations regarding the needed information to operate the node " -"according e.g. to EU-GDPR." +"according e.g. to EU-GDPR." msgstr "" #: src/Module/Admin/Tos.php:81 @@ -8856,8 +8856,8 @@ msgstr "" #: src/Module/Profile/Profile.php:158 #, php-format msgid "" -"You're currently viewing your profile as %s Cancel" +"You're currently viewing your profile as %s Cancel" msgstr "" #: src/Module/Profile/Profile.php:167 @@ -9405,8 +9405,8 @@ msgstr "" #: src/Module/Security/TwoFactor/Verify.php:100 #, php-format msgid "" -"If you do not have access to your authentication code you can use a two-factor recovery code." +"If you do not have access to your authentication code you can use a two-factor recovery code." msgstr "" #: src/Module/Security/TwoFactor/Verify.php:101 @@ -11047,8 +11047,8 @@ msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:149 #, php-format msgid "" -"

Or you can open the following URL in your mobile device:

%s

" +"

Or you can open the following URL in your mobile device:

%s

" msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:156 @@ -11157,9 +11157,9 @@ msgstr "" msgid "" "At any point in time a logged in user can export their account data from the " "account settings. If the user wants " -"to delete their account they can do so at %1$s/settings/removeme. The deletion of the account will be " -"permanent. Deletion of the data will also be requested from the nodes of the " +"to delete their account they can do so at " +"%1$s/settings/removeme. The deletion of the account will be permanent. " +"Deletion of the data will also be requested from the nodes of the " "communication partners." msgstr "" From f37dd2cbc6da42bb933c5acff02f4d0c1904d691 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 8 Oct 2023 07:42:39 +0000 Subject: [PATCH 3/3] Messages.po again --- view/lang/C/messages.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 415fdc21c..47d726704 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-08 07:25+0000\n" +"POT-Creation-Date: 2023-10-08 07:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1380,7 +1380,7 @@ msgstr "" msgid "Public post" msgstr "" -#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:134 +#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:132 #: src/Model/Profile.php:479 src/Module/Admin/Logs/View.php:92 #: src/Module/Post/Edit.php:181 msgid "Message" @@ -2221,7 +2221,7 @@ msgstr "" msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:130 +#: src/Content/Text/HTML.php:859 src/Content/Widget/VCard.php:128 #: src/Model/Profile.php:473 src/Module/Contact/Profile.php:471 msgid "Follow" msgstr "" @@ -2435,17 +2435,17 @@ msgstr "" msgid "Mention" msgstr "" -#: src/Content/Widget/VCard.php:123 src/Model/Profile.php:376 +#: src/Content/Widget/VCard.php:121 src/Model/Profile.php:376 #: src/Module/Contact/Profile.php:408 src/Module/Profile/Profile.php:199 msgid "XMPP:" msgstr "" -#: src/Content/Widget/VCard.php:124 src/Model/Profile.php:377 +#: src/Content/Widget/VCard.php:122 src/Model/Profile.php:377 #: src/Module/Contact/Profile.php:410 src/Module/Profile/Profile.php:203 msgid "Matrix:" msgstr "" -#: src/Content/Widget/VCard.php:125 src/Model/Event.php:82 +#: src/Content/Widget/VCard.php:123 src/Model/Event.php:82 #: src/Model/Event.php:109 src/Model/Event.php:471 src/Model/Event.php:963 #: src/Model/Profile.php:371 src/Module/Contact/Profile.php:406 #: src/Module/Directory.php:147 src/Module/Notifications/Introductions.php:187 @@ -2453,12 +2453,12 @@ msgstr "" msgid "Location:" msgstr "" -#: src/Content/Widget/VCard.php:128 src/Model/Profile.php:486 +#: src/Content/Widget/VCard.php:126 src/Model/Profile.php:486 #: src/Module/Notifications/Introductions.php:201 msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:132 src/Model/Contact.php:1237 +#: src/Content/Widget/VCard.php:130 src/Model/Contact.php:1237 #: src/Model/Contact.php:1249 src/Model/Profile.php:475 #: src/Module/Contact/Profile.php:463 msgid "Unfollow"