clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13980 from annando/mail-summary 

Fix: Subject for private messages from Friendica systems
This commit is contained in:
Tobias Diekershoff 2024-03-10 13:55:09 +01:00 committed by GitHub
parent 2077e00eae 3496d3948a
commit e206175a50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Protocol/ActivityPub/Processor.php
View File

@ -851,6 +851,7 @@ class Processor
} }
$item['title'] = trim(BBCode::toPlaintext($item['title'])); $item['title'] = trim(BBCode::toPlaintext($item['title']));
$item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
if (!empty($activity['languages'])) { if (!empty($activity['languages'])) {
$item['language'] = self::processLanguages($activity['languages']); $item['language'] = self::processLanguages($activity['languages']);
@ -897,7 +898,6 @@ class Processor
} }
$content = self::removeImplicitMentionsFromBody($content, $parent); $content = self::removeImplicitMentionsFromBody($content, $parent);
} }
$item['content-warning'] = HTML::toBBCode($activity['summary'] ?? '');
$item['raw-body'] = $item['body'] = $content; $item['raw-body'] = $item['body'] = $content;
} }