Rename crates.

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/server/backfill.rs

@@ -1,12 +1,12 @@
 use std::cmp;
 
 use axum::extract::State;
-use conduwuit::{
+use futures::{FutureExt, StreamExt, TryStreamExt};
+use ruma::{MilliSecondsSinceUnixEpoch, api::federation::backfill::get_backfill};
+use tuwunel_core::{
 	PduCount, Result,
 	utils::{IterStream, ReadyExt, stream::TryTools},
 };
-use futures::{FutureExt, StreamExt, TryStreamExt};
-use ruma::{MilliSecondsSinceUnixEpoch, api::federation::backfill::get_backfill};
 
 use super::AccessCheck;
 use crate::Ruma;

src/api/server/event.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Result, err};
 use ruma::{MilliSecondsSinceUnixEpoch, RoomId, api::federation::event::get_event};
+use tuwunel_core::{Result, err};
 
 use super::AccessCheck;
 use crate::Ruma;

src/api/server/event_auth.rs

@@ -1,12 +1,12 @@
 use std::{borrow::Borrow, iter::once};
 
 use axum::extract::State;
-use conduwuit::{Error, Result, utils::stream::ReadyExt};
 use futures::StreamExt;
 use ruma::{
 	RoomId,
 	api::{client::error::ErrorKind, federation::authorization::get_event_authorization},
 };
+use tuwunel_core::{Error, Result, utils::stream::ReadyExt};
 
 use super::AccessCheck;
 use crate::Ruma;

src/api/server/get_missing_events.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Result, debug, debug_error, utils::to_canonical_object};
 use ruma::api::federation::event::get_missing_events;
+use tuwunel_core::{Result, debug, debug_error, utils::to_canonical_object};
 
 use super::AccessCheck;
 use crate::Ruma;

src/api/server/hierarchy.rs

@@ -1,13 +1,11 @@
 use axum::extract::State;
