Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
This commit is contained in:
commit
d385789a45
12 changed files with 557 additions and 48 deletions
|
|
@ -728,7 +728,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
params
|
||||
|> Map.put("user", reading_user)
|
||||
|> Map.put("actor_id", user.ap_id)
|
||||
|> Map.put("whole_db", true)
|
||||
|
||||
recipients =
|
||||
user_activities_recipients(%{
|
||||
|
|
@ -746,7 +745,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
|> Map.put("type", ["Create", "Announce"])
|
||||
|> Map.put("user", reading_user)
|
||||
|> Map.put("actor_id", user.ap_id)
|
||||
|> Map.put("whole_db", true)
|
||||
|> Map.put("pinned_activity_ids", user.pinned_activities)
|
||||
|
||||
params =
|
||||
|
|
@ -773,7 +771,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
params
|
||||
|> Map.put("type", ["Create", "Announce"])
|
||||
|> Map.put("instance", params["instance"])
|
||||
|> Map.put("whole_db", true)
|
||||
|
||||
fetch_activities([Pleroma.Constants.as_public()], params, :offset)
|
||||
|> Enum.reverse()
|
||||
|
|
|
|||
|
|
@ -37,7 +37,10 @@ defmodule Pleroma.Web.Feed.UserController do
|
|||
def feed(conn, %{"nickname" => nickname} = params) do
|
||||
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
|
||||
activities =
|
||||
%{"type" => ["Create"], "whole_db" => true, "actor_id" => user.ap_id}
|
||||
%{
|
||||
"type" => ["Create"],
|
||||
"actor_id" => user.ap_id
|
||||
}
|
||||
|> put_in_if_exist("max_id", params["max_id"])
|
||||
|> ActivityPub.fetch_public_activities()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue