de-group alias/es

diff --git a/lib/mix/tasks/pleroma/uploads.ex b/lib/mix/tasks/pleroma/uploads.ex
index 460fa161babd29f17d69cf6acfd1dc584a5076dd..697ad1a7b7da1338e67b478431861fdc8e7caf4d 100644 (file)
--- a/lib/mix/tasks/pleroma/uploads.ex
+++ b/lib/mix/tasks/pleroma/uploads.ex
@@ -4,7 +4,8 @@
 
 defmodule Mix.Tasks.Pleroma.Uploads do
   use Mix.Task
 
 defmodule Mix.Tasks.Pleroma.Uploads do
   use Mix.Task

-  alias Pleroma.{Upload, Uploaders.Local}
+  alias Pleroma.Upload
+  alias Pleroma.Uploaders.Local

   alias Mix.Tasks.Pleroma.Common
   require Logger
 
   alias Mix.Tasks.Pleroma.Common
   require Logger
 

diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index 5da3edfd2f5815ace6eeb41e0769e0a5dd0695f9..037e4471679d5f6ce780b80437964f49fa38c661 100644 (file)
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -5,7 +5,8 @@
 defmodule Mix.Tasks.Pleroma.User do
   use Mix.Task
   import Ecto.Changeset
 defmodule Mix.Tasks.Pleroma.User do
   use Mix.Task
   import Ecto.Changeset

-  alias Pleroma.{Repo, User}
+  alias Pleroma.Repo
+  alias Pleroma.User

   alias Mix.Tasks.Pleroma.Common
 
   @shortdoc "Manages Pleroma users"
   alias Mix.Tasks.Pleroma.Common
 
   @shortdoc "Manages Pleroma users"

diff --git a/lib/pleroma/PasswordResetToken.ex b/lib/pleroma/PasswordResetToken.ex
index c3c0384d234d803311047d9779288bdc559460dc..750ddd3c04645e3714face400e0cbbc42bb6ebe8 100644 (file)
--- a/lib/pleroma/PasswordResetToken.ex
+++ b/lib/pleroma/PasswordResetToken.ex
@@ -7,7 +7,9 @@ defmodule Pleroma.PasswordResetToken do
 
   import Ecto.Changeset
 
 
   import Ecto.Changeset
 

-  alias Pleroma.{User, PasswordResetToken, Repo}
+  alias Pleroma.User
+  alias Pleroma.Repo
+  alias Pleroma.PasswordResetToken

 
   schema "password_reset_tokens" do
     belongs_to(:user, User, type: Pleroma.FlakeId)
 
   schema "password_reset_tokens" do
     belongs_to(:user, User, type: Pleroma.FlakeId)

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index f0aa3ce978f437c854b66b49cbedc9b248760a05..cdfe7ea9e482c9a36b332ce312801af7615a352b 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -4,7 +4,11 @@
 
 defmodule Pleroma.Activity do
   use Ecto.Schema
 
 defmodule Pleroma.Activity do
   use Ecto.Schema

-  alias Pleroma.{Repo, Activity, Notification}
+
+  alias Pleroma.Repo
+  alias Pleroma.Activity
+  alias Pleroma.Notification
+

   import Ecto.Query
 
   @type t :: %__MODULE__{}
   import Ecto.Query
 
   @type t :: %__MODULE__{}

diff --git a/lib/pleroma/captcha/captcha.ex b/lib/pleroma/captcha/captcha.ex
index f70f5a19191466c983e05fe64af0948ea8854193..aa41acd1ab21cfdf61cfb4e01675993ea5703299 100644 (file)
--- a/lib/pleroma/captcha/captcha.ex
+++ b/lib/pleroma/captcha/captcha.ex
@@ -3,8 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Captcha do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Captcha do

-  alias Plug.Crypto.{KeyGenerator, MessageEncryptor}

   alias Calendar.DateTime
   alias Calendar.DateTime

+  alias Plug.Crypto.KeyGenerator
+  alias Plug.Crypto.MessageEncryptor

 
   use GenServer
 
 
   use GenServer
 

diff --git a/lib/pleroma/emails/user_email.ex b/lib/pleroma/emails/user_email.ex
index c42c53c9996faef5d39bfc10ec382f74d86ad509..a3a09e96cccebda630c8ee86b4c534789dc7e949 100644 (file)
--- a/lib/pleroma/emails/user_email.ex
+++ b/lib/pleroma/emails/user_email.ex
@@ -7,7 +7,8 @@ defmodule Pleroma.UserEmail do
 
   import Swoosh.Email
 
 
   import Swoosh.Email
 

-  alias Pleroma.Web.{Endpoint, Router}
+  alias Pleroma.Web.Endpoint
+  alias Pleroma.Web.Router

 
   defp instance_config, do: Pleroma.Config.get(:instance)
 
 
   defp instance_config, do: Pleroma.Config.get(:instance)
 

diff --git a/lib/pleroma/filter.ex b/lib/pleroma/filter.ex
index 308bd70e1956c02fe224249e44c9d6c2382ede4b..bdc34698c13098c09d1cc31906819a6a53ded780 100644 (file)
--- a/lib/pleroma/filter.ex
+++ b/lib/pleroma/filter.ex
@@ -4,8 +4,12 @@
 
 defmodule Pleroma.Filter do
   use Ecto.Schema
 
 defmodule Pleroma.Filter do
   use Ecto.Schema

-  import Ecto.{Changeset, Query}
-  alias Pleroma.{User, Repo}
+
+  import Ecto.Changeset
+  import Ecto.Query
+
+  alias Pleroma.User
+  alias Pleroma.Repo

 
   schema "filters" do
     belongs_to(:user, User, type: Pleroma.FlakeId)
 
   schema "filters" do
     belongs_to(:user, User, type: Pleroma.FlakeId)

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 8a8af266cd1ae7ef160d8f33776b51ff650fdaab..f31aafa0dbd3f530a767619f5b81cc39751a4542 100644 (file)
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Formatter do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Formatter do

