From bfea5d42ad3beb014c2d2d323549f07faa028360 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 23 Feb 2020 20:35:36 -0500 Subject: [PATCH 1/4] Simplify about field conversion to plaintext in Protocol\Diaspora --- src/Protocol/Diaspora.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index fd20991108..1080a81544 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -4135,8 +4135,7 @@ class Diaspora $dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d'); } - $about = $profile['about']; - $about = strip_tags(BBCode::convert($about)); + $about = BBCode::toPlaintext($profile['about']); $location = Profile::formatLocation($profile); $tags = ''; From c147446c9359eb3e4d3439ecf06bad4723e629bc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 23 Feb 2020 20:36:04 -0500 Subject: [PATCH 2/4] Add about field conversion to HTML in Protocol\ActivityPub\Transmitter --- src/Protocol/ActivityPub/Transmitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 38f1022942..b371c7e59d 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -264,7 +264,7 @@ class Transmitter $data['name'] = $contact['name']; $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'], 'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']]; - $data['summary'] = $contact['about']; + $data['summary'] = BBCode::convert($contact['about'], false, 9); $data['url'] = $contact['url']; $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]); $data['publicKey'] = ['id' => $contact['url'] . '#main-key', From 0f85f5d16729803401f917641199e376f4bfce4d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 24 Feb 2020 07:59:53 -0500 Subject: [PATCH 3/4] Convert outgoing profile description to Markdown in Protocol\Diaspora --- src/Content/Text/BBCode.php | 2 -- src/Protocol/Diaspora.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 7b4b7b73de..20a81c42a9 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -2004,8 +2004,6 @@ class BBCode */ public static function toMarkdown($text, $for_diaspora = true) { - $a = DI::app(); - $original_text = $text; // Since Diaspora is creating a summary for links, this function removes them before posting diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 1080a81544..57b3a9d798 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -4135,7 +4135,7 @@ class Diaspora $dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d'); } - $about = BBCode::toPlaintext($profile['about']); + $about = BBCode::toMarkdown($profile['about']); $location = Profile::formatLocation($profile); $tags = ''; From 064cc227c0383bf5cadce1e23825898f760a3420 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 25 Feb 2020 07:41:26 -0500 Subject: [PATCH 4/4] Remove simple_html parameter from about field conversion in Protocol\ActivityPub\Transmitter --- src/Protocol/ActivityPub/Transmitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index b371c7e59d..83441be62d 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -264,7 +264,7 @@ class Transmitter $data['name'] = $contact['name']; $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'], 'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']]; - $data['summary'] = BBCode::convert($contact['about'], false, 9); + $data['summary'] = BBCode::convert($contact['about'], false); $data['url'] = $contact['url']; $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]); $data['publicKey'] = ['id' => $contact['url'] . '#main-key',