hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Credo fixes: alias grouping/ordering

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2019-02-06 20:20:02 +01:00
commit 60ea29dfe6
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
28 changed files with 57 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -4,14 +4,14 @@
defmodule Pleroma.Web.TwitterAPI.UtilController do
use Pleroma.Web, :controller
require Logger
alias Pleroma.Web
alias Pleroma.Web.OStatus
alias Pleroma.Web.WebFinger
alias Pleroma.Web.CommonAPI
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.{Repo, PasswordResetToken, User, Emoji}
def show_password_reset(conn, %{"token" => token}) do
with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}),

6
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -7,11 +7,9 @@
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, ActivityView}
alias Pleroma.{Activity, Formatter, HTML, User}
alias Pleroma.Web.TwitterAPI.{ActivityView, TwitterAPI, UserView}
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

9
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file

@ -7,12 +7,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
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 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

14
lib/pleroma/web/twitter_api/views/activity_view.ex
View file

@ -4,19 +4,11 @@
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.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.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

3
lib/pleroma/web/twitter_api/views/notification_view.ex
View file

@ -6,8 +6,7 @@ defmodule Pleroma.Web.TwitterAPI.NotificationView do
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

4
lib/pleroma/web/twitter_api/views/user_view.ex
View file

@ -4,11 +4,9 @@
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.HTML
def render("show.json", %{user: user = %User{}} = assigns) do
render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns)