aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-03 12:47:05 +0200
committerlain <lain@soykaf.club>2020-07-03 12:47:05 +0200
commit98bfdba108d4213eea82dc4d63edb8bb834118fb (patch)
tree8da65c7ce0e93fddeb0f0f7dd3a881006e2048c2
parent8ad166e8e385b7baea79dc3949b438edba25c69f (diff)
downloadpleroma-98bfdba108d4213eea82dc4d63edb8bb834118fb.tar.gz
User: On registration, set `accepts_chat_messages` to true.
-rw-r--r--lib/pleroma/user.ex5
-rw-r--r--test/user_test.exs9
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 8a54546d6..79e094a79 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -138,6 +138,7 @@ defmodule Pleroma.User do
field(:also_known_as, {:array, :string}, default: [])
field(:inbox, :string)
field(:shared_inbox, :string)
+ field(:accepts_chat_messages, :boolean, default: false)
embeds_one(
:notification_settings,
@@ -623,6 +624,7 @@ defmodule Pleroma.User do
def register_changeset(struct, params \\ %{}, opts \\ []) do
bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000)
name_limit = Pleroma.Config.get([:instance, :user_name_length], 100)
+ params = Map.put_new(params, :accepts_chat_messages, true)
need_confirmation? =
if is_nil(opts[:need_confirmation]) do
@@ -641,7 +643,8 @@ defmodule Pleroma.User do
:nickname,
:password,
:password_confirmation,
- :emoji
+ :emoji,
+ :accepts_chat_messages
])
|> validate_required([:name, :nickname, :password, :password_confirmation])
|> validate_confirmation(:password)
diff --git a/test/user_test.exs b/test/user_test.exs
index 7126bb539..9788e09d9 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -486,6 +486,15 @@ defmodule Pleroma.UserTest do
}
setup do: clear_config([:instance, :account_activation_required], true)
+ test "it sets the 'accepts_chat_messages' set to true" do
+ changeset = User.register_changeset(%User{}, @full_user_data)
+ assert changeset.valid?
+
+ {:ok, user} = Repo.insert(changeset)
+
+ assert user.accepts_chat_messages
+ end
+
test "it creates unconfirmed user" do
changeset = User.register_changeset(%User{}, @full_user_data)
assert changeset.valid?