-  alias Pleroma.{Emoji, HTML, User}
+  alias Pleroma.Emoji
+  alias Pleroma.HTML
+  alias Pleroma.User

   alias Pleroma.Web.MediaProxy
 
   @tag_regex ~r/((?<=[^&])|\A)(\#)(\w+)/u
   alias Pleroma.Web.MediaProxy
 
   @tag_regex ~r/((?<=[^&])|\A)(\#)(\w+)/u

diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex
index a284b3c610128992386d636f21a0185f49c38eeb..32cb817d253a639d318ae94f7d0cef494a342428 100644 (file)
--- a/lib/pleroma/gopher/server.ex
+++ b/lib/pleroma/gopher/server.ex
@@ -37,7 +37,10 @@ end
 
 defmodule Pleroma.Gopher.Server.ProtocolHandler do
   alias Pleroma.Web.ActivityPub.ActivityPub
 
 defmodule Pleroma.Gopher.Server.ProtocolHandler do
   alias Pleroma.Web.ActivityPub.ActivityPub

-  alias Pleroma.{Activity, HTML, User, Repo}
+  alias Pleroma.Activity
+  alias Pleroma.HTML
+  alias Pleroma.User
+  alias Pleroma.Repo

 
   def start_link(ref, socket, transport, opts) do
     pid = spawn_link(__MODULE__, :init, [ref, socket, transport, opts])
 
   def start_link(ref, socket, transport, opts) do
     pid = spawn_link(__MODULE__, :init, [ref, socket, transport, opts])

diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex
index bab8e0564e143ae5b746a6e166c7a89e391bbe46..ce3b46d501b467c0762bdf2297389396dfc468df 100644 (file)
--- a/lib/pleroma/instances/instance.ex
+++ b/lib/pleroma/instances/instance.ex
@@ -1,7 +1,8 @@
 defmodule Pleroma.Instances.Instance do
   @moduledoc "Instance."
 
 defmodule Pleroma.Instances.Instance do
   @moduledoc "Instance."
 

-  alias Pleroma.{Instances, Repo}
+  alias Pleroma.Instances
+  alias Pleroma.Repo

   alias Pleroma.Instances.Instance
 
   use Ecto.Schema
   alias Pleroma.Instances.Instance
 
   use Ecto.Schema

diff --git a/lib/pleroma/list.ex b/lib/pleroma/list.ex
index ca66c69160605590546e2f66e3bc53c46649a509..55c4cf6df16fde340043cd4a214363828cadcebc 100644 (file)
--- a/lib/pleroma/list.ex
+++ b/lib/pleroma/list.ex
@@ -4,8 +4,13 @@
 
 defmodule Pleroma.List do
   use Ecto.Schema
 
 defmodule Pleroma.List do
   use Ecto.Schema

-  import Ecto.{Changeset, Query}
-  alias Pleroma.{User, Repo, Activity}
+
+  import Ecto.Query
+  import Ecto.Changeset
+
+  alias Pleroma.Activity
+  alias Pleroma.Repo
+  alias Pleroma.User

 
   schema "lists" do
     belongs_to(:user, User, type: Pleroma.FlakeId)
 
   schema "lists" do
     belongs_to(:user, User, type: Pleroma.FlakeId)

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 2364d36da0a4a03f43018b17b9e9d114bd821389..c7c925c890a16c4c93fbfdd55a02b3b57259950c 100644 (file)
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -4,8 +4,13 @@
 
 defmodule Pleroma.Notification do
   use Ecto.Schema
 
 defmodule Pleroma.Notification do
   use Ecto.Schema

-  alias Pleroma.{User, Activity, Notification, Repo}
+
+  alias Pleroma.User
+  alias Pleroma.Activity
+  alias Pleroma.Notification
+  alias Pleroma.Repo

   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.CommonAPI.Utils

+

   import Ecto.Query
 
   schema "notifications" do
   import Ecto.Query
 
   schema "notifications" do

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 7b46a3b05266fd47d8a3fa928975c4d9cc54e018..5f1fc801b592d70da0534fdb9defd34e99880758 100644 (file)
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -4,8 +4,15 @@
 
 defmodule Pleroma.Object do
   use Ecto.Schema
 
 defmodule Pleroma.Object do
   use Ecto.Schema

-  alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
-  import Ecto.{Query, Changeset}
+
+  alias Pleroma.Repo
+  alias Pleroma.Object
+  alias Pleroma.User
+  alias Pleroma.Activity
+  alias Pleroma.ObjectTombstone
+
+  import Ecto.Query
+  import Ecto.Changeset

 
   schema "objects" do
     field(:data, :map)
 
   schema "objects" do
     field(:data, :map)

diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
index 945a1d49f7d05fe149e9afcb8372a14dee69199f..22f0406f4637cfc486a1a86155903667b8b7729c 100644 (file)
--- a/lib/pleroma/plugs/oauth_plug.ex
+++ b/lib/pleroma/plugs/oauth_plug.ex
@@ -6,11 +6,9 @@ defmodule Pleroma.Plugs.OAuthPlug do
   import Plug.Conn
   import Ecto.Query
 
   import Plug.Conn
   import Ecto.Query
 

-  alias Pleroma.{
-    User,
-    Repo,
-    Web.OAuth.Token
-  }
+  alias Pleroma.User
+  alias Pleroma.Repo
+  alias Pleroma.Web.OAuth.Token

 
   @realm_reg Regex.compile!("Bearer\:?\s+(.*)$", "i")
 
 
   @realm_reg Regex.compile!("Bearer\:?\s+(.*)$", "i")
 

diff --git a/lib/pleroma/plugs/user_fetcher_plug.ex b/lib/pleroma/plugs/user_fetcher_plug.ex
index 6d6ab092616a2b8f8a64a0602e81dc2c34499f00..7ed4602bbd2a5c43e4a96aba0b975657f05a4958 100644 (file)
--- a/lib/pleroma/plugs/user_fetcher_plug.ex
+++ b/lib/pleroma/plugs/user_fetcher_plug.ex
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.UserFetcherPlug do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.UserFetcherPlug do

-  alias Pleroma.{User, Repo}
+  alias Pleroma.User
+  alias Pleroma.Repo

 
   import Plug.Conn
 
 
   import Plug.Conn
 

diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
index 16cc2856a2a3d6fefc526c1bf022abb50385d2a0..fe0ce9051a9e3359849cb6b63fbbd808aa0ab434 100644 (file)
--- a/lib/pleroma/stats.ex
+++ b/lib/pleroma/stats.ex
@@ -4,7 +4,8 @@
 
 defmodule Pleroma.Stats do
   import Ecto.Query
 
 defmodule Pleroma.Stats do
   import Ecto.Query

-  alias Pleroma.{User, Repo}
+  alias Pleroma.User
+  alias Pleroma.Repo

 
   def start_link do
     agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)
 
   def start_link do
     agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 33630ac7c98fe439105def36f08528ccf471c211..b44ba12799a2de96583116771e4820da93fdf761 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -5,13 +5,23 @@
 defmodule Pleroma.User do
   use Ecto.Schema
 
 defmodule Pleroma.User do
   use Ecto.Schema
 

-  import Ecto.{Changeset, Query}
-  alias Pleroma.{Repo, User, Object, Web, Activity, Notification}
+  import Ecto.Changeset
+  import Ecto.Query
+
+  alias Pleroma.Repo
+  alias Pleroma.User
+  alias Pleroma.Object
+  alias Pleroma.Web
+  alias Pleroma.Activity
+  alias Pleroma.Notification

   alias Comeonin.Pbkdf2
   alias Pleroma.Formatter
   alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils
   alias Comeonin.Pbkdf2
   alias Pleroma.Formatter
   alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils

-  alias Pleroma.Web.{OStatus, Websub, OAuth}
-  alias Pleroma.Web.ActivityPub.{Utils, ActivityPub}
+  alias Pleroma.Web.OStatus
+  alias Pleroma.Web.Websub
+  alias Pleroma.Web.OAuth
+  alias Pleroma.Web.ActivityPub.Utils
+  alias Pleroma.Web.ActivityPub.ActivityPub

 
   require Logger
 
 
   require Logger
 

diff --git a/lib/pleroma/user_invite_token.ex b/lib/pleroma/user_invite_token.ex
index 8e449444c3583e25a411e4d523af929625a0bda5..5a448114c4df20c9dc55d8780a6969888df352b7 100644 (file)
--- a/lib/pleroma/user_invite_token.ex
+++ b/lib/pleroma/user_invite_token.ex
@@ -7,7 +7,8 @@ defmodule Pleroma.UserInviteToken do
 
   import Ecto.Changeset
 
 
   import Ecto.Changeset
 

-  alias Pleroma.{UserInviteToken, Repo}
+  alias Pleroma.UserInviteToken
+  alias Pleroma.Repo

 
   schema "user_invite_tokens" do
     field(:token, :string)
 
   schema "user_invite_tokens" do
     field(:token, :string)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index d22f04bb2f69b3cf0a479c26a39e80b9d78ee7b7..c46d8233e04aa77dfef3a4da5e0d49d66679454f 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -3,9 +3,18 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.ActivityPub do

-  alias Pleroma.{Activity, Repo, Object, Upload, User, Notification, Instances}
-  alias Pleroma.Web.ActivityPub.{Transmogrifier, MRF}
-  alias Pleroma.Web.{WebFinger, Federator, OStatus}
+  alias Pleroma.Activity
+  alias Pleroma.Repo
+  alias Pleroma.Object
+  alias Pleroma.Upload
+  alias Pleroma.User
+  alias Pleroma.Notification
+  alias Pleroma.Instances
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.ActivityPub.MRF
+  alias Pleroma.Web.WebFinger
+  alias Pleroma.Web.Federator
+  alias Pleroma.Web.OStatus

 
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils
 
   import Ecto.Query
   import Pleroma.Web.ActivityPub.Utils

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 01b5210517b834b836b65dd6d7bff961d2e26c60..69879476eb4b26f855d3b65d373c410f20c454ec 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -5,9 +5,15 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
 
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
 

-  alias Pleroma.{Activity, User, Object}
-  alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Relay, Transmogrifier, Utils}
+  alias Pleroma.Activity
+  alias Pleroma.User
+  alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.ObjectView
+  alias Pleroma.Web.ActivityPub.UserView
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Relay
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.ActivityPub.Utils

   alias Pleroma.Web.Federator
 
   require Logger
   alias Pleroma.Web.Federator
 
   require Logger

