Use the field for the summary instead of the "abstract" element

diff --git a/src/Model/Item.php b/src/Model/Item.php
index cf057eed59c3d50822deed7b3441165d6b44aac3..e4f4c7b4cabf24a7cb2597e462b714fad0a4c3cd 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -121,7 +121,7 @@ class Item
        const DELIVER_FIELDLIST = [
                'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid',
                'parent-guid', 'conversation', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
-               'private', 'title', 'body', 'raw-body', 'language', 'location', 'coord', 'app', 'sensitive',
+               'private', 'title', 'content-warning', 'body', 'raw-body', 'language', 'location', 'coord', 'app', 'sensitive',
                'inform', 'deleted', 'extid', 'post-type', 'post-reason', 'gravity',
                'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
                'author-id', 'author-addr', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid',

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index ba0998b520a4c5df8827b8804a2367a25c07d498..b97628f78098765e46c04a0fa14029db3ab649db 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1160,11 +1160,11 @@ class Transmitter
                // - Moving the title into the "summary" field that is used as a "content warning"
 
                if (!$use_title) {
-                       $mail['body']         = '[abstract]' . $mail['title'] . "[/abstract]\n" . $mail['body'];
-                       $mail['title']        = '';
+                       $mail['content-warning'] = $mail['title'];
+                       $mail['title']           = '';
+               } else {
+                       $mail['content-warning']  = '';
                }
-
-               $mail['content-warning']  = '';
                $mail['sensitive']        = false;
                $mail['author-link']      = $mail['owner-link'] = $mail['from-url'];
                $mail['owner-id']         = $mail['author-id'];
@@ -1780,7 +1780,7 @@ class Transmitter
                        return $data;
                }
 
-               $data['summary'] = BBCode::toPlaintext(BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB));
+               $data['summary'] = $item['content-warning'] ?: BBCode::toPlaintext(BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB));
 
                if ($item['uri'] != $item['thr-parent']) {
                        $data['inReplyTo'] = $item['thr-parent'];

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 4b5342d0a1577a2f2cd9a56353658f11ce6a124f..eb0a8eb8f370d0eee24cc5be438480c143423a20 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -29,7 +29,6 @@ use Friendica\Contact\LocalRelationship\Entity\LocalRelationship;
 use Friendica\Content\PageInfo;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
@@ -668,7 +667,7 @@ class Feed
                                }
                        } else {
                                if (!empty($summary)) {
-                                       $item['body'] = '[abstract]' . HTML::toBBCode($summary, $basepath) . "[/abstract]\n" . $item['body'];
+                                       $item['content-warning'] = HTML::toBBCode($summary, $basepath);
                                }
 
                                if ($fetch_further_information == LocalRelationship::FFI_KEYWORD) {