From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 11 Feb 2019 06:54:21 +0000 (+0700)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=305d2194136d4560e02c110d528164034d3727b2;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
---

305d2194136d4560e02c110d528164034d3727b2
diff --cc lib/pleroma/web/federator/federator.ex
index 37100c9e6,468959a65..7df75aca6
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@@ -3,16 -3,20 +3,19 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.Federator do
-   alias Pleroma.User
 -  use GenServer
 -
    alias Pleroma.Activity
-   alias Pleroma.Jobs
-   alias Pleroma.Web.{WebFinger, Websub, Salmon}
-   alias Pleroma.Web.Federator.RetryQueue
+   alias Pleroma.User
+   alias Pleroma.Web.WebFinger
+   alias Pleroma.Web.Websub
+   alias Pleroma.Web.Salmon
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.ActivityPub.Relay
    alias Pleroma.Web.ActivityPub.Transmogrifier
    alias Pleroma.Web.ActivityPub.Utils
+   alias Pleroma.Web.Federator.RetryQueue
    alias Pleroma.Web.OStatus
++  alias Pleroma.Jobs
+ 
    require Logger
  
    @websub Application.get_env(:pleroma, :websub)
diff --cc lib/pleroma/web/websub/websub.ex
index 82845f13d,a08d7993d..c00ec0858
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@@ -4,12 -4,15 +4,16 @@@
  
  defmodule Pleroma.Web.Websub do
    alias Ecto.Changeset
-   alias Pleroma.Repo
    alias Pleroma.Instances
-   alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
+   alias Pleroma.Repo
+   alias Pleroma.Web.Websub.WebsubServerSubscription
+   alias Pleroma.Web.Websub.WebsubClientSubscription
    alias Pleroma.Web.OStatus.FeedRepresenter
-   alias Pleroma.Web.{XML, Endpoint, OStatus, Federator}
+   alias Pleroma.Web.XML
+   alias Pleroma.Web.Endpoint
+   alias Pleroma.Web.OStatus
    alias Pleroma.Web.Router.Helpers
++  alias Pleroma.Web.Federator
    require Logger
  
    import Ecto.Query