diff --git a/lib/pleroma/web/activity_pub/relay.ex b/lib/pleroma/web/activity_pub/relay.ex
index c0a52e349ea423460a5c1c9f52e7fba7e376447f..c496063ea1cd89ba95cf92a519d297f1144f5a10 100644 (file)
--- a/lib/pleroma/web/activity_pub/relay.ex
+++ b/lib/pleroma/web/activity_pub/relay.ex
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.Relay do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.Relay do

-  alias Pleroma.{User, Object, Activity}
+  alias Pleroma.User
+  alias Pleroma.Object
+  alias Pleroma.Activity

   alias Pleroma.Web.ActivityPub.ActivityPub
   require Logger
 
   alias Pleroma.Web.ActivityPub.ActivityPub
   require Logger
 

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index edfbc9bb21cc4480a3aeacf647e2a674bc6243ff..98a2af8198dc1b25a11b315ec83d2819415c80a4 100644 (file)
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -6,8 +6,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   @moduledoc """
   A module to handle coding from internal to wire ActivityPub and back.
   """
   @moduledoc """
   A module to handle coding from internal to wire ActivityPub and back.
   """

-  alias Pleroma.{Activity, User, Object, Repo}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
+  alias Pleroma.Activity
+  alias Pleroma.User
+  alias Pleroma.Object
+  alias Pleroma.Repo
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils

 
   import Ecto.Query
 
 
   import Ecto.Query
 

diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index 4a2cc67384836a31f69c68531a552905a74b6a15..964e11c9d424caae12a43dff5e6c2d46157ad06c 100644 (file)
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -3,11 +3,19 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.Utils do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.Utils do

-  alias Pleroma.{Repo, Web, Object, Activity, User, Notification}
+  alias Pleroma.Repo
+  alias Pleroma.Web
+  alias Pleroma.Object
+  alias Pleroma.Activity
+  alias Pleroma.User
+  alias Pleroma.Notification

   alias Pleroma.Web.Router.Helpers
   alias Pleroma.Web.Endpoint
   alias Pleroma.Web.Router.Helpers
   alias Pleroma.Web.Endpoint

-  alias Ecto.{Changeset, UUID}
+  alias Ecto.Changeset
+  alias Ecto.UUID
+

   import Ecto.Query
   import Ecto.Query

+

   require Logger
 
   @supported_object_types ["Article", "Note", "Video", "Page"]
   require Logger
 
   @supported_object_types ["Article", "Note", "Video", "Page"]

diff --git a/lib/pleroma/web/activity_pub/views/object_view.ex b/lib/pleroma/web/activity_pub/views/object_view.ex
index 394d82fbca48d12eca7f57ff06498d8956cd7867..84fa94e327a052bd6930b6fda6b961e846f32275 100644 (file)
--- a/lib/pleroma/web/activity_pub/views/object_view.ex
+++ b/lib/pleroma/web/activity_pub/views/object_view.ex
@@ -4,7 +4,8 @@
 
 defmodule Pleroma.Web.ActivityPub.ObjectView do
   use Pleroma.Web, :view
 
 defmodule Pleroma.Web.ActivityPub.ObjectView do
   use Pleroma.Web, :view

