Browse Source

other files consistency

1668/default-disable-prometheus
Alexander Strizhakov 4 years ago
parent
commit
0374df1d12
No known key found for this signature in database GPG Key ID: 22896A53AEF1381
18 changed files with 5 additions and 6 deletions
  1. +0
    -0
      lib/pleroma/captcha.ex
  2. +0
    -0
      lib/pleroma/captcha/service.ex
  3. +0
    -0
      lib/pleroma/config_db.ex
  4. +0
    -0
      lib/pleroma/conversation/participation/recipient_ship.ex
  5. +0
    -0
      lib/pleroma/gun.ex
  6. +0
    -0
      lib/pleroma/http.ex
  7. +0
    -0
      lib/pleroma/reverse_proxy.ex
  8. +0
    -0
      lib/pleroma/web/common_api.ex
  9. +1
    -1
      lib/pleroma/web/fallback/redirect_controller.ex
  10. +0
    -0
      lib/pleroma/web/federator.ex
  11. +1
    -2
      lib/pleroma/web/feed/user_controller.ex
  12. +0
    -0
      lib/pleroma/web/media_proxy.ex
  13. +0
    -0
      lib/pleroma/web/media_proxy/invalidation/http.ex
  14. +0
    -0
      lib/pleroma/web/media_proxy/invalidation/script.ex
  15. +0
    -0
      lib/pleroma/web/metadata/providers/open_graph.ex
  16. +1
    -1
      lib/pleroma/web/o_status/o_status_controller.ex
  17. +1
    -1
      lib/pleroma/web/router.ex
  18. +1
    -1
      test/pleroma/web/feed/user_controller_test.exs

lib/pleroma/captcha/captcha.ex → lib/pleroma/captcha.ex View File


lib/pleroma/captcha/captcha_service.ex → lib/pleroma/captcha/service.ex View File


lib/pleroma/config/config_db.ex → lib/pleroma/config_db.ex View File


lib/pleroma/conversation/participation_recipient_ship.ex → lib/pleroma/conversation/participation/recipient_ship.ex View File


lib/pleroma/gun/gun.ex → lib/pleroma/gun.ex View File


lib/pleroma/http/http.ex → lib/pleroma/http.ex View File


lib/pleroma/reverse_proxy/reverse_proxy.ex → lib/pleroma/reverse_proxy.ex View File


lib/pleroma/web/common_api/common_api.ex → lib/pleroma/web/common_api.ex View File


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/>
# SPDX-License-Identifier: AGPL-3.0-only

defmodule Fallback.RedirectController do
defmodule Pleroma.Web.Fallback.RedirectController do
use Pleroma.Web, :controller

require Logger

lib/pleroma/web/federator/federator.ex → lib/pleroma/web/federator.ex View File


+ 1
- 2
lib/pleroma/web/feed/user_controller.ex View File

@@ -5,7 +5,6 @@
defmodule Pleroma.Web.Feed.UserController do
use Pleroma.Web, :controller

alias Fallback.RedirectController
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
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
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



lib/pleroma/web/media_proxy/media_proxy.ex → lib/pleroma/web/media_proxy.ex View File


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


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


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


+ 1
- 1
lib/pleroma/web/o_status/o_status_controller.ex View File

@@ -5,7 +5,6 @@
defmodule Pleroma.Web.OStatus.OStatusController do
use Pleroma.Web, :controller

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



+ 1
- 1
lib/pleroma/web/router.ex View File

@@ -737,7 +737,7 @@ defmodule Pleroma.Web.Router do
get("/check_password", MongooseIMController, :check_password)
end

scope "/", Fallback do
scope "/", Pleroma.Web.Fallback do
get("/registration/:token", RedirectController, :registration_page)
get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
get("/api*path", RedirectController, :api_not_implemented)


+ 1
- 1
test/pleroma/web/feed/user_controller_test.exs View File

@@ -206,7 +206,7 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
|> response(200)

assert response ==
Fallback.RedirectController.redirector_with_meta(
Pleroma.Web.Fallback.RedirectController.redirector_with_meta(
conn,
%{user: user}
).resp_body


Loading…
Cancel
Save