projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge develop
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
admin_api_controller.ex
diff --git
a/lib/pleroma/web/admin_api/admin_api_controller.ex
b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 9f1fd3aeb334f273577a189f460cb55229937096..9175b190442eb173ab7c71f777b20aa9edf9b072 100644
(file)
--- a/
lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/admin_api_controller.ex
@@
-844,15
+844,20
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
end
def status_update(%{assigns: %{user: admin}} = conn, %{"id" => id} = params) do
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
with {:ok, activity} <- CommonAPI.update_activity_scope(id, params) do
- {:ok, sensitive} = Ecto.Type.cast(:boolean, params[
"sensitive"
])
+ {:ok, sensitive} = Ecto.Type.cast(:boolean, params[
:sensitive
])
ModerationLog.insert_log(%{
action: "status_update",
actor: admin,
subject: activity,
sensitive: sensitive,
ModerationLog.insert_log(%{
action: "status_update",
actor: admin,
subject: activity,
sensitive: sensitive,
- visibility: params[
"visibility"
]
+ visibility: params[
:visibility
]
})
conn
})
conn
@@
-1122,11
+1127,10
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
end
end
end
end
- def stats(conn,
_
) do
- count
= Stats.get_status_visibility_count(
)
+ def stats(conn,
params
) do
+ count
ers = Stats.get_status_visibility_count(params["instance"]
)
- conn
- |> json(%{"status_visibility" => count})
+ json(conn, %{"status_visibility" => counters})
end
defp errors(conn, {:error, :not_found}) do
end
defp errors(conn, {:error, :not_found}) do