keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6905 from annando/ap-summary-text

Browse source 
The "summary" field seems to be interpreted as plain text only
This commit is contained in:
Philipp 2019-03-19 06:45:20 +01:00 committed by GitHub
commit 326a7d22ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1021,7 +1021,7 @@ class Transmitter
return $data; return $data;
} }
$data['summary'] = BBCode::convert(BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB), false, 7); $data['summary'] = BBCode::toPlaintext(BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB));
if ($item['uri'] != $item['thr-parent']) { if ($item['uri'] != $item['thr-parent']) {
$data['inReplyTo'] = $item['thr-parent']; $data['inReplyTo'] = $item['thr-parent'];
@ -1056,7 +1056,7 @@ class Transmitter
if ($type == 'Note') { if ($type == 'Note') {
$body = self::removePictures($body); $body = self::removePictures($body);
} elseif (($type == 'Article') && empty($data['summary'])) { } elseif (($type == 'Article') && empty($data['summary'])) {
$data['summary'] = BBCode::convert(Plaintext::shorten(self::removePictures($body), 1000), false, 7); $data['summary'] = BBCode::toPlaintext(Plaintext::shorten(self::removePictures($body), 1000));
} }
if ($type == 'Event') { if ($type == 'Event') {