diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-11-17 18:34:04 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-11-17 18:34:04 +0400 |
| commit | f69fe36ebfdb6fad4af853f002705f5ea3c697a1 (patch) | |
| tree | 29f21b7c20369f23f444438e2b0c3fe2bf398a58 /lib/pleroma/web/api_spec | |
| parent | 81145ecdf52c74147c842ab6c099abf5e1ad1eff (diff) | |
| parent | 61f86774d183b8ba130551999ea498e5f5c71681 (diff) | |
| download | pleroma-f69fe36ebfdb6fad4af853f002705f5ea3c697a1.tar.gz | |
Merge branch 'develop' into frontend-admin-api
Diffstat (limited to 'lib/pleroma/web/api_spec')
| -rw-r--r-- | lib/pleroma/web/api_spec/operations/notification_operation.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/api_spec/schemas/visibility_scope.ex | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/api_spec/operations/notification_operation.ex b/lib/pleroma/web/api_spec/operations/notification_operation.ex index f09be64cb..264a530d2 100644 --- a/lib/pleroma/web/api_spec/operations/notification_operation.ex +++ b/lib/pleroma/web/api_spec/operations/notification_operation.ex @@ -193,6 +193,7 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do "mention", "pleroma:emoji_reaction", "pleroma:chat_mention", + "pleroma:report", "move", "follow_request" ], @@ -206,6 +207,8 @@ defmodule Pleroma.Web.ApiSpec.NotificationOperation do - `poll` - A poll you have voted in or created has ended - `move` - Someone moved their account - `pleroma:emoji_reaction` - Someone reacted with emoji to your status + - `pleroma:chat_mention` - Someone mentioned you in a chat message + - `pleroma:report` - Someone was reported """ } end diff --git a/lib/pleroma/web/api_spec/schemas/visibility_scope.ex b/lib/pleroma/web/api_spec/schemas/visibility_scope.ex index 831734e27..633269a92 100644 --- a/lib/pleroma/web/api_spec/schemas/visibility_scope.ex +++ b/lib/pleroma/web/api_spec/schemas/visibility_scope.ex @@ -9,6 +9,6 @@ defmodule Pleroma.Web.ApiSpec.Schemas.VisibilityScope do title: "VisibilityScope", description: "Status visibility", type: :string, - enum: ["public", "unlisted", "private", "direct", "list"] + enum: ["public", "unlisted", "local", "private", "direct", "list"] }) end |