Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
authorlain <lain@soykaf.club>
Tue, 28 Jan 2020 16:06:36 +0000 (17:06 +0100)
committerlain <lain@soykaf.club>
Tue, 28 Jan 2020 16:06:36 +0000 (17:06 +0100)
1  2 
lib/pleroma/web/feed/user_controller.ex

index cf04fd49725ab65c9aa5ccf18ed1d99b0be85449,acc0c3e6caf23d736ce3e93ae73dc2b7e3e5a110..f5096834b1c8a02e5e4174cd6f7a6c06da529f02
@@@ -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