Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
0374df1d
Verified
Commit
0374df1d
authored
Jun 23, 2020
by
Alexander Strizhakov
Browse files
other files consistency
parent
fc7151a9
Changes
18
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/captcha
/captcha
.ex
→
lib/pleroma/captcha.ex
View file @
0374df1d
File moved
lib/pleroma/captcha/
captcha_
service.ex
→
lib/pleroma/captcha/service.ex
View file @
0374df1d
File moved
lib/pleroma/config
/config
_db.ex
→
lib/pleroma/config_db.ex
View file @
0374df1d
File moved
lib/pleroma/conversation/participation
_
recipient_ship.ex
→
lib/pleroma/conversation/participation
/
recipient_ship.ex
View file @
0374df1d
File moved
lib/pleroma/gun
/gun
.ex
→
lib/pleroma/gun.ex
View file @
0374df1d
File moved
lib/pleroma/http
/http
.ex
→
lib/pleroma/http.ex
View file @
0374df1d
File moved
lib/pleroma/reverse_proxy
/reverse_proxy
.ex
→
lib/pleroma/reverse_proxy.ex
View file @
0374df1d
File moved
lib/pleroma/web/common_api
/common_api
.ex
→
lib/pleroma/web/common_api.ex
View file @
0374df1d
File moved
lib/pleroma/web/fallback
_
redirect_controller.ex
→
lib/pleroma/web/fallback
/
redirect_controller.ex
View file @
0374df1d
...
...
@@ -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 @
0374df1d
File moved
lib/pleroma/web/feed/user_controller.ex
View file @
0374df1d
...
...
@@ -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 @
0374df1d
File moved
lib/pleroma/web/media_proxy/invalidation
s
/http.ex
→
lib/pleroma/web/media_proxy/invalidation/http.ex
View file @
0374df1d
File moved
lib/pleroma/web/media_proxy/invalidation
s
/script.ex
→
lib/pleroma/web/media_proxy/invalidation/script.ex
View file @
0374df1d
File moved
lib/pleroma/web/metadata/providers/opengraph.ex
→
lib/pleroma/web/metadata/providers/open
_
graph.ex
View file @
0374df1d
File moved
lib/pleroma/web/o_status/o_status_controller.ex
View file @
0374df1d
...
...
@@ -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
...
...
lib/pleroma/web/router.ex
View file @
0374df1d
...
...
@@ -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
)
...
...
test/pleroma/web/feed/user_controller_test.exs
View file @
0374df1d
...
...
@@ -206,7 +206,7 @@ test "with html format, it redirects to user feed", %{conn: conn} do
|>
response
(
200
)
assert
response
==
Fallback
.
RedirectController
.
redirector_with_meta
(
Pleroma
.
Web
.
Fallback
.
RedirectController
.
redirector_with_meta
(
conn
,
%{
user:
user
}
)
.
resp_body
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment