serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-29 05:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix start/end token swap left from dropped commits

Browse source
This commit is contained in:
Devin Ragotzy 2020-07-30 07:50:09 -04:00
parent 99220565d4
commit c8d7d80eb2
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client_server.rs
View file

@ -3243,8 +3243,8 @@ pub fn get_message_events_route(
.collect::<Vec<_>>(); .collect::<Vec<_>>();
Ok(get_message_events::Response { Ok(get_message_events::Response {
start: start_token, start: Some(body.from.clone()),
end: Some(body.from.clone()), end: start_token,
chunk: events_before, chunk: events_before,
state: Vec::new(), state: Vec::new(),
} }

10
src/database/rooms.rs
View file

@ -596,14 +596,10 @@ impl Rooms {
EventType::RoomMember => { EventType::RoomMember => {
if let Some(state_key) = state_key { if let Some(state_key) = state_key {
// if the state_key fails // if the state_key fails
let target_user_id = UserId::try_from(state_key).map_err(|_| { let target_user_id = UserId::try_from(state_key)
Error::BadRequest( .expect("This state_key was previously validated");
ErrorKind::InvalidParam,
"State key of member event does not contain user id.",
)
})?;
// Update our membership info, we do this here incase a user is invited // Update our membership info, we do this here incase a user is invited
// and imediatly leaves we need the DB to record the invite event for auth // and immediately leaves we need the DB to record the invite event for auth
self.update_membership( self.update_membership(
&room_id, &room_id,
&target_user_id, &target_user_id,