magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add is_not_found as Error member function; tweak interface; add doc comments

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-04 17:07:31 +00:00 • committed by strawberry
parent dd9f53080a
commit 685eadb171
4 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/client/sync.rs
View file

@ -6,10 +6,8 @@ use std::{
use axum::extract::State;
use conduit::{
debug, err, error,
error::is_not_found,
is_equal_to,
result::IntoIsOk,
debug, err, error, is_equal_to,
result::{FlatOk, IntoIsOk},
utils::{
math::{ruma_from_u64, ruma_from_usize, usize_from_ruma, usize_from_u64_truncated},
BoolExt, IterStream, ReadyExt, TryFutureExtExt,
@ -1891,7 +1889,7 @@ async fn filter_rooms(
.filter_map(|r| async move {
let room_type = services.rooms.state_accessor.get_room_type(r).await;
if room_type.as_ref().is_err_and(|e| !is_not_found(e)) {
if room_type.as_ref().is_err_and(|e| !e.is_not_found()) {
return None;
}

4
src/api/server/send.rs
View file

@ -2,7 +2,7 @@ use std::{collections::BTreeMap, net::IpAddr, time::Instant};
use axum::extract::State;
use axum_client_ip::InsecureClientIp;
use conduit::{debug, debug_warn, err, result::LogErr, trace, utils::ReadyExt, warn, Err, Error, Result};
use conduit::{debug, debug_warn, err, error, result::LogErr, trace, utils::ReadyExt, warn, Err, Error, Result};
use futures::StreamExt;
use ruma::{
api::{
@ -85,7 +85,7 @@ pub(crate) async fn send_transaction_message_route(
Ok(send_transaction_message::v1::Response {
pdus: resolved_map
.into_iter()
.map(|(e, r)| (e, r.map_err(|e| e.sanitized_string())))
.map(|(e, r)| (e, r.map_err(error::sanitized_message)))
.collect(),
})
}