bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

AP is enabled for all users

Browse source
This commit is contained in:
Michael 2018-09-22 23:49:27 +00:00
commit a56565fa99
6 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Network/Probe.php
View file

@ -335,8 +335,9 @@ class Probe
$data = null;
}
if (in_array(defaults($data, 'network', ''), ['', Protocol::PHANTOM])) {
$ap_profile = ActivityPub::probeProfile($uri);
$ap_profile = ActivityPub::probeProfile($uri);
if (!empty($ap_profile) && (defaults($data, 'network', '') != Protocol::DFRN)) {
if (!empty($ap_profile) && ($ap_profile['network'] == Protocol::ACTIVITYPUB)) {
$data = $ap_profile;
}

13
src/Protocol/ActivityPub.php
View file

@ -332,9 +332,9 @@ class ActivityPub
}
$data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
['ostatus' => 'http://ostatus.org#', 'sensitive' => 'as:sensitive',
'Hashtag' => 'as:Hashtag', 'atomUri' => 'ostatus:atomUri',
'conversation' => 'ostatus:conversation',
['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
'atomUri' => 'ostatus:atomUri', 'conversation' => 'ostatus:conversation',
'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
$data['id'] = $item['uri'] . '#activity';
@ -372,9 +372,9 @@ class ActivityPub
}
$data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
['ostatus' => 'http://ostatus.org#', 'sensitive' => 'as:sensitive',
'Hashtag' => 'as:Hashtag', 'atomUri' => 'ostatus:atomUri',
'conversation' => 'ostatus:conversation',
['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
'atomUri' => 'ostatus:atomUri', 'conversation' => 'ostatus:conversation',
'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
$data = array_merge($data, self::CreateNote($item));
@ -433,6 +433,7 @@ class ActivityPub
$data['inReplyTo'] = null;
}
$data['uuid'] = $item['guid'];
$data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
if ($item["created"] != $item["edited"]) {