projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into gun
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index 5c436941ae7aa8f6eea72cdb42256298bca69bfb..12695b3f9218725701fe689eb00f9b2662646183 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-770,13
+770,18
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> Enum.reverse()
end
|> Enum.reverse()
end
- def fetch_
instance_activities(
params) do
+ def fetch_
statuses(reading_user,
params) do
params =
params
|> Map.put("type", ["Create", "Announce"])
params =
params
|> Map.put("type", ["Create", "Announce"])
- |> Map.put("instance", params["instance"])
- fetch_activities([Pleroma.Constants.as_public()], params, :offset)
+ recipients =
+ user_activities_recipients(%{
+ "godmode" => params["godmode"],
+ "reading_user" => reading_user
+ })
+
+ fetch_activities(recipients, params, :offset)
|> Enum.reverse()
end
|> Enum.reverse()
end