diff options
| author | lain <lain@soykaf.club> | 2020-01-28 17:06:36 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 17:06:36 +0100 |
| commit | d385789a450d455019c8aa6b6ee6abd28d5648e8 (patch) | |
| tree | d37b214ff074084c747cf7a7fa962cbf14e86f3c /lib/pleroma/web | |
| parent | e3fae3380e2af0978436191127b148923f62ae53 (diff) | |
| parent | 271935953a384eb97606fb48d1b5c7befaf588e4 (diff) | |
| download | pleroma-d385789a450d455019c8aa6b6ee6abd28d5648e8.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 2e9d56ee5..1ac67b618 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -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() diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index cf04fd497..f5096834b 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -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() |