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

Merge pull request #7352 from annando/ap-probe

Browse source 
Add ActivityPub related fields to the "uri" function
This commit is contained in:
Hypolite Petovan 2019-07-08 13:00:56 -04:00 committed by GitHub
commit e5a29cf979
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Network/Probe.php
View file

@ -48,6 +48,7 @@ class Probe
$fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", $fields = ["name", "nick", "guid", "url", "addr", "alias", "photo",
"account-type", "community", "keywords", "location", "about", "account-type", "community", "keywords", "location", "about",
"batch", "notify", "poll", "request", "confirm", "poco", "batch", "notify", "poll", "request", "confirm", "poco",
"following", "followers", "inbox", "outbox", "sharedinbox",
"priority", "network", "pubkey", "baseurl"]; "priority", "network", "pubkey", "baseurl"];
$newdata = []; $newdata = [];

5
src/Protocol/ActivityPub.php
View file

@ -137,6 +137,11 @@ class ActivityPub
$profile['url'] = $apcontact['url']; $profile['url'] = $apcontact['url'];
$profile['addr'] = $apcontact['addr']; $profile['addr'] = $apcontact['addr'];
$profile['alias'] = $apcontact['alias']; $profile['alias'] = $apcontact['alias'];
$profile['following'] = $apcontact['following'];
$profile['followers'] = $apcontact['followers'];
$profile['inbox'] = $apcontact['inbox'];
$profile['outbox'] = $apcontact['outbox'];
$profile['sharedinbox'] = $apcontact['sharedinbox'];
$profile['photo'] = $apcontact['photo']; $profile['photo'] = $apcontact['photo'];
$profile['account-type'] = self::getAccountType($apcontact); $profile['account-type'] = self::getAccountType($apcontact);
$profile['community'] = ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY); $profile['community'] = ($profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);