From 64c78581fe397b6d9356c52cf3f43becd2ff3b4e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 10 Apr 2020 14:47:56 +0200
Subject: [PATCH] Chat: Only create them for valid users for now.
---
lib/pleroma/chat.ex | 7 +++++++
test/chat_test.exs | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/lib/pleroma/chat.ex b/lib/pleroma/chat.ex
index 2475019d1..c2044881f 100644
--- a/lib/pleroma/chat.ex
+++ b/lib/pleroma/chat.ex
@@ -26,6 +26,13 @@ defmodule Pleroma.Chat do
def creation_cng(struct, params) do
struct
|> cast(params, [:user_id, :recipient, :unread])
+ |> validate_change(:recipient, fn
+ :recipient, recipient ->
+ case User.get_cached_by_ap_id(recipient) do
+ nil -> [recipient: "must a an existing user"]
+ _ -> []
+ end
+ end)
|> validate_required([:user_id, :recipient])
|> unique_constraint(:user_id, name: :chats_user_id_recipient_index)
end
diff --git a/test/chat_test.exs b/test/chat_test.exs
index bb2b46d51..952598c87 100644
--- a/test/chat_test.exs
+++ b/test/chat_test.exs
@@ -10,6 +10,13 @@ defmodule Pleroma.ChatTest do
import Pleroma.Factory
describe "creation and getting" do
+ test "it only works if the recipient is a valid user (for now)" do
+ user = insert(:user)
+
+ assert {:error, _chat} = Chat.bump_or_create(user.id, "http://some/nonexisting/account")
+ assert {:error, _chat} = Chat.get_or_create(user.id, "http://some/nonexisting/account")
+ end
+
test "it creates a chat for a user and recipient" do
user = insert(:user)
other_user = insert(:user)