Merge branch 'notifications-filtering' into 'develop'

Mastodon API return full result set in notifications

See merge request pleroma/pleroma!2552

CHANGELOG.md

@@ -180,6 +180,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **Breaking:** `/api/pleroma/admin/users/invite_token` now uses `POST`, changed accepted params and returns full invite in json instead of only token string.
 - **Breaking** replying to reports is now "report notes", endpoint changed from `POST /api/pleroma/admin/reports/:id/respond` to `POST /api/pleroma/admin/reports/:id/notes`
 - Mastodon API: stopped sanitizing display names, field names and subject fields since they are supposed to be treated as plaintext
+- **Breaking** The `move` notifications now have the type `pleroma:move`
 - Admin API: Return `total` when querying for reports
 - Mastodon API: Return `pleroma.direct_conversation_id` when creating a direct message (`POST /api/v1/statuses`)
 - Admin API: Return link alongside with token on password reset

docs/API/differences_in_mastoapi_responses.md

@@ -106,7 +106,7 @@ Has these additional fields under the `pleroma` object:
 
 ### Move Notification
 
-The `type` value is `move`. Has an additional field:
+The `type` value is `pleroma:move`. Has an additional field:
 
 - `target`: new account
 

lib/pleroma/notification.ex

@@ -387,7 +387,7 @@ defmodule Pleroma.Notification do
         "favourite"
 
       "Move" ->
-        "move"
+        "pleroma:move"
 
       "EmojiReact" ->
         "pleroma:emoji_reaction"

lib/pleroma/web/mastodon_api/views/notification_view.ex

@@ -111,7 +111,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
       "reblog" ->
         put_status(response, parent_activity_fn.(), reading_user, status_render_opts)
 
-      "move" ->
+      "pleroma:move" ->
         put_target(response, activity, reading_user, %{})
 
       "pleroma:emoji_reaction" ->

test/web/mastodon_api/views/notification_view_test.exs

@@ -172,7 +172,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
     expected = %{
       id: to_string(notification.id),
       pleroma: %{is_seen: false},
-      type: "move",
+      type: "pleroma:move",
       account: AccountView.render("show.json", %{user: old_user, for: follower}),
       target: AccountView.render("show.json", %{user: new_user, for: follower}),
       created_at: Utils.to_masto_date(notification.inserted_at)