diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-26 10:37:27 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-26 10:37:27 +0000 |
| commit | beee3e75a8a310cb75cd8b0d51729300b1e05cba (patch) | |
| tree | ebfab2d6e509637607f8c42839abd1c15c0bc5d6 /lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex | |
| parent | 653054d301b88070cd60f6b0f8a0b188dee81cba (diff) | |
| parent | 058065448510af59f550ec7d7f99b81388bc7a40 (diff) | |
| download | pleroma-beee3e75a8a310cb75cd8b0d51729300b1e05cba.tar.gz | |
Merge branch 'conversation-read-status-for-blocking-user' into 'develop'
Count only visible conversations in the user's unread_conversation_count
See merge request pleroma/pleroma!1886
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex index fc39abf05..651a99423 100644 --- a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex @@ -80,7 +80,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do end def read_conversations(%{assigns: %{user: user}} = conn, _params) do - with {:ok, participations} <- Participation.mark_all_as_read(user) do + with {:ok, _, participations} <- Participation.mark_all_as_read(user) do conn |> add_link_headers(participations) |> put_view(ConversationView) |