|
|
|
@ -7,55 +7,57 @@ use std::{ |
|
|
|
use crate::{utils, Database, MatrixResult, Ruma}; |
|
|
|
use crate::{utils, Database, MatrixResult, Ruma}; |
|
|
|
use log::{debug, warn}; |
|
|
|
use log::{debug, warn}; |
|
|
|
use rocket::{delete, get, options, post, put, State}; |
|
|
|
use rocket::{delete, get, options, post, put, State}; |
|
|
|
use ruma_client_api::{ |
|
|
|
use ruma::{ |
|
|
|
error::{Error, ErrorKind}, |
|
|
|
api::client::{ |
|
|
|
r0::{ |
|
|
|
error::{Error, ErrorKind}, |
|
|
|
account::{get_username_availability, register}, |
|
|
|
r0::{ |
|
|
|
alias::{create_alias, delete_alias, get_alias}, |
|
|
|
account::{get_username_availability, register}, |
|
|
|
capabilities::get_capabilities, |
|
|
|
alias::{create_alias, delete_alias, get_alias}, |
|
|
|
config::{get_global_account_data, set_global_account_data}, |
|
|
|
capabilities::get_capabilities, |
|
|
|
context::get_context, |
|
|
|
config::{get_global_account_data, set_global_account_data}, |
|
|
|
device::{self, delete_device, delete_devices, get_device, get_devices, update_device}, |
|
|
|
context::get_context, |
|
|
|
directory::{ |
|
|
|
device::{self, delete_device, delete_devices, get_device, get_devices, update_device}, |
|
|
|
self, get_public_rooms, get_public_rooms_filtered, get_room_visibility, |
|
|
|
directory::{ |
|
|
|
set_room_visibility, |
|
|
|
self, get_public_rooms, get_public_rooms_filtered, get_room_visibility, |
|
|
|
}, |
|
|
|
set_room_visibility, |
|
|
|
filter::{self, create_filter, get_filter}, |
|
|
|
}, |
|
|
|
keys::{self, claim_keys, get_keys, upload_keys}, |
|
|
|
filter::{self, create_filter, get_filter}, |
|
|
|
media::{create_content, get_content, get_content_thumbnail, get_media_config}, |
|
|
|
keys::{self, claim_keys, get_keys, upload_keys}, |
|
|
|
membership::{ |
|
|
|
media::{create_content, get_content, get_content_thumbnail, get_media_config}, |
|
|
|
ban_user, forget_room, get_member_events, invite_user, join_room_by_id, |
|
|
|
membership::{ |
|
|
|
join_room_by_id_or_alias, kick_user, leave_room, unban_user, |
|
|
|
ban_user, forget_room, get_member_events, invite_user, join_room_by_id, |
|
|
|
}, |
|
|
|
join_room_by_id_or_alias, kick_user, leave_room, unban_user, |
|
|
|
message::{create_message_event, get_message_events}, |
|
|
|
}, |
|
|
|
presence::set_presence, |
|
|
|
message::{create_message_event, get_message_events}, |
|
|
|
profile::{ |
|
|
|
presence::set_presence, |
|
|
|
get_avatar_url, get_display_name, get_profile, set_avatar_url, set_display_name, |
|
|
|
profile::{ |
|
|
|
}, |
|
|
|
get_avatar_url, get_display_name, get_profile, set_avatar_url, set_display_name, |
|
|
|
push::{get_pushrules_all, set_pushrule, set_pushrule_enabled}, |
|
|
|
}, |
|
|
|
read_marker::set_read_marker, |
|
|
|
push::{get_pushrules_all, set_pushrule, set_pushrule_enabled}, |
|
|
|
redact::redact_event, |
|
|
|
read_marker::set_read_marker, |
|
|
|
room::{self, create_room}, |
|
|
|
redact::redact_event, |
|
|
|
session::{get_login_types, login, logout}, |
|
|
|
room::{self, create_room}, |
|
|
|
state::{ |
|
|
|
session::{get_login_types, login, logout}, |
|
|
|
create_state_event_for_empty_key, create_state_event_for_key, get_state_events, |
|
|
|
state::{ |
|
|
|
get_state_events_for_empty_key, get_state_events_for_key, |
|
|
|
create_state_event_for_empty_key, create_state_event_for_key, get_state_events, |
|
|
|
|
|
|
|
get_state_events_for_empty_key, get_state_events_for_key, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
sync::sync_events, |
|
|
|
|
|
|
|
thirdparty::get_protocols, |
|
|
|
|
|
|
|
to_device::{self, send_event_to_device}, |
|
|
|
|
|
|
|
typing::create_typing_event, |
|
|
|
|
|
|
|
uiaa::{AuthFlow, UiaaInfo, UiaaResponse}, |
|
|
|
|
|
|
|
user_directory::search_users, |
|
|
|
}, |
|
|
|
}, |
|
|
|
sync::sync_events, |
|
|
|
unversioned::get_supported_versions, |
|
|
|
thirdparty::get_protocols, |
|
|
|
|
|
|
|
to_device::{self, send_event_to_device}, |
|
|
|
|
|
|
|
typing::create_typing_event, |
|
|
|
|
|
|
|
uiaa::{AuthFlow, UiaaInfo, UiaaResponse}, |
|
|
|
|
|
|
|
user_directory::search_users, |
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
unversioned::get_supported_versions, |
|
|
|
events::{ |
|
|
|
}; |
|
|
|
collections::only::Event as EduEvent, |
|
|
|
use ruma_events::{ |
|
|
|
room::{canonical_alias, guest_access, history_visibility, join_rules, member, redaction}, |
|
|
|
collections::only::Event as EduEvent, |
|
|
|
EventJson, EventType, |
|
|
|
room::{canonical_alias, guest_access, history_visibility, join_rules, member, redaction}, |
|
|
|
}, |
|
|
|
EventJson, EventType, |
|
|
|
identifiers::{DeviceId, RoomAliasId, RoomId, RoomVersionId, UserId}, |
|
|
|
}; |
|
|
|
}; |
|
|
|
use ruma_identifiers::{DeviceId, RoomAliasId, RoomId, RoomVersionId, UserId}; |
|
|
|
|
|
|
|
use serde_json::{json, value::RawValue}; |
|
|
|
use serde_json::{json, value::RawValue}; |
|
|
|
|
|
|
|
|
|
|
|
const GUEST_NAME_LENGTH: usize = 10; |
|
|
|
const GUEST_NAME_LENGTH: usize = 10; |
|
|
|
@ -197,12 +199,12 @@ pub fn register_route( |
|
|
|
None, |
|
|
|
None, |
|
|
|
&user_id, |
|
|
|
&user_id, |
|
|
|
&EventType::PushRules, |
|
|
|
&EventType::PushRules, |
|
|
|
serde_json::to_value(ruma_events::push_rules::PushRulesEvent { |
|
|
|
serde_json::to_value(ruma::events::push_rules::PushRulesEvent { |
|
|
|
content: ruma_events::push_rules::PushRulesEventContent { |
|
|
|
content: ruma::events::push_rules::PushRulesEventContent { |
|
|
|
global: ruma_events::push_rules::Ruleset { |
|
|
|
global: ruma::events::push_rules::Ruleset { |
|
|
|
content: vec![], |
|
|
|
content: vec![], |
|
|
|
override_: vec![ruma_events::push_rules::ConditionalPushRule { |
|
|
|
override_: vec![ruma::events::push_rules::ConditionalPushRule { |
|
|
|
actions: vec![ruma_events::push_rules::Action::DontNotify], |
|
|
|
actions: vec![ruma::events::push_rules::Action::DontNotify], |
|
|
|
default: true, |
|
|
|
default: true, |
|
|
|
enabled: false, |
|
|
|
enabled: false, |
|
|
|
rule_id: ".m.rule.master".to_owned(), |
|
|
|
rule_id: ".m.rule.master".to_owned(), |
|
|
|
@ -210,17 +212,17 @@ pub fn register_route( |
|
|
|
}], |
|
|
|
}], |
|
|
|
room: vec![], |
|
|
|
room: vec![], |
|
|
|
sender: vec![], |
|
|
|
sender: vec![], |
|
|
|
underride: vec![ruma_events::push_rules::ConditionalPushRule { |
|
|
|
underride: vec![ruma::events::push_rules::ConditionalPushRule { |
|
|
|
actions: vec![ |
|
|
|
actions: vec![ |
|
|
|
ruma_events::push_rules::Action::Notify, |
|
|
|
ruma::events::push_rules::Action::Notify, |
|
|
|
ruma_events::push_rules::Action::SetTweak( |
|
|
|
ruma::events::push_rules::Action::SetTweak( |
|
|
|
ruma_common::push::Tweak::Sound("default".to_owned()), |
|
|
|
ruma::push::Tweak::Sound("default".to_owned()), |
|
|
|
), |
|
|
|
), |
|
|
|
], |
|
|
|
], |
|
|
|
default: true, |
|
|
|
default: true, |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
rule_id: ".m.rule.message".to_owned(), |
|
|
|
rule_id: ".m.rule.message".to_owned(), |
|
|
|
conditions: vec![ruma_events::push_rules::PushCondition::EventMatch { |
|
|
|
conditions: vec![ruma::events::push_rules::PushCondition::EventMatch { |
|
|
|
key: "type".to_owned(), |
|
|
|
key: "type".to_owned(), |
|
|
|
pattern: "m.room.message".to_owned(), |
|
|
|
pattern: "m.room.message".to_owned(), |
|
|
|
}], |
|
|
|
}], |
|
|
|
@ -522,7 +524,7 @@ pub fn set_displayname_route( |
|
|
|
room_id.clone(), |
|
|
|
room_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
EventType::RoomMember, |
|
|
|
EventType::RoomMember, |
|
|
|
serde_json::to_value(ruma_events::room::member::MemberEventContent { |
|
|
|
serde_json::to_value(ruma::events::room::member::MemberEventContent { |
|
|
|
displayname: body.displayname.clone(), |
|
|
|
displayname: body.displayname.clone(), |
|
|
|
..serde_json::from_value::<EventJson<_>>( |
|
|
|
..serde_json::from_value::<EventJson<_>>( |
|
|
|
db.rooms |
|
|
|
db.rooms |
|
|
|
@ -549,13 +551,13 @@ pub fn set_displayname_route( |
|
|
|
// Presence update
|
|
|
|
// Presence update
|
|
|
|
db.global_edus |
|
|
|
db.global_edus |
|
|
|
.update_presence( |
|
|
|
.update_presence( |
|
|
|
ruma_events::presence::PresenceEvent { |
|
|
|
ruma::events::presence::PresenceEvent { |
|
|
|
content: ruma_events::presence::PresenceEventContent { |
|
|
|
content: ruma::events::presence::PresenceEventContent { |
|
|
|
avatar_url: db.users.avatar_url(&user_id).unwrap(), |
|
|
|
avatar_url: db.users.avatar_url(&user_id).unwrap(), |
|
|
|
currently_active: None, |
|
|
|
currently_active: None, |
|
|
|
displayname: db.users.displayname(&user_id).unwrap(), |
|
|
|
displayname: db.users.displayname(&user_id).unwrap(), |
|
|
|
last_active_ago: Some(utils::millis_since_unix_epoch().try_into().unwrap()), |
|
|
|
last_active_ago: Some(utils::millis_since_unix_epoch().try_into().unwrap()), |
|
|
|
presence: ruma_events::presence::PresenceState::Online, |
|
|
|
presence: ruma::events::presence::PresenceState::Online, |
|
|
|
status_msg: None, |
|
|
|
status_msg: None, |
|
|
|
}, |
|
|
|
}, |
|
|
|
sender: user_id.clone(), |
|
|
|
sender: user_id.clone(), |
|
|
|
@ -613,7 +615,7 @@ pub fn set_avatar_url_route( |
|
|
|
room_id.clone(), |
|
|
|
room_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
EventType::RoomMember, |
|
|
|
EventType::RoomMember, |
|
|
|
serde_json::to_value(ruma_events::room::member::MemberEventContent { |
|
|
|
serde_json::to_value(ruma::events::room::member::MemberEventContent { |
|
|
|
avatar_url: body.avatar_url.clone(), |
|
|
|
avatar_url: body.avatar_url.clone(), |
|
|
|
..serde_json::from_value::<EventJson<_>>( |
|
|
|
..serde_json::from_value::<EventJson<_>>( |
|
|
|
db.rooms |
|
|
|
db.rooms |
|
|
|
@ -640,13 +642,13 @@ pub fn set_avatar_url_route( |
|
|
|
// Presence update
|
|
|
|
// Presence update
|
|
|
|
db.global_edus |
|
|
|
db.global_edus |
|
|
|
.update_presence( |
|
|
|
.update_presence( |
|
|
|
ruma_events::presence::PresenceEvent { |
|
|
|
ruma::events::presence::PresenceEvent { |
|
|
|
content: ruma_events::presence::PresenceEventContent { |
|
|
|
content: ruma::events::presence::PresenceEventContent { |
|
|
|
avatar_url: db.users.avatar_url(&user_id).unwrap(), |
|
|
|
avatar_url: db.users.avatar_url(&user_id).unwrap(), |
|
|
|
currently_active: None, |
|
|
|
currently_active: None, |
|
|
|
displayname: db.users.displayname(&user_id).unwrap(), |
|
|
|
displayname: db.users.displayname(&user_id).unwrap(), |
|
|
|
last_active_ago: Some(utils::millis_since_unix_epoch().try_into().unwrap()), |
|
|
|
last_active_ago: Some(utils::millis_since_unix_epoch().try_into().unwrap()), |
|
|
|
presence: ruma_events::presence::PresenceState::Online, |
|
|
|
presence: ruma::events::presence::PresenceState::Online, |
|
|
|
status_msg: None, |
|
|
|
status_msg: None, |
|
|
|
}, |
|
|
|
}, |
|
|
|
sender: user_id.clone(), |
|
|
|
sender: user_id.clone(), |
|
|
|
@ -706,8 +708,8 @@ pub fn set_presence_route( |
|
|
|
|
|
|
|
|
|
|
|
db.global_edus |
|
|
|
db.global_edus |
|
|
|
.update_presence( |
|
|
|
.update_presence( |
|
|
|
ruma_events::presence::PresenceEvent { |
|
|
|
ruma::events::presence::PresenceEvent { |
|
|
|
content: ruma_events::presence::PresenceEventContent { |
|
|
|
content: ruma::events::presence::PresenceEventContent { |
|
|
|
avatar_url: db.users.avatar_url(&user_id).unwrap(), |
|
|
|
avatar_url: db.users.avatar_url(&user_id).unwrap(), |
|
|
|
currently_active: None, |
|
|
|
currently_active: None, |
|
|
|
displayname: db.users.displayname(&user_id).unwrap(), |
|
|
|
displayname: db.users.displayname(&user_id).unwrap(), |
|
|
|
@ -848,8 +850,8 @@ pub fn set_read_marker_route( |
|
|
|
Some(&body.room_id), |
|
|
|
Some(&body.room_id), |
|
|
|
&user_id, |
|
|
|
&user_id, |
|
|
|
&EventType::FullyRead, |
|
|
|
&EventType::FullyRead, |
|
|
|
serde_json::to_value(ruma_events::fully_read::FullyReadEvent { |
|
|
|
serde_json::to_value(ruma::events::fully_read::FullyReadEvent { |
|
|
|
content: ruma_events::fully_read::FullyReadEventContent { |
|
|
|
content: ruma::events::fully_read::FullyReadEventContent { |
|
|
|
event_id: body.fully_read.clone(), |
|
|
|
event_id: body.fully_read.clone(), |
|
|
|
}, |
|
|
|
}, |
|
|
|
room_id: Some(body.room_id.clone()), |
|
|
|
room_id: Some(body.room_id.clone()), |
|
|
|
@ -877,14 +879,14 @@ pub fn set_read_marker_route( |
|
|
|
let mut user_receipts = BTreeMap::new(); |
|
|
|
let mut user_receipts = BTreeMap::new(); |
|
|
|
user_receipts.insert( |
|
|
|
user_receipts.insert( |
|
|
|
user_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
ruma_events::receipt::Receipt { |
|
|
|
ruma::events::receipt::Receipt { |
|
|
|
ts: Some(SystemTime::now()), |
|
|
|
ts: Some(SystemTime::now()), |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
let mut receipt_content = BTreeMap::new(); |
|
|
|
let mut receipt_content = BTreeMap::new(); |
|
|
|
receipt_content.insert( |
|
|
|
receipt_content.insert( |
|
|
|
event.clone(), |
|
|
|
event.clone(), |
|
|
|
ruma_events::receipt::Receipts { |
|
|
|
ruma::events::receipt::Receipts { |
|
|
|
read: Some(user_receipts), |
|
|
|
read: Some(user_receipts), |
|
|
|
}, |
|
|
|
}, |
|
|
|
); |
|
|
|
); |
|
|
|
@ -894,7 +896,7 @@ pub fn set_read_marker_route( |
|
|
|
.roomlatest_update( |
|
|
|
.roomlatest_update( |
|
|
|
&user_id, |
|
|
|
&user_id, |
|
|
|
&body.room_id, |
|
|
|
&body.room_id, |
|
|
|
EduEvent::Receipt(ruma_events::receipt::ReceiptEvent { |
|
|
|
EduEvent::Receipt(ruma::events::receipt::ReceiptEvent { |
|
|
|
content: receipt_content, |
|
|
|
content: receipt_content, |
|
|
|
room_id: None, // None because it can be inferred
|
|
|
|
room_id: None, // None because it can be inferred
|
|
|
|
}), |
|
|
|
}), |
|
|
|
@ -977,7 +979,7 @@ pub fn create_room_route( |
|
|
|
room_id.clone(), |
|
|
|
room_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
EventType::RoomCreate, |
|
|
|
EventType::RoomCreate, |
|
|
|
serde_json::to_value(ruma_events::room::create::CreateEventContent { |
|
|
|
serde_json::to_value(ruma::events::room::create::CreateEventContent { |
|
|
|
creator: user_id.clone(), |
|
|
|
creator: user_id.clone(), |
|
|
|
federate: body.creation_content.as_ref().map_or(true, |c| c.federate), |
|
|
|
federate: body.creation_content.as_ref().map_or(true, |c| c.federate), |
|
|
|
predecessor: body |
|
|
|
predecessor: body |
|
|
|
@ -1033,7 +1035,7 @@ pub fn create_room_route( |
|
|
|
serde_json::from_str(power_levels.json().get()) |
|
|
|
serde_json::from_str(power_levels.json().get()) |
|
|
|
.expect("TODO: handle. we hope the client sends a valid power levels json") |
|
|
|
.expect("TODO: handle. we hope the client sends a valid power levels json") |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
serde_json::to_value(ruma_events::room::power_levels::PowerLevelsEventContent { |
|
|
|
serde_json::to_value(ruma::events::room::power_levels::PowerLevelsEventContent { |
|
|
|
ban: 50.into(), |
|
|
|
ban: 50.into(), |
|
|
|
events: BTreeMap::new(), |
|
|
|
events: BTreeMap::new(), |
|
|
|
events_default: 0.into(), |
|
|
|
events_default: 0.into(), |
|
|
|
@ -1043,7 +1045,7 @@ pub fn create_room_route( |
|
|
|
state_default: 50.into(), |
|
|
|
state_default: 50.into(), |
|
|
|
users, |
|
|
|
users, |
|
|
|
users_default: 0.into(), |
|
|
|
users_default: 0.into(), |
|
|
|
notifications: ruma_events::room::power_levels::NotificationPowerLevels { |
|
|
|
notifications: ruma::events::room::power_levels::NotificationPowerLevels { |
|
|
|
room: 50.into(), |
|
|
|
room: 50.into(), |
|
|
|
}, |
|
|
|
}, |
|
|
|
}) |
|
|
|
}) |
|
|
|
@ -1159,7 +1161,7 @@ pub fn create_room_route( |
|
|
|
user_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
EventType::RoomName, |
|
|
|
EventType::RoomName, |
|
|
|
serde_json::to_value( |
|
|
|
serde_json::to_value( |
|
|
|
ruma_events::room::name::NameEventContent::new(name.clone()).unwrap(), |
|
|
|
ruma::events::room::name::NameEventContent::new(name.clone()).unwrap(), |
|
|
|
) |
|
|
|
) |
|
|
|
.unwrap(), |
|
|
|
.unwrap(), |
|
|
|
None, |
|
|
|
None, |
|
|
|
@ -1176,7 +1178,7 @@ pub fn create_room_route( |
|
|
|
room_id.clone(), |
|
|
|
room_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
user_id.clone(), |
|
|
|
EventType::RoomTopic, |
|
|
|
EventType::RoomTopic, |
|
|
|
serde_json::to_value(ruma_events::room::topic::TopicEventContent { |
|
|
|
serde_json::to_value(ruma::events::room::topic::TopicEventContent { |
|
|
|
topic: topic.clone(), |
|
|
|
topic: topic.clone(), |
|
|
|
}) |
|
|
|
}) |
|
|
|
.unwrap(), |
|
|
|
.unwrap(), |
|
|
|
@ -1433,7 +1435,7 @@ pub fn leave_room_route( |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
let mut event = |
|
|
|
let mut event = |
|
|
|
serde_json::from_value::<EventJson<ruma_events::room::member::MemberEventContent>>( |
|
|
|
serde_json::from_value::<EventJson<ruma::events::room::member::MemberEventContent>>( |
|
|
|
state |
|
|
|
state |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
@ -1444,7 +1446,7 @@ pub fn leave_room_route( |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
.unwrap(); |
|
|
|
.unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
event.membership = ruma_events::room::member::MembershipState::Leave; |
|
|
|
event.membership = ruma::events::room::member::MembershipState::Leave; |
|
|
|
|
|
|
|
|
|
|
|
db.rooms |
|
|
|
db.rooms |
|
|
|
.append_pdu( |
|
|
|
.append_pdu( |
|
|
|
@ -1472,7 +1474,7 @@ pub fn kick_user_route( |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
let mut event = |
|
|
|
let mut event = |
|
|
|
serde_json::from_value::<EventJson<ruma_events::room::member::MemberEventContent>>( |
|
|
|
serde_json::from_value::<EventJson<ruma::events::room::member::MemberEventContent>>( |
|
|
|
state |
|
|
|
state |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
@ -1483,7 +1485,7 @@ pub fn kick_user_route( |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
.unwrap(); |
|
|
|
.unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
event.membership = ruma_events::room::member::MembershipState::Leave; |
|
|
|
event.membership = ruma::events::room::member::MembershipState::Leave; |
|
|
|
// TODO: reason
|
|
|
|
// TODO: reason
|
|
|
|
|
|
|
|
|
|
|
|
db.rooms |
|
|
|
db.rooms |
|
|
|
@ -1512,7 +1514,7 @@ pub fn ban_user_route( |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
let mut event = |
|
|
|
let mut event = |
|
|
|
serde_json::from_value::<EventJson<ruma_events::room::member::MemberEventContent>>( |
|
|
|
serde_json::from_value::<EventJson<ruma::events::room::member::MemberEventContent>>( |
|
|
|
state |
|
|
|
state |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
@ -1523,7 +1525,7 @@ pub fn ban_user_route( |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
.unwrap(); |
|
|
|
.unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
event.membership = ruma_events::room::member::MembershipState::Ban; |
|
|
|
event.membership = ruma::events::room::member::MembershipState::Ban; |
|
|
|
// TODO: reason
|
|
|
|
// TODO: reason
|
|
|
|
|
|
|
|
|
|
|
|
db.rooms |
|
|
|
db.rooms |
|
|
|
@ -1552,7 +1554,7 @@ pub fn unban_user_route( |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
let state = db.rooms.room_state(&body.room_id).unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
let mut event = |
|
|
|
let mut event = |
|
|
|
serde_json::from_value::<EventJson<ruma_events::room::member::MemberEventContent>>( |
|
|
|
serde_json::from_value::<EventJson<ruma::events::room::member::MemberEventContent>>( |
|
|
|
state |
|
|
|
state |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.get(&(EventType::RoomMember, user_id.to_string())) |
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
.unwrap() // TODO: error handling
|
|
|
|
@ -1563,7 +1565,7 @@ pub fn unban_user_route( |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
.unwrap(); |
|
|
|
.unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
event.membership = ruma_events::room::member::MembershipState::Leave; |
|
|
|
event.membership = ruma::events::room::member::MembershipState::Leave; |
|
|
|
|
|
|
|
|
|
|
|
db.rooms |
|
|
|
db.rooms |
|
|
|
.append_pdu( |
|
|
|
.append_pdu( |
|
|
|
@ -1727,7 +1729,7 @@ pub async fn get_public_rooms_filtered_route( |
|
|
|
aliases: Vec::new(), |
|
|
|
aliases: Vec::new(), |
|
|
|
canonical_alias: state.get(&(EventType::RoomCanonicalAlias, "".to_owned())).and_then(|s| { |
|
|
|
canonical_alias: state.get(&(EventType::RoomCanonicalAlias, "".to_owned())).and_then(|s| { |
|
|
|
serde_json::from_value::< |
|
|
|
serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::canonical_alias::CanonicalAliasEventContent>, |
|
|
|
EventJson<ruma::events::room::canonical_alias::CanonicalAliasEventContent>, |
|
|
|
>(s.content.clone()) |
|
|
|
>(s.content.clone()) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
@ -1735,7 +1737,7 @@ pub async fn get_public_rooms_filtered_route( |
|
|
|
.alias |
|
|
|
.alias |
|
|
|
}), |
|
|
|
}), |
|
|
|
name: state.get(&(EventType::RoomName, "".to_owned())).map(|s| { |
|
|
|
name: state.get(&(EventType::RoomName, "".to_owned())).map(|s| { |
|
|
|
serde_json::from_value::<EventJson<ruma_events::room::name::NameEventContent>>( |
|
|
|
serde_json::from_value::<EventJson<ruma::events::room::name::NameEventContent>>( |
|
|
|
s.content.clone(), |
|
|
|
s.content.clone(), |
|
|
|
) |
|
|
|
) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
@ -1749,7 +1751,7 @@ pub async fn get_public_rooms_filtered_route( |
|
|
|
room_id, |
|
|
|
room_id, |
|
|
|
topic: state.get(&(EventType::RoomTopic, "".to_owned())).map(|s| { |
|
|
|
topic: state.get(&(EventType::RoomTopic, "".to_owned())).map(|s| { |
|
|
|
serde_json::from_value::< |
|
|
|
serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::topic::TopicEventContent>, |
|
|
|
EventJson<ruma::events::room::topic::TopicEventContent>, |
|
|
|
>(s.content.clone()) |
|
|
|
>(s.content.clone()) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
@ -1758,7 +1760,7 @@ pub async fn get_public_rooms_filtered_route( |
|
|
|
}), |
|
|
|
}), |
|
|
|
world_readable: state.get(&(EventType::RoomHistoryVisibility, "".to_owned())).map_or(false, |s| { |
|
|
|
world_readable: state.get(&(EventType::RoomHistoryVisibility, "".to_owned())).map_or(false, |s| { |
|
|
|
serde_json::from_value::< |
|
|
|
serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::history_visibility::HistoryVisibilityEventContent>, |
|
|
|
EventJson<ruma::events::room::history_visibility::HistoryVisibilityEventContent>, |
|
|
|
>(s.content.clone()) |
|
|
|
>(s.content.clone()) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
@ -1767,7 +1769,7 @@ pub async fn get_public_rooms_filtered_route( |
|
|
|
}), |
|
|
|
}), |
|
|
|
guest_can_join: state.get(&(EventType::RoomGuestAccess, "".to_owned())).map_or(false, |s| { |
|
|
|
guest_can_join: state.get(&(EventType::RoomGuestAccess, "".to_owned())).map_or(false, |s| { |
|
|
|
serde_json::from_value::< |
|
|
|
serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::guest_access::GuestAccessEventContent>, |
|
|
|
EventJson<ruma::events::room::guest_access::GuestAccessEventContent>, |
|
|
|
>(s.content.clone()) |
|
|
|
>(s.content.clone()) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
@ -1776,7 +1778,7 @@ pub async fn get_public_rooms_filtered_route( |
|
|
|
}), |
|
|
|
}), |
|
|
|
avatar_url: state.get(&(EventType::RoomAvatar, "".to_owned())).map(|s| { |
|
|
|
avatar_url: state.get(&(EventType::RoomAvatar, "".to_owned())).map(|s| { |
|
|
|
serde_json::from_value::< |
|
|
|
serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::avatar::AvatarEventContent>, |
|
|
|
EventJson<ruma::events::room::avatar::AvatarEventContent>, |
|
|
|
>(s.content.clone()) |
|
|
|
>(s.content.clone()) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
@ -1794,10 +1796,10 @@ pub async fn get_public_rooms_filtered_route( |
|
|
|
&server_server::send_request( |
|
|
|
&server_server::send_request( |
|
|
|
&db, |
|
|
|
&db, |
|
|
|
"privacytools.io".to_owned(), |
|
|
|
"privacytools.io".to_owned(), |
|
|
|
ruma_federation_api::v1::get_public_rooms::Request { |
|
|
|
ruma::api::federation::v1::get_public_rooms::Request { |
|
|
|
limit: Some(20_u32.into()), |
|
|
|
limit: Some(20_u32.into()), |
|
|
|
since: None, |
|
|
|
since: None, |
|
|
|
room_network: ruma_federation_api::v1::get_public_rooms::RoomNetwork::Matrix, |
|
|
|
room_network: ruma::api::federation::v1::get_public_rooms::RoomNetwork::Matrix, |
|
|
|
}, |
|
|
|
}, |
|
|
|
) |
|
|
|
) |
|
|
|
.await |
|
|
|
.await |
|
|
|
@ -2155,12 +2157,12 @@ pub fn sync_route( |
|
|
|
send_member_count = true; |
|
|
|
send_member_count = true; |
|
|
|
if !send_full_state && pdu.state_key == Some(user_id.to_string()) { |
|
|
|
if !send_full_state && pdu.state_key == Some(user_id.to_string()) { |
|
|
|
let content = serde_json::from_value::< |
|
|
|
let content = serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::member::MemberEventContent>, |
|
|
|
EventJson<ruma::events::room::member::MemberEventContent>, |
|
|
|
>(pdu.content.clone()) |
|
|
|
>(pdu.content.clone()) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
.unwrap(); |
|
|
|
.unwrap(); |
|
|
|
if content.membership == ruma_events::room::member::MembershipState::Join { |
|
|
|
if content.membership == ruma::events::room::member::MembershipState::Join { |
|
|
|
send_full_state = true; |
|
|
|
send_full_state = true; |
|
|
|
// Both send_member_count and send_full_state are set. There's nothing more
|
|
|
|
// Both send_member_count and send_full_state are set. There's nothing more
|
|
|
|
// to do
|
|
|
|
// to do
|
|
|
|
@ -2191,14 +2193,14 @@ pub fn sync_route( |
|
|
|
.filter(|pdu| pdu.kind == EventType::RoomMember) |
|
|
|
.filter(|pdu| pdu.kind == EventType::RoomMember) |
|
|
|
.filter_map(|pdu| { |
|
|
|
.filter_map(|pdu| { |
|
|
|
let content = serde_json::from_value::< |
|
|
|
let content = serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::member::MemberEventContent>, |
|
|
|
EventJson<ruma::events::room::member::MemberEventContent>, |
|
|
|
>(pdu.content.clone()) |
|
|
|
>(pdu.content.clone()) |
|
|
|
.unwrap() |
|
|
|
.unwrap() |
|
|
|
.deserialize() |
|
|
|
.deserialize() |
|
|
|
.unwrap(); |
|
|
|
.unwrap(); |
|
|
|
|
|
|
|
|
|
|
|
let current_content = serde_json::from_value::< |
|
|
|
let current_content = serde_json::from_value::< |
|
|
|
EventJson<ruma_events::room::member::MemberEventContent>, |
|
|
|
EventJson<ruma::events::room::member::MemberEventContent>, |
|
|
|
>( |
|
|
|
>( |
|
|
|
state |
|
|
|
state |
|
|
|
.get(&( |
|
|
|
.get(&( |
|
|
|
@ -2218,12 +2220,12 @@ pub fn sync_route( |
|
|
|
// The membership was and still is invite or join
|
|
|
|
// The membership was and still is invite or join
|
|
|
|
if matches!( |
|
|
|
if matches!( |
|
|
|
content.membership, |
|
|
|
content.membership, |
|
|
|
ruma_events::room::member::MembershipState::Join |
|
|
|
ruma::events::room::member::MembershipState::Join |
|
|
|
| ruma_events::room::member::MembershipState::Invite |
|
|
|
| ruma::events::room::member::MembershipState::Invite |
|
|
|
) && matches!( |
|
|
|
) && matches!( |
|
|
|
current_content.membership, |
|
|
|
current_content.membership, |
|
|
|
ruma_events::room::member::MembershipState::Join |
|
|
|
ruma::events::room::member::MembershipState::Join |
|
|
|
| ruma_events::room::member::MembershipState::Invite |
|
|
|
| ruma::events::room::member::MembershipState::Invite |
|
|
|
) { |
|
|
|
) { |
|
|
|
Some(pdu.state_key.unwrap()) |
|
|
|
Some(pdu.state_key.unwrap()) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
Timo Kösters
6 years ago