-  alias Pleroma.{Object, Activity}
+  alias Pleroma.Activity
+  alias Pleroma.Object

   alias Pleroma.Web.ActivityPub.Transmogrifier
 
   def render("object.json", %{object: %Object{} = object}) do
   alias Pleroma.Web.ActivityPub.Transmogrifier
 
   def render("object.json", %{object: %Object{} = object}) do

diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index ba3aea1a608ca0c9aa3e1753425137824ebface4..15e6c1f687c5ee755b7a2bc759e9cf90ff4235ff 100644 (file)
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -5,9 +5,13 @@
 defmodule Pleroma.Web.ActivityPub.UserView do
   use Pleroma.Web, :view
 
 defmodule Pleroma.Web.ActivityPub.UserView do
   use Pleroma.Web, :view
 

-  alias Pleroma.Web.{WebFinger, Salmon}
-  alias Pleroma.{User, Repo}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Transmogrifier, Utils}
+  alias Pleroma.Web.WebFinger
+  alias Pleroma.Web.Salmon
+  alias Pleroma.User
+  alias Pleroma.Repo
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.ActivityPub.Utils

 
   import Ecto.Query
 
 
   import Ecto.Query
 

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 4388396cf9a2b20d6e631c85774e526e8ae2f10e..c0d6fb5c4743272b6be60f892c599030fa07a3c4 100644 (file)
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -3,8 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.CommonAPI do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.CommonAPI do

-  alias Pleroma.{User, Repo, Activity, Object}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
+  alias Pleroma.User
+  alias Pleroma.Repo
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils

   alias Pleroma.Formatter
 
   import Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Formatter
 
   import Pleroma.Web.CommonAPI.Utils

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index e50d63d7753652c4646abc93d920bbf73e21a131..123107b56441a216c8589f29dcd10ce3978d855f 100644 (file)
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -5,9 +5,14 @@
 defmodule Pleroma.Web.CommonAPI.Utils do
   alias Calendar.Strftime
   alias Comeonin.Pbkdf2
 defmodule Pleroma.Web.CommonAPI.Utils do
   alias Calendar.Strftime
   alias Comeonin.Pbkdf2

-  alias Pleroma.{Activity, Formatter, Object, Repo}
-  alias Pleroma.{User, Web}
-  alias Pleroma.Web.{Endpoint, MediaProxy}
+  alias Pleroma.Activity
+  alias Pleroma.Formatter
+  alias Pleroma.Object
+  alias Pleroma.Repo
+  alias Pleroma.User
+  alias Pleroma.Web
+  alias Pleroma.Web.Endpoint
+  alias Pleroma.Web.MediaProxy

   alias Pleroma.Web.ActivityPub.Utils
 
   # This is a hack for twidere.
   alias Pleroma.Web.ActivityPub.Utils
 
   # This is a hack for twidere.

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 3e8469a6fa217d78b94d109ef6e41a0783ea219a..468959a65f34883b55d07593d149b043374195eb 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -5,9 +5,15 @@
 defmodule Pleroma.Web.Federator do
   use GenServer
 
 defmodule Pleroma.Web.Federator do
   use GenServer
 

-  alias Pleroma.{Activity, User}
-  alias Pleroma.Web.{WebFinger, Websub, Salmon}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Relay, Transmogrifier, Utils}
+  alias Pleroma.Activity
+  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.Web.Federator.RetryQueue
   alias Pleroma.Web.OStatus
 

diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
index 5ff93663eb19c5daceceacd693fedaa26c517210..8e2e2a44b8ca71bf8208a05f89e3824dec401dfb 100644 (file)
--- a/lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -5,7 +5,8 @@
 # https://tools.ietf.org/html/draft-cavage-http-signatures-08
 defmodule Pleroma.Web.HTTPSignatures do
   alias Pleroma.User
 # https://tools.ietf.org/html/draft-cavage-http-signatures-08
 defmodule Pleroma.Web.HTTPSignatures do
   alias Pleroma.User

-  alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils

 
   require Logger
 
 
   require Logger
 

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 74f1bed4d13014a740cbfc2d7263165f58dfdd98..06f8703935674c887cb323d3a0ed0cc8a9ec064a 100644 (file)
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -4,22 +4,31 @@
 
 defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   use Pleroma.Web, :controller
 
 defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   use Pleroma.Web, :controller

-  alias Pleroma.{Activity, Config, Filter, Notification, Object, Repo, Stats, User}
+  alias Pleroma.Activity
+  alias Pleroma.Config
+  alias Pleroma.Filter
+  alias Pleroma.Notification
+  alias Pleroma.Object
+  alias Pleroma.Repo
+  alias Pleroma.Stats
+  alias Pleroma.User

   alias Pleroma.Web
   alias Pleroma.Web

-  alias Pleroma.Web.{CommonAPI, MediaProxy, Push}
+  alias Pleroma.Web.CommonAPI
+  alias Pleroma.Web.MediaProxy
+  alias Pleroma.Web.Push

   alias Push.Subscription
 
   alias Push.Subscription
 

-  alias Pleroma.Web.MastodonAPI.{
-    AccountView,
-    FilterView,
-    ListView,
-    MastodonView,
-    PushSubscriptionView,
-    StatusView
-  }
-
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
-  alias Pleroma.Web.OAuth.{App, Authorization, Token}
+  alias Pleroma.Web.MastodonAPI.AccountView
+  alias Pleroma.Web.MastodonAPI.FilterView
+  alias Pleroma.Web.MastodonAPI.ListView
+  alias Pleroma.Web.MastodonAPI.MastodonView
+  alias Pleroma.Web.MastodonAPI.PushSubscriptionView
+  alias Pleroma.Web.MastodonAPI.StatusView
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils
+  alias Pleroma.Web.OAuth.App
+  alias Pleroma.Web.OAuth.Authorization
+  alias Pleroma.Web.OAuth.Token

 
   import Ecto.Query
   require Logger
 
   import Ecto.Query
   require Logger

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 0235f5d5bdf7ab71f920424e19c1d665c20e630f..9df9f14b2a04ff352750e2d7f85a73a6224d09d3 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -5,7 +5,8 @@
 defmodule Pleroma.Web.MastodonAPI.AccountView do
   use Pleroma.Web, :view
 
 defmodule Pleroma.Web.MastodonAPI.AccountView do
   use Pleroma.Web, :view
 

