[#2497] Specified SHELL in .gitlab-ci.yml as required for `exexec`.

[akkoma] / lib / pleroma / web / controller_helper.ex

diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index ae9b265b11850dba433582546cb21231ddf57878..5a1316a5f166f5871be0cb75e059de9299f96735 100644 (file)
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -104,8 +104,16 @@ defmodule Pleroma.Web.ControllerHelper do
 
   def put_if_exist(map, key, value), do: Map.put(map, key, value)
 
+  @doc """
+  Returns true if request specifies to include embedded relationships in account objects.
+  May only be used in selected account-related endpoints; has no effect for status- or
+    notification-related endpoints.
+  """
+  # Intended for PleromaFE: https://git.pleroma.social/pleroma/pleroma-fe/-/issues/838
   def embed_relationships?(params) do
-    # To do: change to `truthy_param?(params["embed_relationships"])` once PleromaFE supports it
-    not explicitly_falsy_param?(params["embed_relationships"])
+    # To do once OpenAPI transition mess is over: just `truthy_param?(params[:with_relationships])`
+    params
+    |> Map.get(:with_relationships, params["with_relationships"])
+    |> truthy_param?()
   end
 end