-use conduwuit::{
+use futures::{FutureExt, StreamExt};
+use ruma::api::federation::space::get_hierarchy;
+use tuwunel_core::{
 	Err, Result,
 	utils::stream::{BroadbandExt, IterStream},
 };
-use conduwuit_service::rooms::spaces::{
-	Identifier, SummaryAccessibility, get_parent_children_via,
-};
-use futures::{FutureExt, StreamExt};
-use ruma::api::federation::space::get_hierarchy;
+use tuwunel_service::rooms::spaces::{Identifier, SummaryAccessibility, get_parent_children_via};
 
 use crate::Ruma;
 

src/api/server/invite.rs

@@ -1,15 +1,15 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use base64::{Engine as _, engine::general_purpose};
-use conduwuit::{
-	Err, Error, PduEvent, Result, err, pdu::gen_event_id, utils, utils::hash::sha256, warn,
-};
 use ruma::{
 	CanonicalJsonValue, OwnedUserId, UserId,
 	api::{client::error::ErrorKind, federation::membership::create_invite},
 	events::room::member::{MembershipState, RoomMemberEventContent},
 	serde::JsonObject,
 };
+use tuwunel_core::{
+	Err, Error, PduEvent, Result, err, pdu::gen_event_id, utils, utils::hash::sha256, warn,
+};
 
 use crate::Ruma;
 

src/api/server/key.rs

@@ -4,7 +4,6 @@ use std::{
 };
 
 use axum::{Json, extract::State, response::IntoResponse};
-use conduwuit::{Result, utils::timepoint_from_now};
 use ruma::{
 	MilliSecondsSinceUnixEpoch, Signatures,
 	api::{
@@ -13,6 +12,7 @@ use ruma::{
 	},
 	serde::Raw,
 };
+use tuwunel_core::{Result, utils::timepoint_from_now};
 
 /// # `GET /_matrix/key/v2/server`
 ///

src/api/server/make_join.rs

@@ -1,8 +1,4 @@
 use axum::extract::State;
-use conduwuit::{
-	Err, Error, Result, debug_info, matrix::pdu::PduBuilder, utils::IterStream, warn,
-};
-use conduwuit_service::Services;
 use futures::StreamExt;
 use ruma::{
 	CanonicalJsonObject, OwnedUserId, RoomId, RoomVersionId, UserId,
@@ -16,6 +12,10 @@ use ruma::{
 	},
 };
 use serde_json::value::to_raw_value;
+use tuwunel_core::{
+	Err, Error, Result, debug_info, matrix::pdu::PduBuilder, utils::IterStream, warn,
+};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/server/make_knock.rs

@@ -1,12 +1,12 @@
 use RoomVersionId::*;
 use axum::extract::State;
-use conduwuit::{Err, Error, Result, debug_warn, matrix::pdu::PduBuilder, warn};
 use ruma::{
 	RoomVersionId,
 	api::{client::error::ErrorKind, federation::knock::create_knock_event_template},
 	events::room::member::{MembershipState, RoomMemberEventContent},
 };
 use serde_json::value::to_raw_value;
+use tuwunel_core::{Err, Error, Result, debug_warn, matrix::pdu::PduBuilder, warn};
 
 use crate::Ruma;
 

src/api/server/make_leave.rs

@@ -1,10 +1,10 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, matrix::pdu::PduBuilder};
 use ruma::{
 	api::federation::membership::prepare_leave_event,
 	events::room::member::{MembershipState, RoomMemberEventContent},
 };
 use serde_json::value::to_raw_value;
+use tuwunel_core::{Err, Result, matrix::pdu::PduBuilder};
 
 use super::make_join::maybe_strip_event_id;
 use crate::Ruma;

src/api/server/media.rs

@@ -1,13 +1,13 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{Err, Result, utils::content_disposition::make_content_disposition};
-use conduwuit_service::media::{Dim, FileMeta};
 use ruma::{
 	Mxc,
 	api::federation::authenticated_media::{
 		Content, ContentMetadata, FileOrLocation, get_content, get_content_thumbnail,
 	},
 };
+use tuwunel_core::{Err, Result, utils::content_disposition::make_content_disposition};
+use tuwunel_service::media::{Dim, FileMeta};
 
 use crate::Ruma;
 

src/api/server/openid.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::Result;
 use ruma::api::federation::openid::get_openid_userinfo;
+use tuwunel_core::Result;
 
 use crate::Ruma;
 

src/api/server/publicrooms.rs

@@ -1,6 +1,5 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{Error, Result};
 use ruma::{
 	api::{
 		client::error::ErrorKind,
@@ -8,6 +7,7 @@ use ruma::{
 	},
 	directory::Filter,
 };
+use tuwunel_core::{Error, Result};
 
 use crate::Ruma;
 

src/api/server/query.rs

@@ -1,7 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{Error, Result, err};
 use futures::StreamExt;
 use get_profile_information::v1::ProfileField;
 use rand::seq::SliceRandom;
@@ -12,6 +11,7 @@ use ruma::{
 		federation::query::{get_profile_information, get_room_information},
 	},
 };
+use tuwunel_core::{Error, Result, err};
 
 use crate::Ruma;
 

src/api/server/send.rs

@@ -2,22 +2,6 @@ use std::{collections::BTreeMap, net::IpAddr, time::Instant};
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Error, Result, debug,
-	debug::INFO_SPAN_LEVEL,
-	debug_warn, err, error,
-	result::LogErr,
-	trace,
-	utils::{
-		IterStream, ReadyExt, millis_since_unix_epoch,
-		stream::{BroadbandExt, TryBroadbandExt, automatic_width},
-	},
-	warn,
-};
-use conduwuit_service::{
-	Services,
-	sending::{EDU_LIMIT, PDU_LIMIT},
-};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use itertools::Itertools;
 use ruma::{
@@ -37,6 +21,22 @@ use ruma::{
 	serde::Raw,
 	to_device::DeviceIdOrAllDevices,
 };
+use tuwunel_core::{
+	Err, Error, Result, debug,
+	debug::INFO_SPAN_LEVEL,
+	debug_warn, err, error,
+	result::LogErr,
+	trace,
+	utils::{
+		IterStream, ReadyExt, millis_since_unix_epoch,
+		stream::{BroadbandExt, TryBroadbandExt, automatic_width},
+	},
+	warn,
+};
+use tuwunel_service::{
+	Services,
+	sending::{EDU_LIMIT, PDU_LIMIT},
+};
 
 use crate::Ruma;
 

src/api/server/send_join.rs

@@ -3,13 +3,6 @@
 use std::borrow::Borrow;
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Result, at, err,
-	pdu::gen_event_id_canonical_json,
-	utils::stream::{IterStream, TryBroadbandExt},
-	warn,
-};
-use conduwuit_service::Services;
 use futures::{FutureExt, StreamExt, TryStreamExt};
 use ruma::{
 	CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedServerName, OwnedUserId, RoomId,
@@ -21,6 +14,13 @@ use ruma::{
 	},
 };
 use serde_json::value::{RawValue as RawJsonValue, to_raw_value};
