forked from YokaiRick/akkoma
Merge branch 'openapi/admin/status' into 'develop'
Add OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2566
This commit is contained in:
commit
ec470c4c77
8 changed files with 500 additions and 284 deletions
|
@ -98,13 +98,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
||||||
plug(
|
plug(
|
||||||
OAuthScopesPlug,
|
OAuthScopesPlug,
|
||||||
%{scopes: ["read:statuses"], admin: true}
|
%{scopes: ["read:statuses"], admin: true}
|
||||||
when action in [:list_statuses, :list_user_statuses, :list_instance_statuses, :status_show]
|
when action in [:list_user_statuses, :list_instance_statuses]
|
||||||
)
|
|
||||||
|
|
||||||
plug(
|
|
||||||
OAuthScopesPlug,
|
|
||||||
%{scopes: ["write:statuses"], admin: true}
|
|
||||||
when action in [:status_update, :status_delete]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
plug(
|
plug(
|
||||||
|
@ -136,7 +130,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
action_fallback(:errors)
|
action_fallback(AdminAPI.FallbackController)
|
||||||
|
|
||||||
def user_delete(conn, %{"nickname" => nickname}) do
|
def user_delete(conn, %{"nickname" => nickname}) do
|
||||||
user_delete(conn, %{"nicknames" => [nickname]})
|
user_delete(conn, %{"nicknames" => [nickname]})
|
||||||
|
@ -597,16 +591,10 @@ def email_invite(%{assigns: %{user: user}} = conn, %{"email" => email} = params)
|
||||||
json_response(conn, :no_content, "")
|
json_response(conn, :no_content, "")
|
||||||
else
|
else
|
||||||
{:registrations_open, _} ->
|
{:registrations_open, _} ->
|
||||||
errors(
|
{:error, "To send invites you need to set the `registrations_open` option to false."}
|
||||||
conn,
|
|
||||||
{:error, "To send invites you need to set the `registrations_open` option to false."}
|
|
||||||
)
|
|
||||||
|
|
||||||
{:invites_enabled, _} ->
|
{:invites_enabled, _} ->
|
||||||
errors(
|
{:error, "To send invites you need to set the `invites_enabled` option to true."}
|
||||||
conn,
|
|
||||||
{:error, "To send invites you need to set the `invites_enabled` option to true."}
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -814,71 +802,6 @@ def report_notes_delete(%{assigns: %{user: user}} = conn, %{
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def list_statuses(%{assigns: %{user: _admin}} = conn, params) do
|
|
||||||
godmode = params["godmode"] == "true" || params["godmode"] == true
|
|
||||||
local_only = params["local_only"] == "true" || params["local_only"] == true
|
|
||||||
with_reblogs = params["with_reblogs"] == "true" || params["with_reblogs"] == true
|
|
||||||
{page, page_size} = page_params(params)
|
|
||||||
|
|
||||||
activities =
|
|
||||||
ActivityPub.fetch_statuses(nil, %{
|
|
||||||
"godmode" => godmode,
|
|
||||||
"local_only" => local_only,
|
|
||||||
"limit" => page_size,
|
|
||||||
"offset" => (page - 1) * page_size,
|
|
||||||
"exclude_reblogs" => !with_reblogs && "true"
|
|
||||||
})
|
|
||||||
|
|
||||||
conn
|
|
||||||
|> put_view(AdminAPI.StatusView)
|
|
||||||
|> render("index.json", %{activities: activities, as: :activity})
|
|
||||||
end
|
|
||||||
|
|
||||||
def status_show(conn, %{"id" => id}) do
|
|
||||||
with %Activity{} = activity <- Activity.get_by_id(id) do
|
|
||||||
conn
|
|
||||||
|> put_view(MastodonAPI.StatusView)
|
|
||||||
|> render("show.json", %{activity: activity})
|
|
||||||
else
|
|
||||||
_ -> errors(conn, {:error, :not_found})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def status_update(%{assigns: %{user: admin}} = conn, %{"id" => id} = params) do
|
|
||||||
params =
|
|
||||||
params
|
|
||||||
|> Map.take(["sensitive", "visibility"])
|
|
||||||
|> Map.new(fn {key, value} -> {String.to_existing_atom(key), value} end)
|
|
||||||
|
|
||||||
with {:ok, activity} <- CommonAPI.update_activity_scope(id, params) do
|
|
||||||
{:ok, sensitive} = Ecto.Type.cast(:boolean, params[:sensitive])
|
|
||||||
|
|
||||||
ModerationLog.insert_log(%{
|
|
||||||
action: "status_update",
|
|
||||||
actor: admin,
|
|
||||||
subject: activity,
|
|
||||||
sensitive: sensitive,
|
|
||||||
visibility: params[:visibility]
|
|
||||||
})
|
|
||||||
|
|
||||||
conn
|
|
||||||
|> put_view(MastodonAPI.StatusView)
|
|
||||||
|> render("show.json", %{activity: activity})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def status_delete(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
||||||
with {:ok, %Activity{}} <- CommonAPI.delete(id, user) do
|
|
||||||
ModerationLog.insert_log(%{
|
|
||||||
action: "status_delete",
|
|
||||||
actor: user,
|
|
||||||
subject_id: id
|
|
||||||
})
|
|
||||||
|
|
||||||
json(conn, %{})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def list_log(conn, params) do
|
def list_log(conn, params) do
|
||||||
{page, page_size} = page_params(params)
|
{page, page_size} = page_params(params)
|
||||||
|
|
||||||
|
@ -904,7 +827,7 @@ def config_descriptions(conn, _params) do
|
||||||
end
|
end
|
||||||
|
|
||||||
def config_show(conn, %{"only_db" => true}) do
|
def config_show(conn, %{"only_db" => true}) do
|
||||||
with :ok <- configurable_from_database(conn) do
|
with :ok <- configurable_from_database() do
|
||||||
configs = Pleroma.Repo.all(ConfigDB)
|
configs = Pleroma.Repo.all(ConfigDB)
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|
@ -914,7 +837,7 @@ def config_show(conn, %{"only_db" => true}) do
|
||||||
end
|
end
|
||||||
|
|
||||||
def config_show(conn, _params) do
|
def config_show(conn, _params) do
|
||||||
with :ok <- configurable_from_database(conn) do
|
with :ok <- configurable_from_database() do
|
||||||
configs = ConfigDB.get_all_as_keyword()
|
configs = ConfigDB.get_all_as_keyword()
|
||||||
|
|
||||||
merged =
|
merged =
|
||||||
|
@ -953,7 +876,7 @@ def config_show(conn, _params) do
|
||||||
end
|
end
|
||||||
|
|
||||||
def config_update(conn, %{"configs" => configs}) do
|
def config_update(conn, %{"configs" => configs}) do
|
||||||
with :ok <- configurable_from_database(conn) do
|
with :ok <- configurable_from_database() do
|
||||||
{_errors, results} =
|
{_errors, results} =
|
||||||
configs
|
configs
|
||||||
|> Enum.filter(&whitelisted_config?/1)
|
|> Enum.filter(&whitelisted_config?/1)
|
||||||
|
@ -997,7 +920,7 @@ def config_update(conn, %{"configs" => configs}) do
|
||||||
end
|
end
|
||||||
|
|
||||||
def restart(conn, _params) do
|
def restart(conn, _params) do
|
||||||
with :ok <- configurable_from_database(conn) do
|
with :ok <- configurable_from_database() do
|
||||||
Restarter.Pleroma.restart(Config.get(:env), 50)
|
Restarter.Pleroma.restart(Config.get(:env), 50)
|
||||||
|
|
||||||
json(conn, %{})
|
json(conn, %{})
|
||||||
|
@ -1008,14 +931,11 @@ def need_reboot(conn, _params) do
|
||||||
json(conn, %{need_reboot: Restarter.Pleroma.need_reboot?()})
|
json(conn, %{need_reboot: Restarter.Pleroma.need_reboot?()})
|
||||||
end
|
end
|
||||||
|
|
||||||
defp configurable_from_database(conn) do
|
defp configurable_from_database do
|
||||||
if Config.get(:configurable_from_database) do
|
if Config.get(:configurable_from_database) do
|
||||||
:ok
|
:ok
|
||||||
else
|
else
|
||||||
errors(
|
{:error, "To use this endpoint you need to enable configuration from database."}
|
||||||
conn,
|
|
||||||
{:error, "To use this endpoint you need to enable configuration from database."}
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1159,30 +1079,6 @@ def stats(conn, _) do
|
||||||
|> json(%{"status_visibility" => count})
|
|> json(%{"status_visibility" => count})
|
||||||
end
|
end
|
||||||
|
|
||||||
defp errors(conn, {:error, :not_found}) do
|
|
||||||
conn
|
|
||||||
|> put_status(:not_found)
|
|
||||||
|> json(dgettext("errors", "Not found"))
|
|
||||||
end
|
|
||||||
|
|
||||||
defp errors(conn, {:error, reason}) do
|
|
||||||
conn
|
|
||||||
|> put_status(:bad_request)
|
|
||||||
|> json(reason)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp errors(conn, {:param_cast, _}) do
|
|
||||||
conn
|
|
||||||
|> put_status(:bad_request)
|
|
||||||
|> json(dgettext("errors", "Invalid parameters"))
|
|
||||||
end
|
|
||||||
|
|
||||||
defp errors(conn, _) do
|
|
||||||
conn
|
|
||||||
|> put_status(:internal_server_error)
|
|
||||||
|> json(dgettext("errors", "Something went wrong"))
|
|
||||||
end
|
|
||||||
|
|
||||||
defp page_params(params) do
|
defp page_params(params) do
|
||||||
{get_page(params["page"]), get_page_size(params["page_size"])}
|
{get_page(params["page"]), get_page_size(params["page_size"])}
|
||||||
end
|
end
|
31
lib/pleroma/web/admin_api/controllers/fallback_controller.ex
Normal file
31
lib/pleroma/web/admin_api/controllers/fallback_controller.ex
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.AdminAPI.FallbackController do
|
||||||
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
|
def call(conn, {:error, :not_found}) do
|
||||||
|
conn
|
||||||
|
|> put_status(:not_found)
|
||||||
|
|> json(%{error: dgettext("errors", "Not found")})
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(conn, {:error, reason}) do
|
||||||
|
conn
|
||||||
|
|> put_status(:bad_request)
|
||||||
|
|> json(%{error: reason})
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(conn, {:param_cast, _}) do
|
||||||
|
conn
|
||||||
|
|> put_status(:bad_request)
|
||||||
|
|> json(dgettext("errors", "Invalid parameters"))
|
||||||
|
end
|
||||||
|
|
||||||
|
def call(conn, _) do
|
||||||
|
conn
|
||||||
|
|> put_status(:internal_server_error)
|
||||||
|
|> json(%{error: dgettext("errors", "Something went wrong")})
|
||||||
|
end
|
||||||
|
end
|
79
lib/pleroma/web/admin_api/controllers/status_controller.ex
Normal file
79
lib/pleroma/web/admin_api/controllers/status_controller.ex
Normal file
|
@ -0,0 +1,79 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.AdminAPI.StatusController do
|
||||||
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
|
alias Pleroma.Activity
|
||||||
|
alias Pleroma.ModerationLog
|
||||||
|
alias Pleroma.Plugs.OAuthScopesPlug
|
||||||
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
|
alias Pleroma.Web.CommonAPI
|
||||||
|
alias Pleroma.Web.MastodonAPI
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
|
||||||
|
plug(Pleroma.Web.ApiSpec.CastAndValidate)
|
||||||
|
plug(OAuthScopesPlug, %{scopes: ["read:statuses"], admin: true} when action in [:index, :show])
|
||||||
|
|
||||||
|
plug(
|
||||||
|
OAuthScopesPlug,
|
||||||
|
%{scopes: ["write:statuses"], admin: true} when action in [:update, :delete]
|
||||||
|
)
|
||||||
|
|
||||||
|
action_fallback(Pleroma.Web.AdminAPI.FallbackController)
|
||||||
|
|
||||||
|
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.Admin.StatusOperation
|
||||||
|
|
||||||
|
def index(%{assigns: %{user: _admin}} = conn, params) do
|
||||||
|
activities =
|
||||||
|
ActivityPub.fetch_statuses(nil, %{
|
||||||
|
"godmode" => params.godmode,
|
||||||
|
"local_only" => params.local_only,
|
||||||
|
"limit" => params.page_size,
|
||||||
|
"offset" => (params.page - 1) * params.page_size,
|
||||||
|
"exclude_reblogs" => not params.with_reblogs
|
||||||
|
})
|
||||||
|
|
||||||
|
render(conn, "index.json", activities: activities, as: :activity)
|
||||||
|
end
|
||||||
|
|
||||||
|
def show(conn, %{id: id}) do
|
||||||
|
with %Activity{} = activity <- Activity.get_by_id(id) do
|
||||||
|
conn
|
||||||
|
|> put_view(MastodonAPI.StatusView)
|
||||||
|
|> render("show.json", %{activity: activity})
|
||||||
|
else
|
||||||
|
nil -> {:error, :not_found}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def update(%{assigns: %{user: admin}, body_params: params} = conn, %{id: id}) do
|
||||||
|
with {:ok, activity} <- CommonAPI.update_activity_scope(id, params) do
|
||||||
|
ModerationLog.insert_log(%{
|
||||||
|
action: "status_update",
|
||||||
|
actor: admin,
|
||||||
|
subject: activity,
|
||||||
|
sensitive: params[:sensitive],
|
||||||
|
visibility: params[:visibility]
|
||||||
|
})
|
||||||
|
|
||||||
|
conn
|
||||||
|
|> put_view(MastodonAPI.StatusView)
|
||||||
|
|> render("show.json", %{activity: activity})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def delete(%{assigns: %{user: user}} = conn, %{id: id}) do
|
||||||
|
with {:ok, %Activity{}} <- CommonAPI.delete(id, user) do
|
||||||
|
ModerationLog.insert_log(%{
|
||||||
|
action: "status_delete",
|
||||||
|
actor: user,
|
||||||
|
subject_id: id
|
||||||
|
})
|
||||||
|
|
||||||
|
json(conn, %{})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
165
lib/pleroma/web/api_spec/operations/admin/status_operation.ex
Normal file
165
lib/pleroma/web/api_spec/operations/admin/status_operation.ex
Normal file
|
@ -0,0 +1,165 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.ApiSpec.Admin.StatusOperation do
|
||||||
|
alias OpenApiSpex.Operation
|
||||||
|
alias OpenApiSpex.Schema
|
||||||
|
alias Pleroma.Web.ApiSpec.Schemas.Account
|
||||||
|
alias Pleroma.Web.ApiSpec.Schemas.ApiError
|
||||||
|
alias Pleroma.Web.ApiSpec.Schemas.FlakeID
|
||||||
|
alias Pleroma.Web.ApiSpec.Schemas.Status
|
||||||
|
alias Pleroma.Web.ApiSpec.Schemas.VisibilityScope
|
||||||
|
|
||||||
|
import Pleroma.Web.ApiSpec.Helpers
|
||||||
|
import Pleroma.Web.ApiSpec.StatusOperation, only: [id_param: 0]
|
||||||
|
|
||||||
|
def open_api_operation(action) do
|
||||||
|
operation = String.to_existing_atom("#{action}_operation")
|
||||||
|
apply(__MODULE__, operation, [])
|
||||||
|
end
|
||||||
|
|
||||||
|
def index_operation do
|
||||||
|
%Operation{
|
||||||
|
tags: ["Admin", "Statuses"],
|
||||||
|
operationId: "AdminAPI.StatusController.index",
|
||||||
|
security: [%{"oAuth" => ["read:statuses"]}],
|
||||||
|
parameters: [
|
||||||
|
Operation.parameter(
|
||||||
|
:godmode,
|
||||||
|
:query,
|
||||||
|
%Schema{type: :boolean, default: false},
|
||||||
|
"Allows to see private statuses"
|
||||||
|
),
|
||||||
|
Operation.parameter(
|
||||||
|
:local_only,
|
||||||
|
:query,
|
||||||
|
%Schema{type: :boolean, default: false},
|
||||||
|
"Excludes remote statuses"
|
||||||
|
),
|
||||||
|
Operation.parameter(
|
||||||
|
:with_reblogs,
|
||||||
|
:query,
|
||||||
|
%Schema{type: :boolean, default: false},
|
||||||
|
"Allows to see reblogs"
|
||||||
|
),
|
||||||
|
Operation.parameter(
|
||||||
|
:page,
|
||||||
|
:query,
|
||||||
|
%Schema{type: :integer, default: 1},
|
||||||
|
"Page"
|
||||||
|
),
|
||||||
|
Operation.parameter(
|
||||||
|
:page_size,
|
||||||
|
:query,
|
||||||
|
%Schema{type: :integer, default: 50},
|
||||||
|
"Number of statuses to return"
|
||||||
|
)
|
||||||
|
],
|
||||||
|
responses: %{
|
||||||
|
200 =>
|
||||||
|
Operation.response("Array of statuses", "application/json", %Schema{
|
||||||
|
type: :array,
|
||||||
|
items: status()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
def show_operation do
|
||||||
|
%Operation{
|
||||||
|
tags: ["Admin", "Statuses"],
|
||||||
|
summary: "Show Status",
|
||||||
|
operationId: "AdminAPI.StatusController.show",
|
||||||
|
parameters: [id_param()],
|
||||||
|
security: [%{"oAuth" => ["read:statuses"]}],
|
||||||
|
responses: %{
|
||||||
|
200 => Operation.response("Status", "application/json", Status),
|
||||||
|
404 => Operation.response("Not Found", "application/json", ApiError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
def update_operation do
|
||||||
|
%Operation{
|
||||||
|
tags: ["Admin", "Statuses"],
|
||||||
|
summary: "Change the scope of an individual reported status",
|
||||||
|
operationId: "AdminAPI.StatusController.update",
|
||||||
|
parameters: [id_param()],
|
||||||
|
security: [%{"oAuth" => ["write:statuses"]}],
|
||||||
|
requestBody: request_body("Parameters", update_request(), required: true),
|
||||||
|
responses: %{
|
||||||
|
200 => Operation.response("Status", "application/json", Status),
|
||||||
|
400 => Operation.response("Error", "application/json", ApiError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
def delete_operation do
|
||||||
|
%Operation{
|
||||||
|
tags: ["Admin", "Statuses"],
|
||||||
|
summary: "Delete an individual reported status",
|
||||||
|
operationId: "AdminAPI.StatusController.delete",
|
||||||
|
parameters: [id_param()],
|
||||||
|
security: [%{"oAuth" => ["write:statuses"]}],
|
||||||
|
responses: %{
|
||||||
|
200 => empty_object_response(),
|
||||||
|
404 => Operation.response("Not Found", "application/json", ApiError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp status do
|
||||||
|
%Schema{
|
||||||
|
anyOf: [
|
||||||
|
Status,
|
||||||
|
%Schema{
|
||||||
|
type: :object,
|
||||||
|
properties: %{
|
||||||
|
account: %Schema{allOf: [Account, admin_account()]}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp admin_account do
|
||||||
|
%Schema{
|
||||||
|
type: :object,
|
||||||
|
properties: %{
|
||||||
|
id: FlakeID,
|
||||||
|
avatar: %Schema{type: :string},
|
||||||
|
nickname: %Schema{type: :string},
|
||||||
|
display_name: %Schema{type: :string},
|
||||||
|
deactivated: %Schema{type: :boolean},
|
||||||
|
local: %Schema{type: :boolean},
|
||||||
|
roles: %Schema{
|
||||||
|
type: :object,
|
||||||
|
properties: %{
|
||||||
|
admin: %Schema{type: :boolean},
|
||||||
|
moderator: %Schema{type: :boolean}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
tags: %Schema{type: :string},
|
||||||
|
confirmation_pending: %Schema{type: :string}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
defp update_request do
|
||||||
|
%Schema{
|
||||||
|
type: :object,
|
||||||
|
properties: %{
|
||||||
|
sensitive: %Schema{
|
||||||
|
type: :boolean,
|
||||||
|
description: "Mark status and attached media as sensitive?"
|
||||||
|
},
|
||||||
|
visibility: VisibilityScope
|
||||||
|
},
|
||||||
|
example: %{
|
||||||
|
"visibility" => "private",
|
||||||
|
"sensitive" => "false"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
|
@ -487,7 +487,7 @@ defp create_request do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
defp id_param do
|
def id_param do
|
||||||
Operation.parameter(:id, :path, FlakeID, "Status ID",
|
Operation.parameter(:id, :path, FlakeID, "Status ID",
|
||||||
example: "9umDrYheeY451cQnEe",
|
example: "9umDrYheeY451cQnEe",
|
||||||
required: true
|
required: true
|
||||||
|
|
|
@ -189,10 +189,10 @@ defmodule Pleroma.Web.Router do
|
||||||
post("/reports/:id/notes", AdminAPIController, :report_notes_create)
|
post("/reports/:id/notes", AdminAPIController, :report_notes_create)
|
||||||
delete("/reports/:report_id/notes/:id", AdminAPIController, :report_notes_delete)
|
delete("/reports/:report_id/notes/:id", AdminAPIController, :report_notes_delete)
|
||||||
|
|
||||||
get("/statuses/:id", AdminAPIController, :status_show)
|
get("/statuses/:id", StatusController, :show)
|
||||||
put("/statuses/:id", AdminAPIController, :status_update)
|
put("/statuses/:id", StatusController, :update)
|
||||||
delete("/statuses/:id", AdminAPIController, :status_delete)
|
delete("/statuses/:id", StatusController, :delete)
|
||||||
get("/statuses", AdminAPIController, :list_statuses)
|
get("/statuses", StatusController, :index)
|
||||||
|
|
||||||
get("/config", AdminAPIController, :config_show)
|
get("/config", AdminAPIController, :config_show)
|
||||||
post("/config", AdminAPIController, :config_update)
|
post("/config", AdminAPIController, :config_update)
|
||||||
|
|
|
@ -351,7 +351,7 @@ test "when the user doesn't exist", %{conn: conn} do
|
||||||
|
|
||||||
conn = get(conn, "/api/pleroma/admin/users/#{user.nickname}")
|
conn = get(conn, "/api/pleroma/admin/users/#{user.nickname}")
|
||||||
|
|
||||||
assert "Not found" == json_response(conn, 404)
|
assert %{"error" => "Not found"} == json_response(conn, 404)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -684,7 +684,10 @@ test "it returns 500 if `invites_enabled` is not enabled", %{conn: conn} do
|
||||||
conn = post(conn, "/api/pleroma/admin/users/email_invite?email=foo@bar.com&name=JD")
|
conn = post(conn, "/api/pleroma/admin/users/email_invite?email=foo@bar.com&name=JD")
|
||||||
|
|
||||||
assert json_response(conn, :bad_request) ==
|
assert json_response(conn, :bad_request) ==
|
||||||
"To send invites you need to set the `invites_enabled` option to true."
|
%{
|
||||||
|
"error" =>
|
||||||
|
"To send invites you need to set the `invites_enabled` option to true."
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it returns 500 if `registrations_open` is enabled", %{conn: conn} do
|
test "it returns 500 if `registrations_open` is enabled", %{conn: conn} do
|
||||||
|
@ -694,7 +697,10 @@ test "it returns 500 if `registrations_open` is enabled", %{conn: conn} do
|
||||||
conn = post(conn, "/api/pleroma/admin/users/email_invite?email=foo@bar.com&name=JD")
|
conn = post(conn, "/api/pleroma/admin/users/email_invite?email=foo@bar.com&name=JD")
|
||||||
|
|
||||||
assert json_response(conn, :bad_request) ==
|
assert json_response(conn, :bad_request) ==
|
||||||
"To send invites you need to set the `registrations_open` option to false."
|
%{
|
||||||
|
"error" =>
|
||||||
|
"To send invites you need to set the `registrations_open` option to false."
|
||||||
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1308,7 +1314,7 @@ test "returns 404 if user not found", %{conn: conn} do
|
||||||
|> put("/api/pleroma/admin/users/disable_mfa", %{nickname: "nickname"})
|
|> put("/api/pleroma/admin/users/disable_mfa", %{nickname: "nickname"})
|
||||||
|> json_response(404)
|
|> json_response(404)
|
||||||
|
|
||||||
assert response == "Not found"
|
assert response == %{"error" => "Not found"}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1414,7 +1420,7 @@ test "with token", %{conn: conn} do
|
||||||
test "with invalid token", %{conn: conn} do
|
test "with invalid token", %{conn: conn} do
|
||||||
conn = post(conn, "/api/pleroma/admin/users/revoke_invite", %{"token" => "foo"})
|
conn = post(conn, "/api/pleroma/admin/users/revoke_invite", %{"token" => "foo"})
|
||||||
|
|
||||||
assert json_response(conn, :not_found) == "Not found"
|
assert json_response(conn, :not_found) == %{"error" => "Not found"}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1441,7 +1447,7 @@ test "returns report by its id", %{conn: conn} do
|
||||||
test "returns 404 when report id is invalid", %{conn: conn} do
|
test "returns 404 when report id is invalid", %{conn: conn} do
|
||||||
conn = get(conn, "/api/pleroma/admin/reports/test")
|
conn = get(conn, "/api/pleroma/admin/reports/test")
|
||||||
|
|
||||||
assert json_response(conn, :not_found) == "Not found"
|
assert json_response(conn, :not_found) == %{"error" => "Not found"}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1698,115 +1704,6 @@ test "returns 403 when requested by anonymous" do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "GET /api/pleroma/admin/statuses/:id" do
|
|
||||||
test "not found", %{conn: conn} do
|
|
||||||
assert conn
|
|
||||||
|> get("/api/pleroma/admin/statuses/not_found")
|
|
||||||
|> json_response(:not_found)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "shows activity", %{conn: conn} do
|
|
||||||
activity = insert(:note_activity)
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> get("/api/pleroma/admin/statuses/#{activity.id}")
|
|
||||||
|> json_response(200)
|
|
||||||
|
|
||||||
assert response["id"] == activity.id
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "PUT /api/pleroma/admin/statuses/:id" do
|
|
||||||
setup do
|
|
||||||
activity = insert(:note_activity)
|
|
||||||
|
|
||||||
%{id: activity.id}
|
|
||||||
end
|
|
||||||
|
|
||||||
test "toggle sensitive flag", %{conn: conn, id: id, admin: admin} do
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> put("/api/pleroma/admin/statuses/#{id}", %{"sensitive" => "true"})
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
assert response["sensitive"]
|
|
||||||
|
|
||||||
log_entry = Repo.one(ModerationLog)
|
|
||||||
|
|
||||||
assert ModerationLog.get_log_entry_message(log_entry) ==
|
|
||||||
"@#{admin.nickname} updated status ##{id}, set sensitive: 'true'"
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> put("/api/pleroma/admin/statuses/#{id}", %{"sensitive" => "false"})
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
refute response["sensitive"]
|
|
||||||
end
|
|
||||||
|
|
||||||
test "change visibility flag", %{conn: conn, id: id, admin: admin} do
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> put("/api/pleroma/admin/statuses/#{id}", %{visibility: "public"})
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
assert response["visibility"] == "public"
|
|
||||||
|
|
||||||
log_entry = Repo.one(ModerationLog)
|
|
||||||
|
|
||||||
assert ModerationLog.get_log_entry_message(log_entry) ==
|
|
||||||
"@#{admin.nickname} updated status ##{id}, set visibility: 'public'"
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> put("/api/pleroma/admin/statuses/#{id}", %{visibility: "private"})
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
assert response["visibility"] == "private"
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> put("/api/pleroma/admin/statuses/#{id}", %{visibility: "unlisted"})
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
assert response["visibility"] == "unlisted"
|
|
||||||
end
|
|
||||||
|
|
||||||
test "returns 400 when visibility is unknown", %{conn: conn, id: id} do
|
|
||||||
conn = put(conn, "/api/pleroma/admin/statuses/#{id}", %{visibility: "test"})
|
|
||||||
|
|
||||||
assert json_response(conn, :bad_request) == "Unsupported visibility"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "DELETE /api/pleroma/admin/statuses/:id" do
|
|
||||||
setup do
|
|
||||||
activity = insert(:note_activity)
|
|
||||||
|
|
||||||
%{id: activity.id}
|
|
||||||
end
|
|
||||||
|
|
||||||
test "deletes status", %{conn: conn, id: id, admin: admin} do
|
|
||||||
conn
|
|
||||||
|> delete("/api/pleroma/admin/statuses/#{id}")
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
refute Activity.get_by_id(id)
|
|
||||||
|
|
||||||
log_entry = Repo.one(ModerationLog)
|
|
||||||
|
|
||||||
assert ModerationLog.get_log_entry_message(log_entry) ==
|
|
||||||
"@#{admin.nickname} deleted status ##{id}"
|
|
||||||
end
|
|
||||||
|
|
||||||
test "returns 404 when the status does not exist", %{conn: conn} do
|
|
||||||
conn = delete(conn, "/api/pleroma/admin/statuses/test")
|
|
||||||
|
|
||||||
assert json_response(conn, :not_found) == "Not found"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "GET /api/pleroma/admin/config" do
|
describe "GET /api/pleroma/admin/config" do
|
||||||
setup do: clear_config(:configurable_from_database, true)
|
setup do: clear_config(:configurable_from_database, true)
|
||||||
|
|
||||||
|
@ -1815,7 +1712,9 @@ test "when configuration from database is off", %{conn: conn} do
|
||||||
conn = get(conn, "/api/pleroma/admin/config")
|
conn = get(conn, "/api/pleroma/admin/config")
|
||||||
|
|
||||||
assert json_response(conn, 400) ==
|
assert json_response(conn, 400) ==
|
||||||
"To use this endpoint you need to enable configuration from database."
|
%{
|
||||||
|
"error" => "To use this endpoint you need to enable configuration from database."
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
test "with settings only in db", %{conn: conn} do
|
test "with settings only in db", %{conn: conn} do
|
||||||
|
@ -1937,7 +1836,7 @@ test "POST /api/pleroma/admin/config error", %{conn: conn} do
|
||||||
conn = post(conn, "/api/pleroma/admin/config", %{"configs" => []})
|
conn = post(conn, "/api/pleroma/admin/config", %{"configs" => []})
|
||||||
|
|
||||||
assert json_response(conn, 400) ==
|
assert json_response(conn, 400) ==
|
||||||
"To use this endpoint you need to enable configuration from database."
|
%{"error" => "To use this endpoint you need to enable configuration from database."}
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "POST /api/pleroma/admin/config" do
|
describe "POST /api/pleroma/admin/config" do
|
||||||
|
@ -3000,54 +2899,6 @@ test "need_reboot flag", %{conn: conn} do
|
||||||
on_exit(fn -> Restarter.Pleroma.refresh() end)
|
on_exit(fn -> Restarter.Pleroma.refresh() end)
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "GET /api/pleroma/admin/statuses" do
|
|
||||||
test "returns all public and unlisted statuses", %{conn: conn, admin: admin} do
|
|
||||||
blocked = insert(:user)
|
|
||||||
user = insert(:user)
|
|
||||||
User.block(admin, blocked)
|
|
||||||
|
|
||||||
{:ok, _} = CommonAPI.post(user, %{status: "@#{admin.nickname}", visibility: "direct"})
|
|
||||||
|
|
||||||
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "unlisted"})
|
|
||||||
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "private"})
|
|
||||||
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "public"})
|
|
||||||
{:ok, _} = CommonAPI.post(blocked, %{status: ".", visibility: "public"})
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> get("/api/pleroma/admin/statuses")
|
|
||||||
|> json_response(200)
|
|
||||||
|
|
||||||
refute "private" in Enum.map(response, & &1["visibility"])
|
|
||||||
assert length(response) == 3
|
|
||||||
end
|
|
||||||
|
|
||||||
test "returns only local statuses with local_only on", %{conn: conn} do
|
|
||||||
user = insert(:user)
|
|
||||||
remote_user = insert(:user, local: false, nickname: "archaeme@archae.me")
|
|
||||||
insert(:note_activity, user: user, local: true)
|
|
||||||
insert(:note_activity, user: remote_user, local: false)
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> get("/api/pleroma/admin/statuses?local_only=true")
|
|
||||||
|> json_response(200)
|
|
||||||
|
|
||||||
assert length(response) == 1
|
|
||||||
end
|
|
||||||
|
|
||||||
test "returns private and direct statuses with godmode on", %{conn: conn, admin: admin} do
|
|
||||||
user = insert(:user)
|
|
||||||
|
|
||||||
{:ok, _} = CommonAPI.post(user, %{status: "@#{admin.nickname}", visibility: "direct"})
|
|
||||||
|
|
||||||
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "private"})
|
|
||||||
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "public"})
|
|
||||||
conn = get(conn, "/api/pleroma/admin/statuses?godmode=true")
|
|
||||||
assert json_response(conn, 200) |> length() == 3
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "GET /api/pleroma/admin/users/:nickname/statuses" do
|
describe "GET /api/pleroma/admin/users/:nickname/statuses" do
|
||||||
setup do
|
setup do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
194
test/web/admin_api/controllers/status_controller_test.exs
Normal file
194
test/web/admin_api/controllers/status_controller_test.exs
Normal file
|
@ -0,0 +1,194 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.AdminAPI.StatusControllerTest do
|
||||||
|
use Pleroma.Web.ConnCase
|
||||||
|
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
alias Pleroma.Activity
|
||||||
|
alias Pleroma.Config
|
||||||
|
alias Pleroma.ModerationLog
|
||||||
|
alias Pleroma.Repo
|
||||||
|
alias Pleroma.User
|
||||||
|
alias Pleroma.Web.CommonAPI
|
||||||
|
|
||||||
|
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/pleroma/admin/statuses/:id" do
|
||||||
|
test "not found", %{conn: conn} do
|
||||||
|
assert conn
|
||||||
|
|> get("/api/pleroma/admin/statuses/not_found")
|
||||||
|
|> json_response_and_validate_schema(:not_found)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "shows activity", %{conn: conn} do
|
||||||
|
activity = insert(:note_activity)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> get("/api/pleroma/admin/statuses/#{activity.id}")
|
||||||
|
|> json_response_and_validate_schema(200)
|
||||||
|
|
||||||
|
assert response["id"] == activity.id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "PUT /api/pleroma/admin/statuses/:id" do
|
||||||
|
setup do
|
||||||
|
activity = insert(:note_activity)
|
||||||
|
|
||||||
|
%{id: activity.id}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "toggle sensitive flag", %{conn: conn, id: id, admin: admin} do
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("content-type", "application/json")
|
||||||
|
|> put("/api/pleroma/admin/statuses/#{id}", %{"sensitive" => "true"})
|
||||||
|
|> json_response_and_validate_schema(:ok)
|
||||||
|
|
||||||
|
assert response["sensitive"]
|
||||||
|
|
||||||
|
log_entry = Repo.one(ModerationLog)
|
||||||
|
|
||||||
|
assert ModerationLog.get_log_entry_message(log_entry) ==
|
||||||
|
"@#{admin.nickname} updated status ##{id}, set sensitive: 'true'"
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("content-type", "application/json")
|
||||||
|
|> put("/api/pleroma/admin/statuses/#{id}", %{"sensitive" => "false"})
|
||||||
|
|> json_response_and_validate_schema(:ok)
|
||||||
|
|
||||||
|
refute response["sensitive"]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "change visibility flag", %{conn: conn, id: id, admin: admin} do
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("content-type", "application/json")
|
||||||
|
|> put("/api/pleroma/admin/statuses/#{id}", %{visibility: "public"})
|
||||||
|
|> json_response_and_validate_schema(:ok)
|
||||||
|
|
||||||
|
assert response["visibility"] == "public"
|
||||||
|
|
||||||
|
log_entry = Repo.one(ModerationLog)
|
||||||
|
|
||||||
|
assert ModerationLog.get_log_entry_message(log_entry) ==
|
||||||
|
"@#{admin.nickname} updated status ##{id}, set visibility: 'public'"
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("content-type", "application/json")
|
||||||
|
|> put("/api/pleroma/admin/statuses/#{id}", %{visibility: "private"})
|
||||||
|
|> json_response_and_validate_schema(:ok)
|
||||||
|
|
||||||
|
assert response["visibility"] == "private"
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> put_req_header("content-type", "application/json")
|
||||||
|
|> put("/api/pleroma/admin/statuses/#{id}", %{visibility: "unlisted"})
|
||||||
|
|> json_response_and_validate_schema(:ok)
|
||||||
|
|
||||||
|
assert response["visibility"] == "unlisted"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns 400 when visibility is unknown", %{conn: conn, id: id} do
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> put_req_header("content-type", "application/json")
|
||||||
|
|> put("/api/pleroma/admin/statuses/#{id}", %{visibility: "test"})
|
||||||
|
|
||||||
|
assert %{"error" => "test - Invalid value for enum."} =
|
||||||
|
json_response_and_validate_schema(conn, :bad_request)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "DELETE /api/pleroma/admin/statuses/:id" do
|
||||||
|
setup do
|
||||||
|
activity = insert(:note_activity)
|
||||||
|
|
||||||
|
%{id: activity.id}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "deletes status", %{conn: conn, id: id, admin: admin} do
|
||||||
|
conn
|
||||||
|
|> delete("/api/pleroma/admin/statuses/#{id}")
|
||||||
|
|> json_response_and_validate_schema(:ok)
|
||||||
|
|
||||||
|
refute Activity.get_by_id(id)
|
||||||
|
|
||||||
|
log_entry = Repo.one(ModerationLog)
|
||||||
|
|
||||||
|
assert ModerationLog.get_log_entry_message(log_entry) ==
|
||||||
|
"@#{admin.nickname} deleted status ##{id}"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns 404 when the status does not exist", %{conn: conn} do
|
||||||
|
conn = delete(conn, "/api/pleroma/admin/statuses/test")
|
||||||
|
|
||||||
|
assert json_response_and_validate_schema(conn, :not_found) == %{"error" => "Not found"}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "GET /api/pleroma/admin/statuses" do
|
||||||
|
test "returns all public and unlisted statuses", %{conn: conn, admin: admin} do
|
||||||
|
blocked = insert(:user)
|
||||||
|
user = insert(:user)
|
||||||
|
User.block(admin, blocked)
|
||||||
|
|
||||||
|
{:ok, _} = CommonAPI.post(user, %{status: "@#{admin.nickname}", visibility: "direct"})
|
||||||
|
|
||||||
|
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "unlisted"})
|
||||||
|
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "private"})
|
||||||
|
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "public"})
|
||||||
|
{:ok, _} = CommonAPI.post(blocked, %{status: ".", visibility: "public"})
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> get("/api/pleroma/admin/statuses")
|
||||||
|
|> json_response_and_validate_schema(200)
|
||||||
|
|
||||||
|
refute "private" in Enum.map(response, & &1["visibility"])
|
||||||
|
assert length(response) == 3
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns only local statuses with local_only on", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
remote_user = insert(:user, local: false, nickname: "archaeme@archae.me")
|
||||||
|
insert(:note_activity, user: user, local: true)
|
||||||
|
insert(:note_activity, user: remote_user, local: false)
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> get("/api/pleroma/admin/statuses?local_only=true")
|
||||||
|
|> json_response_and_validate_schema(200)
|
||||||
|
|
||||||
|
assert length(response) == 1
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns private and direct statuses with godmode on", %{conn: conn, admin: admin} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
{:ok, _} = CommonAPI.post(user, %{status: "@#{admin.nickname}", visibility: "direct"})
|
||||||
|
|
||||||
|
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "private"})
|
||||||
|
{:ok, _} = CommonAPI.post(user, %{status: ".", visibility: "public"})
|
||||||
|
conn = get(conn, "/api/pleroma/admin/statuses?godmode=true")
|
||||||
|
assert json_response_and_validate_schema(conn, 200) |> length() == 3
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue