Merge branch 'bugfix/408' into 'develop'

ensure user info is populated when registering users

See merge request pleroma/pleroma!500

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 3bd92c15706591addbadd2abd4d90421eb5e71a5..74ae5ef0d7e30c9905fc32e1ddb21fc78e7d9aeb 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -177,6 +177,7 @@ defmodule Pleroma.User do
       |> validate_format(:email, @email_regex)
       |> validate_length(:bio, max: 1000)
       |> validate_length(:name, min: 1, max: 100)
+      |> put_change(:info, %Pleroma.User.Info{})
 
     if changeset.valid? do
       hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])

diff --git a/test/user_test.exs b/test/user_test.exs
index d097eb17128c6cb13605df393d472c304a983fe5..3d2f7f4e056b364203e0ee394730105c5c7558e6 100644 (file)
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -149,6 +149,18 @@ defmodule Pleroma.UserTest do
 
       assert changeset.changes.follower_address == "#{changeset.changes.ap_id}/followers"
     end
+
+    test "it ensures info is not nil" do
+      changeset = User.register_changeset(%User{}, @full_user_data)
+
+      assert changeset.valid?
+
+      {:ok, user} =
+        changeset
+        |> Repo.insert()
+
+      refute is_nil(user.info)
+    end
   end
 
   describe "fetching a user from nickname or trying to build one" do