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
/
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 09959b3bfe70bd217f9bb205d10cf0f4eb26b072..831c3bd0276c17e5a3946936fb2c0a4ed0d7bfa3 100644
(file)
--- a/
lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/admin_api_controller.ex
@@
-258,7
+258,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
- |> render("index.json", %{activities: activities, as: :activity})
+ |> render("index.json", %{activities: activities, as: :activity
, skip_relationships: false
})
end
def list_user_statuses(conn, %{"nickname" => nickname} = params) do
end
def list_user_statuses(conn, %{"nickname" => nickname} = params) do
@@
-277,7
+277,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn
|> put_view(StatusView)
conn
|> put_view(StatusView)
- |> render("index.json", %{activities: activities, as: :activity})
+ |> render("index.json", %{activities: activities, as: :activity
, skip_relationships: false
})
else
_ -> {:error, :not_found}
end
else
_ -> {:error, :not_found}
end
@@
-598,7
+598,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
{:invites_enabled, _} ->
errors(
conn,
{:invites_enabled, _} ->
errors(
conn,
- {:error, "To send invites you need
set
to set the `invites_enabled` option to true."}
+ {:error, "To send invites you need to set the `invites_enabled` option to true."}
)
end
end
)
end
end
@@
-812,7
+812,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
- |> render("index.json", %{activities: activities, as: :activity})
+ |> render("index.json", %{activities: activities, as: :activity
, skip_relationships: false
})
end
def status_update(%{assigns: %{user: admin}} = conn, %{"id" => id} = params) do
end
def status_update(%{assigns: %{user: admin}} = conn, %{"id" => id} = params) do