diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 8 | ||||
| -rw-r--r-- | lib/pleroma/web/federator/federator.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 2 | 
5 files changed, 9 insertions, 10 deletions
| diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 0637b18dc..a80aa52c6 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -6,13 +6,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do    @moduledoc """    A module to handle coding from internal to wire ActivityPub and back.    """ -  alias Pleroma.User -  alias Pleroma.Object -  alias Pleroma.Object.Containment    alias Pleroma.Activity    alias Pleroma.Object +  alias Pleroma.Object.Containment    alias Pleroma.Repo    alias Pleroma.User +  alias Pleroma.User    alias Pleroma.Web.ActivityPub.ActivityPub    alias Pleroma.Web.ActivityPub.Utils    alias Pleroma.Web.ActivityPub.Visibility diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 7781f1635..50a72aee5 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -208,7 +208,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do          context,          content_html,          attachments, -        inReplyTo, +        in_reply_to,          tags,          cw \\ nil,          cc \\ [] @@ -225,11 +225,11 @@ defmodule Pleroma.Web.CommonAPI.Utils do        "tag" => tags |> Enum.map(fn {_, tag} -> tag end) |> Enum.uniq()      } -    if inReplyTo do -      inReplyToObject = Object.normalize(inReplyTo.data["object"]) +    if in_reply_to do +      in_reply_to_object = Object.normalize(inReplyTo.data["object"])        object -      |> Map.put("inReplyTo", inReplyToObject.data["id"]) +      |> Map.put("inReplyTo", in_reply_to_object.data["id"])      else        object      end diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index a1f6373a4..1b4deb6dc 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -4,6 +4,7 @@  defmodule Pleroma.Web.Federator do    alias Pleroma.Activity +  alias Pleroma.Object.Containment    alias Pleroma.User    alias Pleroma.Web.ActivityPub.ActivityPub    alias Pleroma.Web.ActivityPub.Relay @@ -12,7 +13,6 @@ defmodule Pleroma.Web.Federator do    alias Pleroma.Web.ActivityPub.Visibility    alias Pleroma.Web.Federator.RetryQueue    alias Pleroma.Web.OStatus -  alias Pleroma.Object.Containment    alias Pleroma.Web.Salmon    alias Pleroma.Web.WebFinger    alias Pleroma.Web.Websub diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 1e82b2f68..4cec26c9b 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -4,13 +4,13 @@  defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do    use Pleroma.Web, :controller -  alias Pleroma.Object.Fetcher    alias Ecto.Changeset    alias Pleroma.Activity    alias Pleroma.Config    alias Pleroma.Filter    alias Pleroma.Notification    alias Pleroma.Object +  alias Pleroma.Object.Fetcher    alias Pleroma.Pagination    alias Pleroma.Repo    alias Pleroma.ScheduledActivity diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 03dc587d9..f8961eb6c 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -7,8 +7,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do    alias Pleroma.Activity    alias Pleroma.HTML -  alias Pleroma.Repo    alias Pleroma.Object +  alias Pleroma.Repo    alias Pleroma.User    alias Pleroma.Web.CommonAPI    alias Pleroma.Web.CommonAPI.Utils | 
