Commit fbeaaa098107
tarball5 files changed+33-20
@@ -130,9 +130,9 @@ impl Sessions {
130130
let mut open = self.open.lock().await;131131
let mut kept = VecDeque::with_capacity(open.len());132132
for session in open.drain(..) {133
- let left = client.get_room(&session.room_id).is_none_or(|room| {134
- matches!(room.state(), RoomState::Left | RoomState::Banned)135
- });133
+ let left = client134
+ .get_room(&session.room_id)135
+ .is_none_or(|room| matches!(room.state(), RoomState::Left | RoomState::Banned));136136
if left {137137
media.release(&session.scope).await;138138
closed.push(session.id);@@ -272,7 +272,15 @@ pub(crate) async fn capture(
272272
before_limit: u16,273273
after_limit: u16,274274
) -> Result<(EventContext, Vec<MediaRegistration>, Vec<Value>), Error> {275
- capture_in(room, current_user_id, event_id, before_limit, after_limit, "").await275
+ capture_in(276
+ room,277
+ current_user_id,278
+ event_id,279
+ before_limit,280
+ after_limit,281
+ "",282
+ )283
+ .await276284
}277285
278286
async fn capture_in(@@ -419,13 +427,7 @@ impl Assembly {
419427
keep: Option<usize>,420428
media_prefix: &str,421429
) -> Self {422
- let page = normalise_context(423
- values,424
- keep,425
- current_user_id,426
- room.room_id(),427
- media_prefix,428
- );430
+ let page = normalise_context(values, keep, current_user_id, room.room_id(), media_prefix);429431
let mut items = page.items;430432
for (index, item) in &mut items {431433
if let TimelineItem::Event(event) = item {@@ -524,9 +526,11 @@ async fn profiles<'a>(
524526
let mut unique: Vec<&OwnedUserId> = user_ids.collect();525527
unique.sort();526528
unique.dedup();527
- join_all(unique.into_iter().map(|user_id| async move {528
- Some((user_id.clone(), member_sender(room, user_id).await?))529
- }))529
+ join_all(530
+ unique.into_iter().map(|user_id| async move {531
+ Some((user_id.clone(), member_sender(room, user_id).await?))532
+ }),533
+ )530534
.await531535
.into_iter()532536
.flatten()@@ -396,7 +396,13 @@ async fn send_sticker(
396396
.load_or_fetch_event(root, None)397397
.await398398
.ok()399
- .and_then(|event| event.raw().get_field::<JsonValue>("unsigned").ok().flatten())399
+ .and_then(|event| {400
+ event401
+ .raw()402
+ .get_field::<JsonValue>("unsigned")403
+ .ok()404
+ .flatten()405
+ })400406
.and_then(|unsigned| {401407
unsigned402408
.pointer("/m.relations/m.thread/latest_event/event_id")@@ -239,7 +239,13 @@ mod tests {
239239
"content": {},240240
}),241241
];242
- let page = normalise_context(&values, None, Some(user_id!("@a:x")), room_id!("!room:x"), "");242
+ let page = normalise_context(243
+ &values,244
+ None,245
+ Some(user_id!("@a:x")),246
+ room_id!("!room:x"),247
+ "",248
+ );243249
assert_eq!(page.items.len(), 1);244250
let TimelineItem::Event(event) = &page.items[0].1 else {245251
panic!("expected an event");@@ -471,4 +471,3 @@ pub(super) fn formatted_body(message: &MessageType) -> Option<String> {
471471
}?;472472
(formatted.format == MessageFormat::Html).then(|| formatted.body.clone())473473
}474
-@@ -954,9 +954,7 @@ async fn a_quiet_keyword_rule_only_gains_the_highlight() {
954954
.and(path(955955
"/_matrix/client/v3/pushrules/global/content/deploy/actions",956956
))957
- .and(actions_are(958
- json!([{"set_tweak": "highlight"}]),959
- ))957
+ .and(actions_are(json!([{"set_tweak": "highlight"}])))960958
.respond_with(ResponseTemplate::new(200).set_body_json(json!({})))961959
.expect(1)962960
.mount(server.server())