Merge pull request #12223 from MrPetovan/task/12220-add-authorize_interaction-route

Add support for Mastodon /authorize_interaction route
This commit is contained in:
Tobias Diekershoff 2022-11-20 08:05:44 +01:00 committed by GitHub
commit 99c6e65be4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View file

@ -88,7 +88,9 @@ class Follow extends BaseModule
} }
$uid = $this->session->getLocalUserId(); $uid = $this->session->getLocalUserId();
$url = Probe::cleanURI(trim($request['url'] ?? ''));
// uri is used by the /authorize_interaction Mastodon route
$url = Probe::cleanURI(trim($request['uri'] ?? $request['url'] ?? ''));
// Issue 6874: Allow remote following from Peertube // Issue 6874: Allow remote following from Peertube
if (strpos($url, 'acct:') === 0) { if (strpos($url, 'acct:') === 0) {

View file

@ -342,6 +342,10 @@ return [
'/acctlink' => [Module\Acctlink::class, [R::GET]], '/acctlink' => [Module\Acctlink::class, [R::GET]],
'/apps' => [Module\Apps::class, [R::GET]], '/apps' => [Module\Apps::class, [R::GET]],
'/attach/{item:\d+}' => [Module\Attach::class, [R::GET]], '/attach/{item:\d+}' => [Module\Attach::class, [R::GET]],
// Mastodon route used by Fedifind to follow people who set their Webfinger address in their Twitter bio
'/authorize_interaction' => [Module\Contact\Follow::class, [R::GET, R::POST]],
'/babel' => [Module\Debug\Babel::class, [R::GET, R::POST]], '/babel' => [Module\Debug\Babel::class, [R::GET, R::POST]],
'/debug/ap' => [Module\Debug\ActivityPubConversion::class, [R::GET, R::POST]], '/debug/ap' => [Module\Debug\ActivityPubConversion::class, [R::GET, R::POST]],