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

Merge remote-tracking branch 'upstream/develop' into private

Browse Source
This commit is contained in:
Michael
2020-03-02 15:05:00 +00:00
parent d3c6f6de2a e008811514
commit 72c198990e
60 changed files with 985 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\Event;
use Friendica\Model\Item;
use Friendica\Model\Mail;
@@ -455,6 +456,13 @@ class Processor
$item['private'] = Item::PRIVATE;
}
if (!empty($activity['raw'])) {
$item['source'] = $activity['raw'];
$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
$item['conversation-href'] = $activity['context'] ?? '';
$item['conversation-uri'] = $activity['conversation'] ?? '';
}
$isForum = false;
if (!empty($activity['thread-completion'])) {