diff options
| author | Karen Konou <konoukaren@gmail.com> | 2019-02-11 12:10:10 +0100 |
|---|---|---|
| committer | Karen Konou <konoukaren@gmail.com> | 2019-02-11 12:10:49 +0100 |
| commit | ac72b578da673282b927b945bfe03cd3012444b6 (patch) | |
| tree | 45b8c075aa883ca47fd24f3e71f6740bd2f2308b /lib/pleroma/web/common_api/utils.ex | |
| parent | c01ef574c192488c2643a20b4064439757613449 (diff) | |
| parent | 48552b38b2dd26bb832e940a0e52c0e1c2165b31 (diff) | |
| download | pleroma-ac72b578da673282b927b945bfe03cd3012444b6.tar.gz | |
Merge branch 'develop' into feature/thread-muting
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 208677bd7..123107b56 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -5,12 +5,15 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Calendar.Strftime alias Comeonin.Pbkdf2 - alias Pleroma.{Activity, Formatter, Object, Repo} + alias Pleroma.Activity + alias Pleroma.Formatter + alias Pleroma.Object + alias Pleroma.Repo alias Pleroma.User alias Pleroma.Web - alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.Endpoint alias Pleroma.Web.MediaProxy + alias Pleroma.Web.ActivityPub.Utils # This is a hack for twidere. def get_by_id_or_ap_id(id) do @@ -95,7 +98,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) |