ForForkMerge #2

Merged
sliver merged 185 commits from ForForkMerge into stable 2024-03-31 06:59:36 +00:00
Showing only changes of commit 9bc0345e57 - Show all commits

View file

@ -18,7 +18,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
import Ecto.Query import Ecto.Query
def render("endpoints.json", %{user: %User{nickname: nil, local: true} = _user}) do def render("endpoints.json", %{user: %User{nickname: nil, local: true} = _user}) do
%{"sharedInbox" => ~p"/inbox"} %{"sharedInbox" => url(~p"/inbox")}
end end
def render("endpoints.json", %{user: %User{local: true} = _user}) do def render("endpoints.json", %{user: %User{local: true} = _user}) do