rename conduit to conduwuit finally
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
parent
c6bf8f5ea1
commit
0317cc8cc5
277 changed files with 559 additions and 551 deletions
|
@ -2,7 +2,7 @@ mod remote;
|
|||
|
||||
use std::sync::Arc;
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
err,
|
||||
utils::{stream::TryIgnore, ReadyExt},
|
||||
Err, Error, Result,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::iter::once;
|
||||
|
||||
use conduit::{debug, debug_error, err, implement, Result};
|
||||
use conduwuit::{debug, debug_error, err, implement, Result};
|
||||
use federation::query::get_room_information::v1::Response;
|
||||
use ruma::{api::federation, OwnedRoomId, OwnedServerName, RoomAliasId, ServerName};
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ use std::{
|
|||
sync::{Arc, Mutex},
|
||||
};
|
||||
|
||||
use conduit::{err, utils, utils::math::usize_from_f64, Err, Result};
|
||||
use conduwuit::{err, utils, utils::math::usize_from_f64, Err, Result};
|
||||
use database::Map;
|
||||
use lru_cache::LruCache;
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
debug, debug_error, trace,
|
||||
utils::{stream::ReadyExt, IterStream},
|
||||
validated, warn, Err, Result,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use conduit::{implement, utils::stream::TryIgnore, Result};
|
||||
use conduwuit::{implement, utils::stream::TryIgnore, Result};
|
||||
use database::Map;
|
||||
use futures::Stream;
|
||||
use ruma::{api::client::room::Visibility, RoomId};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use conduit::{debug, implement, trace, warn, Err, Result};
|
||||
use conduwuit::{debug, implement, trace, warn, Err, Result};
|
||||
use ruma::{
|
||||
events::{room::server_acl::RoomServerAclEventContent, StateEventType},
|
||||
RoomId, ServerName,
|
||||
|
|
|
@ -4,7 +4,7 @@ use std::{
|
|||
time::Instant,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
debug, debug_error, implement, info, pdu, trace, utils::math::continue_exponential_backoff_secs, warn, PduEvent,
|
||||
};
|
||||
use futures::TryFutureExt;
|
||||
|
|
|
@ -3,7 +3,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{debug_warn, err, implement, PduEvent, Result};
|
||||
use conduwuit::{debug_warn, err, implement, PduEvent, Result};
|
||||
use futures::{future, FutureExt};
|
||||
use ruma::{
|
||||
int,
|
||||
|
|
|
@ -3,7 +3,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{debug, implement, warn, Err, Error, PduEvent, Result};
|
||||
use conduwuit::{debug, implement, warn, Err, Error, PduEvent, Result};
|
||||
use futures::FutureExt;
|
||||
use ruma::{
|
||||
api::federation::event::get_room_state_ids, events::StateEventType, EventId, RoomId, RoomVersionId, ServerName,
|
||||
|
|
|
@ -4,7 +4,7 @@ use std::{
|
|||
time::Instant,
|
||||
};
|
||||
|
||||
use conduit::{debug, err, implement, warn, Error, Result};
|
||||
use conduwuit::{debug, err, implement, warn, Error, Result};
|
||||
use futures::{FutureExt, TryFutureExt};
|
||||
use ruma::{
|
||||
api::client::error::ErrorKind, events::StateEventType, CanonicalJsonValue, EventId, RoomId, ServerName, UserId,
|
||||
|
|
|
@ -3,7 +3,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{debug, debug_info, err, implement, trace, warn, Err, Error, PduEvent, Result};
|
||||
use conduwuit::{debug, debug_info, err, implement, trace, warn, Err, Error, PduEvent, Result};
|
||||
use futures::{future::ready, TryFutureExt};
|
||||
use ruma::{
|
||||
api::client::error::ErrorKind,
|
||||
|
|
|
@ -4,7 +4,7 @@ use std::{
|
|||
time::Instant,
|
||||
};
|
||||
|
||||
use conduit::{debug, implement, utils::math::continue_exponential_backoff_secs, Error, PduEvent, Result};
|
||||
use conduwuit::{debug, implement, utils::math::continue_exponential_backoff_secs, Error, PduEvent, Result};
|
||||
use ruma::{api::client::error::ErrorKind, CanonicalJsonValue, EventId, RoomId, ServerName};
|
||||
|
||||
#[implement(super::Service)]
|
||||
|
|
|
@ -17,7 +17,7 @@ use std::{
|
|||
time::Instant,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
utils::{MutexMap, TryFutureExtExt},
|
||||
Err, PduEvent, Result, Server,
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use conduit::{err, implement, pdu::gen_event_id_canonical_json, result::FlatOk, Result};
|
||||
use conduwuit::{err, implement, pdu::gen_event_id_canonical_json, result::FlatOk, Result};
|
||||
use ruma::{CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, RoomId};
|
||||
use serde_json::value::RawValue as RawJsonValue;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
debug, err, implement,
|
||||
utils::stream::{IterStream, WidebandExt},
|
||||
Result,
|
||||
|
|
|
@ -4,7 +4,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
debug, err, implement,
|
||||
result::LogErr,
|
||||
utils::stream::{BroadbandExt, IterStream},
|
||||
|
|
|
@ -5,7 +5,7 @@ use std::{
|
|||
time::Instant,
|
||||
};
|
||||
|
||||
use conduit::{debug, debug_info, err, implement, trace, warn, Err, Error, PduEvent, Result};
|
||||
use conduwuit::{debug, debug_info, err, implement, trace, warn, Err, Error, PduEvent, Result};
|
||||
use futures::{future::ready, StreamExt};
|
||||
use ruma::{
|
||||
api::client::error::ErrorKind,
|
||||
|
|
|
@ -4,7 +4,7 @@ use std::{
|
|||
sync::{Arc, Mutex},
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
implement,
|
||||
utils::{stream::TryIgnore, ReadyExt},
|
||||
PduCount, Result,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use conduit::{implement, utils::stream::TryIgnore, Result};
|
||||
use conduwuit::{implement, utils::stream::TryIgnore, Result};
|
||||
use database::Map;
|
||||
use futures::{Stream, StreamExt};
|
||||
use ruma::RoomId;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use conduit::{implement, Result};
|
||||
use conduwuit::{implement, Result};
|
||||
use database::{Deserialized, Json, Map};
|
||||
use ruma::{CanonicalJsonObject, EventId};
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::{mem::size_of, sync::Arc};
|
||||
|
||||
use arrayvec::ArrayVec;
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
result::LogErr,
|
||||
utils::{
|
||||
stream::{TryIgnore, WidebandExt},
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
mod data;
|
||||
use std::sync::Arc;
|
||||
|
||||
use conduit::{PduCount, Result};
|
||||
use conduwuit::{PduCount, Result};
|
||||
use futures::StreamExt;
|
||||
use ruma::{api::Direction, EventId, RoomId, UserId};
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
utils::{stream::TryIgnore, ReadyExt},
|
||||
Result,
|
||||
};
|
||||
|
|
|
@ -2,7 +2,7 @@ mod data;
|
|||
|
||||
use std::{collections::BTreeMap, sync::Arc};
|
||||
|
||||
use conduit::{debug, err, warn, PduCount, PduId, RawPduId, Result};
|
||||
use conduwuit::{debug, err, warn, PduCount, PduId, RawPduId, Result};
|
||||
use futures::{try_join, Stream, TryFutureExt};
|
||||
use ruma::{
|
||||
events::{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use arrayvec::ArrayVec;
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
implement,
|
||||
utils::{
|
||||
set,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use std::{borrow::Borrow, fmt::Debug, mem::size_of_val, sync::Arc};
|
||||
|
||||
pub use conduit::pdu::{ShortEventId, ShortId, ShortRoomId};
|
||||
use conduit::{err, implement, utils, utils::stream::ReadyExt, Result};
|
||||
pub use conduwuit::pdu::{ShortEventId, ShortId, ShortRoomId};
|
||||
use conduwuit::{err, implement, utils, utils::stream::ReadyExt, Result};
|
||||
use database::{Deserialized, Map};
|
||||
use futures::{Stream, StreamExt};
|
||||
use ruma::{events::StateEventType, EventId, RoomId};
|
||||
|
|
|
@ -7,7 +7,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
checked, debug_info, err,
|
||||
utils::{math::usize_from_f64, IterStream},
|
||||
Error, Result,
|
||||
|
|
|
@ -5,7 +5,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
err,
|
||||
result::FlatOk,
|
||||
utils::{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::{borrow::Borrow, collections::HashMap, sync::Arc};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
at, err, ref_at,
|
||||
utils::stream::{BroadbandExt, IterStream, ReadyExt},
|
||||
PduEvent, Result,
|
||||
|
|
|
@ -7,7 +7,7 @@ use std::{
|
|||
sync::{Arc, Mutex as StdMutex, Mutex},
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
err, error,
|
||||
pdu::PduBuilder,
|
||||
utils::{math::usize_from_f64, ReadyExt},
|
||||
|
|
|
@ -3,7 +3,7 @@ use std::{
|
|||
sync::{Arc, RwLock},
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
is_not_empty,
|
||||
result::LogErr,
|
||||
utils::{stream::TryIgnore, ReadyExt, StreamTools},
|
||||
|
@ -395,7 +395,7 @@ impl Service {
|
|||
pub fn get_shared_rooms<'a>(
|
||||
&'a self, user_a: &'a UserId, user_b: &'a UserId,
|
||||
) -> impl Stream<Item = &RoomId> + Send + 'a {
|
||||
use conduit::utils::set;
|
||||
use conduwuit::utils::set;
|
||||
|
||||
let a = self.rooms_joined(user_a);
|
||||
let b = self.rooms_joined(user_b);
|
||||
|
|
|
@ -6,7 +6,7 @@ use std::{
|
|||
};
|
||||
|
||||
use arrayvec::ArrayVec;
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
at, checked, debug, err, expected, utils,
|
||||
utils::{bytes, math::usize_from_f64, stream::IterStream},
|
||||
Result,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::{collections::BTreeMap, sync::Arc};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
err,
|
||||
utils::{
|
||||
stream::{TryIgnore, WidebandExt},
|
||||
|
|
|
@ -4,7 +4,7 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
at, err,
|
||||
result::{LogErr, NotFound},
|
||||
utils,
|
||||
|
|
|
@ -8,13 +8,13 @@ use std::{
|
|||
sync::Arc,
|
||||
};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
debug, debug_warn, err, error, implement, info,
|
||||
pdu::{EventHash, PduBuilder, PduCount, PduEvent},
|
||||
utils::{self, stream::TryIgnore, IterStream, MutexMap, MutexMapGuard, ReadyExt},
|
||||
validated, warn, Err, Error, Result, Server,
|
||||
};
|
||||
pub use conduit::{PduId, RawPduId};
|
||||
pub use conduwuit::{PduId, RawPduId};
|
||||
use futures::{future, future::ready, Future, FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
|
||||
use ruma::{
|
||||
api::federation,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::{collections::BTreeMap, sync::Arc};
|
||||
|
||||
use conduit::{
|
||||
use conduwuit::{
|
||||
debug_info, trace,
|
||||
utils::{self, IterStream},
|
||||
Result, Server,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
use conduit::{implement, Result};
|
||||
use conduwuit::{implement, Result};
|
||||
use database::{Database, Deserialized, Map};
|
||||
use ruma::{RoomId, UserId};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue