Merge branch 'develop' into issue/1342

diff --cc lib/pleroma/notification.ex
Simple merge

diff --cc lib/pleroma/user.ex
index 94fca2a9fcaf69b30af6db2c07a78282e21c680a,120cb2641252589cfdc36169451833a67d668252..5f3f63acefdb35e73c25141f53ea2d57a21c060e
--- 1/lib/pleroma/user.ex
--- 2/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 lib/pleroma/web/push/impl.ex
Simple merge

diff --cc test/notification_test.exs
Simple merge

diff --cc test/support/factory.ex
index 4bd82ebd69dbd8119dec0bb5d771e350b2db4934,bb8a64e7243816e5b9a036e25ec458311eda8c72..5f976f9ce484f9a8b2addcc85df9fb3d5176f24d
--- 1/test/support/factory.ex
--- 2/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{}
      }
  
      %{

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge