diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-04 11:26:34 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-09-04 11:26:34 +0000 |
| commit | e72531bfacb2399ad0783a26b1c23f0bba24a107 (patch) | |
| tree | 69fc553ac7aa2520c726a69b6d11bedfc8a66a82 /lib | |
| parent | e54694748bdcc27a3acd3ff3feac5c0c284d8b0d (diff) | |
| parent | 3face454671bfdf2b850daf9dcb05468eb909e95 (diff) | |
| download | pleroma-e72531bfacb2399ad0783a26b1c23f0bba24a107.tar.gz | |
Merge branch 'feat/mastoapi-status-threadmuted' into 'develop'
Mastodon API: Add `pleroma.thread_muted` to Status entity
See merge request pleroma/pleroma!1626
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 3 |
1 files changed, 2 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 a4ee0b5dd..4c3c8c564 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -299,7 +299,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do content: %{"text/plain" => content_plaintext}, spoiler_text: %{"text/plain" => summary_plaintext}, expires_at: expires_at, - direct_conversation_id: direct_conversation_id + direct_conversation_id: direct_conversation_id, + thread_muted: thread_muted? } } end |