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
/
tag_controller.ex
diff --git
a/lib/pleroma/web/feed/tag_controller.ex
b/lib/pleroma/web/feed/tag_controller.ex
index 8133f8480366bc2c14c6fa36538b0435e3d928d4..39b2a766a503cc25ff8715e435d18ec6917f1c82 100644
(file)
--- a/
lib/pleroma/web/feed/tag_controller.ex
+++ b/
lib/pleroma/web/feed/tag_controller.ex
@@
-9,14
+9,12
@@
defmodule Pleroma.Web.Feed.TagController do
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.Feed.FeedView
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.Feed.FeedView
- import Pleroma.Web.ControllerHelper, only: [put_if_exist: 3]
-
def feed(conn, %{"tag" => raw_tag} = params) do
{format, tag} = parse_tag(raw_tag)
activities =
def feed(conn, %{"tag" => raw_tag} = params) do
{format, tag} = parse_tag(raw_tag)
activities =
- %{
"type" => ["Create"], "tag" =>
tag}
- |>
put_if_exist("max_id"
, params["max_id"])
+ %{
type: ["Create"], tag:
tag}
+ |>
Pleroma.Maps.put_if_present(:max_id
, params["max_id"])
|> ActivityPub.fetch_public_activities()
conn
|> ActivityPub.fetch_public_activities()
conn