projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
106f4e7
)
Credo fixes: alias grouping/ordering
author
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Wed, 6 Feb 2019 19:20:02 +0000
(20:20 +0100)
committer
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Sat, 9 Feb 2019 13:59:20 +0000
(14:59 +0100)
28 files changed:
lib/pleroma/captcha/captcha.ex
patch
|
blob
|
history
lib/pleroma/formatter.ex
patch
|
blob
|
history
lib/pleroma/gopher/server.ex
patch
|
blob
|
history
lib/pleroma/html.ex
patch
|
blob
|
history
lib/pleroma/instances/instance.ex
patch
|
blob
|
history
lib/pleroma/plugs/user_fetcher_plug.ex
patch
|
blob
|
history
lib/pleroma/user_invite_token.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub_controller.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/views/user_view.ex
patch
|
blob
|
history
lib/pleroma/web/common_api/common_api.ex
patch
|
blob
|
history
lib/pleroma/web/common_api/utils.ex
patch
|
blob
|
history
lib/pleroma/web/federator/federator.ex
patch
|
blob
|
history
lib/pleroma/web/http_signatures/http_signatures.ex
patch
|
blob
|
history
lib/pleroma/web/metadata/opengraph.ex
patch
|
blob
|
history
lib/pleroma/web/ostatus/feed_representer.ex
patch
|
blob
|
history
lib/pleroma/web/ostatus/handlers/note_handler.ex
patch
|
blob
|
history
lib/pleroma/web/ostatus/ostatus.ex
patch
|
blob
|
history
lib/pleroma/web/ostatus/ostatus_controller.ex
patch
|
blob
|
history
lib/pleroma/web/salmon/salmon.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/controllers/util_controller.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/representers/activity_representer.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/views/activity_view.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/views/notification_view.ex
patch
|
blob
|
history
lib/pleroma/web/twitter_api/views/user_view.ex
patch
|
blob
|
history
lib/pleroma/web/websub/websub.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/captcha/captcha.ex
b/lib/pleroma/captcha/captcha.ex
index 0207bcbea6261df88c000bb8d7b9d27d9c42ab2e..f70f5a19191466c983e05fe64af0948ea8854193 100644
(file)
--- a/
lib/pleroma/captcha/captcha.ex
+++ b/
lib/pleroma/captcha/captcha.ex
@@
-3,8
+3,7
@@
# 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
- alias Plug.Crypto.MessageEncryptor
+ alias Plug.Crypto.{KeyGenerator, MessageEncryptor}
alias Calendar.DateTime
use GenServer
alias Calendar.DateTime
use GenServer
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index 386096a52b2ad4dfbf94ccf32685b1b734fd8ac2..8a8af266cd1ae7ef160d8f33776b51ff650fdaab 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-3,10
+3,8
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Formatter do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Formatter do
- alias Pleroma.
User
+ alias Pleroma.
{Emoji, HTML, User}
alias Pleroma.Web.MediaProxy
alias Pleroma.Web.MediaProxy
- alias Pleroma.HTML
- alias Pleroma.Emoji
@tag_regex ~r/((?<=[^&])|\A)(\#)(\w+)/u
@markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
@tag_regex ~r/((?<=[^&])|\A)(\#)(\w+)/u
@markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
diff --git
a/lib/pleroma/gopher/server.ex
b/lib/pleroma/gopher/server.ex
index b47a0697d9da48f4621a0f051f2883ab8c17c1a9..a284b3c610128992386d636f21a0185f49c38eeb 100644
(file)
--- a/
lib/pleroma/gopher/server.ex
+++ b/
lib/pleroma/gopher/server.ex
@@
-37,10
+37,7
@@
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.User
- alias Pleroma.Activity
- alias Pleroma.Repo
- alias Pleroma.HTML
+ alias Pleroma.{Activity, HTML, User, 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/html.ex
b/lib/pleroma/html.ex
index b4a4742ee30c39699e0ecaf079a8226415ead5f3..0fd41ffb862630f3447ad933f5a6acb2990c48be 100644
(file)
--- a/
lib/pleroma/html.ex
+++ b/
lib/pleroma/html.ex
@@
-125,6
+125,7
@@
defmodule Pleroma.HTML.Scrubber.Default do
@doc "The default HTML scrubbing policy: no "
require HtmlSanitizeEx.Scrubber.Meta
@doc "The default HTML scrubbing policy: no "
require HtmlSanitizeEx.Scrubber.Meta
+
alias HtmlSanitizeEx.Scrubber.Meta
@markup Application.get_env(:pleroma, :markup)
alias HtmlSanitizeEx.Scrubber.Meta
@markup Application.get_env(:pleroma, :markup)
diff --git
a/lib/pleroma/instances/instance.ex
b/lib/pleroma/instances/instance.ex
index 4a4ca26dd731b3b8a0ddec7e4e06346e2fcaaff3..bab8e0564e143ae5b746a6e166c7a89e391bbe46 100644
(file)
--- a/
lib/pleroma/instances/instance.ex
+++ b/
lib/pleroma/instances/instance.ex
@@
-1,15
+1,13
@@
defmodule Pleroma.Instances.Instance do
@moduledoc "Instance."
defmodule Pleroma.Instances.Instance do
@moduledoc "Instance."
- alias Pleroma.
Instances
+ alias Pleroma.
{Instances, Repo}
alias Pleroma.Instances.Instance
use Ecto.Schema
import Ecto.{Query, Changeset}
alias Pleroma.Instances.Instance
use Ecto.Schema
import Ecto.{Query, Changeset}
- alias Pleroma.Repo
-
schema "instances" do
field(:host, :string)
field(:unreachable_since, :naive_datetime)
schema "instances" do
field(:host, :string)
field(:unreachable_since, :naive_datetime)
diff --git
a/lib/pleroma/plugs/user_fetcher_plug.ex
b/lib/pleroma/plugs/user_fetcher_plug.ex
index f874e2f95a3fd8fb836af99ccdbdd237abf85651..6d6ab092616a2b8f8a64a0602e81dc2c34499f00 100644
(file)
--- a/
lib/pleroma/plugs/user_fetcher_plug.ex
+++ b/
lib/pleroma/plugs/user_fetcher_plug.ex
@@
-3,9
+3,9
@@
# 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}
+
import Plug.Conn
import Plug.Conn
- alias Pleroma.Repo
- alias Pleroma.User
def init(options) do
options
def init(options) do
options
diff --git
a/lib/pleroma/user_invite_token.ex
b/lib/pleroma/user_invite_token.ex
index 5a448114c4df20c9dc55d8780a6969888df352b7..8e449444c3583e25a411e4d523af929625a0bda5 100644
(file)
--- a/
lib/pleroma/user_invite_token.ex
+++ b/
lib/pleroma/user_invite_token.ex
@@
-7,8
+7,7
@@
defmodule Pleroma.UserInviteToken do
import Ecto.Changeset
import Ecto.Changeset
- alias Pleroma.UserInviteToken
- alias Pleroma.Repo
+ alias Pleroma.{UserInviteToken, 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 e1cd2d34c37bc2d7075ebb57843a9e4c897187c9..6028e96a97fe46f8dfe56ad7059946380d96c78d 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-5,11
+5,11
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
alias Pleroma.{Activity, Repo, Object, Upload, User, Notification, Instances}
alias Pleroma.Web.ActivityPub.{Transmogrifier, MRF}
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
- alias Pleroma.Web.Federator
- alias Pleroma.Web.OStatus
+ alias Pleroma.Web.{WebFinger, Federator, OStatus}
+
import Ecto.Query
import Pleroma.Web.ActivityPub.Utils
import Ecto.Query
import Pleroma.Web.ActivityPub.Utils
+
require Logger
@httpoison Application.get_env(:pleroma, :httpoison)
require Logger
@httpoison Application.get_env(:pleroma, :httpoison)
diff --git
a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 2cdf132e2dc998520548ed70d654ca1881ee36f9..01b5210517b834b836b65dd6d7bff961d2e26c60 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@
-7,10
+7,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
alias Pleroma.{Activity, User, Object}
alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
alias Pleroma.{Activity, User, Object}
alias Pleroma.Web.ActivityPub.{ObjectView, UserView}
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Relay
- alias Pleroma.Web.ActivityPub.Utils
- alias Pleroma.Web.ActivityPub.Transmogrifier
+ alias Pleroma.Web.ActivityPub.{ActivityPub, Relay, Transmogrifier, Utils}
alias Pleroma.Web.Federator
require Logger
alias Pleroma.Web.Federator
require Logger
diff --git
a/lib/pleroma/web/activity_pub/transmogrifier.ex
b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 7151efdeb79774b1356403b4f7e291601b77098a..edfbc9bb21cc4480a3aeacf647e2a674bc6243ff 100644
(file)
--- a/
lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/
lib/pleroma/web/activity_pub/transmogrifier.ex
@@
-6,12
+6,8
@@
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.User
- alias Pleroma.Object
- alias Pleroma.Activity
- alias Pleroma.Repo
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Utils
+ alias Pleroma.{Activity, User, Object, Repo}
+ alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
import Ecto.Query
import Ecto.Query
diff --git
a/lib/pleroma/web/activity_pub/views/user_view.ex
b/lib/pleroma/web/activity_pub/views/user_view.ex
index 43ec2010d711f131b5ae19579a97ec87d894599d..ba3aea1a608ca0c9aa3e1753425137824ebface4 100644
(file)
--- a/
lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/
lib/pleroma/web/activity_pub/views/user_view.ex
@@
-4,13
+4,11
@@
defmodule Pleroma.Web.ActivityPub.UserView do
use Pleroma.Web, :view
defmodule Pleroma.Web.ActivityPub.UserView do
use Pleroma.Web, :view
- alias Pleroma.Web.Salmon
- alias Pleroma.Web.WebFinger
- alias Pleroma.User
- alias Pleroma.Repo
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Transmogrifier
- alias Pleroma.Web.ActivityPub.Utils
+
+ alias Pleroma.Web.{WebFinger, Salmon}
+ alias Pleroma.{User, Repo}
+ alias Pleroma.Web.ActivityPub.{ActivityPub, Transmogrifier, Utils}
+
import Ecto.Query
# the instance itself is not a Person, but instead an Application
import Ecto.Query
# the instance itself is not a Person, but instead an Application
diff --git
a/lib/pleroma/web/common_api/common_api.ex
b/lib/pleroma/web/common_api/common_api.ex
index 7084da6deca42948351e1fe5547cdda9bb91e3ed..4388396cf9a2b20d6e631c85774e526e8ae2f10e 100644
(file)
--- a/
lib/pleroma/web/common_api/common_api.ex
+++ b/
lib/pleroma/web/common_api/common_api.ex
@@
-4,8
+4,7
@@
defmodule Pleroma.Web.CommonAPI do
alias Pleroma.{User, Repo, Activity, Object}
defmodule Pleroma.Web.CommonAPI do
alias Pleroma.{User, Repo, Activity, Object}
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Utils
+ alias Pleroma.Web.ActivityPub.{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 be90b60bcdab7536c2b2ec91d792f18bc61e25c6..e50d63d7753652c4646abc93d920bbf73e21a131 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-7,9
+7,8
@@
defmodule Pleroma.Web.CommonAPI.Utils do
alias Comeonin.Pbkdf2
alias Pleroma.{Activity, Formatter, Object, Repo}
alias Pleroma.{User, Web}
alias Comeonin.Pbkdf2
alias Pleroma.{Activity, Formatter, Object, Repo}
alias Pleroma.{User, Web}
+ alias Pleroma.Web.{Endpoint, MediaProxy}
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Utils
- alias Pleroma.Web.Endpoint
- alias Pleroma.Web.MediaProxy
# This is a hack for twidere.
def get_by_id_or_ap_id(id) do
# This is a hack for twidere.
def get_by_id_or_ap_id(id) do
diff --git
a/lib/pleroma/web/federator/federator.ex
b/lib/pleroma/web/federator/federator.ex
index 6fe3dd2a09734635f9f87e26646cba8e7aa82e54..71648e8c7c33d5e3c9b7182e4a56f97f53ccdafd 100644
(file)
--- a/
lib/pleroma/web/federator/federator.ex
+++ b/
lib/pleroma/web/federator/federator.ex
@@
-4,15
+4,13
@@
defmodule Pleroma.Web.Federator do
use GenServer
defmodule Pleroma.Web.Federator do
use GenServer
- alias Pleroma.User
- alias Pleroma.
Activity
+
+ alias Pleroma.
{Activity, User}
alias Pleroma.Web.{WebFinger, Websub, Salmon}
alias Pleroma.Web.{WebFinger, Websub, Salmon}
+ alias Pleroma.Web.ActivityPub.{ActivityPub, Relay, Transmogrifier, Utils}
alias Pleroma.Web.Federator.RetryQueue
alias Pleroma.Web.Federator.RetryQueue
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Relay
- alias Pleroma.Web.ActivityPub.Transmogrifier
- alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus
+
require Logger
@websub Application.get_env(:pleroma, :websub)
require Logger
@websub Application.get_env(:pleroma, :websub)
diff --git
a/lib/pleroma/web/http_signatures/http_signatures.ex
b/lib/pleroma/web/http_signatures/http_signatures.ex
index e81f9e27a3e3782d8d7325dfdd7d036b12198b7e..5ff93663eb19c5daceceacd693fedaa26c517210 100644
(file)
--- a/
lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/
lib/pleroma/web/http_signatures/http_signatures.ex
@@
-5,8
+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.
Utils
- alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.
{ActivityPub, Utils}
+
require Logger
def split_signature(sig) do
require Logger
def split_signature(sig) do
diff --git
a/lib/pleroma/web/metadata/opengraph.ex
b/lib/pleroma/web/metadata/opengraph.ex
index 30333785ef05ec6b64c306526d96744ef9191909..479c9d20de1c5219f6b94ded775292ed3ab3839f 100644
(file)
--- a/
lib/pleroma/web/metadata/opengraph.ex
+++ b/
lib/pleroma/web/metadata/opengraph.ex
@@
-3,10
+3,9
@@
# 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.Web.Metadata.Providers.Provider
- alias Pleroma.Web.Metadata
alias Pleroma.{HTML, Formatter, User}
alias Pleroma.{HTML, Formatter, User}
- alias Pleroma.Web.MediaProxy
+ alias Pleroma.Web.{Metadata, MediaProxy}
+ alias Pleroma.Web.Metadata.Providers.Provider
@behaviour Provider
@behaviour Provider
diff --git
a/lib/pleroma/web/ostatus/feed_representer.ex
b/lib/pleroma/web/ostatus/feed_representer.ex
index 934d4042fb8c4ac1ffcdbcced2202dff1afc3b3b..fd530307cfee067e6ad4ba2ae70e8928087fc659 100644
(file)
--- a/
lib/pleroma/web/ostatus/feed_representer.ex
+++ b/
lib/pleroma/web/ostatus/feed_representer.ex
@@
-3,10
+3,9
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OStatus.FeedRepresenter do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OStatus.FeedRepresenter do
- alias Pleroma.Web.OStatus
- alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
alias Pleroma.User
alias Pleroma.User
- alias Pleroma.Web.MediaProxy
+ alias Pleroma.Web.{OStatus, MediaProxy}
+ alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
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/note_handler.ex
b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index c5b3e8d97af8f3ce61dc07be150a08100833ea89..5bbb86f872b42214283989fb7466edaf3984718b 100644
(file)
--- a/
lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/
lib/pleroma/web/ostatus/handlers/note_handler.ex
@@
-6,8
+6,7
@@
defmodule Pleroma.Web.OStatus.NoteHandler do
require Logger
alias Pleroma.Web.{XML, OStatus}
alias Pleroma.{Object, Activity}
require Logger
alias Pleroma.Web.{XML, OStatus}
alias Pleroma.{Object, Activity}
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Utils
+ alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
alias Pleroma.Web.CommonAPI
@doc """
alias Pleroma.Web.CommonAPI
@doc """
diff --git
a/lib/pleroma/web/ostatus/ostatus.ex
b/lib/pleroma/web/ostatus/ostatus.ex
index a20ca17bbe7ce8498bdb3cf9faa3e3d158fd920d..e1213923e495ef8c1e5a691520888d829b7793ef 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus.ex
+++ b/
lib/pleroma/web/ostatus/ostatus.ex
@@
-10,10
+10,9
@@
defmodule Pleroma.Web.OStatus do
require Logger
alias Pleroma.{Repo, User, Web, Object, Activity}
require Logger
alias Pleroma.{Repo, User, Web, Object, Activity}
- alias Pleroma.Web.ActivityPub.
ActivityPub
+ alias Pleroma.Web.ActivityPub.
{ActivityPub, Transmogrifier}
alias Pleroma.Web.{WebFinger, Websub}
alias Pleroma.Web.OStatus.{FollowHandler, UnfollowHandler, NoteHandler, DeleteHandler}
alias Pleroma.Web.{WebFinger, Websub}
alias Pleroma.Web.OStatus.{FollowHandler, UnfollowHandler, NoteHandler, DeleteHandler}
- alias Pleroma.Web.ActivityPub.Transmogrifier
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 302ff38a457716b06e557892c2315ce7aa1d6e0d..ed0df620bff42017abee1a3cd0296035d11871b6 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/
lib/pleroma/web/ostatus/ostatus_controller.ex
@@
-5,13
+5,11
@@
defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller
- alias Pleroma.{User, Activity, Object}
- alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
- alias Pleroma.Web.{OStatus, Federator}
+ 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.Web.XML
alias Pleroma.Web.XML
- alias Pleroma.Web.ActivityPub.ObjectView
- alias Pleroma.Web.ActivityPub.ActivityPubController
- alias Pleroma.Web.ActivityPub.ActivityPub
plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming])
plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming])
diff --git
a/lib/pleroma/web/salmon/salmon.ex
b/lib/pleroma/web/salmon/salmon.ex
index b1c2dc7fa96972cfc59de974098374cd5d1bd0df..fb08d645b6cf57d4e6dd9fa3602852ab0af7702c 100644
(file)
--- a/
lib/pleroma/web/salmon/salmon.ex
+++ b/
lib/pleroma/web/salmon/salmon.ex
@@
-6,10
+6,11
@@
defmodule Pleroma.Web.Salmon do
@httpoison Application.get_env(:pleroma, :httpoison)
use Bitwise
@httpoison Application.get_env(:pleroma, :httpoison)
use Bitwise
- alias Pleroma.Instances
+
+ alias Pleroma.{Instances, User}
alias Pleroma.Web.XML
alias Pleroma.Web.OStatus.ActivityRepresenter
alias Pleroma.Web.XML
alias Pleroma.Web.OStatus.ActivityRepresenter
- alias Pleroma.User
+
require Logger
def decode(salmon) do
require Logger
def decode(salmon) do
diff --git
a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index b347faa71e204ee5f48fb567c26516b29fe63228..bf8d7e5aafb862b99a3eb09cadff33f8325aaf60 100644
(file)
--- a/
lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/
lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@
-4,14
+4,14
@@
defmodule Pleroma.Web.TwitterAPI.UtilController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.TwitterAPI.UtilController do
use Pleroma.Web, :controller
+
require Logger
require Logger
- alias Pleroma.Web
- alias Pleroma.Web.OStatus
- alias Pleroma.Web.WebFinger
- alias Pleroma.Web.CommonAPI
+
alias Comeonin.Pbkdf2
alias Comeonin.Pbkdf2
+ alias Pleroma.{Emoji, PasswordResetToken, User, Repo}
+ alias Pleroma.Web
+ alias Pleroma.Web.{CommonAPI, OStatus, WebFinger}
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.{Repo, PasswordResetToken, User, Emoji}
def show_password_reset(conn, %{"token" => token}) do
with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}),
def show_password_reset(conn, %{"token" => token}) do
with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}),
diff --git
a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index c4025cbd78c47e3597e1232f97f7d40b4f1f0acb..a5fec88f7286330f6443b88ea12905c2c864d30a 100644
(file)
--- a/
lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/
lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@
-7,11
+7,9
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
- alias Pleroma.{Activity, User}
- alias Pleroma.Web.TwitterAPI.{
TwitterAPI, UserView, Activity
View}
+ alias Pleroma.{Activity,
Formatter, HTML,
User}
+ alias Pleroma.Web.TwitterAPI.{
ActivityView, TwitterAPI, User
View}
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.CommonAPI.Utils
- alias Pleroma.Formatter
- alias Pleroma.HTML
alias Pleroma.Web.MastodonAPI.StatusView
defp user_by_ap_id(user_list, ap_id) do
alias Pleroma.Web.MastodonAPI.StatusView
defp user_by_ap_id(user_list, ap_id) do
diff --git
a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index b781d981f180ca05891f3e08528a044b5f0aa6e3..c0081bf6e1ff25139c2d4dc0b6be86d3c0d135c8 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@
-7,12
+7,11
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
- alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView, NotificationView}
- alias Pleroma.Web.CommonAPI
- alias Pleroma.{Repo, Activity, Object, User, Notification}
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Utils
alias Ecto.Changeset
alias Ecto.Changeset
+ alias Pleroma.Web.ActivityPub.{ActivityPub, Utils}
+ alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.TwitterAPI.{ActivityView, NotificationView, TwitterAPI, UserView}
+ alias Pleroma.{Activity, Object, Notification, Repo, 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 d0d1221c347111d176107bd78de79b24281d1759..dbcb732fea6e58b59b84b8a5e028957246c76f4b 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/activity_view.ex
@@
-4,19
+4,11
@@
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.Web.CommonAPI.Utils
alias Pleroma.Web.CommonAPI.Utils
- alias Pleroma.User
- alias Pleroma.Web.TwitterAPI.UserView
- alias Pleroma.Web.TwitterAPI.ActivityView
- alias Pleroma.Web.TwitterAPI.TwitterAPI
- alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.MastodonAPI.StatusView
- alias Pleroma.Activity
- alias Pleroma.HTML
- alias Pleroma.Object
- alias Pleroma.User
- alias Pleroma.Repo
- alias Pleroma.Formatter
+ alias Pleroma.Web.TwitterAPI.{ActivityView, TwitterAPI, UserView}
+ alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
import Ecto.Query
require Logger
import Ecto.Query
require Logger
diff --git
a/lib/pleroma/web/twitter_api/views/notification_view.ex
b/lib/pleroma/web/twitter_api/views/notification_view.ex
index d6a1c0a4d78e07a94446fed04744d6b8407944bb..414ed4731fa81bdb7e6d3e89cf836a6272bf4b7f 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/notification_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/notification_view.ex
@@
-6,8
+6,7
@@
defmodule Pleroma.Web.TwitterAPI.NotificationView do
use Pleroma.Web, :view
alias Pleroma.{Notification, User}
alias Pleroma.Web.CommonAPI.Utils
use Pleroma.Web, :view
alias Pleroma.{Notification, User}
alias Pleroma.Web.CommonAPI.Utils
- alias Pleroma.Web.TwitterAPI.UserView
- alias Pleroma.Web.TwitterAPI.ActivityView
+ alias Pleroma.Web.TwitterAPI.{ActivityView, 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 cc53dfbc2b47e60223534475d653d89a18e09510..3cde3bc1beeeea757fd3dc476ec8e23b4b1fd39d 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/user_view.ex
@@
-4,11
+4,9
@@
defmodule Pleroma.Web.TwitterAPI.UserView do
use Pleroma.Web, :view
defmodule Pleroma.Web.TwitterAPI.UserView do
use Pleroma.Web, :view
- alias Pleroma.User
- alias Pleroma.Formatter
+ alias Pleroma.{Formatter, HTML, User}
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
- alias Pleroma.HTML
def render("show.json", %{user: user = %User{}} = assigns) do
render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns)
def render("show.json", %{user: user = %User{}} = assigns) do
render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns)
diff --git
a/lib/pleroma/web/websub/websub.ex
b/lib/pleroma/web/websub/websub.ex
index 90ba79962718ef0f6550f5cc3b380c094a276d26..de6508f5228837b352617837916c2f6fba2b970a 100644
(file)
--- a/
lib/pleroma/web/websub/websub.ex
+++ b/
lib/pleroma/web/websub/websub.ex
@@
-4,8
+4,7
@@
defmodule Pleroma.Web.Websub do
alias Ecto.Changeset
defmodule Pleroma.Web.Websub do
alias Ecto.Changeset
- alias Pleroma.Repo
- alias Pleroma.Instances
+ alias Pleroma.{Instances, Repo}
alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
alias Pleroma.Web.OStatus.FeedRepresenter
alias Pleroma.Web.{XML, Endpoint, OStatus}
alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
alias Pleroma.Web.OStatus.FeedRepresenter
alias Pleroma.Web.{XML, Endpoint, OStatus}