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

de-global services for services

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-18 06:37:47 +00:00
parent 992c0a1e58
commit 010e4ee35a
85 changed files with 2480 additions and 1887 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api/client/alias.rs
View file

@ -22,7 +22,11 @@ pub(crate) async fn create_alias_route(
) -> Result<create_alias::v3::Response> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
service::rooms::alias::appservice_checks(&body.room_alias, &body.appservice_info).await?;
services
.rooms
.alias
.appservice_checks(&body.room_alias, &body.appservice_info)
.await?;
// this isn't apart of alias_checks or delete alias route because we should
// allow removing forbidden room aliases
@ -61,7 +65,11 @@ pub(crate) async fn delete_alias_route(
) -> Result<delete_alias::v3::Response> {
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
service::rooms::alias::appservice_checks(&body.room_alias, &body.appservice_info).await?;
services
.rooms
.alias
.appservice_checks(&body.room_alias, &body.appservice_info)
.await?;
if services
.rooms

17
src/api/client/membership.rs
View file

@ -43,7 +43,6 @@ use crate::{
service::{
pdu::{gen_event_id_canonical_json, PduBuilder},
rooms::state::RoomMutexGuard,
sending::convert_to_outgoing_federation_event,
server_is_ours, user_is_local, Services,
},
Ruma,
@ -791,7 +790,9 @@ async fn join_room_by_id_helper_remote(
federation::membership::create_join_event::v2::Request {
room_id: room_id.to_owned(),
event_id: event_id.to_owned(),
pdu: convert_to_outgoing_federation_event(join_event.clone()),
pdu: services
.sending
.convert_to_outgoing_federation_event(join_event.clone()),
omit_members: false,
},
)
@ -1203,7 +1204,9 @@ async fn join_room_by_id_helper_local(
federation::membership::create_join_event::v2::Request {
room_id: room_id.to_owned(),
event_id: event_id.to_owned(),
pdu: convert_to_outgoing_federation_event(join_event.clone()),
pdu: services
.sending
.convert_to_outgoing_federation_event(join_event.clone()),
omit_members: false,
},
)
@ -1431,7 +1434,9 @@ pub(crate) async fn invite_helper(
room_id: room_id.to_owned(),
event_id: (*pdu.event_id).to_owned(),
room_version: room_version_id.clone(),
event: convert_to_outgoing_federation_event(pdu_json.clone()),
event: services
.sending
.convert_to_outgoing_federation_event(pdu_json.clone()),
invite_room_state,
via: services.rooms.state_cache.servers_route_via(room_id).ok(),
},
@ -1763,7 +1768,9 @@ async fn remote_leave_room(services: &Services, user_id: &UserId, room_id: &Room
federation::membership::create_leave_event::v2::Request {
room_id: room_id.to_owned(),
event_id,
pdu: convert_to_outgoing_federation_event(leave_event.clone()),
pdu: services
.sending
.convert_to_outgoing_federation_event(leave_event.clone()),
},
)
.await?;

6
src/api/client/sync.rs
View file

@ -475,8 +475,6 @@ async fn handle_left_room(
async fn process_presence_updates(
services: &Services, presence_updates: &mut HashMap<OwnedUserId, PresenceEvent>, since: u64, syncing_user: &UserId,
) -> Result<()> {
use crate::service::presence::Presence;
// Take presence updates
for (user_id, _, presence_bytes) in services.presence.presence_since(since) {
if !services
@ -487,7 +485,9 @@ async fn process_presence_updates(
continue;
}
let presence_event = Presence::from_json_bytes_to_event(&presence_bytes, &user_id)?;
let presence_event = services
.presence
.from_json_bytes_to_event(&presence_bytes, &user_id)?;
match presence_updates.entry(user_id) {
Entry::Vacant(slot) => {
slot.insert(presence_event);