-  alias Pleroma.{HTML, User}
+  alias Pleroma.HTML
+  alias Pleroma.User

   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MastodonAPI.AccountView
   alias Pleroma.Web.MediaProxy
   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MastodonAPI.AccountView
   alias Pleroma.Web.MediaProxy

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index cd030fe545d665c7116ab4c91fc8afded74bb17b..f51a2ebb0e5ccd4d6039ce962886f1dfcf39da3b 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -5,9 +5,13 @@
 defmodule Pleroma.Web.MastodonAPI.StatusView do
   use Pleroma.Web, :view
 
 defmodule Pleroma.Web.MastodonAPI.StatusView do
   use Pleroma.Web, :view
 

-  alias Pleroma.{Activity, HTML, Repo, User}
+  alias Pleroma.Activity
+  alias Pleroma.HTML
+  alias Pleroma.Repo
+  alias Pleroma.User

   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.CommonAPI.Utils

-  alias Pleroma.Web.MastodonAPI.{AccountView, StatusView}
+  alias Pleroma.Web.MastodonAPI.AccountView
+  alias Pleroma.Web.MastodonAPI.StatusView

   alias Pleroma.Web.MediaProxy
 
   # TODO: Add cached version.
   alias Pleroma.Web.MediaProxy
 
   # TODO: Add cached version.

diff --git a/lib/pleroma/web/mastodon_api/websocket_handler.ex b/lib/pleroma/web/mastodon_api/websocket_handler.ex
index ce42338a744b74ee783293c364358f67dcee657b..ea75070c441f343e39b4e2c344d6fd869e722859 100644 (file)
--- a/lib/pleroma/web/mastodon_api/websocket_handler.ex
+++ b/lib/pleroma/web/mastodon_api/websocket_handler.ex
@@ -6,7 +6,8 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
   require Logger
 
   alias Pleroma.Web.OAuth.Token
   require Logger
 
   alias Pleroma.Web.OAuth.Token

-  alias Pleroma.{Repo, User}
+  alias Pleroma.Repo
+  alias Pleroma.User

 
   @behaviour :cowboy_websocket_handler
 
 
   @behaviour :cowboy_websocket_handler
 

diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex
index 479c9d20de1c5219f6b94ded775292ed3ab3839f..190377767ddf4c534cecbcc4be0c2a9759ddfb20 100644 (file)
--- a/lib/pleroma/web/metadata/opengraph.ex
+++ b/lib/pleroma/web/metadata/opengraph.ex
@@ -3,8 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Metadata.Providers.OpenGraph do

-  alias Pleroma.{HTML, Formatter, User}
-  alias Pleroma.Web.{Metadata, MediaProxy}
+  alias Pleroma.HTML
+  alias Pleroma.Formatter
+  alias Pleroma.User
+  alias Pleroma.Web.Metadata
+  alias Pleroma.Web.MediaProxy

   alias Pleroma.Web.Metadata.Providers.Provider
 
   @behaviour Provider
   alias Pleroma.Web.Metadata.Providers.Provider
 
   @behaviour Provider

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index e81de7bbd6ad0ac49ebf05712e6778d2ff6bf3b1..c38827165ae7495fac783cfbf62834b5881b82e8 100644 (file)
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -5,7 +5,11 @@
 defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
   use Pleroma.Web, :controller
 
 defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
   use Pleroma.Web, :controller
 

-  alias Pleroma.{Config, Repo, Stats, User, Web}
+  alias Pleroma.Config
+  alias Pleroma.Repo
+  alias Pleroma.Stats
+  alias Pleroma.User
+  alias Pleroma.Web

   alias Pleroma.Web.ActivityPub.MRF
 
   plug(Pleroma.Web.FederatingPlug)
   alias Pleroma.Web.ActivityPub.MRF
 
   plug(Pleroma.Web.FederatingPlug)

diff --git a/lib/pleroma/web/oauth/authorization.ex b/lib/pleroma/web/oauth/authorization.ex
index f8c65602dda59cd682ed522f3e1abd8b8c951730..ea742f6786deab65311585f8ad7b6a07d033c799 100644 (file)
--- a/lib/pleroma/web/oauth/authorization.ex
+++ b/lib/pleroma/web/oauth/authorization.ex
@@ -5,8 +5,10 @@
 defmodule Pleroma.Web.OAuth.Authorization do
   use Ecto.Schema
 
 defmodule Pleroma.Web.OAuth.Authorization do
   use Ecto.Schema
 

-  alias Pleroma.{User, Repo}
-  alias Pleroma.Web.OAuth.{Authorization, App}
+  alias Pleroma.User
+  alias Pleroma.Repo
+  alias Pleroma.Web.OAuth.Authorization
+  alias Pleroma.Web.OAuth.App

 
   import Ecto.{Changeset, Query}
 
 
   import Ecto.{Changeset, Query}
 

diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index 8ec963c79f557e2000e49e21ed1f8511dd3c891e..e4d0601f8ba00b7b8963cb10b73a83f0c18b8abf 100644 (file)
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -5,8 +5,11 @@
 defmodule Pleroma.Web.OAuth.OAuthController do
   use Pleroma.Web, :controller
 
 defmodule Pleroma.Web.OAuth.OAuthController do
   use Pleroma.Web, :controller
 

-  alias Pleroma.Web.OAuth.{Authorization, Token, App}
-  alias Pleroma.{Repo, User}
+  alias Pleroma.Web.OAuth.Authorization
+  alias Pleroma.Web.OAuth.Token
+  alias Pleroma.Web.OAuth.App
+  alias Pleroma.Repo
+  alias Pleroma.User

   alias Comeonin.Pbkdf2
 
   plug(:fetch_session)
   alias Comeonin.Pbkdf2
 
   plug(:fetch_session)

diff --git a/lib/pleroma/web/oauth/token.ex b/lib/pleroma/web/oauth/token.ex
index 4e01b123b2ff3589f1b146a424c9ecd6d6624d71..b0bbeeb69d47fcc62fcdb43fe8d5f82dec1a68d6 100644 (file)
--- a/lib/pleroma/web/oauth/token.ex
+++ b/lib/pleroma/web/oauth/token.ex
@@ -7,8 +7,11 @@ defmodule Pleroma.Web.OAuth.Token do
 
   import Ecto.Query
 
 
   import Ecto.Query
 

-  alias Pleroma.{User, Repo}
-  alias Pleroma.Web.OAuth.{Token, App, Authorization}
+  alias Pleroma.User
+  alias Pleroma.Repo
+  alias Pleroma.Web.OAuth.Token
+  alias Pleroma.Web.OAuth.App
+  alias Pleroma.Web.OAuth.Authorization

 
   schema "oauth_tokens" do
     field(:token, :string)
 
   schema "oauth_tokens" do
     field(:token, :string)

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 3d41fc708224649115daad4f1ffd670991a9fb86..9e1f24bc434fcb9ad7b3ae19c842851a45f37655 100644 (file)
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -3,8 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OStatus.ActivityRepresenter do

