From: Maksim Pechnikov <parallel588@gmail.com>
Date: Thu, 5 Dec 2019 12:46:27 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1342
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3fe7a1fd35a9ca81b158eff6dbcc25ca48cbf96d;p=akkoma

Merge branch 'develop' into issue/1342
---

3fe7a1fd35a9ca81b158eff6dbcc25ca48cbf96d
diff --cc lib/pleroma/user.ex
index 94fca2a9f,120cb2641..5f3f63ace
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@@ -103,12 -103,17 +103,14 @@@ defmodule Pleroma.User d
      field(:raw_fields, {:array, :map}, default: [])
      field(:discoverable, :boolean, default: false)
      field(:invisible, :boolean, default: false)
+     field(:allow_following_move, :boolean, default: true)
      field(:skip_thread_containment, :boolean, default: false)
+     field(:also_known_as, {:array, :string}, default: [])
  
 -    field(:notification_settings, :map,
 -      default: %{
 -        "followers" => true,
 -        "follows" => true,
 -        "non_follows" => true,
 -        "non_followers" => true
 -      }
 +    embeds_one(
 +      :notification_settings,
 +      Pleroma.User.NotificationSetting,
 +      on_replace: :update
      )
  
      has_many(:notifications, Notification)
diff --cc test/support/factory.ex
index 4bd82ebd6,bb8a64e72..5f976f9ce
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@@ -31,9 -31,7 +31,8 @@@ defmodule Pleroma.Factory d
        nickname: sequence(:nickname, &"nick#{&1}"),
        password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
        bio: sequence(:bio, &"Tester Number #{&1}"),
-       info: %{},
 -      last_digest_emailed_at: NaiveDateTime.utc_now()
 +      last_digest_emailed_at: NaiveDateTime.utc_now(),
 +      notification_settings: %Pleroma.User.NotificationSetting{}
      }
  
      %{