backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-18 08:11:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

stop putting comments in the middle of call chains

Browse source 
`rustfmt` doesn't handle this very well.
This commit is contained in:
Charles Hall 2024-05-16 01:08:08 -07:00
parent 1911ad34d9
commit 05be778fbb
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
10 changed files with 35 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/service/rooms/pdu_metadata.rs
View file

@ -61,10 +61,10 @@ impl Service {
//TODO: Fix ruma: match body.dir {
match ruma::api::Direction::Backward {
ruma::api::Direction::Forward => {
// TODO: should be relations_after
let events_after: Vec<_> = services()
.rooms
.pdu_metadata
// TODO: should be relations_after
.relations_until(sender_user, room_id, target, from)?
.filter(|r| {
r.as_ref().map_or(true, |(_, pdu)| {
@ -91,15 +91,14 @@ impl Service {
.user_can_see_event(sender_user, room_id, &pdu.event_id)
.unwrap_or(false)
})
// Stop at `to`
.take_while(|&(k, _)| Some(k) != to)
.collect();
next_token = events_after.last().map(|(count, _)| count).copied();
// Reversed because relations are always most recent first
let events_after: Vec<_> = events_after
.into_iter()
// relations are always most recent first
.rev()
.map(|(_, pdu)| pdu.to_message_like_event())
.collect();
@ -140,7 +139,6 @@ impl Service {
.user_can_see_event(sender_user, room_id, &pdu.event_id)
.unwrap_or(false)
})
// Stop at `to`
.take_while(|&(k, _)| Some(k) != to)
.collect();

1
src/service/rooms/spaces.rs
View file

@ -371,7 +371,6 @@ impl Service {
.map_err(|_| Error::bad_database("Invalid room avatar event in database."))
})
.transpose()?
// url is now an Option<String> so we must flatten
.flatten(),
join_rule: {
let join_rule = services()