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 activation-meta
[akkoma]
/
lib
/
pleroma
/
web
/
feed
/
user_controller.ex
diff --git
a/lib/pleroma/web/feed/user_controller.ex
b/lib/pleroma/web/feed/user_controller.ex
index e27f859299dbc9f3e47dc83601d2bba6b9df7ee6..d56f438184fa920457ad4f8d6ceaf5f5b6b932a4 100644
(file)
--- a/
lib/pleroma/web/feed/user_controller.ex
+++ b/
lib/pleroma/web/feed/user_controller.ex
@@
-11,8
+11,6
@@
defmodule Pleroma.Web.Feed.UserController do
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.Feed.FeedView
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.Feed.FeedView
- import Pleroma.Web.ControllerHelper, only: [put_if_exist: 3]
-
plug(Pleroma.Plugs.SetFormatPlug when action in [:feed_redirect])
action_fallback(:errors)
plug(Pleroma.Plugs.SetFormatPlug when action in [:feed_redirect])
action_fallback(:errors)
@@
-27,7
+25,7
@@
defmodule Pleroma.Web.Feed.UserController do
when format in ["json", "activity+json"] do
with %{halted: false} = conn <-
Pleroma.Plugs.EnsureAuthenticatedPlug.call(conn,
when format in ["json", "activity+json"] do
with %{halted: false} = conn <-
Pleroma.Plugs.EnsureAuthenticatedPlug.call(conn,
- unless_func: &Pleroma.Web.FederatingPlug.federating?/
0
+ unless_func: &Pleroma.Web.FederatingPlug.federating?/
1
) do
ActivityPubController.call(conn, :user)
end
) do
ActivityPubController.call(conn, :user)
end
@@
-52,11
+50,11
@@
defmodule Pleroma.Web.Feed.UserController do
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
activities =
%{
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
activities =
%{
-
"type" =>
["Create"],
-
"actor_id" =>
user.ap_id
+
type:
["Create"],
+
actor_id:
user.ap_id
}
}
- |>
put_if_exist("max_id"
, params["max_id"])
- |> ActivityPub.fetch_public_activities()
+ |>
Pleroma.Maps.put_if_present(:max_id
, params["max_id"])
+ |> ActivityPub.fetch_public_
or_unlisted_
activities()
conn
|> put_resp_content_type("application/#{format}+xml")
conn
|> put_resp_content_type("application/#{format}+xml")