aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/common_api.ex
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-09-03 10:34:06 -0500
committerMark Felder <feld@FreeBSD.org>2020-09-03 10:34:06 -0500
commit85446cc30c97a326d90b4ef719ba2e54c2ad423f (patch)
treecaa8e1268cbab2a09e414b85d2ce52b24249d0da /lib/pleroma/web/common_api/common_api.ex
parent6ce28c409137972ee9b105b9d7ab4a0fd2a0d08b (diff)
parent9433311923d4b41b057ce6cb1632ff27d46919b4 (diff)
downloadpleroma-85446cc30c97a326d90b4ef719ba2e54c2ad423f.tar.gz
Merge branch 'develop' into media-preview-proxy
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 5ad2b91c2..4ab533658 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -452,7 +452,8 @@ defmodule Pleroma.Web.CommonAPI do
end
def add_mute(user, activity) do
- with {:ok, _} <- ThreadMute.add_mute(user.id, activity.data["context"]) do
+ with {:ok, _} <- ThreadMute.add_mute(user.id, activity.data["context"]),
+ _ <- Pleroma.Notification.mark_context_as_read(user, activity.data["context"]) do
{:ok, activity}
else
{:error, _} -> {:error, dgettext("errors", "conversation is already muted")}