projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into oembed_provider
[akkoma]
/
lib
/
pleroma
/
web
/
ostatus
/
ostatus_controller.ex
diff --git
a/lib/pleroma/web/ostatus/ostatus_controller.ex
b/lib/pleroma/web/ostatus/ostatus_controller.ex
index fbd25c5f53c8d23032b7d9d61a1f7c54807355ed..5dbee20e1c9429f112db4d8b0362ca9e2f31f070 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/
lib/pleroma/web/ostatus/ostatus_controller.ex
@@
-14,12
+14,12
@@
defmodule Pleroma.Web.OStatus.OStatusController do
action_fallback(:errors)
def feed_redirect(conn, %{"nickname" => nickname}) do
action_fallback(:errors)
def feed_redirect(conn, %{"nickname" => nickname}) do
- format = get_format(conn)
- IO.puts(format)
- case format do
+ case get_format(conn) do
"html" ->
"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})
Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
+ else
+ nil -> {:error, :not_found}
end
"activity+json" ->
end
"activity+json" ->