X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=e50d63d7753652c4646abc93d920bbf73e21a131;hb=2272934a5e5d5f2d0319381bd2f4dc322da78e18;hp=208677bd755857f7b31af1dc113123a02be10839;hpb=d03a116654bd7c4329b698a0f175e37aea8c2caa;p=akkoma diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 208677bd7..e50d63d77 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -6,11 +6,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Calendar.Strftime alias Comeonin.Pbkdf2 alias Pleroma.{Activity, Formatter, Object, Repo} - alias Pleroma.User - alias Pleroma.Web + alias Pleroma.{User, Web} + alias Pleroma.Web.{Endpoint, MediaProxy} alias Pleroma.Web.ActivityPub.Utils - alias Pleroma.Web.Endpoint - alias Pleroma.Web.MediaProxy # This is a hack for twidere. def get_by_id_or_ap_id(id) do @@ -95,7 +93,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do def make_context(%Activity{data: %{"context" => context}}), do: context def make_context(_), do: Utils.generate_context_id() - def maybe_add_attachments(text, _attachments, _no_links = true), do: text + def maybe_add_attachments(text, _attachments, true = _no_links), do: text def maybe_add_attachments(text, attachments, _no_links) do add_attachments(text, attachments)