projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#2456] Removed support for embedded relationships in account view.
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
pleroma_api_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
index 4aa5c1dd866c0906414eedbd8bb8a06510571d34..e834133b27100724f1cf75c9202bb0f08f8946c0 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@
-5,7
+5,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
use Pleroma.Web, :controller
- import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2
, skip_relationships?: 1
]
+ import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
alias Pleroma.Activity
alias Pleroma.Conversation.Participation
alias Pleroma.Activity
alias Pleroma.Conversation.Participation
@@
-69,7
+69,12
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
%{
name: emoji,
count: length(users),
%{
name: emoji,
count: length(users),
- accounts: AccountView.render("index.json", %{users: users, for: user, as: :user}),
+ accounts:
+ AccountView.render("index.json", %{
+ users: users,
+ for: user,
+ as: :user
+ }),
me: !!(user && user.ap_id in user_ap_ids)
}
end
me: !!(user && user.ap_id in user_ap_ids)
}
end
@@
-86,7
+91,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
end
def react_with_emoji(%{assigns: %{user: user}} = conn, %{"id" => activity_id, "emoji" => emoji}) do
end
def react_with_emoji(%{assigns: %{user: user}} = conn, %{"id" => activity_id, "emoji" => emoji}) do
- with {:ok, _activity
, _object
} <- CommonAPI.react_with_emoji(activity_id, user, emoji),
+ with {:ok, _activity} <- CommonAPI.react_with_emoji(activity_id, user, emoji),
activity <- Activity.get_by_id(activity_id) do
conn
|> put_view(StatusView)
activity <- Activity.get_by_id(activity_id) do
conn
|> put_view(StatusView)
@@
-145,8
+150,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
|> render("index.json",
activities: activities,
for: user,
|> render("index.json",
activities: activities,
for: user,
- as: :activity,
- skip_relationships: skip_relationships?(params)
+ as: :activity
)
else
_error ->
)
else
_error ->
@@
-201,7
+205,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
end
end
end
end
- def mark_notifications_as_read(%{assigns: %{user: user}} = conn, %{"max_id" => max_id}
= params
) do
+ def mark_notifications_as_read(%{assigns: %{user: user}} = conn, %{"max_id" => max_id}) do
with notifications <- Notification.set_read_up_to(user, max_id) do
notifications = Enum.take(notifications, 80)
with notifications <- Notification.set_read_up_to(user, max_id) do
notifications = Enum.take(notifications, 80)
@@
-209,8
+213,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
|> put_view(NotificationView)
|> render("index.json",
notifications: notifications,
|> put_view(NotificationView)
|> render("index.json",
notifications: notifications,
- for: user,
- skip_relationships: skip_relationships?(params)
+ for: user
)
end
end
)
end
end