Add with_muted
param.
This commit is contained in:
parent
14bc6bd40f
commit
c4235f96bd
|
@ -9,3 +9,7 @@ Pleroma uses 128-bit ids as opposed to Mastodon's 64 bits. However just like Mas
|
||||||
## Attachment cap
|
## Attachment cap
|
||||||
|
|
||||||
Some apps operate under the assumption that no more than 4 attachments can be returned or uploaded. Pleroma however does not enforce any limits on attachment count neither when returning the status object nor when posting.
|
Some apps operate under the assumption that no more than 4 attachments can be returned or uploaded. Pleroma however does not enforce any limits on attachment count neither when returning the status object nor when posting.
|
||||||
|
|
||||||
|
## Timelines
|
||||||
|
|
||||||
|
Adding the parameter `with_muted=true` to the timeline queries will also return activities by muted (not by blocked!) users.
|
||||||
|
|
|
@ -602,6 +602,8 @@ defp restrict_reblogs(query, %{"exclude_reblogs" => val}) when val == "true" or
|
||||||
|
|
||||||
defp restrict_reblogs(query, _), do: query
|
defp restrict_reblogs(query, _), do: query
|
||||||
|
|
||||||
|
defp restrict_muted(query, %{"with_muted" => val}) when val in [true, "true", "1"], do: query
|
||||||
|
|
||||||
defp restrict_muted(query, %{"muting_user" => %User{info: info}}) do
|
defp restrict_muted(query, %{"muting_user" => %User{info: info}}) do
|
||||||
mutes = info.mutes
|
mutes = info.mutes
|
||||||
|
|
||||||
|
|
|
@ -291,6 +291,13 @@ test "doesn't return muted activities" do
|
||||||
assert Enum.member?(activities, activity_three)
|
assert Enum.member?(activities, activity_three)
|
||||||
refute Enum.member?(activities, activity_one)
|
refute Enum.member?(activities, activity_one)
|
||||||
|
|
||||||
|
# Calling with 'with_muted' will deliver muted activities, too.
|
||||||
|
activities = ActivityPub.fetch_activities([], %{"muting_user" => user, "with_muted" => true})
|
||||||
|
|
||||||
|
assert Enum.member?(activities, activity_two)
|
||||||
|
assert Enum.member?(activities, activity_three)
|
||||||
|
assert Enum.member?(activities, activity_one)
|
||||||
|
|
||||||
{:ok, user} = User.unmute(user, %User{ap_id: activity_one.data["actor"]})
|
{:ok, user} = User.unmute(user, %User{ap_id: activity_one.data["actor"]})
|
||||||
|
|
||||||
activities = ActivityPub.fetch_activities([], %{"muting_user" => user})
|
activities = ActivityPub.fetch_activities([], %{"muting_user" => user})
|
||||||
|
|
Loading…
Reference in a new issue