diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:29:16 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-10 18:29:16 +0000 |
| commit | 390329a303dd6d6a91d0bafa7dff0f7d63a8dad5 (patch) | |
| tree | 75d2bc4a55e1469d60bb770288652c962eaa4449 /lib | |
| parent | 337edb3e500dc8d3d74926eb9da739bec8e8a7ac (diff) | |
| parent | 0802a08871afee7f09362cbca8b802f0e27ff4b9 (diff) | |
| download | pleroma-390329a303dd6d6a91d0bafa7dff0f7d63a8dad5.tar.gz | |
Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'
Mastodon API: Fix thread mute detection
See merge request pleroma/pleroma!1548
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 80df9b2ac..02819e116 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -168,7 +168,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do thread_muted? = case activity.thread_muted? do thread_muted? when is_boolean(thread_muted?) -> thread_muted? - nil -> CommonAPI.thread_muted?(user, activity) + nil -> (opts[:for] && CommonAPI.thread_muted?(opts[:for], activity)) || false end attachment_data = object.data["attachment"] || [] |