projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feld-test.secret' into feld-warnings
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
utils.ex
diff --git
a/lib/pleroma/web/common_api/utils.ex
b/lib/pleroma/web/common_api/utils.ex
index 3c092d524101867e916c4734266caa22c9f820fc..57f8be89458cc1eff74f68b9683608b121a0c44d 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-1,5
+1,5
@@
defmodule Pleroma.Web.CommonAPI.Utils do
defmodule Pleroma.Web.CommonAPI.Utils do
- alias Pleroma.{Repo, Object, Formatter,
User,
Activity}
+ alias Pleroma.{Repo, Object, Formatter, Activity}
alias Pleroma.Web.ActivityPub.Utils
alias Calendar.Strftime
alias Pleroma.Web.ActivityPub.Utils
alias Calendar.Strftime
@@
-49,7
+49,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
{[user.follower_address | to], cc}
end
{[user.follower_address | to], cc}
end
- def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
+ def to_for_user_and_mentions(
_
user, mentions, inReplyTo, "direct") do
mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
if inReplyTo do
mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
if inReplyTo do
@@
-69,7
+69,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 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, _no_links = true), do: text
def maybe_add_attachments(text, attachments, _no_links) do
add_attachments(text, attachments)
def maybe_add_attachments(text, attachments, _no_links) do
add_attachments(text, attachments)