strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

We don't need to pass the protocol that way

Browse source
This commit is contained in:
Michael 2020-02-28 09:46:53 +00:00
parent a9896ecdb1
commit 1743682153
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Protocol/ActivityPub/Processor.php
View file

@ -29,6 +29,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\APContact; use Friendica\Model\APContact;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\Event; use Friendica\Model\Event;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Mail; use Friendica\Model\Mail;
@ -448,9 +449,9 @@ class Processor
$item['owner-link'] = $activity['actor']; $item['owner-link'] = $activity['actor'];
$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true); $item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
if (!empty($activity['raw']) && isset($activity['protocol'])) { if (!empty($activity['raw'])) {
$item['source'] = $activity['raw']; $item['source'] = $activity['raw'];
$item['protocol'] = $activity['protocol']; $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
$item['conversation-href'] = $activity['context'] ?? ''; $item['conversation-href'] = $activity['context'] ?? '';
$item['conversation-uri'] = $activity['conversation'] ?? ''; $item['conversation-uri'] = $activity['conversation'] ?? '';
} }

2
src/Protocol/ActivityPub/Receiver.php
View file

@ -28,7 +28,6 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\APContact; use Friendica\Model\APContact;
use Friendica\Model\Conversation;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
@ -355,7 +354,6 @@ class Receiver
if (!empty($body)) { if (!empty($body)) {
$object_data['raw'] = $body; $object_data['raw'] = $body;
$object_data['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
} }
// Internal flag for thread completion. See Processor.php // Internal flag for thread completion. See Processor.php