wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[OStatus] Update salmonaction to use the new LRDD's method for grabbing aliases

Browse Source
This commit is contained in:
tenma 2020-03-31 08:09:22 +01:00 committed by Diogo Peralta Cordeiro
parent 8b8157ce25
commit 40bc43215d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/OStatus/lib/salmonaction.php
View File

@ -250,14 +250,11 @@ class SalmonAction extends Action
// //
// Example: We have stored http://example.com/user/1 but this URI says https://example.com/user/1 // Example: We have stored http://example.com/user/1 but this URI says https://example.com/user/1
common_debug('No local Profile object found for a magicsigned activity author URI: '.$e->object_uri); common_debug('No local Profile object found for a magicsigned activity author URI: '.$e->object_uri);
$disco = new Discovery(); $all_ids = LRDDPlugin::grab_profile_aliases($e->object_uri);
$xrd = $disco->lookup($e->object_uri);
// Step 1: We got a bunch of discovery data for https://example.com/user/1 which includes // Step 1: We got a bunch of discovery data for https://example.com/user/1 which includes
// aliases https://example.com/user and hopefully our original http://example.com/user/1 too // aliases https://example.com/user and hopefully our original http://example.com/user/1 too
$all_ids = array_merge(array($xrd->subject), $xrd->aliases); if (is_null($all_ids)) {
if (!in_array($e->object_uri, $all_ids)) {
common_debug('The activity author URI we got was not listed itself when doing discovery on it.');
throw $e; throw $e;
} }