hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cycles-base-url' into 'develop'

Browse source 
Deprecate Pleroma.Web.base_url/0

See merge request pleroma/pleroma!3432
This commit is contained in:
feld 2021-06-01 16:15:27 +00:00
commit 0ddf492c5d
43 changed files with 94 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/pleroma/web/common_api_test.exs
View file

@ -519,7 +519,7 @@ defmodule Pleroma.Web.CommonAPITest do
{:ok, activity} = CommonAPI.post(user, %{status: "hey :blank:"})
assert %{"blank" => url} = Object.normalize(activity).data["emoji"]
assert url == "#{Pleroma.Web.base_url()}/emoji/blank.png"
assert url == "#{Pleroma.Web.Endpoint.url()}/emoji/blank.png"
end
test "it copies emoji from the subject of the parent post" do