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
|
|
@ -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