katafrakt/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity

other files consistency

Browse source
This commit is contained in:
Alexander Strizhakov 2020-06-23 21:10:32 +03:00
parent fc7151a9c4
commit 0374df1d12
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
18 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
lib/pleroma/captcha/captcha.ex → lib/pleroma/captcha.ex
View file

0
lib/pleroma/captcha/captcha_service.ex → lib/pleroma/captcha/service.ex
View file

0
lib/pleroma/config/config_db.ex → lib/pleroma/config_db.ex
View file

0
lib/pleroma/conversation/participation_recipient_ship.ex → lib/pleroma/conversation/participation/recipient_ship.ex
View file

0
lib/pleroma/gun/gun.ex → lib/pleroma/gun.ex
View file

0
lib/pleroma/http/http.ex → lib/pleroma/http.ex
View file

0
lib/pleroma/reverse_proxy/reverse_proxy.ex → lib/pleroma/reverse_proxy.ex
View file

0
lib/pleroma/web/common_api/common_api.ex → lib/pleroma/web/common_api.ex
View file

2
lib/pleroma/web/fallback_redirect_controller.ex → lib/pleroma/web/fallback/redirect_controller.ex
View file

@ -2,7 +2,7 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Fallback.RedirectController do defmodule Pleroma.Web.Fallback.RedirectController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
require Logger require Logger

0
lib/pleroma/web/federator/federator.ex → lib/pleroma/web/federator.ex
View file

3
lib/pleroma/web/feed/user_controller.ex
View file

@ -5,7 +5,6 @@
defmodule Pleroma.Web.Feed.UserController do defmodule Pleroma.Web.Feed.UserController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Fallback.RedirectController
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.ActivityPubController alias Pleroma.Web.ActivityPub.ActivityPubController
@ -17,7 +16,7 @@ defmodule Pleroma.Web.Feed.UserController do
def feed_redirect(%{assigns: %{format: "html"}} = conn, %{"nickname" => nickname}) do def feed_redirect(%{assigns: %{format: "html"}} = conn, %{"nickname" => nickname}) do
with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname_or_id(nickname)} do with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname_or_id(nickname)} do
RedirectController.redirector_with_meta(conn, %{user: user}) Pleroma.Web.Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
end end
end end

0
lib/pleroma/web/media_proxy/media_proxy.ex → lib/pleroma/web/media_proxy.ex
View file

0
lib/pleroma/web/media_proxy/invalidations/http.ex → lib/pleroma/web/media_proxy/invalidation/http.ex
View file

0
lib/pleroma/web/media_proxy/invalidations/script.ex → lib/pleroma/web/media_proxy/invalidation/script.ex
View file

0
lib/pleroma/web/metadata/providers/opengraph.ex → lib/pleroma/web/metadata/providers/open_graph.ex
View file

2
lib/pleroma/web/o_status/o_status_controller.ex
View file

@ -5,7 +5,6 @@
defmodule Pleroma.Web.OStatus.OStatusController do defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Fallback.RedirectController
alias Pleroma.Activity alias Pleroma.Activity
alias Pleroma.Object alias Pleroma.Object
alias Pleroma.Plugs.RateLimiter alias Pleroma.Plugs.RateLimiter
@ -13,6 +12,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
alias Pleroma.Web.ActivityPub.ActivityPubController alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.ActivityPub.Visibility alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.Endpoint alias Pleroma.Web.Endpoint
alias Pleroma.Web.Fallback.Fallback.RedirectController
alias Pleroma.Web.Metadata.PlayerView alias Pleroma.Web.Metadata.PlayerView
alias Pleroma.Web.Router alias Pleroma.Web.Router

2
lib/pleroma/web/router.ex
View file

@ -737,7 +737,7 @@ defmodule Pleroma.Web.Router do
get("/check_password", MongooseIMController, :check_password) get("/check_password", MongooseIMController, :check_password)
end end
scope "/", Fallback do scope "/", Pleroma.Web.Fallback do
get("/registration/:token", RedirectController, :registration_page) get("/registration/:token", RedirectController, :registration_page)
get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta) get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
get("/api*path", RedirectController, :api_not_implemented) get("/api*path", RedirectController, :api_not_implemented)

2
test/pleroma/web/feed/user_controller_test.exs
View file

@ -206,7 +206,7 @@ test "with html format, it redirects to user feed", %{conn: conn} do
|> response(200) |> response(200)
assert response == assert response ==
Fallback.RedirectController.redirector_with_meta( Pleroma.Web.Fallback.RedirectController.redirector_with_meta(
conn, conn,
%{user: user} %{user: user}
).resp_body ).resp_body