Merge branch 'develop' into improve-move-notificaions-api

diff --cc test/web/mastodon_api/views/notification_view_test.exs
index cd36cb5384cca0bfd0c7f3bb61ad105794a15a56,26e1afc857d5fc8f2ae5f68f65ba3f9cdc4f5920..ba1721e06dd5b9ebf5ec884e5df9d0e9ffffc53e
--- 1/test/web/mastodon_api/views/notification_view_test.exs
--- 2/test/web/mastodon_api/views/notification_view_test.exs
+++ b/test/web/mastodon_api/views/notification_view_test.exs
@@@ -117,7 -117,10 +117,10 @@@ defmodule Pleroma.Web.MastodonAPI.Notif
      Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user)
      Pleroma.Tests.ObanHelpers.perform_all()
  
 -    [notification] = Notification.for_user(follower)
+     old_user = refresh_record(old_user)
+     new_user = refresh_record(new_user)
+ 
 +    [notification] = Notification.for_user(follower, %{with_move: true})
  
      expected = %{
        id: to_string(notification.id),