|
|
|
@ -2338,50 +2338,51 @@ pub fn sync_route(
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
joined_rooms.insert(
|
|
|
|
let joined_room = sync_events::JoinedRoom {
|
|
|
|
room_id.clone().try_into().unwrap(),
|
|
|
|
account_data: sync_events::AccountData {
|
|
|
|
sync_events::JoinedRoom {
|
|
|
|
events: db
|
|
|
|
account_data: Some(sync_events::AccountData {
|
|
|
|
.account_data
|
|
|
|
events: db
|
|
|
|
.changes_since(Some(&room_id), &user_id, since)
|
|
|
|
.account_data
|
|
|
|
.unwrap()
|
|
|
|
.changes_since(Some(&room_id), &user_id, since)
|
|
|
|
.into_iter()
|
|
|
|
.unwrap()
|
|
|
|
.map(|(_, v)| v)
|
|
|
|
.into_iter()
|
|
|
|
.collect(),
|
|
|
|
.map(|(_, v)| v)
|
|
|
|
},
|
|
|
|
.collect(),
|
|
|
|
summary: sync_events::RoomSummary {
|
|
|
|
}),
|
|
|
|
heroes,
|
|
|
|
summary: sync_events::RoomSummary {
|
|
|
|
joined_member_count: joined_member_count.map(|n| (n as u32).into()),
|
|
|
|
heroes,
|
|
|
|
invited_member_count: invited_member_count.map(|n| (n as u32).into()),
|
|
|
|
joined_member_count: joined_member_count.map(|n| (n as u32).into()),
|
|
|
|
},
|
|
|
|
invited_member_count: invited_member_count.map(|n| (n as u32).into()),
|
|
|
|
unread_notifications: sync_events::UnreadNotificationsCount {
|
|
|
|
},
|
|
|
|
highlight_count: None,
|
|
|
|
unread_notifications: sync_events::UnreadNotificationsCount {
|
|
|
|
notification_count,
|
|
|
|
highlight_count: None,
|
|
|
|
},
|
|
|
|
notification_count,
|
|
|
|
timeline: sync_events::Timeline {
|
|
|
|
},
|
|
|
|
limited: if limited || joined_since_last_sync {
|
|
|
|
timeline: sync_events::Timeline {
|
|
|
|
Some(true)
|
|
|
|
limited: if limited || joined_since_last_sync {
|
|
|
|
} else {
|
|
|
|
Some(true)
|
|
|
|
None
|
|
|
|
} else {
|
|
|
|
|
|
|
|
None
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
prev_batch,
|
|
|
|
|
|
|
|
events: room_events,
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// TODO: state before timeline
|
|
|
|
prev_batch,
|
|
|
|
state: sync_events::State {
|
|
|
|
events: room_events,
|
|
|
|
events: if joined_since_last_sync {
|
|
|
|
},
|
|
|
|
state
|
|
|
|
// TODO: state before timeline
|
|
|
|
.into_iter()
|
|
|
|
state: sync_events::State {
|
|
|
|
.map(|(_, pdu)| pdu.to_state_event())
|
|
|
|
events: if joined_since_last_sync {
|
|
|
|
.collect()
|
|
|
|
state
|
|
|
|
} else {
|
|
|
|
.into_iter()
|
|
|
|
Vec::new()
|
|
|
|
.map(|(_, pdu)| pdu.to_state_event())
|
|
|
|
},
|
|
|
|
.collect()
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
Vec::new()
|
|
|
|
},
|
|
|
|
},
|
|
|
|
ephemeral: sync_events::Ephemeral { events: edus },
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
);
|
|
|
|
ephemeral: sync_events::Ephemeral { events: edus },
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if !joined_room.is_empty() {
|
|
|
|
|
|
|
|
joined_rooms.insert(room_id.clone().try_into().unwrap(), joined_room);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let mut left_rooms = BTreeMap::new();
|
|
|
|
let mut left_rooms = BTreeMap::new();
|
|
|
|
@ -2390,6 +2391,7 @@ pub fn sync_route(
|
|
|
|
let pdus = db.rooms.pdus_since(&room_id, since).unwrap();
|
|
|
|
let pdus = db.rooms.pdus_since(&room_id, since).unwrap();
|
|
|
|
let room_events = pdus.map(|pdu| pdu.unwrap().to_room_event()).collect();
|
|
|
|
let room_events = pdus.map(|pdu| pdu.unwrap().to_room_event()).collect();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: Only until leave point
|
|
|
|
let mut edus = db
|
|
|
|
let mut edus = db
|
|
|
|
.rooms
|
|
|
|
.rooms
|
|
|
|
.edus
|
|
|
|
.edus
|
|
|
|
@ -2416,38 +2418,40 @@ pub fn sync_route(
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
left_rooms.insert(
|
|
|
|
let left_room = sync_events::LeftRoom {
|
|
|
|
room_id.clone().try_into().unwrap(),
|
|
|
|
account_data: sync_events::AccountData { events: Vec::new() },
|
|
|
|
sync_events::LeftRoom {
|
|
|
|
timeline: sync_events::Timeline {
|
|
|
|
account_data: Some(sync_events::AccountData { events: Vec::new() }),
|
|
|
|
limited: Some(false),
|
|
|
|
timeline: sync_events::Timeline {
|
|
|
|
prev_batch: Some(next_batch.clone()),
|
|
|
|
limited: Some(false),
|
|
|
|
events: room_events,
|
|
|
|
prev_batch: Some(next_batch.clone()),
|
|
|
|
|
|
|
|
events: room_events,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
state: sync_events::State { events: Vec::new() },
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
);
|
|
|
|
state: sync_events::State { events: Vec::new() },
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if !left_room.is_empty() {
|
|
|
|
|
|
|
|
left_rooms.insert(room_id.clone().try_into().unwrap(), left_room);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let mut invited_rooms = BTreeMap::new();
|
|
|
|
let mut invited_rooms = BTreeMap::new();
|
|
|
|
for room_id in db.rooms.rooms_invited(&user_id) {
|
|
|
|
for room_id in db.rooms.rooms_invited(&user_id) {
|
|
|
|
let room_id = room_id.unwrap();
|
|
|
|
let room_id = room_id.unwrap();
|
|
|
|
|
|
|
|
|
|
|
|
invited_rooms.insert(
|
|
|
|
let invited_room = sync_events::InvitedRoom {
|
|
|
|
room_id.clone(),
|
|
|
|
invite_state: sync_events::InviteState {
|
|
|
|
sync_events::InvitedRoom {
|
|
|
|
events: db
|
|
|
|
invite_state: sync_events::InviteState {
|
|
|
|
.rooms
|
|
|
|
events: db
|
|
|
|
.room_state(&room_id)
|
|
|
|
.rooms
|
|
|
|
.unwrap()
|
|
|
|
.room_state(&room_id)
|
|
|
|
.into_iter()
|
|
|
|
.unwrap()
|
|
|
|
.map(|(_, pdu)| pdu.to_stripped_state_event())
|
|
|
|
.into_iter()
|
|
|
|
.collect(),
|
|
|
|
.map(|(_, pdu)| pdu.to_stripped_state_event())
|
|
|
|
|
|
|
|
.collect(),
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
);
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if !invited_room.is_empty() {
|
|
|
|
|
|
|
|
invited_rooms.insert(room_id.clone(), invited_room);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
MatrixResult(Ok(sync_events::Response {
|
|
|
|
MatrixResult(Ok(sync_events::Response {
|
|
|
|
@ -2482,17 +2486,16 @@ pub fn sync_route(
|
|
|
|
.map(|(_, v)| v)
|
|
|
|
.map(|(_, v)| v)
|
|
|
|
.collect(),
|
|
|
|
.collect(),
|
|
|
|
},
|
|
|
|
},
|
|
|
|
device_lists: if since != 0 {
|
|
|
|
device_lists: sync_events::DeviceLists {
|
|
|
|
Some(sync_events::DeviceLists {
|
|
|
|
changed: if since != 0 {
|
|
|
|
changed: db
|
|
|
|
db.users
|
|
|
|
.users
|
|
|
|
|
|
|
|
.device_keys_changed(since)
|
|
|
|
.device_keys_changed(since)
|
|
|
|
.map(|u| u.unwrap())
|
|
|
|
.map(|u| u.unwrap())
|
|
|
|
.collect(),
|
|
|
|
.collect()
|
|
|
|
left: Vec::new(), // TODO
|
|
|
|
} else {
|
|
|
|
})
|
|
|
|
Vec::new()
|
|
|
|
} else {
|
|
|
|
},
|
|
|
|
None // TODO: left
|
|
|
|
left: Vec::new(), // TODO
|
|
|
|
},
|
|
|
|
},
|
|
|
|
device_one_time_keys_count: Default::default(), // TODO
|
|
|
|
device_one_time_keys_count: Default::default(), // TODO
|
|
|
|
to_device: sync_events::ToDevice {
|
|
|
|
to_device: sync_events::ToDevice {
|
|
|
|
|
timokoesters
4 years ago