projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
status_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/status_controller.ex
b/lib/pleroma/web/admin_api/controllers/status_controller.ex
index 08cb9c10b3da0a696eeb7a31992728ef194c86dc..c91fbc771ce25b0f9ddccb233043a6adc8c6c8ff 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/status_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/status_controller.ex
@@
-42,7
+42,7
@@
defmodule Pleroma.Web.AdminAPI.StatusController do
def show(conn, %{id: id}) do
with %Activity{} = activity <- Activity.get_by_id(id) do
conn
def show(conn, %{id: id}) do
with %Activity{} = activity <- Activity.get_by_id(id) do
conn
- |> put_view(
Mastodo
nAPI.StatusView)
+ |> put_view(
Pleroma.Web.Admi
nAPI.StatusView)
|> render("show.json", %{activity: activity})
else
nil -> {:error, :not_found}
|> render("show.json", %{activity: activity})
else
nil -> {:error, :not_found}