mirror of
https://github.com/girlbossceo/conduwuit.git
synced 2025-12-14 11:18:58 -05:00
workaround some large type name length issues
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
parent
db99d3a001
commit
d60920c728
14 changed files with 41 additions and 32 deletions
|
|
@ -31,7 +31,7 @@ pub fn room_state_full<'a>(
|
|||
self.services
|
||||
.state
|
||||
.get_room_shortstatehash(room_id)
|
||||
.map_ok(|shortstatehash| self.state_full(shortstatehash).map(Ok))
|
||||
.map_ok(|shortstatehash| self.state_full(shortstatehash).map(Ok).boxed())
|
||||
.map_err(move |e| err!(Database("Missing state for {room_id:?}: {e:?}")))
|
||||
.try_flatten_stream()
|
||||
}
|
||||
|
|
@ -46,7 +46,7 @@ pub fn room_state_full_pdus<'a>(
|
|||
self.services
|
||||
.state
|
||||
.get_room_shortstatehash(room_id)
|
||||
.map_ok(|shortstatehash| self.state_full_pdus(shortstatehash).map(Ok))
|
||||
.map_ok(|shortstatehash| self.state_full_pdus(shortstatehash).map(Ok).boxed())
|
||||
.map_err(move |e| err!(Database("Missing state for {room_id:?}: {e:?}")))
|
||||
.try_flatten_stream()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -235,6 +235,7 @@ pub fn state_keys_with_shortids<'a>(
|
|||
.ignore_err()
|
||||
.unzip()
|
||||
.map(|(ssks, sids): (Vec<u64>, Vec<u64>)| (ssks, sids))
|
||||
.boxed()
|
||||
.shared();
|
||||
|
||||
let shortstatekeys = short_ids
|
||||
|
|
@ -390,8 +391,10 @@ pub fn state_full_shortids(
|
|||
.map(parse_compressed_state_event)
|
||||
.collect()
|
||||
})
|
||||
.map_ok(|vec: Vec<_>| vec.into_iter().try_stream())
|
||||
.map_ok(Vec::into_iter)
|
||||
.map_ok(IterStream::try_stream)
|
||||
.try_flatten_stream()
|
||||
.boxed()
|
||||
}
|
||||
|
||||
#[implement(super::Service)]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue