diff options
| author | lain <lain@soykaf.club> | 2020-05-06 08:46:45 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-06 08:46:45 +0000 |
| commit | f84c8f2f0d23223049f6a79f40790b08c563c519 (patch) | |
| tree | 212091e775171354551ab5ff270111ade33c346c /lib | |
| parent | 1ee34d4acb0a27e99284e4a32beafdbc140dbd75 (diff) | |
| parent | 7dd47bee82c9f4a5e3b4ce6d74c5a22cac596b52 (diff) | |
| download | pleroma-f84c8f2f0d23223049f6a79f40790b08c563c519.tar.gz | |
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/web_finger/web_finger.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex index 84ece1be2..71ccf251a 100644 --- a/lib/pleroma/web/web_finger/web_finger.ex +++ b/lib/pleroma/web/web_finger/web_finger.ex @@ -161,13 +161,15 @@ defmodule Pleroma.Web.WebFinger do URI.parse(account).host end + encoded_account = URI.encode("acct:#{account}") + address = case find_lrdd_template(domain) do {:ok, template} -> - String.replace(template, "{uri}", URI.encode(account)) + String.replace(template, "{uri}", encoded_account) _ -> - "https://#{domain}/.well-known/webfinger?resource=acct:#{account}" + "https://#{domain}/.well-known/webfinger?resource=#{encoded_account}" end with response <- |