limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

rebase fix

Browse source
This commit is contained in:
Alexander Strizhakov 2021-03-21 13:41:20 +03:00 committed by Mark Felder
parent a57c025594
commit 8407e26b0c
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/web_finger.ex
View file

@ -69,8 +69,6 @@ defmodule Pleroma.Web.WebFinger do
end end
def represent_user(user, "JSON") do def represent_user(user, "JSON") do
{:ok, user} = User.ensure_keys_present(user)
%{ %{
"subject" => "acct:#{user.nickname}@#{domain()}", "subject" => "acct:#{user.nickname}@#{domain()}",
"aliases" => gather_aliases(user), "aliases" => gather_aliases(user),

16
test/pleroma/user_test.exs
View file

@ -887,7 +887,8 @@ defmodule Pleroma.UserTest do
|> File.read!() |> File.read!()
|> String.replace("{{nickname}}", "a") |> String.replace("{{nickname}}", "a")
|> String.replace("{{domain}}", "example.com") |> String.replace("{{domain}}", "example.com")
|> String.replace("{{subdomain}}", "sub.example.com") |> String.replace("{{subdomain}}", "sub.example.com"),
headers: [{"content-type", "application/jrd+json"}]
} }
%{url: "https://sub.example.com/users/a"} -> %{url: "https://sub.example.com/users/a"} ->
@ -900,6 +901,16 @@ defmodule Pleroma.UserTest do
|> String.replace("{{domain}}", "sub.example.com"), |> String.replace("{{domain}}", "sub.example.com"),
headers: [{"content-type", "application/activity+json"}] headers: [{"content-type", "application/activity+json"}]
} }
%{url: "https://sub.example.com/users/a/collections/featured"} ->
%Tesla.Env{
status: 200,
body:
File.read!("test/fixtures/users_mock/masto_featured.json")
|> String.replace("{{domain}}", "sub.example.com")
|> String.replace("{{nickname}}", "a"),
headers: [{"content-type", "application/activity+json"}]
}
end) end)
ap_id = "a@example.com" ap_id = "a@example.com"
@ -934,7 +945,8 @@ defmodule Pleroma.UserTest do
|> File.read!() |> File.read!()
|> String.replace("{{nickname}}", "a") |> String.replace("{{nickname}}", "a")
|> String.replace("{{domain}}", "example.com") |> String.replace("{{domain}}", "example.com")
|> String.replace("{{subdomain}}", "sub.example.com") |> String.replace("{{subdomain}}", "sub.example.com"),
headers: [{"content-type", "application/jrd+json"}]
} }
%{url: "https://sub.example.com/users/a"} -> %{url: "https://sub.example.com/users/a"} ->

6
test/pleroma/web/web_finger_test.exs
View file

@ -47,7 +47,7 @@ defmodule Pleroma.Web.WebFingerTest do
test "returns error when there is no content-type header" do test "returns error when there is no content-type header" do
Tesla.Mock.mock(fn Tesla.Mock.mock(fn
%{url: "http://social.heldscal.la/.well-known/host-meta"} -> %{url: "https://social.heldscal.la/.well-known/host-meta"} ->
{:ok, {:ok,
%Tesla.Env{ %Tesla.Env{
status: 200, status: 200,
@ -147,7 +147,7 @@ defmodule Pleroma.Web.WebFingerTest do
headers: [{"content-type", "application/jrd+json"}] headers: [{"content-type", "application/jrd+json"}]
}} }}
%{url: "http://mastodon.social/.well-known/host-meta"} -> %{url: "https://mastodon.social/.well-known/host-meta"} ->
{:ok, {:ok,
%Tesla.Env{ %Tesla.Env{
status: 200, status: 200,
@ -170,7 +170,7 @@ defmodule Pleroma.Web.WebFingerTest do
headers: [{"content-type", "application/xrd+xml"}] headers: [{"content-type", "application/xrd+xml"}]
}} }}
%{url: "http://pawoo.net/.well-known/host-meta"} -> %{url: "https://pawoo.net/.well-known/host-meta"} ->
{:ok, {:ok,
%Tesla.Env{ %Tesla.Env{
status: 200, status: 200,