char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
conduit/src/client_server/message.rs

160 lines
5.2 KiB
Rust
Raw Normal View History

refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
use super::State;
feat: handle txn ids
2020-08-25 11:24:38 +00:00
use crate::{pdu::PduBuilder, utils, ConduitResult, Database, Error, Ruma};
Keep track of State at event for state resolution feat: first steps towards joining rooms over federation Add state-res as a dependency of conduit Add reverse_topological_power_sort before append_pdu Implement statehashstatid_pduid tree for keeping track of state Clean up implementation of state_hash as key for tracking state
2020-08-06 12:29:59 +00:00
use ruma::{
api::client::{
error::ErrorKind,
r0::message::{get_message_events, send_message_event},
},
events::EventContent,
feat: handle txn ids
2020-08-25 11:24:38 +00:00
EventId,
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
};
feat: handle txn ids
2020-08-25 11:24:38 +00:00
use std::convert::{TryFrom, TryInto};
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
#[cfg(feature = "conduit_bin")]
use rocket::{get, put};
#[cfg_attr(
feature = "conduit_bin",
put("/_matrix/client/r0/rooms/<_>/send/<_>/<_>", data = "<body>")
)]
Update ruma
2020-08-12 21:32:39 +00:00
pub fn send_message_event_route(
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
db: State<'_, Database>,
Update ruma version
2020-09-08 15:32:03 +00:00
body: Ruma<send_message_event::Request<'_>>,
Update ruma
2020-08-12 21:32:39 +00:00
) -> ConduitResult<send_message_event::Response> {
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
let sender_id = body.sender_id.as_ref().expect("user is authenticated");
feat: handle txn ids
2020-08-25 11:24:38 +00:00
let device_id = body.device_id.as_ref().expect("user is authenticated");
// Check if this is a new transaction id
if let Some(response) = db
.transaction_ids
.existing_txnid(sender_id, device_id, &body.txn_id)?
{
// The client might have sent a txnid of the /sendToDevice endpoint
// This txnid has no response associated with it
if response.is_empty() {
return Err(Error::BadRequest(
ErrorKind::InvalidParam,
"Tried to use txn id already used for an incompatible endpoint.",
));
}
let event_id = EventId::try_from(
utils::string_from_bytes(&response)
.map_err(|_| Error::bad_database("Invalid txnid bytes in database."))?,
)
.map_err(|_| Error::bad_database("Invalid event id in txnid data."))?;
return Ok(send_message_event::Response { event_id }.into());
}
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
let mut unsigned = serde_json::Map::new();
unsigned.insert("transaction_id".to_owned(), body.txn_id.clone().into());
Split append_pdu -> append_pdu and build_and_append Move all state event appending to append_state_pdu.
2020-08-18 20:26:03 +00:00
let event_id = db.rooms.build_and_append_pdu(
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
PduBuilder {
Keep track of State at event for state resolution feat: first steps towards joining rooms over federation Add state-res as a dependency of conduit Add reverse_topological_power_sort before append_pdu Implement statehashstatid_pduid tree for keeping track of state Clean up implementation of state_hash as key for tracking state
2020-08-06 12:29:59 +00:00
event_type: body.content.event_type().into(),
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
content: serde_json::from_str(
body.json_body
fix: join rooms over federation
2020-09-12 19:30:07 +00:00
.as_ref()
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
.ok_or(Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?
.get(),
)
.map_err(|_| Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?,
unsigned: Some(unsigned),
state_key: None,
redacts: None,
},
fix: join rooms over federation
2020-09-12 19:30:07 +00:00
&sender_id,
&body.room_id,
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
&db.globals,
&db.account_data,
)?;
feat: handle txn ids
2020-08-25 11:24:38 +00:00
db.transaction_ids
.add_txnid(sender_id, device_id, &body.txn_id, event_id.as_bytes())?;
Merge remote-tracking branch 'origin/master' into federation
2020-09-12 20:13:53 +00:00
Keep track of State at event for state resolution feat: first steps towards joining rooms over federation Add state-res as a dependency of conduit Add reverse_topological_power_sort before append_pdu Implement statehashstatid_pduid tree for keeping track of state Clean up implementation of state_hash as key for tracking state
2020-08-06 12:29:59 +00:00
Ok(send_message_event::Response::new(event_id).into())
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
}
#[cfg_attr(
feature = "conduit_bin",
get("/_matrix/client/r0/rooms/<_>/messages", data = "<body>")
)]
pub fn get_message_events_route(
db: State<'_, Database>,
Update ruma version
2020-09-08 15:32:03 +00:00
body: Ruma<get_message_events::Request<'_>>,
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
) -> ConduitResult<get_message_events::Response> {
let sender_id = body.sender_id.as_ref().expect("user is authenticated");
if !db.rooms.is_joined(sender_id, &body.room_id)? {
return Err(Error::BadRequest(
ErrorKind::Forbidden,
"You don't have permission to view this room.",
));
}
let from = body
.from
.clone()
.parse()
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid `from` value."))?;
let to = body.to.as_ref().map(|t| t.parse());
// Use limit or else 10
let limit = body
.limit
.try_into()
.map_or(Ok::<_, Error>(10_usize), |l: u32| Ok(l as usize))?;
match body.dir {
get_message_events::Direction::Forward => {
let events_after = db
.rooms
.pdus_after(&sender_id, &body.room_id, from)
.take(limit)
.filter_map(|r| r.ok()) // Filter out buggy events
.take_while(|&(k, _)| Some(Ok(k)) != to) // Stop at `to`
.collect::<Vec<_>>();
let end_token = events_after.last().map(|(count, _)| count.to_string());
let events_after = events_after
.into_iter()
.map(|(_, pdu)| pdu.to_room_event())
.collect::<Vec<_>>();
Keep track of State at event for state resolution feat: first steps towards joining rooms over federation Add state-res as a dependency of conduit Add reverse_topological_power_sort before append_pdu Implement statehashstatid_pduid tree for keeping track of state Clean up implementation of state_hash as key for tracking state
2020-08-06 12:29:59 +00:00
let mut resp = get_message_events::Response::new();
Update ruma version
2020-09-08 15:32:03 +00:00
resp.start = Some(body.from.to_owned());
Keep track of State at event for state resolution feat: first steps towards joining rooms over federation Add state-res as a dependency of conduit Add reverse_topological_power_sort before append_pdu Implement statehashstatid_pduid tree for keeping track of state Clean up implementation of state_hash as key for tracking state
2020-08-06 12:29:59 +00:00
resp.end = end_token;
resp.chunk = events_after;
resp.state = Vec::new();
Ok(resp.into())
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
}
get_message_events::Direction::Backward => {
let events_before = db
.rooms
.pdus_until(&sender_id, &body.room_id, from)
.take(limit)
.filter_map(|r| r.ok()) // Filter out buggy events
.take_while(|&(k, _)| Some(Ok(k)) != to) // Stop at `to`
.collect::<Vec<_>>();
let start_token = events_before.last().map(|(count, _)| count.to_string());
let events_before = events_before
.into_iter()
.map(|(_, pdu)| pdu.to_room_event())
.collect::<Vec<_>>();
Keep track of State at event for state resolution feat: first steps towards joining rooms over federation Add state-res as a dependency of conduit Add reverse_topological_power_sort before append_pdu Implement statehashstatid_pduid tree for keeping track of state Clean up implementation of state_hash as key for tracking state
2020-08-06 12:29:59 +00:00
let mut resp = get_message_events::Response::new();
Update ruma version
2020-09-08 15:32:03 +00:00
resp.start = Some(body.from.to_owned());
Keep track of State at event for state resolution feat: first steps towards joining rooms over federation Add state-res as a dependency of conduit Add reverse_topological_power_sort before append_pdu Implement statehashstatid_pduid tree for keeping track of state Clean up implementation of state_hash as key for tracking state
2020-08-06 12:29:59 +00:00
resp.end = start_token;
resp.chunk = events_before;
resp.state = Vec::new();
Ok(resp.into())
refactor: put endpoints into modules
2020-07-30 16:14:47 +00:00
}
}
}