No OneTemporary
Actions

Size

66 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/announcement.ex b/lib/pleroma/announcement.ex
	index 85500751e..8c15d5bdf 100644
	--- a/lib/pleroma/announcement.ex
	+++ b/lib/pleroma/announcement.ex
	@@ -1,119 +1,127 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Announcement do
	use Ecto.Schema

	import Ecto.Changeset, only: [cast: 3, validate_required: 2]
	import Ecto.Query

	alias Pleroma.AnnouncementReadRelationship
	alias Pleroma.Repo

	@type t :: %__MODULE__{}
	@primary_key {:id, FlakeId.Ecto.CompatType, autogenerate: true}

	schema "announcements" do
	field(:data, :map)
	field(:starts_at, :naive_datetime)
	field(:ends_at, :naive_datetime)

	timestamps()
	end

	def change(struct, params \\ %{}) do
	struct
	- \|> cast(validate_params(params), [:data, :starts_at, :ends_at])
	+ \|> cast(validate_params(struct, params), [:data, :starts_at, :ends_at])
	\|> validate_required([:data])
	end

	- defp validate_params(params) do
	- base_struct = %{
	- "content" => "",
	- "all_day" => false
	- }
	+ defp validate_params(struct, params) do
	+ base_data =
	+ %{
	+ "content" => "",
	+ "all_day" => false
	+ }
	+ \|> Map.merge((struct && struct.data) \|\| %{})

	merged_data =
	- Map.merge(base_struct, params.data)
	+ Map.merge(base_data, params.data)
	\|> Map.take(["content", "all_day"])

	params
	\|> Map.merge(%{data: merged_data})
	end

	def add(params) do
	changeset = change(%__MODULE__{}, params)

	Repo.insert(changeset)
	end

	+ def update(announcement, params) do
	+ changeset = change(announcement, params)
	+
	+ Repo.update(changeset)
	+ end
	+
	def list_all do
	__MODULE__
	\|> Repo.all()
	end

	def get_by_id(id) do
	Repo.get_by(__MODULE__, id: id)
	end

	def delete_by_id(id) do
	with announcement when not is_nil(announcement) <- get_by_id(id),
	{:ok, _} <- Repo.delete(announcement) do
	:ok
	else
	_ ->
	:error
	end
	end

	def read_by?(announcement, user) do
	AnnouncementReadRelationship.exists?(user, announcement)
	end

	def mark_read_by(announcement, user) do
	AnnouncementReadRelationship.mark_read(user, announcement)
	end

	def render_json(announcement, opts \\ []) do
	extra_params =
	case Keyword.fetch(opts, :for) do
	{:ok, user} when not is_nil(user) ->
	%{read: read_by?(announcement, user)}

	_ ->
	%{}
	end

	base = %{
	id: announcement.id,
	content: announcement.data["content"],
	starts_at: announcement.starts_at,
	ends_at: announcement.ends_at,
	all_day: announcement.data["all_day"],
	published_at: announcement.inserted_at,
	updated_at: announcement.updated_at,
	mentions: [],
	statuses: [],
	tags: [],
	emojis: [],
	reactions: []
	}

	base
	\|> Map.merge(extra_params)
	end

	# "visible" means:
	# starts_at < time < ends_at
	def list_all_visible_when(time) do
	__MODULE__
	\|> where([a], is_nil(a.starts_at) or a.starts_at < ^time)
	\|> where([a], is_nil(a.ends_at) or a.ends_at > ^time)
	\|> Repo.all()
	end

	def list_all_visible do
	list_all_visible_when(NaiveDateTime.utc_now())
	end
	end
	diff --git a/lib/pleroma/web/admin_api/controllers/announcement_controller.ex b/lib/pleroma/web/admin_api/controllers/announcement_controller.ex
	index ad94e2642..6195e582a 100644
	--- a/lib/pleroma/web/admin_api/controllers/announcement_controller.ex
	+++ b/lib/pleroma/web/admin_api/controllers/announcement_controller.ex
	@@ -1,63 +1,78 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.AdminAPI.AnnouncementController do
	use Pleroma.Web, :controller

	alias Pleroma.Announcement
	alias Pleroma.Web.ControllerHelper
	alias Pleroma.Web.Plugs.OAuthScopesPlug

	plug(Pleroma.Web.ApiSpec.CastAndValidate)
	- plug(OAuthScopesPlug, %{scopes: ["admin:write"]} when action in [:create, :delete])
	+ plug(OAuthScopesPlug, %{scopes: ["admin:write"]} when action in [:create, :delete, :change])
	plug(OAuthScopesPlug, %{scopes: ["admin:read"]} when action in [:index, :show])
	action_fallback(Pleroma.Web.AdminAPI.FallbackController)

	defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.Admin.AnnouncementOperation

	def index(conn, _params) do
	announcements = Announcement.list_all()

	render(conn, "index.json", announcements: announcements)
	end

	def show(conn, %{id: id} = _params) do
	announcement = Announcement.get_by_id(id)

	if is_nil(announcement) do
	{:error, :not_found}
	else
	render(conn, "show.json", announcement: announcement)
	end
	end

	def create(%{body_params: params} = conn, _params) do
	+ with {:ok, announcement} <- Announcement.add(change_params(params)) do
	+ render(conn, "show.json", announcement: announcement)
	+ else
	+ _ ->
	+ {:error, 400}
	+ end
	+ end
	+
	+ def change_params(orig_params) do
	data =
	%{}
	- \|> Pleroma.Maps.put_if_present("content", params, &Map.fetch(&1, :content))
	- \|> Pleroma.Maps.put_if_present("all_day", params, &Map.fetch(&1, :all_day))
	+ \|> Pleroma.Maps.put_if_present("content", orig_params, &Map.fetch(&1, :content))
	+ \|> Pleroma.Maps.put_if_present("all_day", orig_params, &Map.fetch(&1, :all_day))

	- add_params =
	- params
	- \|> Map.merge(%{data: data})
	+ orig_params
	+ \|> Map.merge(%{data: data})
	+ end

	- with {:ok, announcement} <- Announcement.add(add_params) do
	+ def change(%{body_params: params} = conn, %{id: id} = _params) do
	+ with announcement <- Announcement.get_by_id(id),
	+ {:exists, true} <- {:exists, not is_nil(announcement)},
	+ {:ok, announcement} <- Announcement.update(announcement, change_params(params)) do
	render(conn, "show.json", announcement: announcement)
	else
	+ {:exists, false} ->
	+ {:error, :not_found}
	+
	_ ->
	{:error, 400}
	end
	end

	def delete(conn, %{id: id} = _params) do
	case Announcement.delete_by_id(id) do
	:ok ->
	conn
	\|> ControllerHelper.json_response(:ok, %{})

	_ ->
	{:error, :not_found}
	end
	end
	end
	diff --git a/lib/pleroma/web/api_spec/operations/admin/announcement_operation.ex b/lib/pleroma/web/api_spec/operations/admin/announcement_operation.ex
	index 8179a0e7b..cdf04d357 100644
	--- a/lib/pleroma/web/api_spec/operations/admin/announcement_operation.ex
	+++ b/lib/pleroma/web/api_spec/operations/admin/announcement_operation.ex
	@@ -1,112 +1,149 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ApiSpec.Admin.AnnouncementOperation do
	alias OpenApiSpex.Operation
	alias OpenApiSpex.Schema
	alias Pleroma.Web.ApiSpec.Schemas.Announcement
	alias Pleroma.Web.ApiSpec.Schemas.ApiError

	import Pleroma.Web.ApiSpec.Helpers

	def open_api_operation(action) do
	operation = String.to_existing_atom("#{action}_operation")
	apply(__MODULE__, operation, [])
	end

	def index_operation do
	%Operation{
	tags: ["Announcement managment"],
	summary: "Retrieve a list of announcements",
	operationId: "AdminAPI.AnnouncementController.index",
	security: [%{"oAuth" => ["admin:read"]}],
	responses: %{
	200 => Operation.response("Response", "application/json", list_of_announcements()),
	403 => Operation.response("Forbidden", "application/json", ApiError)
	}
	}
	end

	def show_operation do
	%Operation{
	tags: ["Announcement managment"],
	summary: "Display one announcement",
	operationId: "AdminAPI.AnnouncementController.show",
	security: [%{"oAuth" => ["admin:read"]}],
	parameters: [
	Operation.parameter(
	:id,
	:path,
	:string,
	"announcement id"
	)
	\| admin_api_params()
	],
	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 delete_operation do
	%Operation{
	tags: ["Announcement managment"],
	summary: "Delete one announcement",
	operationId: "AdminAPI.AnnouncementController.delete",
	security: [%{"oAuth" => ["admin:write"]}],
	parameters: [
	Operation.parameter(
	:id,
	:path,
	:string,
	"announcement id"
	)
	\| admin_api_params()
	],
	responses: %{
	200 => Operation.response("Response", "application/json", %Schema{type: :object}),
	403 => Operation.response("Forbidden", "application/json", ApiError),
	404 => Operation.response("Not Found", "application/json", ApiError)
	}
	}
	end

	def create_operation do
	%Operation{
	tags: ["Announcement managment"],
	summary: "Create one announcement",
	operationId: "AdminAPI.AnnouncementController.create",
	security: [%{"oAuth" => ["admin:write"]}],
	requestBody: request_body("Parameters", create_request(), required: true),
	responses: %{
	200 => Operation.response("Response", "application/json", Announcement),
	400 => Operation.response("Bad Request", "application/json", ApiError),
	403 => Operation.response("Forbidden", "application/json", ApiError)
	}
	}
	end

	+ def change_operation do
	+ %Operation{
	+ tags: ["Announcement managment"],
	+ summary: "Change one announcement",
	+ operationId: "AdminAPI.AnnouncementController.change",
	+ security: [%{"oAuth" => ["admin:write"]}],
	+ parameters: [
	+ Operation.parameter(
	+ :id,
	+ :path,
	+ :string,
	+ "announcement id"
	+ )
	+ \| admin_api_params()
	+ ],
	+ requestBody: request_body("Parameters", change_request(), required: true),
	+ responses: %{
	+ 200 => Operation.response("Response", "application/json", Announcement),
	+ 400 => Operation.response("Bad Request", "application/json", ApiError),
	+ 403 => Operation.response("Forbidden", "application/json", ApiError),
	+ 404 => Operation.response("Not Found", "application/json", ApiError)
	+ }
	+ }
	+ end
	+
	+ defp create_or_change_props do
	+ %{
	+ content: %Schema{type: :string},
	+ starts_at: %Schema{type: :string, format: "date-time", nullable: true},
	+ ends_at: %Schema{type: :string, format: "date-time", nullable: true},
	+ all_day: %Schema{type: :boolean}
	+ }
	+ end
	+
	def create_request do
	%Schema{
	title: "AnnouncementCreateRequest",
	type: :object,
	required: [:content],
	- properties: %{
	- content: %Schema{type: :string},
	- starts_at: %Schema{type: :string, format: "date-time"},
	- ends_at: %Schema{type: :string, format: "date-time"},
	- all_day: %Schema{type: :boolean}
	- }
	+ properties: create_or_change_props()
	+ }
	+ end
	+
	+ def change_request do
	+ %Schema{
	+ title: "AnnouncementChangeRequest",
	+ type: :object,
	+ properties: create_or_change_props()
	}
	end

	def list_of_announcements do
	%Schema{
	type: :array,
	items: Announcement
	}
	end
	end
	diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
	index 51a9dec6b..af56494a2 100644
	--- a/lib/pleroma/web/router.ex
	+++ b/lib/pleroma/web/router.ex
	@@ -1,881 +1,882 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.Router do
	use Pleroma.Web, :router
	import Phoenix.LiveDashboard.Router

	pipeline :accepts_html do
	plug(:accepts, ["html"])
	end

	pipeline :accepts_html_xml do
	plug(:accepts, ["html", "xml", "rss", "atom"])
	end

	pipeline :accepts_html_json do
	plug(:accepts, ["html", "activity+json", "json"])
	end

	pipeline :accepts_html_xml_json do
	plug(:accepts, ["html", "xml", "rss", "atom", "activity+json", "json"])
	end

	pipeline :accepts_xml_rss_atom do
	plug(:accepts, ["xml", "rss", "atom"])
	end

	pipeline :browser do
	plug(:accepts, ["html"])
	plug(:fetch_session)
	end

	pipeline :oauth do
	plug(:fetch_session)
	plug(Pleroma.Web.Plugs.OAuthPlug)
	plug(Pleroma.Web.Plugs.UserEnabledPlug)
	plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
	end

	# Note: expects _user_ authentication (user-unbound app-bound tokens don't qualify)
	pipeline :expect_user_authentication do
	plug(Pleroma.Web.Plugs.ExpectAuthenticatedCheckPlug)
	end

	# Note: expects public instance or _user_ authentication (user-unbound tokens don't qualify)
	pipeline :expect_public_instance_or_user_authentication do
	plug(Pleroma.Web.Plugs.ExpectPublicOrAuthenticatedCheckPlug)
	end

	pipeline :authenticate do
	plug(Pleroma.Web.Plugs.OAuthPlug)
	plug(Pleroma.Web.Plugs.BasicAuthDecoderPlug)
	plug(Pleroma.Web.Plugs.UserFetcherPlug)
	plug(Pleroma.Web.Plugs.AuthenticationPlug)
	end

	pipeline :after_auth do
	plug(Pleroma.Web.Plugs.UserEnabledPlug)
	plug(Pleroma.Web.Plugs.SetUserSessionIdPlug)
	plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
	plug(Pleroma.Web.Plugs.UserTrackingPlug)
	end

	pipeline :base_api do
	plug(:accepts, ["json"])
	plug(:fetch_session)
	plug(:authenticate)
	plug(OpenApiSpex.Plug.PutApiSpec, module: Pleroma.Web.ApiSpec)
	end

	pipeline :no_auth_or_privacy_expectations_api do
	plug(:base_api)
	plug(:after_auth)
	plug(Pleroma.Web.Plugs.IdempotencyPlug)
	end

	# Pipeline for app-related endpoints (no user auth checks — app-bound tokens must be supported)
	pipeline :app_api do
	plug(:no_auth_or_privacy_expectations_api)
	end

	pipeline :api do
	plug(:expect_public_instance_or_user_authentication)
	plug(:no_auth_or_privacy_expectations_api)
	end

	pipeline :authenticated_api do
	plug(:expect_user_authentication)
	plug(:no_auth_or_privacy_expectations_api)
	plug(Pleroma.Web.Plugs.EnsureAuthenticatedPlug)
	end

	pipeline :admin_api do
	plug(:expect_user_authentication)
	plug(:base_api)
	plug(Pleroma.Web.Plugs.AdminSecretAuthenticationPlug)
	plug(:after_auth)
	plug(Pleroma.Web.Plugs.EnsureAuthenticatedPlug)
	plug(Pleroma.Web.Plugs.UserIsStaffPlug)
	plug(Pleroma.Web.Plugs.IdempotencyPlug)
	end

	pipeline :require_privileged_staff do
	plug(Pleroma.Web.Plugs.EnsureStaffPrivilegedPlug)
	end

	pipeline :require_admin do
	plug(Pleroma.Web.Plugs.UserIsAdminPlug)
	end

	pipeline :pleroma_html do
	plug(:browser)
	plug(:authenticate)
	plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
	end

	pipeline :well_known do
	plug(:accepts, ["json", "jrd+json", "xml", "xrd+xml"])
	end

	pipeline :config do
	plug(:accepts, ["json", "xml"])
	plug(OpenApiSpex.Plug.PutApiSpec, module: Pleroma.Web.ApiSpec)
	end

	pipeline :pleroma_api do
	plug(:accepts, ["html", "json"])
	plug(OpenApiSpex.Plug.PutApiSpec, module: Pleroma.Web.ApiSpec)
	end

	pipeline :mailbox_preview do
	plug(:accepts, ["html"])

	plug(:put_secure_browser_headers, %{
	"content-security-policy" =>
	"default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline' 'unsafe-eval'"
	})
	end

	pipeline :http_signature do
	plug(Pleroma.Web.Plugs.HTTPSignaturePlug)
	plug(Pleroma.Web.Plugs.MappedSignatureToIdentityPlug)
	end

	pipeline :static_fe do
	plug(Pleroma.Web.Plugs.StaticFEPlug)
	end

	scope "/api/v1/pleroma", Pleroma.Web.TwitterAPI do
	pipe_through(:pleroma_api)

	get("/password_reset/:token", PasswordController, :reset, as: :reset_password)
	post("/password_reset", PasswordController, :do_reset, as: :reset_password)
	get("/emoji", UtilController, :emoji)
	get("/captcha", UtilController, :captcha)
	get("/healthcheck", UtilController, :healthcheck)
	post("/remote_interaction", UtilController, :remote_interaction)
	end

	scope "/api/v1/pleroma", Pleroma.Web do
	pipe_through(:pleroma_api)
	post("/uploader_callback/:upload_path", UploaderController, :callback)
	end

	# AdminAPI: only admins can perform these actions
	scope "/api/v1/pleroma/admin", Pleroma.Web.AdminAPI do
	pipe_through([:admin_api, :require_admin])

	put("/users/disable_mfa", AdminAPIController, :disable_mfa)

	get("/users/:nickname/permission_group", AdminAPIController, :right_get)
	get("/users/:nickname/permission_group/:permission_group", AdminAPIController, :right_get)

	post("/users/:nickname/permission_group/:permission_group", AdminAPIController, :right_add)

	delete(
	"/users/:nickname/permission_group/:permission_group",
	AdminAPIController,
	:right_delete
	)

	post("/users/permission_group/:permission_group", AdminAPIController, :right_add_multiple)

	delete(
	"/users/permission_group/:permission_group",
	AdminAPIController,
	:right_delete_multiple
	)

	post("/users/follow", UserController, :follow)
	post("/users/unfollow", UserController, :unfollow)
	post("/users", UserController, :create)

	patch("/users/suggest", UserController, :suggest)
	patch("/users/unsuggest", UserController, :unsuggest)

	get("/relay", RelayController, :index)
	post("/relay", RelayController, :follow)
	delete("/relay", RelayController, :unfollow)

	patch("/users/force_password_reset", AdminAPIController, :force_password_reset)
	get("/users/:nickname/credentials", AdminAPIController, :show_user_credentials)
	patch("/users/:nickname/credentials", AdminAPIController, :update_user_credentials)

	get("/instance_document/:name", InstanceDocumentController, :show)
	patch("/instance_document/:name", InstanceDocumentController, :update)
	delete("/instance_document/:name", InstanceDocumentController, :delete)

	patch("/users/confirm_email", AdminAPIController, :confirm_email)
	patch("/users/resend_confirmation_email", AdminAPIController, :resend_confirmation_email)

	get("/config", ConfigController, :show)
	post("/config", ConfigController, :update)
	get("/config/descriptions", ConfigController, :descriptions)
	get("/need_reboot", AdminAPIController, :need_reboot)
	get("/restart", AdminAPIController, :restart)

	get("/oauth_app", OAuthAppController, :index)
	post("/oauth_app", OAuthAppController, :create)
	patch("/oauth_app/:id", OAuthAppController, :update)
	delete("/oauth_app/:id", OAuthAppController, :delete)

	get("/media_proxy_caches", MediaProxyCacheController, :index)
	post("/media_proxy_caches/delete", MediaProxyCacheController, :delete)
	post("/media_proxy_caches/purge", MediaProxyCacheController, :purge)

	get("/frontends", FrontendController, :index)
	post("/frontends/install", FrontendController, :install)

	post("/backups", AdminAPIController, :create_backup)

	get("/announcements", AnnouncementController, :index)
	post("/announcements", AnnouncementController, :create)
	get("/announcements/:id", AnnouncementController, :show)
	+ patch("/announcements/:id", AnnouncementController, :change)
	delete("/announcements/:id", AnnouncementController, :delete)
	end

	# AdminAPI: admins and mods (staff) can perform these actions (if enabled by config)
	scope "/api/v1/pleroma/admin", Pleroma.Web.AdminAPI do
	pipe_through([:admin_api, :require_privileged_staff])

	delete("/users", UserController, :delete)

	get("/users/:nickname/password_reset", AdminAPIController, :get_password_reset)
	patch("/users/:nickname/credentials", AdminAPIController, :update_user_credentials)

	get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)
	get("/users/:nickname/chats", AdminAPIController, :list_user_chats)

	get("/statuses", StatusController, :index)

	get("/chats/:id", ChatController, :show)
	get("/chats/:id/messages", ChatController, :messages)
	end

	# AdminAPI: admins and mods (staff) can perform these actions
	scope "/api/v1/pleroma/admin", Pleroma.Web.AdminAPI do
	pipe_through(:admin_api)

	put("/users/tag", AdminAPIController, :tag_users)
	delete("/users/tag", AdminAPIController, :untag_users)

	patch("/users/:nickname/toggle_activation", UserController, :toggle_activation)
	patch("/users/activate", UserController, :activate)
	patch("/users/deactivate", UserController, :deactivate)
	patch("/users/approve", UserController, :approve)

	post("/users/invite_token", InviteController, :create)
	get("/users/invites", InviteController, :index)
	post("/users/revoke_invite", InviteController, :revoke)
	post("/users/email_invite", InviteController, :email)

	get("/users", UserController, :index)
	get("/users/:nickname", UserController, :show)

	get("/instances/:instance/statuses", InstanceController, :list_statuses)
	delete("/instances/:instance", InstanceController, :delete)

	get("/reports", ReportController, :index)
	get("/reports/:id", ReportController, :show)
	patch("/reports", ReportController, :update)
	post("/reports/:id/notes", ReportController, :notes_create)
	delete("/reports/:report_id/notes/:id", ReportController, :notes_delete)

	get("/statuses/:id", StatusController, :show)
	put("/statuses/:id", StatusController, :update)
	delete("/statuses/:id", StatusController, :delete)

	get("/moderation_log", AdminAPIController, :list_log)

	post("/reload_emoji", AdminAPIController, :reload_emoji)
	get("/stats", AdminAPIController, :stats)

	delete("/chats/:id/messages/:message_id", ChatController, :delete_message)
	end

	scope "/api/v1/pleroma/emoji", Pleroma.Web.PleromaAPI do
	scope "/pack" do
	pipe_through(:admin_api)

	post("/", EmojiPackController, :create)
	patch("/", EmojiPackController, :update)
	delete("/", EmojiPackController, :delete)
	end

	scope "/pack" do
	pipe_through(:api)

	get("/", EmojiPackController, :show)
	end

	# Modifying packs
	scope "/packs" do
	pipe_through(:admin_api)

	get("/import", EmojiPackController, :import_from_filesystem)
	get("/remote", EmojiPackController, :remote)
	post("/download", EmojiPackController, :download)

	post("/files", EmojiFileController, :create)
	patch("/files", EmojiFileController, :update)
	delete("/files", EmojiFileController, :delete)
	end

	# Pack info / downloading
	scope "/packs" do
	pipe_through(:api)

	get("/", EmojiPackController, :index)
	get("/archive", EmojiPackController, :archive)
	end
	end

	scope "/", Pleroma.Web.TwitterAPI do
	pipe_through(:pleroma_html)

	post("/main/ostatus", UtilController, :remote_subscribe)
	get("/ostatus_subscribe", RemoteFollowController, :follow)
	post("/ostatus_subscribe", RemoteFollowController, :do_follow)
	end

	scope "/api/pleroma", Pleroma.Web.TwitterAPI do
	pipe_through(:authenticated_api)

	post("/change_email", UtilController, :change_email)
	post("/change_password", UtilController, :change_password)
	post("/delete_account", UtilController, :delete_account)
	put("/notification_settings", UtilController, :update_notificaton_settings)
	post("/disable_account", UtilController, :disable_account)
	end

	scope "/api/pleroma", Pleroma.Web.PleromaAPI do
	pipe_through(:authenticated_api)

	post("/mutes_import", UserImportController, :mutes)
	post("/blocks_import", UserImportController, :blocks)
	post("/follow_import", UserImportController, :follow)

	get("/accounts/mfa", TwoFactorAuthenticationController, :settings)
	get("/accounts/mfa/backup_codes", TwoFactorAuthenticationController, :backup_codes)
	get("/accounts/mfa/setup/:method", TwoFactorAuthenticationController, :setup)
	post("/accounts/mfa/confirm/:method", TwoFactorAuthenticationController, :confirm)
	delete("/accounts/mfa/:method", TwoFactorAuthenticationController, :disable)
	end

	scope "/oauth", Pleroma.Web.OAuth do
	# Note: use /api/v1/accounts/verify_credentials for userinfo of signed-in user

	get("/registration_details", OAuthController, :registration_details)

	post("/mfa/verify", MFAController, :verify, as: :mfa_verify)
	get("/mfa", MFAController, :show)

	scope [] do
	pipe_through(:oauth)

	get("/authorize", OAuthController, :authorize)
	post("/authorize", OAuthController, :create_authorization)
	end

	scope [] do
	pipe_through(:fetch_session)

	post("/token", OAuthController, :token_exchange)
	post("/revoke", OAuthController, :token_revoke)
	post("/mfa/challenge", MFAController, :challenge)
	end

	scope [] do
	pipe_through(:browser)

	get("/prepare_request", OAuthController, :prepare_request)
	get("/:provider", OAuthController, :request)
	get("/:provider/callback", OAuthController, :callback)
	post("/register", OAuthController, :register)
	end
	end

	scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
	pipe_through(:api)

	get("/apps", AppController, :index)
	get("/statuses/:id/reactions/:emoji", EmojiReactionController, :index)
	get("/statuses/:id/reactions", EmojiReactionController, :index)
	end

	scope "/api/v0/pleroma", Pleroma.Web.PleromaAPI do
	pipe_through(:authenticated_api)
	get("/reports", ReportController, :index)
	get("/reports/:id", ReportController, :show)
	end

	scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
	scope [] do
	pipe_through(:authenticated_api)

	post("/chats/by-account-id/:id", ChatController, :create)
	get("/chats", ChatController, :index)
	get("/chats/:id", ChatController, :show)
	get("/chats/:id/messages", ChatController, :messages)
	post("/chats/:id/messages", ChatController, :post_chat_message)
	delete("/chats/:id/messages/:message_id", ChatController, :delete_message)
	post("/chats/:id/read", ChatController, :mark_as_read)
	post("/chats/:id/messages/:message_id/read", ChatController, :mark_message_as_read)

	get("/conversations/:id/statuses", ConversationController, :statuses)
	get("/conversations/:id", ConversationController, :show)
	post("/conversations/read", ConversationController, :mark_as_read)
	patch("/conversations/:id", ConversationController, :update)

	put("/statuses/:id/reactions/:emoji", EmojiReactionController, :create)
	delete("/statuses/:id/reactions/:emoji", EmojiReactionController, :delete)
	post("/notifications/read", NotificationController, :mark_as_read)

	get("/mascot", MascotController, :show)
	put("/mascot", MascotController, :update)

	post("/scrobble", ScrobbleController, :create)

	get("/backups", BackupController, :index)
	post("/backups", BackupController, :create)
	end

	scope [] do
	pipe_through(:api)
	get("/accounts/:id/favourites", AccountController, :favourites)
	get("/accounts/:id/endorsements", AccountController, :endorsements)
	end

	scope [] do
	pipe_through(:authenticated_api)

	post("/accounts/:id/subscribe", AccountController, :subscribe)
	post("/accounts/:id/unsubscribe", AccountController, :unsubscribe)

	get("/birthdays", AccountController, :birthdays)
	end

	post("/accounts/confirmation_resend", AccountController, :confirmation_resend)
	end

	scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
	pipe_through(:api)
	get("/accounts/:id/scrobbles", ScrobbleController, :index)
	get("/federation_status", InstancesController, :show)
	end

	scope "/api/v2/pleroma", Pleroma.Web.PleromaAPI do
	scope [] do
	pipe_through(:authenticated_api)
	get("/chats", ChatController, :index2)
	end
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through(:authenticated_api)

	get("/accounts/verify_credentials", AccountController, :verify_credentials)
	patch("/accounts/update_credentials", AccountController, :update_credentials)

	get("/accounts/relationships", AccountController, :relationships)
	get("/accounts/:id/lists", AccountController, :lists)
	get("/accounts/:id/identity_proofs", AccountController, :identity_proofs)
	get("/endorsements", AccountController, :endorsements)
	get("/blocks", AccountController, :blocks)
	get("/mutes", AccountController, :mutes)

	post("/follows", AccountController, :follow_by_uri)
	post("/accounts/:id/follow", AccountController, :follow)
	post("/accounts/:id/unfollow", AccountController, :unfollow)
	post("/accounts/:id/block", AccountController, :block)
	post("/accounts/:id/unblock", AccountController, :unblock)
	post("/accounts/:id/mute", AccountController, :mute)
	post("/accounts/:id/unmute", AccountController, :unmute)
	post("/accounts/:id/note", AccountController, :note)
	post("/accounts/:id/pin", AccountController, :endorse)
	post("/accounts/:id/unpin", AccountController, :unendorse)

	get("/conversations", ConversationController, :index)
	post("/conversations/:id/read", ConversationController, :mark_as_read)
	delete("/conversations/:id", ConversationController, :delete)

	get("/domain_blocks", DomainBlockController, :index)
	post("/domain_blocks", DomainBlockController, :create)
	delete("/domain_blocks", DomainBlockController, :delete)

	get("/filters", FilterController, :index)

	post("/filters", FilterController, :create)
	get("/filters/:id", FilterController, :show)
	put("/filters/:id", FilterController, :update)
	delete("/filters/:id", FilterController, :delete)

	get("/follow_requests", FollowRequestController, :index)
	post("/follow_requests/:id/authorize", FollowRequestController, :authorize)
	post("/follow_requests/:id/reject", FollowRequestController, :reject)

	get("/lists", ListController, :index)
	get("/lists/:id", ListController, :show)
	get("/lists/:id/accounts", ListController, :list_accounts)

	delete("/lists/:id", ListController, :delete)
	post("/lists", ListController, :create)
	put("/lists/:id", ListController, :update)
	post("/lists/:id/accounts", ListController, :add_to_list)
	delete("/lists/:id/accounts", ListController, :remove_from_list)

	get("/markers", MarkerController, :index)
	post("/markers", MarkerController, :upsert)

	post("/media", MediaController, :create)
	get("/media/:id", MediaController, :show)
	put("/media/:id", MediaController, :update)

	get("/notifications", NotificationController, :index)
	get("/notifications/:id", NotificationController, :show)

	post("/notifications/:id/dismiss", NotificationController, :dismiss)
	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_via_body)

	post("/polls/:id/votes", PollController, :vote)

	post("/reports", ReportController, :create)

	get("/scheduled_statuses", ScheduledActivityController, :index)
	get("/scheduled_statuses/:id", ScheduledActivityController, :show)

	put("/scheduled_statuses/:id", ScheduledActivityController, :update)
	delete("/scheduled_statuses/:id", ScheduledActivityController, :delete)

	# 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)
	post("/statuses/:id/reblog", StatusController, :reblog)
	post("/statuses/:id/unreblog", StatusController, :unreblog)
	post("/statuses/:id/favourite", StatusController, :favourite)
	post("/statuses/:id/unfavourite", StatusController, :unfavourite)
	post("/statuses/:id/pin", StatusController, :pin)
	post("/statuses/:id/unpin", StatusController, :unpin)
	post("/statuses/:id/bookmark", StatusController, :bookmark)
	post("/statuses/:id/unbookmark", StatusController, :unbookmark)
	post("/statuses/:id/mute", StatusController, :mute_conversation)
	post("/statuses/:id/unmute", StatusController, :unmute_conversation)

	post("/push/subscription", SubscriptionController, :create)
	get("/push/subscription", SubscriptionController, :show)
	put("/push/subscription", SubscriptionController, :update)
	delete("/push/subscription", SubscriptionController, :delete)

	get("/suggestions", SuggestionController, :index)
	delete("/suggestions/:account_id", SuggestionController, :dismiss)

	get("/timelines/home", TimelineController, :home)
	get("/timelines/direct", TimelineController, :direct)
	get("/timelines/list/:list_id", TimelineController, :list)

	post("/announcements/:id/dismiss", AnnouncementController, :mark_read)
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through(:app_api)

	post("/apps", AppController, :create)
	get("/apps/verify_credentials", AppController, :verify_credentials)
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through(:api)

	get("/accounts/search", SearchController, :account_search)
	get("/search", SearchController, :search)

	get("/accounts/lookup", AccountController, :lookup)

	get("/accounts/:id/statuses", AccountController, :statuses)
	get("/accounts/:id/followers", AccountController, :followers)
	get("/accounts/:id/following", AccountController, :following)
	get("/accounts/:id", AccountController, :show)

	post("/accounts", AccountController, :create)

	get("/instance", InstanceController, :show)
	get("/instance/peers", InstanceController, :peers)

	get("/statuses", StatusController, :index)
	get("/statuses/:id", StatusController, :show)
	get("/statuses/:id/context", StatusController, :context)
	get("/statuses/:id/card", StatusController, :card)
	get("/statuses/:id/favourited_by", StatusController, :favourited_by)
	get("/statuses/:id/reblogged_by", StatusController, :reblogged_by)

	get("/custom_emojis", CustomEmojiController, :index)

	get("/trends", MastodonAPIController, :empty_array)

	get("/timelines/public", TimelineController, :public)
	get("/timelines/tag/:tag", TimelineController, :hashtag)

	get("/polls/:id", PollController, :show)

	get("/directory", DirectoryController, :index)

	get("/announcements", AnnouncementController, :index)
	end

	scope "/api/v2", Pleroma.Web.MastodonAPI do
	pipe_through(:api)
	get("/search", SearchController, :search2)

	post("/media", MediaController, :create2)

	get("/suggestions", SuggestionController, :index2)
	end

	scope "/api", Pleroma.Web do
	pipe_through(:config)

	get("/pleroma/frontend_configurations", TwitterAPI.UtilController, :frontend_configurations)
	end

	scope "/api", Pleroma.Web do
	pipe_through(:api)

	get(
	"/account/confirm_email/:user_id/:token",
	TwitterAPI.Controller,
	:confirm_email,
	as: :confirm_email
	)
	end

	scope "/api" do
	pipe_through(:base_api)

	get("/openapi", OpenApiSpex.Plug.RenderSpec, [])
	end

	scope "/api", Pleroma.Web, as: :authenticated_twitter_api do
	pipe_through(:authenticated_api)

	get("/oauth_tokens", TwitterAPI.Controller, :oauth_tokens)
	delete("/oauth_tokens/:id", TwitterAPI.Controller, :revoke_token)
	end

	scope "/", Pleroma.Web do
	# Note: html format is supported only if static FE is enabled
	# Note: http signature is only considered for json requests (no auth for non-json requests)
	pipe_through([:accepts_html_json, :http_signature, :static_fe])

	get("/objects/:uuid", OStatus.OStatusController, :object)
	get("/activities/:uuid", OStatus.OStatusController, :activity)
	get("/notice/:id", OStatus.OStatusController, :notice)

	# Notice compatibility routes for other frontends
	get("/@:nickname/:id", OStatus.OStatusController, :notice)
	get("/@:nickname/posts/:id", OStatus.OStatusController, :notice)
	get("/:nickname/status/:id", OStatus.OStatusController, :notice)

	# Mastodon compatibility routes
	get("/users/:nickname/statuses/:id", OStatus.OStatusController, :object)
	get("/users/:nickname/statuses/:id/activity", OStatus.OStatusController, :activity)
	end

	scope "/", Pleroma.Web do
	# Note: html format is supported only if static FE is enabled
	# Note: http signature is only considered for json requests (no auth for non-json requests)
	pipe_through([:accepts_html_xml_json, :http_signature, :static_fe])

	# Note: returns user _profile_ for json requests, redirects to user _feed_ for non-json ones
	get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed)
	end

	scope "/", Pleroma.Web do
	# Note: html format is supported only if static FE is enabled
	pipe_through([:accepts_html_xml, :static_fe])

	get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed)
	end

	scope "/", Pleroma.Web do
	pipe_through(:accepts_html)
	get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player)
	end

	scope "/", Pleroma.Web do
	pipe_through(:accepts_xml_rss_atom)
	get("/tags/:tag", Feed.TagController, :feed, as: :tag_feed)
	end

	scope "/", Pleroma.Web do
	pipe_through(:browser)
	get("/mailer/unsubscribe/:token", Mailer.SubscriptionController, :unsubscribe)
	end

	pipeline :ap_service_actor do
	plug(:accepts, ["activity+json", "json"])
	end

	# Server to Server (S2S) AP interactions
	pipeline :activitypub do
	plug(:ap_service_actor)
	plug(:http_signature)
	end

	# Client to Server (C2S) AP interactions
	pipeline :activitypub_client do
	plug(:ap_service_actor)
	plug(:fetch_session)
	plug(:authenticate)
	plug(:after_auth)
	end

	scope "/", Pleroma.Web.ActivityPub do
	pipe_through([:activitypub_client])

	get("/api/ap/whoami", ActivityPubController, :whoami)
	get("/users/:nickname/inbox", ActivityPubController, :read_inbox)

	get("/users/:nickname/outbox", ActivityPubController, :outbox)
	post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
	post("/api/ap/upload_media", ActivityPubController, :upload_media)

	# The following two are S2S as well, see `ActivityPub.fetch_follow_information_for_user/1`:
	get("/users/:nickname/followers", ActivityPubController, :followers)
	get("/users/:nickname/following", ActivityPubController, :following)
	get("/users/:nickname/collections/featured", ActivityPubController, :pinned)
	end

	scope "/", Pleroma.Web.ActivityPub do
	pipe_through(:activitypub)
	post("/inbox", ActivityPubController, :inbox)
	post("/users/:nickname/inbox", ActivityPubController, :inbox)
	end

	scope "/relay", Pleroma.Web.ActivityPub do
	pipe_through(:ap_service_actor)

	get("/", ActivityPubController, :relay)

	scope [] do
	pipe_through(:http_signature)
	post("/inbox", ActivityPubController, :inbox)
	end

	get("/following", ActivityPubController, :relay_following)
	get("/followers", ActivityPubController, :relay_followers)
	end

	scope "/internal/fetch", Pleroma.Web.ActivityPub do
	pipe_through(:ap_service_actor)

	get("/", ActivityPubController, :internal_fetch)
	post("/inbox", ActivityPubController, :inbox)
	end

	scope "/.well-known", Pleroma.Web do
	pipe_through(:well_known)

	get("/host-meta", WebFinger.WebFingerController, :host_meta)
	get("/webfinger", WebFinger.WebFingerController, :webfinger)
	get("/nodeinfo", Nodeinfo.NodeinfoController, :schemas)
	end

	scope "/nodeinfo", Pleroma.Web do
	get("/:version", Nodeinfo.NodeinfoController, :nodeinfo)
	end

	scope "/", Pleroma.Web do
	pipe_through(:api)

	get("/manifest.json", ManifestController, :show)
	end

	scope "/", Pleroma.Web do
	pipe_through(:pleroma_html)

	post("/auth/password", TwitterAPI.PasswordController, :request)
	end

	scope "/proxy/", Pleroma.Web do
	get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview)
	get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview)
	get("/:sig/:url", MediaProxy.MediaProxyController, :remote)
	get("/:sig/:url/:filename", MediaProxy.MediaProxyController, :remote)
	end

	if Pleroma.Config.get(:env) == :dev do
	scope "/dev" do
	pipe_through([:mailbox_preview])

	forward("/mailbox", Plug.Swoosh.MailboxPreview, base_path: "/dev/mailbox")
	end
	end

	scope "/" do
	pipe_through([:pleroma_html, :authenticate, :require_admin])
	live_dashboard("/phoenix/live_dashboard")
	end

	# Test-only routes needed to test action dispatching and plug chain execution
	if Pleroma.Config.get(:env) == :test do
	@test_actions [
	:do_oauth_check,
	:fallback_oauth_check,
	:skip_oauth_check,
	:fallback_oauth_skip_publicity_check,
	:skip_oauth_skip_publicity_check,
	:missing_oauth_check_definition
	]

	scope "/test/api", Pleroma.Tests do
	pipe_through(:api)

	for action <- @test_actions do
	get("/#{action}", AuthTestController, action)
	end
	end

	scope "/test/authenticated_api", Pleroma.Tests do
	pipe_through(:authenticated_api)

	for action <- @test_actions do
	get("/#{action}", AuthTestController, action)
	end
	end
	end

	scope "/", Pleroma.Web.MongooseIM do
	get("/user_exists", MongooseIMController, :user_exists)
	get("/check_password", MongooseIMController, :check_password)
	end

	scope "/", Pleroma.Web.Fallback do
	get("/registration/:token", RedirectController, :registration_page)
	get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
	match(:, "/api/pleromapath", LegacyPleromaApiRerouterPlug, [])
	get("/api*path", RedirectController, :api_not_implemented)
	get("/*path", RedirectController, :redirector_with_preload)

	options("/*path", RedirectController, :empty)
	end

	# TODO: Change to Phoenix.Router.routes/1 for Phoenix 1.6.0+
	def get_api_routes do
	__MODULE__.__routes__()
	\|> Enum.reject(fn r -> r.plug == Pleroma.Web.Fallback.RedirectController end)
	\|> Enum.map(fn r ->
	r.path
	\|> String.split("/", trim: true)
	\|> List.first()
	end)
	\|> Enum.uniq()
	end
	end
	diff --git a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
	index 5c9d50120..c6b2163d0 100644
	--- a/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
	+++ b/test/pleroma/web/admin_api/controllers/announcement_controller_test.exs
	@@ -1,108 +1,186 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.AdminAPI.AnnouncementControllerTest do
	use Pleroma.Web.ConnCase

	import Pleroma.Factory

	setup do
	admin = insert(:user, is_admin: true)
	token = insert(:oauth_admin_token, user: admin)

	conn =
	build_conn()
	\|> assign(:user, admin)
	\|> assign(:token, token)

	{:ok, %{admin: admin, token: token, conn: conn}}
	end

	describe "GET /api/v1/pleroma/admin/announcements" do
	test "it lists all announcements", %{conn: conn} do
	%{id: id} = insert(:announcement)

	response =
	conn
	\|> get("/api/v1/pleroma/admin/announcements")
	\|> json_response_and_validate_schema(:ok)

	assert [%{"id" => ^id}] = response
	end
	end

	describe "GET /api/v1/pleroma/admin/announcements/:id" do
	test "it displays one announcement", %{conn: conn} do
	%{id: id} = insert(:announcement)

	response =
	conn
	\|> get("/api/v1/pleroma/admin/announcements/#{id}")
	\|> json_response_and_validate_schema(:ok)

	assert %{"id" => ^id} = response
	end

	test "it returns not found for non-existent id", %{conn: conn} do
	%{id: id} = insert(:announcement)

	_response =
	conn
	\|> get("/api/v1/pleroma/admin/announcements/#{id}xxx")
	\|> json_response_and_validate_schema(:not_found)
	end
	end

	describe "DELETE /api/v1/pleroma/admin/announcements/:id" do
	test "it deletes specified announcement", %{conn: conn} do
	%{id: id} = insert(:announcement)

	_response =
	conn
	\|> delete("/api/v1/pleroma/admin/announcements/#{id}")
	\|> json_response_and_validate_schema(:ok)
	end

	test "it returns not found for non-existent id", %{conn: conn} do
	%{id: id} = insert(:announcement)

	_response =
	conn
	- \|> get("/api/v1/pleroma/admin/announcements/#{id}xxx")
	+ \|> delete("/api/v1/pleroma/admin/announcements/#{id}xxx")
	+ \|> json_response_and_validate_schema(:not_found)
	+
	+ assert %{id: ^id} = Pleroma.Announcement.get_by_id(id)
	+ end
	+ end
	+
	+ describe "PATCH /api/v1/pleroma/admin/announcements/:id" do
	+ test "it returns not found for non-existent id", %{conn: conn} do
	+ %{id: id} = insert(:announcement)
	+
	+ _response =
	+ conn
	+ \|> put_req_header("content-type", "application/json")
	+ \|> patch("/api/v1/pleroma/admin/announcements/#{id}xxx", %{})
	\|> json_response_and_validate_schema(:not_found)

	assert %{id: ^id} = Pleroma.Announcement.get_by_id(id)
	end
	+
	+ test "it updates a field", %{conn: conn} do
	+ %{id: id} = insert(:announcement)
	+
	+ now = NaiveDateTime.utc_now() \|> NaiveDateTime.truncate(:second)
	+ starts_at = NaiveDateTime.add(now, -10, :second)
	+
	+ _response =
	+ conn
	+ \|> put_req_header("content-type", "application/json")
	+ \|> patch("/api/v1/pleroma/admin/announcements/#{id}", %{
	+ starts_at: NaiveDateTime.to_iso8601(starts_at)
	+ })
	+ \|> json_response_and_validate_schema(:ok)
	+
	+ new = Pleroma.Announcement.get_by_id(id)
	+
	+ assert NaiveDateTime.compare(new.starts_at, starts_at) == :eq
	+ end
	+
	+ test "it updates a data field", %{conn: conn} do
	+ %{id: id} = announcement = insert(:announcement, data: %{"all_day" => true})
	+
	+ assert announcement.data["all_day"] == true
	+
	+ new_content = "new content"
	+
	+ response =
	+ conn
	+ \|> put_req_header("content-type", "application/json")
	+ \|> patch("/api/v1/pleroma/admin/announcements/#{id}", %{
	+ content: new_content
	+ })
	+ \|> json_response_and_validate_schema(:ok)
	+
	+ assert response["content"] == new_content
	+ assert response["all_day"] == true
	+
	+ new = Pleroma.Announcement.get_by_id(id)
	+
	+ assert new.data["content"] == new_content
	+ assert new.data["all_day"] == true
	+ end
	+
	+ test "it nullifies a nullable field", %{conn: conn} do
	+ now = NaiveDateTime.utc_now() \|> NaiveDateTime.truncate(:second)
	+ starts_at = NaiveDateTime.add(now, -10, :second)
	+
	+ %{id: id} = insert(:announcement, starts_at: starts_at)
	+
	+ response =
	+ conn
	+ \|> put_req_header("content-type", "application/json")
	+ \|> patch("/api/v1/pleroma/admin/announcements/#{id}", %{
	+ starts_at: nil
	+ })
	+ \|> json_response_and_validate_schema(:ok)
	+
	+ assert response["starts_at"] == nil
	+
	+ new = Pleroma.Announcement.get_by_id(id)
	+
	+ assert new.starts_at == nil
	+ end
	end

	describe "POST /api/v1/pleroma/admin/announcements" do
	test "it creates an announcement", %{conn: conn} do
	content = "test post announcement api"

	now = NaiveDateTime.utc_now() \|> NaiveDateTime.truncate(:second)
	starts_at = NaiveDateTime.add(now, -10, :second)
	ends_at = NaiveDateTime.add(now, 10, :second)

	response =
	conn
	\|> put_req_header("content-type", "application/json")
	\|> post("/api/v1/pleroma/admin/announcements", %{
	"content" => content,
	"starts_at" => NaiveDateTime.to_iso8601(starts_at),
	"ends_at" => NaiveDateTime.to_iso8601(ends_at),
	"all_day" => true
	})
	\|> json_response_and_validate_schema(:ok)

	assert %{"content" => ^content, "all_day" => true} = response

	announcement = Pleroma.Announcement.get_by_id(response["id"])

	assert not is_nil(announcement)

	assert NaiveDateTime.compare(announcement.starts_at, starts_at) == :eq
	assert NaiveDateTime.compare(announcement.ends_at, ends_at) == :eq
	end
	end
	end
	diff --git a/test/support/factory.ex b/test/support/factory.ex
	index 64b0049ac..d28a56345 100644
	--- a/test/support/factory.ex
	+++ b/test/support/factory.ex
	@@ -1,637 +1,641 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Factory do
	use ExMachina.Ecto, repo: Pleroma.Repo

	require Pleroma.Constants

	alias Pleroma.Object
	alias Pleroma.User

	def participation_factory do
	conversation = insert(:conversation)
	user = insert(:user)

	%Pleroma.Conversation.Participation{
	conversation: conversation,
	user: user,
	read: false
	}
	end

	def conversation_factory do
	%Pleroma.Conversation{
	ap_id: sequence(:ap_id, &"https://some_conversation/#{&1}")
	}
	end

	def user_factory(attrs \\ %{}) do
	user = %User{
	name: sequence(:name, &"Test テスト User #{&1}"),
	email: sequence(:email, &"user#{&1}@example.com"),
	nickname: sequence(:nickname, &"nick#{&1}"),
	password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("test"),
	bio: sequence(:bio, &"Tester Number #{&1}"),
	is_discoverable: true,
	last_digest_emailed_at: NaiveDateTime.utc_now(),
	last_refreshed_at: NaiveDateTime.utc_now(),
	notification_settings: %Pleroma.User.NotificationSetting{},
	multi_factor_authentication_settings: %Pleroma.MFA.Settings{},
	ap_enabled: true
	}

	urls =
	if attrs[:local] == false do
	base_domain = attrs[:domain] \|\| Enum.random(["domain1.com", "domain2.com", "domain3.com"])

	ap_id = "https://#{base_domain}/users/#{user.nickname}"

	%{
	ap_id: ap_id,
	follower_address: ap_id <> "/followers",
	following_address: ap_id <> "/following",
	featured_address: ap_id <> "/collections/featured"
	}
	else
	%{
	ap_id: User.ap_id(user),
	follower_address: User.ap_followers(user),
	following_address: User.ap_following(user),
	featured_address: User.ap_featured_collection(user)
	}
	end

	attrs = Map.delete(attrs, :domain)

	user
	\|> Map.put(:raw_bio, user.bio)
	\|> Map.merge(urls)
	\|> merge_attributes(attrs)
	end

	def user_relationship_factory(attrs \\ %{}) do
	source = attrs[:source] \|\| insert(:user)
	target = attrs[:target] \|\| insert(:user)
	relationship_type = attrs[:relationship_type] \|\| :block

	%Pleroma.UserRelationship{
	source_id: source.id,
	target_id: target.id,
	relationship_type: relationship_type
	}
	end

	def note_factory(attrs \\ %{}) do
	text = sequence(:text, &"This is :moominmamma: note #{&1}")

	user = attrs[:user] \|\| insert(:user)

	data = %{
	"type" => "Note",
	"content" => text,
	"source" => text,
	"id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
	"actor" => user.ap_id,
	"to" => ["https://www.w3.org/ns/activitystreams#Public"],
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"likes" => [],
	"like_count" => 0,
	"context" => "2hu",
	"summary" => "2hu",
	"tag" => ["2hu"],
	"emoji" => %{
	"2hu" => "corndog.png"
	}
	}

	%Pleroma.Object{
	data: merge_attributes(data, Map.get(attrs, :data, %{}))
	}
	end

	def attachment_note_factory(attrs \\ %{}) do
	user = attrs[:user] \|\| insert(:user)
	{length, attrs} = Map.pop(attrs, :length, 1)

	data = %{
	"attachment" =>
	Stream.repeatedly(fn -> attachment_data(user.ap_id, attrs[:href]) end)
	\|> Enum.take(length)
	}

	build(:note, Map.put(attrs, :data, data))
	end

	defp attachment_data(ap_id, href) do
	href = href \|\| sequence(:href, &"#{Pleroma.Web.Endpoint.url()}/media/#{&1}.jpg")

	%{
	"url" => [
	%{
	"href" => href,
	"type" => "Link",
	"mediaType" => "image/jpeg"
	}
	],
	"name" => "some name",
	"type" => "Document",
	"actor" => ap_id,
	"mediaType" => "image/jpeg"
	}
	end

	def followers_only_note_factory(attrs \\ %{}) do
	%Pleroma.Object{data: data} = note_factory(attrs)
	%Pleroma.Object{data: Map.merge(data, %{"to" => [data["actor"] <> "/followers"]})}
	end

	def audio_factory(attrs \\ %{}) do
	text = sequence(:text, &"lain radio episode #{&1}")

	user = attrs[:user] \|\| insert(:user)

	data = %{
	"type" => "Audio",
	"id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
	"artist" => "lain",
	"title" => text,
	"album" => "lain radio",
	"to" => ["https://www.w3.org/ns/activitystreams#Public"],
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"actor" => user.ap_id,
	"length" => 180_000
	}

	%Pleroma.Object{
	data: merge_attributes(data, Map.get(attrs, :data, %{}))
	}
	end

	def listen_factory do
	audio = insert(:audio)

	data = %{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"type" => "Listen",
	"actor" => audio.data["actor"],
	"to" => audio.data["to"],
	"object" => audio.data,
	"published" => audio.data["published"]
	}

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"]
	}
	end

	def direct_note_factory do
	user2 = insert(:user)

	%Pleroma.Object{data: data} = note_factory()
	%Pleroma.Object{data: Map.merge(data, %{"to" => [user2.ap_id]})}
	end

	def article_factory do
	%Pleroma.Object{data: data} = note_factory()
	%Pleroma.Object{data: Map.merge(data, %{"type" => "Article"})}
	end

	def tombstone_factory do
	data = %{
	"type" => "Tombstone",
	"id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
	"formerType" => "Note",
	"deleted" => DateTime.utc_now() \|> DateTime.to_iso8601()
	}

	%Pleroma.Object{
	data: data
	}
	end

	def question_factory(attrs \\ %{}) do
	user = attrs[:user] \|\| insert(:user)

	data = %{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
	"type" => "Question",
	"actor" => user.ap_id,
	"attributedTo" => user.ap_id,
	"attachment" => [],
	"to" => ["https://www.w3.org/ns/activitystreams#Public"],
	"cc" => [user.follower_address],
	"context" => Pleroma.Web.ActivityPub.Utils.generate_context_id(),
	"closed" => DateTime.utc_now() \|> DateTime.add(86_400) \|> DateTime.to_iso8601(),
	"oneOf" => [
	%{
	"type" => "Note",
	"name" => "chocolate",
	"replies" => %{"totalItems" => 0, "type" => "Collection"}
	},
	%{
	"type" => "Note",
	"name" => "vanilla",
	"replies" => %{"totalItems" => 0, "type" => "Collection"}
	}
	]
	}

	%Pleroma.Object{
	data: merge_attributes(data, Map.get(attrs, :data, %{}))
	}
	end

	def direct_note_activity_factory do
	dm = insert(:direct_note)

	data = %{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"type" => "Create",
	"actor" => dm.data["actor"],
	"to" => dm.data["to"],
	"object" => dm.data,
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"context" => dm.data["context"]
	}

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"]
	}
	end

	def add_activity_factory(attrs \\ %{}) do
	featured_collection_activity(attrs, "Add")
	end

	def remove_activity_factor(attrs \\ %{}) do
	featured_collection_activity(attrs, "Remove")
	end

	defp featured_collection_activity(attrs, type) do
	user = attrs[:user] \|\| insert(:user)
	note = attrs[:note] \|\| insert(:note, user: user)

	data_attrs =
	attrs
	\|> Map.get(:data_attrs, %{})
	\|> Map.put(:type, type)

	attrs = Map.drop(attrs, [:user, :note, :data_attrs])

	data =
	%{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"target" => user.featured_address,
	"object" => note.data["object"],
	"actor" => note.data["actor"],
	"type" => "Add",
	"to" => [Pleroma.Constants.as_public()],
	"cc" => [user.follower_address]
	}
	\|> Map.merge(data_attrs)

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"]
	}
	\|> Map.merge(attrs)
	end

	def followers_only_note_activity_factory(attrs \\ %{}) do
	user = attrs[:user] \|\| insert(:user)
	note = insert(:followers_only_note, user: user)

	data_attrs = attrs[:data_attrs] \|\| %{}
	attrs = Map.drop(attrs, [:user, :note, :data_attrs])

	data =
	%{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"type" => "Create",
	"actor" => note.data["actor"],
	"to" => note.data["to"],
	"object" => note.data,
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"context" => note.data["context"]
	}
	\|> Map.merge(data_attrs)

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"]
	}
	\|> Map.merge(attrs)
	end

	def note_activity_factory(attrs \\ %{}) do
	user = attrs[:user] \|\| insert(:user)
	note = attrs[:note] \|\| insert(:note, user: user)

	data_attrs = attrs[:data_attrs] \|\| %{}
	attrs = Map.drop(attrs, [:user, :note, :data_attrs])

	data =
	%{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"type" => "Create",
	"actor" => note.data["actor"],
	"to" => note.data["to"],
	"object" => note.data["id"],
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"context" => note.data["context"]
	}
	\|> Map.merge(data_attrs)

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"]
	}
	\|> Map.merge(attrs)
	end

	def article_activity_factory do
	article = insert(:article)

	data = %{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"type" => "Create",
	"actor" => article.data["actor"],
	"to" => article.data["to"],
	"object" => article.data,
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"context" => article.data["context"]
	}

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"]
	}
	end

	def announce_activity_factory(attrs \\ %{}) do
	note_activity = attrs[:note_activity] \|\| insert(:note_activity)
	user = attrs[:user] \|\| insert(:user)

	data = %{
	"type" => "Announce",
	"actor" => note_activity.actor,
	"object" => note_activity.data["id"],
	"to" => [user.follower_address, note_activity.data["actor"]],
	"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
	"context" => note_activity.data["context"]
	}

	%Pleroma.Activity{
	data: data,
	actor: user.ap_id,
	recipients: data["to"]
	}
	end

	def like_activity_factory(attrs \\ %{}) do
	note_activity = attrs[:note_activity] \|\| insert(:note_activity)
	object = Object.normalize(note_activity, fetch: false)
	user = insert(:user)

	data =
	%{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"actor" => user.ap_id,
	"type" => "Like",
	"object" => object.data["id"],
	"published_at" => DateTime.utc_now() \|> DateTime.to_iso8601()
	}
	\|> Map.merge(attrs[:data_attrs] \|\| %{})

	%Pleroma.Activity{
	data: data
	}
	end

	def follow_activity_factory do
	follower = insert(:user)
	followed = insert(:user)

	data = %{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"actor" => follower.ap_id,
	"type" => "Follow",
	"object" => followed.ap_id,
	"published_at" => DateTime.utc_now() \|> DateTime.to_iso8601()
	}

	%Pleroma.Activity{
	data: data,
	actor: follower.ap_id
	}
	end

	def report_activity_factory(attrs \\ %{}) do
	user = attrs[:user] \|\| insert(:user)
	activity = attrs[:activity] \|\| insert(:note_activity)
	state = attrs[:state] \|\| "open"

	data = %{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"actor" => user.ap_id,
	"type" => "Flag",
	"object" => [activity.actor, activity.data["id"]],
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"to" => [],
	"cc" => [activity.actor],
	"context" => activity.data["context"],
	"state" => state
	}

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"] ++ data["cc"]
	}
	end

	def question_activity_factory(attrs \\ %{}) do
	user = attrs[:user] \|\| insert(:user)
	question = attrs[:question] \|\| insert(:question, user: user)

	data_attrs = attrs[:data_attrs] \|\| %{}
	attrs = Map.drop(attrs, [:user, :question, :data_attrs])

	data =
	%{
	"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
	"type" => "Create",
	"actor" => question.data["actor"],
	"to" => question.data["to"],
	"object" => question.data["id"],
	"published" => DateTime.utc_now() \|> DateTime.to_iso8601(),
	"context" => question.data["context"]
	}
	\|> Map.merge(data_attrs)

	%Pleroma.Activity{
	data: data,
	actor: data["actor"],
	recipients: data["to"]
	}
	\|> Map.merge(attrs)
	end

	def oauth_app_factory do
	%Pleroma.Web.OAuth.App{
	client_name: sequence(:client_name, &"Some client #{&1}"),
	redirect_uris: "https://example.com/callback",
	scopes: ["read", "write", "follow", "push", "admin"],
	website: "https://example.com",
	client_id: Ecto.UUID.generate(),
	client_secret: "aaa;/&bbb"
	}
	end

	def instance_factory do
	%Pleroma.Instances.Instance{
	host: "domain.com",
	unreachable_since: nil
	}
	end

	def oauth_token_factory(attrs \\ %{}) do
	scopes = Map.get(attrs, :scopes, ["read"])
	oauth_app = Map.get_lazy(attrs, :app, fn -> insert(:oauth_app, scopes: scopes) end)
	user = Map.get_lazy(attrs, :user, fn -> build(:user) end)

	valid_until =
	Map.get(attrs, :valid_until, NaiveDateTime.add(NaiveDateTime.utc_now(), 60 * 10))

	%Pleroma.Web.OAuth.Token{
	token: :crypto.strong_rand_bytes(32) \|> Base.url_encode64(),
	refresh_token: :crypto.strong_rand_bytes(32) \|> Base.url_encode64(),
	scopes: scopes,
	user: user,
	app: oauth_app,
	valid_until: valid_until
	}
	end

	def oauth_admin_token_factory(attrs \\ %{}) do
	user = Map.get_lazy(attrs, :user, fn -> build(:user, is_admin: true) end)

	scopes =
	attrs
	\|> Map.get(:scopes, ["admin"])
	\|> Kernel.++(["admin"])
	\|> Enum.uniq()

	attrs = Map.merge(attrs, %{user: user, scopes: scopes})
	oauth_token_factory(attrs)
	end

	def oauth_authorization_factory do
	%Pleroma.Web.OAuth.Authorization{
	token: :crypto.strong_rand_bytes(32) \|> Base.url_encode64(padding: false),
	scopes: ["read", "write", "follow", "push"],
	valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 60 * 10),
	user: build(:user),
	app: build(:oauth_app)
	}
	end

	def push_subscription_factory do
	%Pleroma.Web.Push.Subscription{
	user: build(:user),
	token: build(:oauth_token),
	endpoint: "https://example.com/example/1234",
	key_auth: "8eDyX_uCN0XRhSbY5hs7Hg==",
	key_p256dh:
	"BCIWgsnyXDv1VkhqL2P7YRBvdeuDnlwAPT2guNhdIoW3IP7GmHh1SMKPLxRf7x8vJy6ZFK3ol2ohgn_-0yP7QQA=",
	data: %{}
	}
	end

	def notification_factory do
	%Pleroma.Notification{
	user: build(:user)
	}
	end

	def scheduled_activity_factory do
	%Pleroma.ScheduledActivity{
	user: build(:user),
	scheduled_at: NaiveDateTime.add(NaiveDateTime.utc_now(), :timer.minutes(60), :millisecond),
	params: build(:note) \|> Map.from_struct() \|> Map.get(:data)
	}
	end

	def registration_factory do
	user = insert(:user)

	%Pleroma.Registration{
	user: user,
	provider: "twitter",
	uid: "171799000",
	info: %{
	"name" => "John Doe",
	"email" => "john@doe.com",
	"nickname" => "johndoe",
	"description" => "My bio"
	}
	}
	end

	def config_factory(attrs \\ %{}) do
	%Pleroma.ConfigDB{
	key: sequence(:key, &String.to_atom("some_key_#{&1}")),
	group: :pleroma,
	value:
	sequence(
	:value,
	&%{another_key: "#{&1}somevalue", another: "#{&1}somevalue"}
	)
	}
	\|> merge_attributes(attrs)
	end

	def marker_factory do
	%Pleroma.Marker{
	user: build(:user),
	timeline: "notifications",
	lock_version: 0,
	last_read_id: "1"
	}
	end

	def mfa_token_factory do
	%Pleroma.MFA.Token{
	token: :crypto.strong_rand_bytes(32) \|> Base.url_encode64(padding: false),
	authorization: build(:oauth_authorization),
	valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 60 * 10),
	user: build(:user)
	}
	end

	def filter_factory do
	%Pleroma.Filter{
	user: build(:user),
	filter_id: sequence(:filter_id, & &1),
	phrase: "cofe",
	context: ["home"]
	}
	end

	- def announcement_factory(params \\ %{}, data \\ %{}) do
	+ def announcement_factory(params \\ %{}) do
	+ data = Map.get(params, :data, %{})
	+
	+ {_, params} = Map.pop(params, :data)
	+
	%Pleroma.Announcement{
	data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
	}
	\|> Map.merge(params)
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jun 4, 7:11 PM (1 d, 17 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1539284
Default Alt Text: (66 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions