https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
69f2556
)
We now send a summary via AP. This partially fixes the problem with Mastodon and...
author
Michael
<heluecht@pirati.ca>
Sat, 16 Mar 2019 08:46:33 +0000
(08:46 +0000)
committer
Michael
<heluecht@pirati.ca>
Sat, 16 Mar 2019 08:46:33 +0000
(08:46 +0000)
src/Protocol/ActivityPub/Transmitter.php
patch
|
blob
|
history
diff --git
a/src/Protocol/ActivityPub/Transmitter.php
b/src/Protocol/ActivityPub/Transmitter.php
index
d85f67a
..
79263f8
100644
(file)
--- a/
src/Protocol/ActivityPub/Transmitter.php
+++ b/
src/Protocol/ActivityPub/Transmitter.php
@@
-20,6
+20,7
@@
use Friendica\Model\Term;
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
use Friendica\Content\Text\BBCode;
use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
use Friendica\Model\Profile;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
use Friendica\Model\Profile;
@@
-1020,7
+1021,7
@@
class Transmitter
return $data;
}
return $data;
}
- $data['summary'] =
null; // Ignore by now
+ $data['summary'] =
BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB);
if ($item['uri'] != $item['thr-parent']) {
$data['inReplyTo'] = $item['thr-parent'];
if ($item['uri'] != $item['thr-parent']) {
$data['inReplyTo'] = $item['thr-parent'];
@@
-1054,6
+1055,8
@@
class Transmitter
if ($type == 'Note') {
$body = self::removePictures($body);
if ($type == 'Note') {
$body = self::removePictures($body);
+ } elseif (($type == 'Article') && empty($data['summary'])) {
+ $data['summary'] = Plaintext::shorten(self::removePictures($body), 1000);
}
if ($type == 'Event') {
}
if ($type == 'Event') {