aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/api_spec/operations/announcement_operation.ex21
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex18
-rw-r--r--lib/pleroma/web/router.ex1
3 files changed, 0 insertions, 40 deletions
diff --git a/lib/pleroma/web/api_spec/operations/announcement_operation.ex b/lib/pleroma/web/api_spec/operations/announcement_operation.ex
index c33b9e135..a66073b8b 100644
--- a/lib/pleroma/web/api_spec/operations/announcement_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/announcement_operation.ex
@@ -25,27 +25,6 @@ defmodule Pleroma.Web.ApiSpec.AnnouncementOperation do
}
end
- def show_operation do
- %Operation{
- tags: ["Announcement"],
- summary: "Display one announcement",
- operationId: "MastodonAPI.AnnouncementController.show",
- parameters: [
- Operation.parameter(
- :id,
- :path,
- :string,
- "announcement id"
- )
- ],
- responses: %{
- 200 => Operation.response("Response", "application/json", Announcement),
- 403 => Operation.response("Forbidden", "application/json", ApiError),
- 404 => Operation.response("Not Found", "application/json", ApiError)
- }
- }
- end
-
def mark_read_operation do
%Operation{
tags: ["Announcement"],
diff --git a/lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex b/lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex
index a2179f934..e6da7892c 100644
--- a/lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/announcement_controller.ex
@@ -59,22 +59,4 @@ defmodule Pleroma.Web.MastodonAPI.AnnouncementController do
{:error, :not_found}
end
end
-
- @doc "GET /api/v1/announcements/:id"
- def show(%{assigns: %{user: user}} = conn, %{id: id} = _params) do
- render_announcement_by_id(conn, id, user)
- end
-
- def show(conn, %{id: id} = _params) do
- render_announcement_by_id(conn, id)
- end
-
- def render_announcement_by_id(conn, id, user \\ nil) do
- with announcement when not is_nil(announcement) <- Announcement.get_by_id(id) do
- render(conn, "show.json", announcement: announcement, user: user)
- else
- _ ->
- {:error, :not_found}
- end
- end
end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 5be9891b1..51a9dec6b 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -628,7 +628,6 @@ defmodule Pleroma.Web.Router do
get("/directory", DirectoryController, :index)
get("/announcements", AnnouncementController, :index)
- get("/announcements/:id", AnnouncementController, :show)
end
scope "/api/v2", Pleroma.Web.MastodonAPI do