Hide chats from muted users

This commit is contained in:
Egor Kislitsyn 2020-11-02 17:51:54 +04:00
parent 9fbe9ef774
commit be52819a11
No known key found for this signature in database
GPG Key ID: 1B49CB15B71E7805
2 changed files with 33 additions and 16 deletions

View File

@ -15,7 +15,6 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
alias Pleroma.Web.PleromaAPI.ChatView
alias Pleroma.Web.Plugs.OAuthScopesPlug alias Pleroma.Web.Plugs.OAuthScopesPlug
import Ecto.Query import Ecto.Query
@ -121,9 +120,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
) do ) do
with {:ok, chat} <- Chat.get_by_user_and_id(user, id), with {:ok, chat} <- Chat.get_by_user_and_id(user, id),
{_n, _} <- MessageReference.set_all_seen_for_chat(chat, last_read_id) do {_n, _} <- MessageReference.set_all_seen_for_chat(chat, last_read_id) do
conn render(conn, "show.json", chat: chat)
|> put_view(ChatView)
|> render("show.json", chat: chat)
end end
end end
@ -142,32 +139,30 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
end end
def index(%{assigns: %{user: %{id: user_id} = user}} = conn, _params) do def index(%{assigns: %{user: %{id: user_id} = user}} = conn, _params) do
blocked_ap_ids = User.blocked_users_ap_ids(user) exclude_users =
user
|> User.blocked_users_ap_ids()
|> Enum.concat(User.muted_users_ap_ids(user))
chats = chats =
Chat.for_user_query(user_id) user_id
|> where([c], c.recipient not in ^blocked_ap_ids) |> Chat.for_user_query()
|> where([c], c.recipient not in ^exclude_users)
|> Repo.all() |> Repo.all()
conn render(conn, "index.json", chats: chats)
|> put_view(ChatView)
|> render("index.json", chats: chats)
end end
def create(%{assigns: %{user: user}} = conn, %{id: id}) do def create(%{assigns: %{user: user}} = conn, %{id: id}) do
with %User{ap_id: recipient} <- User.get_cached_by_id(id), with %User{ap_id: recipient} <- User.get_cached_by_id(id),
{:ok, %Chat{} = chat} <- Chat.get_or_create(user.id, recipient) do {:ok, %Chat{} = chat} <- Chat.get_or_create(user.id, recipient) do
conn render(conn, "show.json", chat: chat)
|> put_view(ChatView)
|> render("show.json", chat: chat)
end end
end end
def show(%{assigns: %{user: user}} = conn, %{id: id}) do def show(%{assigns: %{user: user}} = conn, %{id: id}) do
with {:ok, chat} <- Chat.get_by_user_and_id(user, id) do with {:ok, chat} <- Chat.get_by_user_and_id(user, id) do
conn render(conn, "show.json", chat: chat)
|> put_view(ChatView)
|> render("show.json", chat: chat)
end end
end end

View File

@ -343,6 +343,28 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
assert length(result) == 0 assert length(result) == 0
end end
test "it does not return chats with users you muted", %{conn: conn, user: user} do
recipient = insert(:user)
{:ok, _} = Chat.get_or_create(user.id, recipient.ap_id)
result =
conn
|> get("/api/v1/pleroma/chats")
|> json_response_and_validate_schema(200)
assert length(result) == 1
User.mute(user, recipient)
result =
conn
|> get("/api/v1/pleroma/chats")
|> json_response_and_validate_schema(200)
assert length(result) == 0
end
test "it returns all chats", %{conn: conn, user: user} do test "it returns all chats", %{conn: conn, user: user} do
Enum.each(1..30, fn _ -> Enum.each(1..30, fn _ ->
recipient = insert(:user) recipient = insert(:user)