GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Let the WebFingerPlugin lookup profile resources with index.php/ too

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-02-21 18:48:48 +01:00
parent 23e66bef64
commit 0c17c32267
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/WebFinger/WebFingerPlugin.php
View File

@ -100,14 +100,23 @@ class WebFingerPlugin extends Plugin
} }
} }
} else { } else {
$user = User::getKV('uri', $resource); try {
if ($user instanceof User) { $user = User::getByUri($resource);
$profile = $user->getProfile(); $profile = $user->getProfile();
} else { } catch (NoResultException $e) {
// try and get it by profile url try {
// common_fake_local_fancy_url can throw an exception
$fancy_url = common_fake_local_fancy_url($resource);
// and this will throw a NoResultException if not found
$user = User::getByUri($fancy_url);
$profile = $user->getProfile();
} catch (Exception $e) {
// if our rewrite hack didn't work, try to get something by profile URL
$profile = Profile::getKV('profileurl', $resource); $profile = Profile::getKV('profileurl', $resource);
} }
} }
}
if ($profile instanceof Profile) { if ($profile instanceof Profile) {
$target = new WebFingerResource_Profile($profile); $target = new WebFingerResource_Profile($profile);