diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-08 11:23:31 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-08 11:23:31 +0000 |
| commit | 29a3f70cba7bed31e6777832c4d2dc5c326b70c1 (patch) | |
| tree | 08882be8111f79012af716f6d5fa78feccb187cb /lib/pleroma | |
| parent | 6cb31edd76fd42a0e33bc365d982cd02e3578d6c (diff) | |
| parent | e8cee4d9a0ea13db8d087e42eb17939bb8b11f0b (diff) | |
| download | pleroma-29a3f70cba7bed31e6777832c4d2dc5c326b70c1.tar.gz | |
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 9 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 9724ec272..1e2cc2e2b 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -749,6 +749,15 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> Map.put("whole_db", true) |> Map.put("pinned_activity_ids", user.pinned_activities) + params = + if User.blocks?(reading_user, user) do + params + else + params + |> Map.put("blocking_user", reading_user) + |> Map.put("muting_user", reading_user) + end + recipients = user_activities_recipients(%{ "godmode" => params["godmode"], diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index d71a14434..d19029cb5 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -249,7 +249,11 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do @doc "GET /api/v1/accounts/:id/statuses" def statuses(%{assigns: %{user: reading_user}} = conn, params) do with %User{} = user <- User.get_cached_by_nickname_or_id(params["id"], for: reading_user) do - params = Map.put(params, "tag", params["tagged"]) + params = + params + |> Map.put("tag", params["tagged"]) + |> Map.delete("godmode") + activities = ActivityPub.fetch_user_activities(user, reading_user, params) conn |