nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat: send messages over federation

Browse source
This commit is contained in:
Timo Kösters 2020-09-14 20:23:19 +02:00
parent 9f05ef926a
commit f7816b11de
No known key found for this signature in database
GPG key ID: 356E705610F626D5
15 changed files with 324 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client_server/account.rs
View file

@ -303,7 +303,7 @@ pub fn whoami_route(body: Ruma<whoami::Request>) -> ConduitResult<whoami::Respon
feature = "conduit_bin",
post("/_matrix/client/r0/account/deactivate", data = "<body>")
)]
pub fn deactivate_route(
pub async fn deactivate_route(
db: State<'_, Database>,
body: Ruma<deactivate::Request<'_>>,
) -> ConduitResult<deactivate::Response> {
@ -366,7 +366,7 @@ pub fn deactivate_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
}
// Remove devices and mark account as deactivated

2
src/client_server/alias.rs
View file

@ -62,7 +62,7 @@ pub async fn get_alias_helper(
) -> ConduitResult<get_alias::Response> {
if room_alias.server_name() != db.globals.server_name() {
let response = server_server::send_request(
&db,
&db.globals,
room_alias.server_name(),
federation::query::get_room_information::v1::Request { room_alias },
)

2
src/client_server/directory.rs
View file

@ -121,7 +121,7 @@ pub async fn get_public_rooms_filtered_helper(
.filter(|server| *server != db.globals.server_name().as_str())
{
let response = server_server::send_request(
&db,
&db.globals,
other_server,
federation::directory::get_public_rooms_filtered::v1::Request {
limit,

4
src/client_server/media.rs
View file

@ -79,7 +79,7 @@ pub async fn get_content_route(
.into())
} else if body.allow_remote {
let get_content_response = server_server::send_request(
&db,
&db.globals,
body.server_name.as_ref(),
get_content::Request {
allow_remote: false,
@ -129,7 +129,7 @@ pub async fn get_content_thumbnail_route(
Ok(get_content_thumbnail::Response { file, content_type }.into())
} else if body.allow_remote {
let get_thumbnail_response = server_server::send_request(
&db,
&db.globals,
body.server_name.as_ref(),
get_content_thumbnail::Request {
allow_remote: false,

206
src/client_server/membership.rs
View file

@ -83,7 +83,7 @@ pub async fn join_room_by_id_or_alias_route(
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_>/leave", data = "<body>")
)]
pub fn leave_room_route(
pub async fn leave_room_route(
db: State<'_, Database>,
body: Ruma<leave_room::Request<'_>>,
) -> ConduitResult<leave_room::Response> {
@ -108,19 +108,21 @@ pub fn leave_room_route(
event.membership = member::MembershipState::Leave;
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(sender_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)?;
db.rooms
.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(sender_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)
.await?;
Ok(leave_room::Response::new().into())
}
@ -129,33 +131,35 @@ pub fn leave_room_route(
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_>/invite", data = "<body>")
)]
pub fn invite_user_route(
pub async fn invite_user_route(
db: State<'_, Database>,
body: Ruma<invite_user::Request<'_>>,
) -> ConduitResult<invite_user::Response> {
let sender_id = body.sender_id.as_ref().expect("user is authenticated");
if let invite_user::IncomingInvitationRecipient::UserId { user_id } = &body.recipient {
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(member::MemberEventContent {
membership: member::MembershipState::Invite,
displayname: db.users.displayname(&user_id)?,
avatar_url: db.users.avatar_url(&user_id)?,
is_direct: None,
third_party_invite: None,
})
.expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)?;
db.rooms
.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(member::MemberEventContent {
membership: member::MembershipState::Invite,
displayname: db.users.displayname(&user_id)?,
avatar_url: db.users.avatar_url(&user_id)?,
is_direct: None,
third_party_invite: None,
})
.expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)
.await?;
Ok(invite_user::Response.into())
} else {
@ -167,7 +171,7 @@ pub fn invite_user_route(
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_>/kick", data = "<body>")
)]
pub fn kick_user_route(
pub async fn kick_user_route(
db: State<'_, Database>,
body: Ruma<kick_user::Request<'_>>,
) -> ConduitResult<kick_user::Response> {
@ -193,19 +197,21 @@ pub fn kick_user_route(
event.membership = ruma::events::room::member::MembershipState::Leave;
// TODO: reason
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(body.user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)?;
db.rooms
.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(body.user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)
.await?;
Ok(kick_user::Response::new().into())
}
@ -214,7 +220,7 @@ pub fn kick_user_route(
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_>/ban", data = "<body>")
)]
pub fn ban_user_route(
pub async fn ban_user_route(
db: State<'_, Database>,
body: Ruma<ban_user::Request<'_>>,
) -> ConduitResult<ban_user::Response> {
@ -248,19 +254,21 @@ pub fn ban_user_route(
},
)?;
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(body.user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)?;
db.rooms
.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(body.user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)
.await?;
Ok(ban_user::Response::new().into())
}
@ -269,7 +277,7 @@ pub fn ban_user_route(
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_>/unban", data = "<body>")
)]
pub fn unban_user_route(
pub async fn unban_user_route(
db: State<'_, Database>,
body: Ruma<unban_user::Request<'_>>,
) -> ConduitResult<unban_user::Response> {
@ -294,19 +302,21 @@ pub fn unban_user_route(
event.membership = ruma::events::room::member::MembershipState::Leave;
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(body.user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)?;
db.rooms
.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(body.user_id.to_string()),
redacts: None,
},
&sender_id,
&body.room_id,
&db.globals,
&db.account_data,
)
.await?;
Ok(unban_user::Response::new().into())
}
@ -429,7 +439,7 @@ async fn join_room_by_id_helper(
for remote_server in servers {
let make_join_response = server_server::send_request(
&db,
&db.globals,
remote_server,
federation::membership::create_join_event_template::v1::Request {
room_id,
@ -490,7 +500,7 @@ async fn join_room_by_id_helper(
.expect("event is valid, we just created it");
let send_join_response = server_server::send_request(
&db,
&db.globals,
remote_server,
federation::membership::create_join_event::v2::Request {
room_id,
@ -621,9 +631,12 @@ async fn join_room_by_id_helper(
.expect("Found event_id in sorted events that is not in resolved state");
// We do not rebuild the PDU in this case only insert to DB
let pdu_id =
db.rooms
.append_pdu(&PduEvent::from(&**pdu), &db.globals, &db.account_data)?;
let pdu_id = db.rooms.append_pdu(
&PduEvent::from(&**pdu),
&serde_json::to_value(&**pdu).expect("PDU is valid value"),
&db.globals,
&db.account_data,
)?;
if state_events.contains(ev_id) {
state.insert(
@ -646,19 +659,22 @@ async fn join_room_by_id_helper(
third_party_invite: None,
};
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event).expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(sender_id.to_string()),
redacts: None,
},
&sender_id,
&room_id,
&db.globals,
&db.account_data,
)?;
db.rooms
.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomMember,
content: serde_json::to_value(event)
.expect("event is valid, we just created it"),
unsigned: None,
state_key: Some(sender_id.to_string()),
redacts: None,
},
&sender_id,
&room_id,
&db.globals,
&db.account_data,
)
.await?;
}
Ok(join_room_by_id::Response::new(room_id.clone()).into())

4
src/client_server/message.rs
View file

@ -17,7 +17,7 @@ use rocket::{get, put};
feature = "conduit_bin",
put("/_matrix/client/r0/rooms/<_>/send/<_>/<_>", data = "<body>")
)]
pub fn send_message_event_route(
pub async fn send_message_event_route(
db: State<'_, Database>,
body: Ruma<send_message_event::Request<'_>>,
) -> ConduitResult<send_message_event::Response> {
@ -67,7 +67,7 @@ pub fn send_message_event_route(
&body.room_id,
&db.globals,
&db.account_data,
)?;
).await?;
db.transaction_ids
.add_txnid(sender_id, device_id, &body.txn_id, event_id.as_bytes())?;

8
src/client_server/profile.rs
View file

@ -19,7 +19,7 @@ use std::convert::TryInto;
feature = "conduit_bin",
put("/_matrix/client/r0/profile/<_>/displayname", data = "<body>")
)]
pub fn set_displayname_route(
pub async fn set_displayname_route(
db: State<'_, Database>,
body: Ruma<set_display_name::Request<'_>>,
) -> ConduitResult<set_display_name::Response> {
@ -64,7 +64,7 @@ pub fn set_displayname_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// Presence update
db.rooms.edus.update_presence(
@ -110,7 +110,7 @@ pub fn get_displayname_route(
feature = "conduit_bin",
put("/_matrix/client/r0/profile/<_>/avatar_url", data = "<body>")
)]
pub fn set_avatar_url_route(
pub async fn set_avatar_url_route(
db: State<'_, Database>,
body: Ruma<set_avatar_url::Request<'_>>,
) -> ConduitResult<set_avatar_url::Response> {
@ -167,7 +167,7 @@ pub fn set_avatar_url_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// Presence update
db.rooms.edus.update_presence(

4
src/client_server/redact.rs
View file

@ -12,7 +12,7 @@ use rocket::put;
feature = "conduit_bin",
put("/_matrix/client/r0/rooms/<_>/redact/<_>/<_>", data = "<body>")
)]
pub fn redact_event_route(
pub async fn redact_event_route(
db: State<'_, Database>,
body: Ruma<redact_event::Request<'_>>,
) -> ConduitResult<redact_event::Response> {
@ -33,7 +33,7 @@ pub fn redact_event_route(
&body.room_id,
&db.globals,
&db.account_data,
)?;
).await?;
Ok(redact_event::Response { event_id }.into())
}

37
src/client_server/room.rs
View file

@ -20,7 +20,7 @@ use rocket::{get, post};
feature = "conduit_bin",
post("/_matrix/client/r0/createRoom", data = "<body>")
)]
pub fn create_room_route(
pub async fn create_room_route(
db: State<'_, Database>,
body: Ruma<create_room::Request<'_>>,
) -> ConduitResult<create_room::Response> {
@ -65,7 +65,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// 2. Let the room creator join
db.rooms.build_and_append_pdu(
@ -87,7 +87,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// 3. Power levels
let mut users = BTreeMap::new();
@ -129,7 +129,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// 4. Events set by preset
@ -162,7 +162,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// 4.2 History Visibility
db.rooms.build_and_append_pdu(
@ -180,7 +180,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// 4.3 Guest Access
db.rooms.build_and_append_pdu(
@ -206,7 +206,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// 5. Events listed in initial_state
for event in &body.initial_state {
@ -226,7 +226,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
}
// 6. Events implied by name and topic
@ -248,7 +248,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
}
if let Some(topic) = &body.topic {
@ -267,7 +267,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
}
// 7. Events implied by invite (and TODO: invite_3pid)
@ -291,7 +291,7 @@ pub fn create_room_route(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
}
// Homeserver specific stuff
@ -337,7 +337,7 @@ pub fn get_room_event_route(
feature = "conduit_bin",
post("/_matrix/client/r0/rooms/<_room_id>/upgrade", data = "<body>")
)]
pub fn upgrade_room_route(
pub async fn upgrade_room_route(
db: State<'_, Database>,
body: Ruma<upgrade_room::Request<'_>>,
_room_id: String,
@ -379,7 +379,7 @@ pub fn upgrade_room_route(
&body.room_id,
&db.globals,
&db.account_data,
)?;
).await?;
// Get the old room federations status
let federate = serde_json::from_value::<Raw<ruma::events::room::create::CreateEventContent>>(
@ -419,7 +419,7 @@ pub fn upgrade_room_route(
&replacement_room,
&db.globals,
&db.account_data,
)?;
).await?;
// Join the new room
db.rooms.build_and_append_pdu(
@ -441,7 +441,7 @@ pub fn upgrade_room_route(
&replacement_room,
&db.globals,
&db.account_data,
)?;
).await?;
// Recommended transferable state events list from the specs
let transferable_state_events = vec![
@ -475,7 +475,7 @@ pub fn upgrade_room_route(
&replacement_room,
&db.globals,
&db.account_data,
)?;
).await?;
}
// Moves any local aliases to the new room
@ -505,7 +505,7 @@ pub fn upgrade_room_route(
power_levels_event_content.invite = new_level;
// Modify the power levels in the old room to prevent sending of events and inviting new users
db.rooms
let _ = db.rooms
.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomPowerLevels,
@ -519,8 +519,7 @@ pub fn upgrade_room_route(
&body.room_id,
&db.globals,
&db.account_data,
)
.ok();
).await;
// Return the replacement room id
Ok(upgrade_room::Response { replacement_room }.into())

12
src/client_server/state.rs
View file

@ -19,7 +19,7 @@ use rocket::{get, put};
feature = "conduit_bin",
put("/_matrix/client/r0/rooms/<_>/state/<_>/<_>", data = "<body>")
)]
pub fn send_state_event_for_key_route(
pub async fn send_state_event_for_key_route(
db: State<'_, Database>,
body: Ruma<send_state_event_for_key::Request<'_>>,
) -> ConduitResult<send_state_event_for_key::Response> {
@ -41,7 +41,7 @@ pub fn send_state_event_for_key_route(
content,
&body.room_id,
Some(body.state_key.to_owned()),
)?)
).await?)
.into(),
)
}
@ -50,7 +50,7 @@ pub fn send_state_event_for_key_route(
feature = "conduit_bin",
put("/_matrix/client/r0/rooms/<_>/state/<_>", data = "<body>")
)]
pub fn send_state_event_for_empty_key_route(
pub async fn send_state_event_for_empty_key_route(
db: State<'_, Database>,
body: Ruma<send_state_event_for_empty_key::Request<'_>>,
) -> ConduitResult<send_state_event_for_empty_key::Response> {
@ -80,7 +80,7 @@ pub fn send_state_event_for_empty_key_route(
json,
&body.room_id,
Some("".into()),
)?)
).await?)
.into(),
)
}
@ -177,7 +177,7 @@ pub fn get_state_events_for_empty_key_route(
.into())
}
pub fn send_state_event_for_key_helper(
pub async fn send_state_event_for_key_helper(
db: &Database,
sender: &UserId,
content: &AnyStateEventContent,
@ -223,7 +223,7 @@ pub fn send_state_event_for_key_helper(
&room_id,
&db.globals,
&db.account_data,
)?;
).await?;
Ok(event_id)
}