hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor as per Rin's suggestions, add endpoint tests

Browse source
This commit is contained in:
Karen Konou 2019-02-11 11:59:51 +01:00
commit c01ef574c1
9 changed files with 136 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -446,7 +446,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def mute_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
with {:ok, activity} <- Pleroma.Web.ThreadMute.add_mute(user, id) do
activity = Activity.get_by_id(id)
with {:ok, activity} <- CommonAPI.add_mute(user, activity) do
conn
|> put_view(StatusView)
|> try_render("status.json", %{activity: activity, for: user, as: :activity})
@ -459,7 +460,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def unmute_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
with {:ok, activity} <- Pleroma.Web.ThreadMute.remove_mute(user, id) do
activity = Activity.get_by_id(id)
with {:ok, activity} <- CommonAPI.remove_mute(user, activity) do
conn
|> put_view(StatusView)
|> try_render("status.json", %{activity: activity, for: user, as: :activity})

3
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -9,6 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
alias Pleroma.HTML
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
alias Pleroma.Web.MastodonAPI.AccountView
@ -160,7 +161,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
reblogged: present?(repeated),
favourited: present?(favorited),
bookmarked: present?(bookmarked),
muted: Pleroma.Web.ThreadMute.muted?(user, activity),
muted: CommonAPI.thread_muted?(user, activity),
pinned: pinned?(activity, user),
sensitive: sensitive,
spoiler_text: object["summary"] || "",