From: lain Date: Tue, 28 Jan 2020 16:06:36 +0000 (+0100) Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d385789a450d455019c8aa6b6ee6abd28d5648e8;p=akkoma Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed --- d385789a450d455019c8aa6b6ee6abd28d5648e8 diff --cc lib/pleroma/web/feed/user_controller.ex index cf04fd497,acc0c3e6c..f5096834b --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@@ -37,8 -34,11 +37,11 @@@ defmodule Pleroma.Web.Feed.UserControll 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 + } - |> Map.merge(Map.take(params, ["max_id"])) + |> put_in_if_exist("max_id", params["max_id"]) |> ActivityPub.fetch_public_activities() conn