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

Handle "users/:id" links as well. Fix comments in MR.

Browse source
This commit is contained in:
raeno 2018-12-14 19:55:40 +01:00
commit 46486595ff
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/ostatus/metadata.ex
View file

@ -11,8 +11,7 @@ defmodule Pleroma.Web.Metadata do
end
def meta_enabled?(type) do
config = Pleroma.Config.get(:metadata, [])
Keyword.get(config, type, false)
Pleroma.Config.get([:metadata, type], false)
end
# opengraph for single status
@ -70,6 +69,6 @@ defmodule Pleroma.Web.Metadata do
end
def pleroma_domain do
Pleroma.Config.get([:instance, :domain], "UNKNOWN_DOMAIN")
Pleroma.Web.Endpoint.host()
end
end

4
lib/pleroma/web/ostatus/ostatus_controller.ex
View file

@ -16,8 +16,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
def feed_redirect(conn, %{"nickname" => nickname}) do
case get_format(conn) do
"html" ->
with %User{} = user <- User.get_cached_by_nickname(nickname) do
with %User{} = user <- User.get_cached_by_nickname_or_id(nickname) do
Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
else
nil -> {:error, :not_found}
end
"activity+json" ->