magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eliminate references to services.globals.config

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-01-24 07:02:56 +00:00
parent 7c6b8b132a
commit 5be07ebc0f
26 changed files with 116 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/router/auth.rs
View file

@ -71,7 +71,7 @@ pub(super) async fn auth(
match metadata {
| &get_public_rooms::v3::Request::METADATA => {
if !services
.globals
.server
.config
.allow_public_room_directory_without_auth
{
@ -94,7 +94,7 @@ pub(super) async fn auth(
| &get_display_name::v3::Request::METADATA
| &get_avatar_url::v3::Request::METADATA
| &get_timezone_key::unstable::Request::METADATA => {
if services.globals.config.require_auth_for_profile_requests {
if services.server.config.require_auth_for_profile_requests {
match token {
| Token::Appservice(_) | Token::User(_) => {
// we should have validated the token above
@ -127,7 +127,7 @@ pub(super) async fn auth(
}),
| (AuthScheme::AccessToken, Token::None) => match metadata {
| &get_turn_server_info::v3::Request::METADATA => {
if services.globals.config.turn_allow_guests {
if services.server.config.turn_allow_guests {
Ok(Auth {
origin: None,
sender_user: None,

2
src/api/router/request.rs
View file

@ -32,7 +32,7 @@ pub(super) async fn from(
let query = serde_html_form::from_str(query)
.map_err(|e| err!(Request(Unknown("Failed to read query parameters: {e}"))))?;
let max_body_size = services.globals.config.max_request_size;
let max_body_size = services.server.config.max_request_size;
let body = axum::body::to_bytes(body, max_body_size)
.await