-  alias Pleroma.{Activity, User, Object}
+  alias Pleroma.Activity
+  alias Pleroma.User
+  alias Pleroma.Object

   alias Pleroma.Web.OStatus.UserRepresenter
   alias Pleroma.Web.OStatus.UserRepresenter

+

   require Logger
 
   defp get_href(id) do
   require Logger
 
   defp get_href(id) do

diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index fd530307cfee067e6ad4ba2ae70e8928087fc659..025d4731cf0dc7067814310d7d39cc23096197c3 100644 (file)
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -4,8 +4,10 @@
 
 defmodule Pleroma.Web.OStatus.FeedRepresenter do
   alias Pleroma.User
 
 defmodule Pleroma.Web.OStatus.FeedRepresenter do
   alias Pleroma.User

-  alias Pleroma.Web.{OStatus, MediaProxy}
-  alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
+  alias Pleroma.Web.OStatus
+  alias Pleroma.Web.MediaProxy
+  alias Pleroma.Web.OStatus.ActivityRepresenter
+  alias Pleroma.Web.OStatus.UserRepresenter

 
   def to_simple_form(user, activities, _users) do
     most_recent_update =
 
   def to_simple_form(user, activities, _users) do
     most_recent_update =

diff --git a/lib/pleroma/web/ostatus/handlers/follow_handler.ex b/lib/pleroma/web/ostatus/handlers/follow_handler.ex
index becdf2fbf18d36ebeb3cfb9beb3a4b5a1da5b63d..91ad4bc40f960c0ceb6e47a32b0b2ab8eee2b588 100644 (file)
--- a/lib/pleroma/web/ostatus/handlers/follow_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/follow_handler.ex
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OStatus.FollowHandler do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OStatus.FollowHandler do

-  alias Pleroma.Web.{XML, OStatus}
+  alias Pleroma.Web.XML
+  alias Pleroma.Web.OStatus

   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.User
 
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.User
 

diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index 5bbb86f872b42214283989fb7466edaf3984718b..c2e585cac18f7a72030661161a93df1f98202a60 100644 (file)
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -4,9 +4,12 @@
 
 defmodule Pleroma.Web.OStatus.NoteHandler do
   require Logger
 
 defmodule Pleroma.Web.OStatus.NoteHandler do
   require Logger

-  alias Pleroma.Web.{XML, OStatus}
-  alias Pleroma.{Object, Activity}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
+  alias Pleroma.Web.OStatus
+  alias Pleroma.Web.XML
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils

   alias Pleroma.Web.CommonAPI
 
   @doc """
   alias Pleroma.Web.CommonAPI
 
   @doc """

diff --git a/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex b/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex
index 1c64f3c3d2fce32e7dddcba0412506c604d926b0..c9085894d115cbb2e849452c3d4ff054324b0613 100644 (file)
--- a/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OStatus.UnfollowHandler do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OStatus.UnfollowHandler do

-  alias Pleroma.Web.{XML, OStatus}
+  alias Pleroma.Web.XML
+  alias Pleroma.Web.OStatus

   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.User
 
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.User
 

diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index e1213923e495ef8c1e5a691520888d829b7793ef..b4f5761ac2d15f86c1645741117a749e149aebfc 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -9,10 +9,19 @@ defmodule Pleroma.Web.OStatus do
   import Pleroma.Web.XML
   require Logger
 
   import Pleroma.Web.XML
   require Logger
 

-  alias Pleroma.{Repo, User, Web, Object, Activity}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, Transmogrifier}
-  alias Pleroma.Web.{WebFinger, Websub}
-  alias Pleroma.Web.OStatus.{FollowHandler, UnfollowHandler, NoteHandler, DeleteHandler}
+  alias Pleroma.Repo
+  alias Pleroma.User
+  alias Pleroma.Web
+  alias Pleroma.Object
+  alias Pleroma.Activity
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Transmogrifier
+  alias Pleroma.Web.WebFinger
+  alias Pleroma.Web.Websub
+  alias Pleroma.Web.OStatus.FollowHandler
+  alias Pleroma.Web.OStatus.UnfollowHandler
+  alias Pleroma.Web.OStatus.NoteHandler
+  alias Pleroma.Web.OStatus.DeleteHandler

 
   def is_representable?(%Activity{data: data}) do
     object = Object.normalize(data["object"])
 
   def is_representable?(%Activity{data: data}) do
     object = Object.normalize(data["object"])

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index ed0df620bff42017abee1a3cd0296035d11871b6..db4c8f4daf7d45c55656614379ffa196e7958778 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -5,10 +5,16 @@
 defmodule Pleroma.Web.OStatus.OStatusController do
   use Pleroma.Web, :controller
 
 defmodule Pleroma.Web.OStatus.OStatusController do
   use Pleroma.Web, :controller
 

-  alias Pleroma.{Activity, Object, User}
-  alias Pleroma.Web.ActivityPub.{ActivityPub, ActivityPubController, ObjectView}
-  alias Pleroma.Web.OStatus.{ActivityRepresenter, FeedRepresenter}
-  alias Pleroma.Web.{Federator, OStatus}
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.ActivityPubController
+  alias Pleroma.Web.ActivityPub.ObjectView
+  alias Pleroma.Web.OStatus.ActivityRepresenter
+  alias Pleroma.Web.OStatus.FeedRepresenter
+  alias Pleroma.Web.Federator
+  alias Pleroma.Web.OStatus

   alias Pleroma.Web.XML
 
   plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming])
   alias Pleroma.Web.XML
 
   plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming])

diff --git a/lib/pleroma/web/push/push.ex b/lib/pleroma/web/push/push.ex
index ffd2aac91ad1097de63be3c229eb94a72f1e3028..ddd4fe0376fdf3a1584be21f6f5994c1a6b8066f 100644 (file)
--- a/lib/pleroma/web/push/push.ex
+++ b/lib/pleroma/web/push/push.ex
@@ -5,7 +5,8 @@
 defmodule Pleroma.Web.Push do
   use GenServer
 
 defmodule Pleroma.Web.Push do
   use GenServer
 

-  alias Pleroma.{Repo, User}
+  alias Pleroma.Repo
+  alias Pleroma.User

   alias Pleroma.Web.Push.Subscription
 
   require Logger
   alias Pleroma.Web.Push.Subscription
 
   require Logger

