Clean up unused aliases and imports

diff --git a/lib/mix/tasks/generate_password_reset.ex b/lib/mix/tasks/generate_password_reset.ex
index e39134007fac7e7dcc74247e1c9048a2e6ea64fc..6bf640150ca3849ea00d2f40a920dfa5b806afaf 100644 (file)
--- a/lib/mix/tasks/generate_password_reset.ex
+++ b/lib/mix/tasks/generate_password_reset.ex
@@ -1,7 +1,6 @@
 defmodule Mix.Tasks.GeneratePasswordReset do
   use Mix.Task
-  import Mix.Ecto
-  alias Pleroma.{Repo, User}
+  alias Pleroma.User
 
   @shortdoc "Generate password reset link for user"
   def run([nickname]) do

diff --git a/lib/mix/tasks/register_user.ex b/lib/mix/tasks/register_user.ex
index 4bec6b9d9c5c59f471b7e4d295a0d6f964b02fbd..e74721c49b9e43b993b29b31b1d4b0881978d336 100644 (file)
--- a/lib/mix/tasks/register_user.ex
+++ b/lib/mix/tasks/register_user.ex
@@ -1,6 +1,5 @@
 defmodule Mix.Tasks.RegisterUser do
   use Mix.Task
-  import Mix.Ecto
   alias Pleroma.{Repo, User}
 
   @shortdoc "Register user"

diff --git a/lib/mix/tasks/rm_user.ex b/lib/mix/tasks/rm_user.ex
index 6a698f3600e834b9b329beb3d277669740b880a2..27521b745767e39d26e76e9a558651708acd79ff 100644 (file)
--- a/lib/mix/tasks/rm_user.ex
+++ b/lib/mix/tasks/rm_user.ex
@@ -1,7 +1,6 @@
 defmodule Mix.Tasks.RmUser do
   use Mix.Task
-  import Mix.Ecto
-  alias Pleroma.{User, Repo}
+  alias Pleroma.User
 
   @shortdoc "Permanently delete a user"
   def run([nickname]) do

diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
index 83b896a16a8d875f5324fe5b2a34d8f5e9cd8038..8478fe4ced6565642c864b0a2b88bededfb7882f 100644 (file)
--- a/lib/pleroma/stats.ex
+++ b/lib/pleroma/stats.ex
@@ -1,6 +1,6 @@
 defmodule Pleroma.Stats do
   import Ecto.Query
-  alias Pleroma.{User, Repo, Activity}
+  alias Pleroma.{User, Repo}
 
   def start_link do
     agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 12f61f5f0760b1072d9de8d25b02d8164b736bb9..d374fd91f6bd5f616125e0912ada986c7979a03e 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -1,6 +1,6 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   use Pleroma.Web, :controller
-  alias Pleroma.{User, Repo, Object, Activity}
+  alias Pleroma.{User, Object}
   alias Pleroma.Web.ActivityPub.{ObjectView, UserView, Transmogrifier}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.Federator

diff --git a/lib/pleroma/web/channels/user_socket.ex b/lib/pleroma/web/channels/user_socket.ex
index fd8918a7dfab83900addab182e2d342c57e23c0e..21b22b40994a6419282645f8ecb68dd757ff597a 100644 (file)
--- a/lib/pleroma/web/channels/user_socket.ex
+++ b/lib/pleroma/web/channels/user_socket.ex
@@ -1,7 +1,6 @@
 defmodule Pleroma.Web.UserSocket do
   use Phoenix.Socket
   alias Pleroma.User
-  alias Comeonin.Pbkdf2
 
   ## Channels
   # channel "room:*", Pleroma.Web.RoomChannel

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 2c4b591d4a9477d14584821b32f424d894122808..14a68929dcaf036466422abf00eeb9342f2f3f7a 100644 (file)
--- 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 b142eda952a9cf13dd735dab1fa57d91e3f4b0d0..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
-  alias Pleroma.{Repo, Object, Formatter, User, Activity}
+  alias Pleroma.{Repo, Object, Formatter, Activity}
   alias Pleroma.Web.ActivityPub.Utils
   alias Calendar.Strftime
 

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 36a7802eddc962b8c3251300e19329302e5cf274..aec77168a5c466ef5f91cf9351cf735c94d5963d 100644 (file)
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -1,7 +1,6 @@
 defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.Web.Nodeinfo
   alias Pleroma.Stats
   alias Pleroma.Web
 

diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 921a89bd015fca545652f3c0f202996e0d220080..e8841a8562e1029773ec605d0efcaab50b4ec12c 100644 (file)
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -1,7 +1,6 @@
 defmodule Pleroma.Web.OStatus.ActivityRepresenter do
   alias Pleroma.{Activity, User, Object}
   alias Pleroma.Web.OStatus.UserRepresenter
-  alias Pleroma.Formatter
   require Logger
 
   defp get_href(id) do

diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index bd6e92238efd6ee748b676a8bdd3b58be3b65034..0d40802913513c27317f87102f9121ffbfcb3a93 100644 (file)
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -1,7 +1,7 @@
 defmodule Pleroma.Web.OStatus.NoteHandler do
   require Logger
   alias Pleroma.Web.{XML, OStatus}
-  alias Pleroma.{Object, User, Activity}
+  alias Pleroma.{Object, Activity}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.CommonAPI

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index a02f55fe6383b85ace1eedbafab0f70bd059adf4..f39ebaf2b5f92d0701e4f6efae1d0b0d1ec45db0 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -8,7 +8,6 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   alias Pleroma.Web.XML
   alias Pleroma.Web.ActivityPub.ActivityPubController
   alias Pleroma.Web.ActivityPub.ActivityPub
-  import Ecto.Query
 
   def feed_redirect(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 5a843a3ab0489eed89dab95d702ebc8e7132d425..44ea40a4e4e8bdb6cbf1b08fb3d1d260b969b334 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,7 +1,6 @@
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   alias Pleroma.{User, Activity, Repo, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
-  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
   alias Pleroma.Web.TwitterAPI.UserView
   alias Pleroma.Web.{OStatus, CommonAPI}
   import Ecto.Query

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index dc9ad2014216d425ac08b22993c00b6cb82c94d6..9fe3b2ca17f58727fb81631b6bd740f903108146 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -1,7 +1,7 @@
 defmodule Pleroma.Web.WebFinger do
   @httpoison Application.get_env(:pleroma, :httpoison)
 
-  alias Pleroma.{Repo, User, XmlBuilder}
+  alias Pleroma.{User, XmlBuilder}
   alias Pleroma.Web
   alias Pleroma.Web.{XML, Salmon, OStatus}
   require Jason