diff options
| author | marcin mikołajczak <me@mkljczk.pl> | 2024-09-15 10:07:52 +0000 |
|---|---|---|
| committer | marcin mikołajczak <me@mkljczk.pl> | 2024-09-15 10:07:52 +0000 |
| commit | 8250a9764ea07a69a701401fd00f6d55e0ef2003 (patch) | |
| tree | 805e69dc94218e128d1d7b074f8685692f72ecd0 /lib | |
| parent | c1a1150888f48448d353897327d4d3f050bec9b4 (diff) | |
| parent | 17b69c43d5ed6ba867f5fb1da15f6af9aa7c5d00 (diff) | |
| download | pleroma-8250a9764ea07a69a701401fd00f6d55e0ef2003.tar.gz pleroma-8250a9764ea07a69a701401fd00f6d55e0ef2003.zip | |
Merge branch 'notifications-group-key' into 'develop'
Add `group_key` to notifications
See merge request pleroma/pleroma!4262
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/api_spec/operations/notification_operation.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/notification_view.ex | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/api_spec/operations/notification_operation.ex b/lib/pleroma/web/api_spec/operations/notification_operation.ex index 2dc0f66df..94d1f6b82 100644 --- a/lib/pleroma/web/api_spec/operations/notification_operation.ex +++ b/lib/pleroma/web/api_spec/operations/notification_operation.ex @@ -158,6 +158,10 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do type: :object, properties: %{ id: %Schema{type: :string}, + group_key: %Schema{ + type: :string, + description: "Group key shared by similar notifications" + }, type: notification_type(), created_at: %Schema{type: :string, format: :"date-time"}, account: %Schema{ @@ -180,6 +184,7 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do }, example: %{ "id" => "34975861", + "group-key" => "ungrouped-34975861", "type" => "mention", "created_at" => "2019-11-23T07:49:02.064Z", "account" => Account.schema().example, diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex index 3f2478719..c277af98b 100644 --- a/lib/pleroma/web/mastodon_api/views/notification_view.ex +++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex @@ -95,6 +95,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do response = %{ id: to_string(notification.id), + group_key: "ungrouped-" <> to_string(notification.id), type: notification.type, created_at: CommonAPI.Utils.to_masto_date(notification.inserted_at), account: account, |