diff --git a/lib/pleroma/web/push/subscription.ex b/lib/pleroma/web/push/subscription.ex
index bd9d9f3a75e2acc9844da61139cff9abf2f197ce..242e30910747cf32576b70080077ee1d24448cb4 100644 (file)
--- a/lib/pleroma/web/push/subscription.ex
+++ b/lib/pleroma/web/push/subscription.ex
@@ -4,8 +4,11 @@
 
 defmodule Pleroma.Web.Push.Subscription do
   use Ecto.Schema
 
 defmodule Pleroma.Web.Push.Subscription do
   use Ecto.Schema

+

   import Ecto.Changeset
   import Ecto.Changeset

-  alias Pleroma.{Repo, User}
+
+  alias Pleroma.Repo
+  alias Pleroma.User

   alias Pleroma.Web.OAuth.Token
   alias Pleroma.Web.Push.Subscription
 
   alias Pleroma.Web.OAuth.Token
   alias Pleroma.Web.Push.Subscription
 

diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index 521fa7ee048cabcee0b465f524cae89170a56184..abb1cf7f2b481617fc18236328a397abf2032b65 100644 (file)
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.RichMedia.Helpers do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.RichMedia.Helpers do

-  alias Pleroma.{Activity, Object, HTML}
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.HTML

   alias Pleroma.Web.RichMedia.Parser
 
   def fetch_data_for_activity(%Activity{} = activity) do
   alias Pleroma.Web.RichMedia.Parser
 
   def fetch_data_for_activity(%Activity{} = activity) do

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index fb08d645b6cf57d4e6dd9fa3602852ab0af7702c..a5a9e16c62cfd2f821234e960ce947f98d22ea19 100644 (file)
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -7,7 +7,8 @@ defmodule Pleroma.Web.Salmon do
 
   use Bitwise
 
 
   use Bitwise
 

-  alias Pleroma.{Instances, User}
+  alias Pleroma.Instances
+  alias Pleroma.User

   alias Pleroma.Web.XML
   alias Pleroma.Web.OStatus.ActivityRepresenter
 
   alias Pleroma.Web.XML
   alias Pleroma.Web.OStatus.ActivityRepresenter
 

diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
index 978c77e57b4209c7248f91b2825a7f85c9b89ace..4de7608e4c683d789cbf80779101136739770c4d 100644 (file)
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@@ -5,7 +5,11 @@
 defmodule Pleroma.Web.Streamer do
   use GenServer
   require Logger
 defmodule Pleroma.Web.Streamer do
   use GenServer
   require Logger

-  alias Pleroma.{User, Notification, Activity, Object, Repo}
+  alias Pleroma.User
+  alias Pleroma.Notification
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.Repo

   alias Pleroma.Web.ActivityPub.ActivityPub
 
   @keepalive_interval :timer.seconds(30)
   alias Pleroma.Web.ActivityPub.ActivityPub
 
   @keepalive_interval :timer.seconds(30)

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index bf8d7e5aafb862b99a3eb09cadff33f8325aaf60..e2fdedb25f94cab9182a44726697741943f1fc44 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -8,9 +8,14 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
   require Logger
 
   alias Comeonin.Pbkdf2
   require Logger
 
   alias Comeonin.Pbkdf2

-  alias Pleroma.{Emoji, PasswordResetToken, User, Repo}
+  alias Pleroma.Emoji
+  alias Pleroma.PasswordResetToken
+  alias Pleroma.User
+  alias Pleroma.Repo

   alias Pleroma.Web
   alias Pleroma.Web

-  alias Pleroma.Web.{CommonAPI, OStatus, WebFinger}
+  alias Pleroma.Web.CommonAPI
+  alias Pleroma.Web.OStatus
+  alias Pleroma.Web.WebFinger

   alias Pleroma.Web.ActivityPub.ActivityPub
 
   def show_password_reset(conn, %{"token" => token}) do
   alias Pleroma.Web.ActivityPub.ActivityPub
 
   def show_password_reset(conn, %{"token" => token}) do

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index a5fec88f7286330f6443b88ea12905c2c864d30a..192ab7334a069c69350f21c7af9b004c98d87e84 100644 (file)
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -2,13 +2,19 @@
 # Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 # Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 

+# FIXME: Remove this module?

 # THIS MODULE IS DEPRECATED! DON'T USE IT!
 # USE THE Pleroma.Web.TwitterAPI.Views.ActivityView MODULE!
 defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
   alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
 # THIS MODULE IS DEPRECATED! DON'T USE IT!
 # USE THE Pleroma.Web.TwitterAPI.Views.ActivityView MODULE!
 defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
   alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter

-  alias Pleroma.{Activity, Formatter, HTML, User}
-  alias Pleroma.Web.TwitterAPI.{ActivityView, TwitterAPI, UserView}
+  alias Pleroma.Activity
+  alias Pleroma.Formatter
+  alias Pleroma.HTML
+  alias Pleroma.User
+  alias Pleroma.Web.TwitterAPI.ActivityView
+  alias Pleroma.Web.TwitterAPI.TwitterAPI
+  alias Pleroma.Web.TwitterAPI.UserView

   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MastodonAPI.StatusView
 
   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MastodonAPI.StatusView
 

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 7d00c01a164a709d9229b31b00ae6f932c40e789..db521a3ad09599568d52dc597c2b1e469e8dc6e4 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -3,8 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do

-  alias Pleroma.{UserInviteToken, User, Activity, Repo, Object}
-  alias Pleroma.{UserEmail, Mailer}
+  alias Pleroma.UserInviteToken
+  alias Pleroma.User
+  alias Pleroma.Activity
+  alias Pleroma.Repo
+  alias Pleroma.Object
+  alias Pleroma.UserEmail
+  alias Pleroma.Mailer

   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.TwitterAPI.UserView
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.TwitterAPI.UserView
   alias Pleroma.Web.CommonAPI

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index c0081bf6e1ff25139c2d4dc0b6be86d3c0d135c8..c2f0dc2a9e331b361bb1820af6a79e743134f430 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -8,10 +8,18 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   import Pleroma.Web.ControllerHelper, only: [json_response: 3]
 
   alias Ecto.Changeset
   import Pleroma.Web.ControllerHelper, only: [json_response: 3]
 
   alias Ecto.Changeset

-  alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
+  alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Web.ActivityPub.Utils

   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.CommonAPI

