diff options
| author | feld <feld@feld.me> | 2020-04-09 19:32:11 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-04-09 19:32:11 +0000 |
| commit | c23532d24bc47b5cc11004ea80b206c092850c3c (patch) | |
| tree | 5c7c7f94208d0e6c2d1aefd63b92aa132997f853 /lib | |
| parent | e84c0450bff0f6f34f24fc66a73e6778c0d00617 (diff) | |
| parent | d545b883eb3c5b79b89a49ccaf9256c31b401145 (diff) | |
| download | pleroma-c23532d24bc47b5cc11004ea80b206c092850c3c.tar.gz | |
Merge branch 'notifications-dismiss-api' into 'develop'
Add `/api/v1/notifications/:id/dismiss` endpoint
Closes #1673
See merge request pleroma/pleroma!2360
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/notification_controller.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/router.ex | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex index 0c9218454..a6b4096ec 100644 --- a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex @@ -66,7 +66,8 @@ defmodule Pleroma.Web.MastodonAPI.NotificationController do json(conn, %{}) end - # POST /api/v1/notifications/dismiss + # POST /api/v1/notifications/:id/dismiss + # POST /api/v1/notifications/dismiss (deprecated) def dismiss(%{assigns: %{user: user}} = conn, %{"id" => id} = _params) do with {:ok, _notif} <- Notification.dismiss(user, id) do json(conn, %{}) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 3ecd59cd1..5f5ec1c81 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -352,9 +352,11 @@ defmodule Pleroma.Web.Router do get("/notifications", NotificationController, :index) get("/notifications/:id", NotificationController, :show) + post("/notifications/:id/dismiss", NotificationController, :dismiss) post("/notifications/clear", NotificationController, :clear) - post("/notifications/dismiss", NotificationController, :dismiss) delete("/notifications/destroy_multiple", NotificationController, :destroy_multiple) + # Deprecated: was removed in Mastodon v3, use `/notifications/:id/dismiss` instead + post("/notifications/dismiss", NotificationController, :dismiss) get("/scheduled_statuses", ScheduledActivityController, :index) get("/scheduled_statuses/:id", ScheduledActivityController, :show) |