From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 30 Apr 2020 09:52:07 +0000 (+0400)
Subject: Merge branch 'develop' into openapi/notifications
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9c1adb35dea9a4e86b68b98558b85de7210d563e;p=akkoma

Merge branch 'develop' into openapi/notifications
---

9c1adb35dea9a4e86b68b98558b85de7210d563e
diff --cc lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
index dcb421756,311405277..a14c86893
--- a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
@@@ -22,12 -20,8 +22,10 @@@ defmodule Pleroma.Web.MastodonAPI.Notif
  
    plug(OAuthScopesPlug, %{scopes: ["write:notifications"]} when action not in @oauth_read_actions)
  
-   plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)
- 
 +  defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.NotificationOperation
 +
    # GET /api/v1/notifications
 -  def index(conn, %{"account_id" => account_id} = params) do
 +  def index(conn, %{account_id: account_id} = params) do
      case Pleroma.User.get_cached_by_id(account_id) do
        %{ap_id: account_ap_id} ->
          params =
diff --cc lib/pleroma/web/router.ex
index fe984b06c,becce3098..ab6ae9415
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -344,27 -396,21 +396,21 @@@ defmodule Pleroma.Web.Router d
      post("/notifications/clear", NotificationController, :clear)
      delete("/notifications/destroy_multiple", NotificationController, :destroy_multiple)
      # Deprecated: was removed in Mastodon v3, use `/notifications/:id/dismiss` instead
 -    post("/notifications/dismiss", NotificationController, :dismiss)
 +    post("/notifications/dismiss", NotificationController, :dismiss_via_body)
  
-     get("/scheduled_statuses", ScheduledActivityController, :index)
-     get("/scheduled_statuses/:id", ScheduledActivityController, :show)
- 
-     get("/lists", ListController, :index)
-     get("/lists/:id", ListController, :show)
-     get("/lists/:id/accounts", ListController, :list_accounts)
- 
-     get("/domain_blocks", DomainBlockController, :index)
- 
-     get("/filters", FilterController, :index)
+     post("/polls/:id/votes", PollController, :vote)
  
-     get("/suggestions", SuggestionController, :index)
+     post("/reports", ReportController, :create)
  
-     get("/conversations", ConversationController, :index)
-     post("/conversations/:id/read", ConversationController, :read)
+     get("/scheduled_statuses", ScheduledActivityController, :index)
+     get("/scheduled_statuses/:id", ScheduledActivityController, :show)
  
-     get("/endorsements", AccountController, :endorsements)
+     put("/scheduled_statuses/:id", ScheduledActivityController, :update)
+     delete("/scheduled_statuses/:id", ScheduledActivityController, :delete)
  
-     patch("/accounts/update_credentials", AccountController, :update_credentials)
+     # Unlike `GET /api/v1/accounts/:id/favourites`, demands authentication
+     get("/favourites", StatusController, :favourites)
+     get("/bookmarks", StatusController, :bookmarks)
  
      post("/statuses", StatusController, :create)
      delete("/statuses/:id", StatusController, :delete)