diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-20 23:30:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-20 23:30:19 +0000 |
| commit | d4847b17ca0d0c5acf8344d06e11062b2d7ab37e (patch) | |
| tree | 6d455fd1a9248262c3fae5bc13fd42915995e631 /lib/pleroma/web/twitter_api | |
| parent | 943d1b2f269eaa1fc29702fed45eb8a11164598b (diff) | |
| parent | eb02edcad9cb0d65fc216408960aec63713e5d2b (diff) | |
| download | pleroma-d4847b17ca0d0c5acf8344d06e11062b2d7ab37e.tar.gz | |
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
Diffstat (limited to 'lib/pleroma/web/twitter_api')
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 44bcafe0e..e84af84dc 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -284,6 +284,12 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) ) + thread_muted? = + case activity.thread_muted? do + thread_muted? when is_boolean(thread_muted?) -> thread_muted? + nil -> CommonAPI.thread_muted?(user, activity) + end + %{ "id" => activity.id, "uri" => object.data["id"], @@ -314,7 +320,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do "summary" => summary, "summary_html" => summary |> Formatter.emojify(object.data["emoji"]), "card" => card, - "muted" => CommonAPI.thread_muted?(user, activity) || User.mutes?(opts[:for], user) + "muted" => thread_muted? || User.mutes?(opts[:for], user) } end |