-  alias Pleroma.Web.TwitterAPI.{ActivityView, NotificationView, TwitterAPI, UserView}
-  alias Pleroma.{Activity, Object, Notification, Repo, User}
+  alias Pleroma.Web.TwitterAPI.ActivityView
+  alias Pleroma.Web.TwitterAPI.NotificationView
+  alias Pleroma.Web.TwitterAPI.TwitterAPI
+  alias Pleroma.Web.TwitterAPI.UserView
+  alias Pleroma.Activity
+  alias Pleroma.Object
+  alias Pleroma.Notification
+  alias Pleroma.Repo
+  alias Pleroma.User

 
   require Logger
 
 
   require Logger
 

diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex
index dbcb732fea6e58b59b84b8a5e028957246c76f4b..661022afa7f9464169c8d520d54fe6fa08d09355 100644 (file)
--- a/lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/lib/pleroma/web/twitter_api/views/activity_view.ex
@@ -4,10 +4,17 @@
 
 defmodule Pleroma.Web.TwitterAPI.ActivityView do
   use Pleroma.Web, :view
 
 defmodule Pleroma.Web.TwitterAPI.ActivityView do
   use Pleroma.Web, :view

-  alias Pleroma.{Activity, Formatter, HTML, Object, Repo, User}
+  alias Pleroma.Activity
+  alias Pleroma.Formatter
+  alias Pleroma.HTML
+  alias Pleroma.Object
+  alias Pleroma.Repo
+  alias Pleroma.User

   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MastodonAPI.StatusView
   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MastodonAPI.StatusView

-  alias Pleroma.Web.TwitterAPI.{ActivityView, TwitterAPI, UserView}
+  alias Pleroma.Web.TwitterAPI.ActivityView
+  alias Pleroma.Web.TwitterAPI.TwitterAPI
+  alias Pleroma.Web.TwitterAPI.UserView

   alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
 
   import Ecto.Query
   alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
 
   import Ecto.Query

diff --git a/lib/pleroma/web/twitter_api/views/notification_view.ex b/lib/pleroma/web/twitter_api/views/notification_view.ex
index 414ed4731fa81bdb7e6d3e89cf836a6272bf4b7f..e7c7a74964d06f832c30b9355aed88a12340edb3 100644 (file)
--- a/lib/pleroma/web/twitter_api/views/notification_view.ex
+++ b/lib/pleroma/web/twitter_api/views/notification_view.ex
@@ -4,9 +4,11 @@
 
 defmodule Pleroma.Web.TwitterAPI.NotificationView do
   use Pleroma.Web, :view
 
 defmodule Pleroma.Web.TwitterAPI.NotificationView do
   use Pleroma.Web, :view

-  alias Pleroma.{Notification, User}
+  alias Pleroma.Notification
+  alias Pleroma.User

   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.CommonAPI.Utils

-  alias Pleroma.Web.TwitterAPI.{ActivityView, UserView}
+  alias Pleroma.Web.TwitterAPI.ActivityView
+  alias Pleroma.Web.TwitterAPI.UserView

 
   defp get_user(ap_id, opts) do
     cond do
 
   defp get_user(ap_id, opts) do
     cond do

diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index 3cde3bc1beeeea757fd3dc476ec8e23b4b1fd39d..a09450df74629f63d92746aee30309cd1286712f 100644 (file)
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -4,7 +4,9 @@
 
 defmodule Pleroma.Web.TwitterAPI.UserView do
   use Pleroma.Web, :view
 
 defmodule Pleroma.Web.TwitterAPI.UserView do
   use Pleroma.Web, :view

-  alias Pleroma.{Formatter, HTML, User}
+  alias Pleroma.Formatter
+  alias Pleroma.HTML
+  alias Pleroma.User

   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MediaProxy
 
   alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Web.MediaProxy
 

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 0a63383121c43f8239da443fc4801c2d6da565e1..5ea5ae48e809fe21b3770b05c5e7f1a389d552fe 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -5,9 +5,12 @@
 defmodule Pleroma.Web.WebFinger do
   @httpoison Application.get_env(:pleroma, :httpoison)
 
 defmodule Pleroma.Web.WebFinger do
   @httpoison Application.get_env(:pleroma, :httpoison)
 

-  alias Pleroma.{User, XmlBuilder}
+  alias Pleroma.User
+  alias Pleroma.XmlBuilder

   alias Pleroma.Web
   alias Pleroma.Web

-  alias Pleroma.Web.{XML, Salmon, OStatus}
+  alias Pleroma.Web.XML
+  alias Pleroma.Web.Salmon
+  alias Pleroma.Web.OStatus

   require Jason
   require Logger
 
   require Jason
   require Logger
 

diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index de6508f5228837b352617837916c2f6fba2b970a..a08d7993d007915d63a00265ab4389ab2e825a37 100644 (file)
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -4,10 +4,14 @@
 
 defmodule Pleroma.Web.Websub do
   alias Ecto.Changeset
 
 defmodule Pleroma.Web.Websub do
   alias Ecto.Changeset

-  alias Pleroma.{Instances, Repo}
-  alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
+  alias Pleroma.Instances
+  alias Pleroma.Repo
+  alias Pleroma.Web.Websub.WebsubServerSubscription
+  alias Pleroma.Web.Websub.WebsubClientSubscription

   alias Pleroma.Web.OStatus.FeedRepresenter
   alias Pleroma.Web.OStatus.FeedRepresenter

-  alias Pleroma.Web.{XML, Endpoint, OStatus}
+  alias Pleroma.Web.XML
+  alias Pleroma.Web.Endpoint
+  alias Pleroma.Web.OStatus

   alias Pleroma.Web.Router.Helpers
   require Logger
 
   alias Pleroma.Web.Router.Helpers
   require Logger
 

diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex
index a92dfe87b6cd0191bc412d10e1f960f9a05adc6d..1ad18a8a4edad84fae8252a4ca5b266b6a62096e 100644 (file)
--- a/lib/pleroma/web/websub/websub_controller.ex
+++ b/lib/pleroma/web/websub/websub_controller.ex
@@ -5,8 +5,10 @@
 defmodule Pleroma.Web.Websub.WebsubController do
   use Pleroma.Web, :controller
 
 defmodule Pleroma.Web.Websub.WebsubController do
   use Pleroma.Web, :controller
 

-  alias Pleroma.{Repo, User}
-  alias Pleroma.Web.{Websub, Federator}
+  alias Pleroma.Repo
+  alias Pleroma.User
+  alias Pleroma.Web.Websub
+  alias Pleroma.Web.Federator

   alias Pleroma.Web.Websub.WebsubClientSubscription
 
   require Logger
   alias Pleroma.Web.Websub.WebsubClientSubscription
 
   require Logger