aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-08-16 15:19:46 +0000
committerkaniini <nenolod@gmail.com>2018-08-16 15:19:46 +0000
commit38361e7b5e24cbbd4654bd76fce4b3c66562ab59 (patch)
tree020fc1934e8aef655e7bf3648f034237a609ad74 /lib
parent8dc715b30bf310d040f72c0c01a5c668c3696b2a (diff)
parent9c1b6f11c501756362342b5652769c9dfd12e77c (diff)
downloadpleroma-38361e7b5e24cbbd4654bd76fce4b3c66562ab59.tar.gz
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
Fix: Output repeats at ActivityPub outbox Closes #191 See merge request pleroma/pleroma!175
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/views/user_view.ex9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index 41bfe5048..0b1d5a9fa 100644
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -98,9 +98,6 @@ defmodule Pleroma.Web.ActivityPub.UserView do
info = User.user_info(user)
params = %{
- "type" => ["Create", "Announce"],
- "actor_id" => user.ap_id,
- "whole_db" => true,
"limit" => "10"
}
@@ -111,10 +108,8 @@ defmodule Pleroma.Web.ActivityPub.UserView do
params
end
- activities = ActivityPub.fetch_public_activities(params)
- min_id = Enum.at(activities, 0).id
-
- activities = Enum.reverse(activities)
+ activities = ActivityPub.fetch_user_activities(user, nil, params)
+ min_id = Enum.at(Enum.reverse(activities), 0).id
max_id = Enum.at(activities, 0).id
collection =