diff options
author | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
commit | 76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch) | |
tree | 34020541df1d6684e935cfd09f36cb6eed7b13f6 /lib/pleroma/web/common_api | |
parent | a3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff) | |
parent | bb864e96ad4e0be470da78baa000019f571e30db (diff) | |
download | pleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz |
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 2 | ||||
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 2c4b591d4..14a68929d 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -1,5 +1,5 @@ defmodule Pleroma.Web.CommonAPI do - alias Pleroma.{Repo, Activity, Object, User} + alias Pleroma.{Repo, Activity, Object} alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Formatter diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 3c092d524..57f8be894 100644 --- 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 - alias Pleroma.{Repo, Object, Formatter, User, Activity} + alias Pleroma.{Repo, Object, Formatter, Activity} alias Pleroma.Web.ActivityPub.Utils alias Calendar.Strftime @@ -49,7 +49,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do {[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 @@ -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 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) |