+use tuwunel_core::{
+	Err, Result, at, err,
+	pdu::gen_event_id_canonical_json,
+	utils::stream::{IterStream, TryBroadbandExt},
+	warn,
+};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/server/send_knock.rs

@@ -1,9 +1,4 @@
 use axum::extract::State;
-use conduwuit::{
-	Err, Result, err,
-	matrix::pdu::{PduEvent, gen_event_id_canonical_json},
-	warn,
-};
 use futures::FutureExt;
 use ruma::{
 	OwnedServerName, OwnedUserId,
@@ -15,6 +10,11 @@ use ruma::{
 	},
 	serde::JsonObject,
 };
+use tuwunel_core::{
+	Err, Result, err,
+	matrix::pdu::{PduEvent, gen_event_id_canonical_json},
+	warn,
+};
 
 use crate::Ruma;
 

src/api/server/send_leave.rs

@@ -1,8 +1,6 @@
 #![allow(deprecated)]
 
 use axum::extract::State;
-use conduwuit::{Err, Result, err, matrix::pdu::gen_event_id_canonical_json};
-use conduwuit_service::Services;
 use futures::FutureExt;
 use ruma::{
 	OwnedRoomId, OwnedUserId, RoomId, ServerName,
@@ -13,6 +11,8 @@ use ruma::{
 	},
 };
 use serde_json::value::RawValue as RawJsonValue;
+use tuwunel_core::{Err, Result, err, matrix::pdu::gen_event_id_canonical_json};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/server/state.rs

@@ -1,9 +1,9 @@
 use std::{borrow::Borrow, iter::once};
 
 use axum::extract::State;
-use conduwuit::{Result, at, err, utils::IterStream};
 use futures::{FutureExt, StreamExt, TryStreamExt};
 use ruma::{OwnedEventId, api::federation::event::get_room_state};
+use tuwunel_core::{Result, at, err, utils::IterStream};
 
 use super::AccessCheck;
 use crate::Ruma;

src/api/server/state_ids.rs

@@ -1,9 +1,9 @@
 use std::{borrow::Borrow, iter::once};
 
 use axum::extract::State;
-use conduwuit::{Result, at, err};
 use futures::{StreamExt, TryStreamExt};
 use ruma::{OwnedEventId, api::federation::event::get_room_state_ids};
+use tuwunel_core::{Result, at, err};
 
 use super::AccessCheck;
 use crate::Ruma;

src/api/server/user.rs

@@ -1,5 +1,4 @@
 use axum::extract::State;
-use conduwuit::{Error, Result};
 use futures::{FutureExt, StreamExt, TryFutureExt};
 use ruma::api::{
 	client::error::ErrorKind,
@@ -8,6 +7,7 @@ use ruma::api::{
 		keys::{claim_keys, get_keys},
 	},
 };
+use tuwunel_core::{Error, Result};
 
 use crate::{
 	Ruma,

src/api/server/utils.rs

@@ -1,7 +1,7 @@
-use conduwuit::{Err, Result, implement, is_false};
-use conduwuit_service::Services;
 use futures::{FutureExt, StreamExt, future::OptionFuture, join};
 use ruma::{EventId, RoomId, ServerName};
+use tuwunel_core::{Err, Result, implement, is_false};
+use tuwunel_service::Services;
 
 pub(super) struct AccessCheck<'a> {
 	pub(super) services: &'a Services,

src/api/server/version.rs

@@ -1,5 +1,5 @@
-use conduwuit::Result;
 use ruma::api::federation::discovery::get_server_version;
+use tuwunel_core::Result;
 
 use crate::Ruma;
 
@@ -11,8 +11,8 @@ pub(crate) async fn get_server_version_route(
 ) -> Result<get_server_version::v1::Response> {
 	Ok(get_server_version::v1::Response {
 		server: Some(get_server_version::v1::Server {
-			name: Some(conduwuit::version::name().into()),
-			version: Some(conduwuit::version::version().into()),
+			name: Some(tuwunel_core::version::name().into()),
+			version: Some(tuwunel_core::version::version().into()),
 		}),
 	})
 }

src/api/server/well_known.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Error, Result};
 use ruma::api::{client::error::ErrorKind, federation::discovery::discover_homeserver};
+use tuwunel_core::{Error, Result};
 
 use crate::Ruma;