Rename crates.

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

src/api/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "conduwuit_api"
+name = "tuwunel_api"
 categories.workspace = true
 description.workspace = true
 edition.workspace = true
@@ -18,48 +18,48 @@ crate-type = [
 
 [features]
 brotli_compression = [
-	"conduwuit-core/brotli_compression",
-	"conduwuit-service/brotli_compression",
+	"tuwunel-core/brotli_compression",
+	"tuwunel-service/brotli_compression",
 	"reqwest/brotli",
 ]
 element_hacks = [
-	"conduwuit-service/element_hacks",
+	"tuwunel-service/element_hacks",
 ]
 gzip_compression = [
-	"conduwuit-core/gzip_compression",
-	"conduwuit-service/gzip_compression",
+	"tuwunel-core/gzip_compression",
+	"tuwunel-service/gzip_compression",
 	"reqwest/gzip",
 ]
 io_uring = [
-	"conduwuit-service/io_uring",
+	"tuwunel-service/io_uring",
 ]
 jemalloc = [
-    "conduwuit-core/jemalloc",
-    "conduwuit-service/jemalloc",
+    "tuwunel-core/jemalloc",
+    "tuwunel-service/jemalloc",
 ]
 jemalloc_conf = [
-	"conduwuit-core/jemalloc_conf",
-	"conduwuit-service/jemalloc_conf",
+	"tuwunel-core/jemalloc_conf",
+	"tuwunel-service/jemalloc_conf",
 ]
 jemalloc_prof = [
-	"conduwuit-core/jemalloc_prof",
-	"conduwuit-service/jemalloc_prof",
+	"tuwunel-core/jemalloc_prof",
+	"tuwunel-service/jemalloc_prof",
 ]
 jemalloc_stats = [
-	"conduwuit-core/jemalloc_stats",
-	"conduwuit-service/jemalloc_stats",
+	"tuwunel-core/jemalloc_stats",
+	"tuwunel-service/jemalloc_stats",
 ]
 release_max_log_level = [
-	"conduwuit-core/release_max_log_level",
-	"conduwuit-service/release_max_log_level",
+	"tuwunel-core/release_max_log_level",
+	"tuwunel-service/release_max_log_level",
 	"log/max_level_trace",
 	"log/release_max_level_info",
 	"tracing/max_level_trace",
 	"tracing/release_max_level_info",
 ]
 zstd_compression = [
-	"conduwuit-core/zstd_compression",
-	"conduwuit-service/zstd_compression",
+	"tuwunel-core/zstd_compression",
+	"tuwunel-service/zstd_compression",
 	"reqwest/zstd",
 ]
 
@@ -70,8 +70,8 @@ axum-extra.workspace = true
 axum.workspace = true
 base64.workspace = true
 bytes.workspace = true
-conduwuit-core.workspace = true
-conduwuit-service.workspace = true
+tuwunel-core.workspace = true
+tuwunel-service.workspace = true
 const-str.workspace = true
 futures.workspace = true
 hmac.workspace = true

src/api/client/account.rs

@@ -2,14 +2,6 @@ use std::fmt::Write;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Error, Result, debug_info, err, error, info, is_equal_to,
-	matrix::pdu::PduBuilder,
-	utils,
-	utils::{ReadyExt, stream::BroadbandExt},
-	warn,
-};
-use conduwuit_service::Services;
 use futures::{FutureExt, StreamExt};
 use register::RegistrationKind;
 use ruma::{
@@ -33,6 +25,14 @@ use ruma::{
 	},
 	push,
 };
+use tuwunel_core::{
+	Err, Error, Result, debug_info, err, error, info, is_equal_to,
+	matrix::pdu::PduBuilder,
+	utils,
+	utils::{ReadyExt, stream::BroadbandExt},
+	warn,
+};
+use tuwunel_service::Services;
 
 use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH, join_room_by_id_helper};
 use crate::Ruma;

src/api/client/account_data.rs

@@ -1,6 +1,4 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, err};
-use conduwuit_service::Services;
 use ruma::{
 	RoomId, UserId,
 	api::client::config::{
@@ -15,6 +13,8 @@ use ruma::{
 };
 use serde::Deserialize;
 use serde_json::{json, value::RawValue as RawJsonValue};
+use tuwunel_core::{Err, Result, err};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/client/alias.rs

@@ -1,12 +1,12 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, debug};
-use conduwuit_service::Services;
 use futures::StreamExt;
 use rand::seq::SliceRandom;
 use ruma::{
 	OwnedServerName, RoomAliasId, RoomId,
 	api::client::alias::{create_alias, delete_alias, get_alias},
 };
+use tuwunel_core::{Err, Result, debug};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/client/appservice.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, err};
 use ruma::api::{appservice::ping, client::appservice::request_ping};
+use tuwunel_core::{Err, Result, err};
 
 use crate::Ruma;
 

src/api/client/backup.rs

@@ -1,7 +1,6 @@
 use std::cmp::Ordering;
 
 use axum::extract::State;
-use conduwuit::{Err, Result, err};
 use ruma::{
 	UInt,
 	api::client::backup::{
@@ -12,6 +11,7 @@ use ruma::{
 		update_backup_version,
 	},
 };
+use tuwunel_core::{Err, Result, err};
 
 use crate::Ruma;
 

src/api/client/capabilities.rs

@@ -1,7 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{Result, Server};
 use ruma::{
 	RoomVersionId,
 	api::client::discovery::get_capabilities::{
@@ -10,6 +9,7 @@ use ruma::{
 	},
 };
 use serde_json::json;
+use tuwunel_core::{Result, Server};
 
 use crate::Ruma;
 

src/api/client/context.rs

@@ -1,5 +1,10 @@
 use axum::extract::State;
-use conduwuit::{
+use futures::{
+	FutureExt, StreamExt, TryFutureExt, TryStreamExt,
+	future::{OptionFuture, join, join3, try_join3},
+};
+use ruma::{OwnedEventId, UserId, api::client::context::get_context, events::StateEventType};
+use tuwunel_core::{
 	Err, Result, at, debug_warn, err,
 	matrix::pdu::PduEvent,
 	ref_at,
@@ -9,12 +14,7 @@ use conduwuit::{
 		stream::{BroadbandExt, ReadyExt, TryIgnore, WidebandExt},
 	},
 };
-use conduwuit_service::rooms::{lazy_loading, lazy_loading::Options, short::ShortStateKey};
-use futures::{
-	FutureExt, StreamExt, TryFutureExt, TryStreamExt,
-	future::{OptionFuture, join, join3, try_join3},
-};
-use ruma::{OwnedEventId, UserId, api::client::context::get_context, events::StateEventType};
+use tuwunel_service::rooms::{lazy_loading, lazy_loading::Options, short::ShortStateKey};
 
 use crate::{
 	Ruma,

src/api/client/device.rs

@@ -1,6 +1,5 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{Err, Error, Result, debug, err, utils};
 use futures::StreamExt;
 use ruma::{
 	MilliSecondsSinceUnixEpoch, OwnedDeviceId,
@@ -10,6 +9,7 @@ use ruma::{
 		uiaa::{AuthFlow, AuthType, UiaaInfo},
 	},
 };
+use tuwunel_core::{Err, Error, Result, debug, err, utils};
 
 use super::SESSION_ID_LENGTH;
 use crate::{Ruma, client::DEVICE_ID_LENGTH};

src/api/client/directory.rs

@@ -1,15 +1,5 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Result, err, info,
-	utils::{
-		TryFutureExtExt,
-		math::Expected,
-		result::FlatOk,
-		stream::{ReadyExt, WidebandExt},
-	},
-};
-use conduwuit_service::Services;
 use futures::{
 	FutureExt, StreamExt, TryFutureExt,
 	future::{join, join4, join5},
@@ -36,6 +26,16 @@ use ruma::{
 	},
 	uint,
 };
+use tuwunel_core::{
+	Err, Result, err, info,
+	utils::{
+		TryFutureExtExt,
+		math::Expected,
+		result::FlatOk,
+		stream::{ReadyExt, WidebandExt},
+	},
+};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/client/filter.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Result, err};
 use ruma::api::client::filter::{create_filter, get_filter};
+use tuwunel_core::{Result, err};
 
 use crate::Ruma;
 

src/api/client/keys.rs

@@ -1,8 +1,6 @@
 use std::collections::{BTreeMap, HashMap, HashSet};
 
 use axum::extract::State;
-use conduwuit::{Err, Error, Result, debug, debug_warn, err, result::NotFound, utils};
-use conduwuit_service::{Services, users::parse_master_key};
 use futures::{StreamExt, stream::FuturesUnordered};
 use ruma::{
 	OneTimeKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
@@ -22,6 +20,8 @@ use ruma::{
 	serde::Raw,
 };
 use serde_json::json;
+use tuwunel_core::{Err, Error, Result, debug, debug_warn, err, result::NotFound, utils};
+use tuwunel_service::{Services, users::parse_master_key};
 
 use super::SESSION_ID_LENGTH;
 use crate::Ruma;

src/api/client/media.rs

@@ -2,14 +2,6 @@ use std::time::Duration;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Result, err,
-	utils::{self, content_disposition::make_content_disposition, math::ruma_from_usize},
-};
-use conduwuit_service::{
-	Services,
-	media::{CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, Dim, FileMeta, MXC_LENGTH},
-};
 use reqwest::Url;
 use ruma::{
 	Mxc, UserId,
@@ -21,6 +13,14 @@ use ruma::{
 		media::create_content,
 	},
 };
+use tuwunel_core::{
+	Err, Result, err,
+	utils::{self, content_disposition::make_content_disposition, math::ruma_from_usize},
+};
+use tuwunel_service::{
+	Services,
+	media::{CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, Dim, FileMeta, MXC_LENGTH},
+};
 
 use crate::Ruma;
 

src/api/client/media_legacy.rs

@@ -2,11 +2,6 @@
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Result, err,
-	utils::{content_disposition::make_content_disposition, math::ruma_from_usize},
-};
-use conduwuit_service::media::{CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, Dim, FileMeta};
 use reqwest::Url;
 use ruma::{
 	Mxc,
@@ -15,6 +10,11 @@ use ruma::{
 		get_media_config, get_media_preview,
 	},
 };
+use tuwunel_core::{
+	Err, Result, err,
+	utils::{content_disposition::make_content_disposition, math::ruma_from_usize},
+};
+use tuwunel_service::media::{CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, Dim, FileMeta};
 
 use crate::{Ruma, RumaResponse, client::create_content_route};
 

src/api/client/membership.rs

@@ -8,31 +8,6 @@ use std::{
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Result, at, debug, debug_error, debug_info, debug_warn, err, error, info, is_matching,
-	matrix::{
-		StateKey,
-		pdu::{PduBuilder, PduEvent, gen_event_id, gen_event_id_canonical_json},
-		state_res,
-	},
-	result::{FlatOk, NotFound},
-	trace,
-	utils::{
-		self, FutureBoolExt,
-		future::ReadyEqExt,
-		shuffle,
-		stream::{BroadbandExt, IterStream, ReadyExt},
-	},
-	warn,
-};
-use conduwuit_service::{
-	Services,
-	appservice::RegistrationInfo,
-	rooms::{
-		state::RoomMutexGuard,
-		state_compressor::{CompressedState, HashSetCompressStateEvent},
-	},
-};
 use futures::{FutureExt, StreamExt, TryFutureExt, join, pin_mut};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedServerName,
@@ -60,6 +35,31 @@ use ruma::{
 		},
 	},
 };
+use tuwunel_core::{
+	Err, Result, at, debug, debug_error, debug_info, debug_warn, err, error, info, is_matching,
+	matrix::{
+		StateKey,
+		pdu::{PduBuilder, PduEvent, gen_event_id, gen_event_id_canonical_json},
+		state_res,
+	},
+	result::{FlatOk, NotFound},
+	trace,
+	utils::{
+		self, FutureBoolExt,
+		future::ReadyEqExt,
+		shuffle,
+		stream::{BroadbandExt, IterStream, ReadyExt},
+	},
+	warn,
+};
+use tuwunel_service::{
+	Services,
+	appservice::RegistrationInfo,
+	rooms::{
+		state::RoomMutexGuard,
+		state_compressor::{CompressedState, HashSetCompressStateEvent},
+	},
+};
 
 use crate::{Ruma, client::full_user_deactivate};
 

src/api/client/message.rs

@@ -1,5 +1,15 @@
 use axum::extract::State;
-use conduwuit::{
+use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture, pin_mut};
+use ruma::{
+	RoomId, UserId,
+	api::{
+		Direction,
+		client::{filter::RoomEventFilter, message::get_message_events},
+	},
+	events::{AnyStateEvent, StateEventType, TimelineEventType, TimelineEventType::*},
+	serde::Raw,
+};
+use tuwunel_core::{
 	Err, Result, at,
 	matrix::{
 		Event,
@@ -11,7 +21,7 @@ use conduwuit::{
 		stream::{BroadbandExt, TryIgnore, WidebandExt},
 	},
 };
-use conduwuit_service::{
+use tuwunel_service::{
 	Services,
 	rooms::{
 		lazy_loading,
@@ -19,16 +29,6 @@ use conduwuit_service::{
 		timeline::PdusIterItem,
 	},
 };
-use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture, pin_mut};
-use ruma::{
-	RoomId, UserId,
-	api::{
-		Direction,
-		client::{filter::RoomEventFilter, message::get_message_events},
-	},
-	events::{AnyStateEvent, StateEventType, TimelineEventType, TimelineEventType::*},
-	serde::Raw,
-};
 
 use crate::Ruma;
 
@@ -296,7 +296,7 @@ pub(crate) fn event_filter(item: PdusIterItem, filter: &RoomEventFilter) -> Opti
 	pdu.matches(filter).then_some(item)
 }
 
-#[cfg_attr(debug_assertions, conduwuit::ctor)]
+#[cfg_attr(debug_assertions, tuwunel_core::ctor)]
 fn _is_sorted() {
 	debug_assert!(
 		IGNORED_MESSAGE_TYPES.is_sorted(),

src/api/client/mod.rs

@@ -90,4 +90,4 @@ const DEVICE_ID_LENGTH: usize = 10;
 const TOKEN_LENGTH: usize = 32;
 
 /// generated user session ID length
-const SESSION_ID_LENGTH: usize = service::uiaa::SESSION_ID_LENGTH;
+const SESSION_ID_LENGTH: usize = tuwunel_service::uiaa::SESSION_ID_LENGTH;

src/api/client/openid.rs

@@ -1,11 +1,11 @@
 use std::time::Duration;
 
 use axum::extract::State;
-use conduwuit::{Error, Result, utils};
 use ruma::{
 	api::client::{account, error::ErrorKind},
 	authentication::TokenType,
 };
+use tuwunel_core::{Error, Result, utils};
 
 use super::TOKEN_LENGTH;
 use crate::Ruma;

src/api/client/presence.rs

@@ -1,8 +1,8 @@
 use std::time::Duration;
 
 use axum::extract::State;
-use conduwuit::{Err, Result};
 use ruma::api::client::presence::{get_presence, set_presence};
+use tuwunel_core::{Err, Result};
 
 use crate::Ruma;
 

src/api/client/profile.rs

@@ -1,13 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Error, Result,
-	matrix::pdu::PduBuilder,
-	utils::{IterStream, stream::TryIgnore},
-	warn,
-};
-use conduwuit_service::Services;
 use futures::{StreamExt, TryStreamExt, future::join3};
 use ruma::{
 	OwnedMxcUri, OwnedRoomId, UserId,
@@ -23,6 +16,13 @@ use ruma::{
 	events::room::member::{MembershipState, RoomMemberEventContent},
 	presence::PresenceState,
 };
+use tuwunel_core::{
+	Err, Error, Result,
+	matrix::pdu::PduBuilder,
+	utils::{IterStream, stream::TryIgnore},
+	warn,
+};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/client/push.rs

@@ -1,6 +1,4 @@
 use axum::extract::State;
-use conduwuit::{Err, Error, Result, err};
-use conduwuit_service::Services;
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue,
 	api::client::{
@@ -20,6 +18,8 @@ use ruma::{
 		RemovePushRuleError, Ruleset,
 	},
 };
+use tuwunel_core::{Err, Error, Result, err};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/client/read_marker.rs

@@ -1,7 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{Err, PduCount, Result, err};
 use ruma::{
 	MilliSecondsSinceUnixEpoch,
 	api::client::{read_marker::set_read_marker, receipt::create_receipt},
@@ -10,6 +9,7 @@ use ruma::{
 		receipt::{ReceiptThread, ReceiptType},
 	},
 };
+use tuwunel_core::{Err, PduCount, Result, err};
 
 use crate::Ruma;
 

src/api/client/redact.rs

@@ -1,8 +1,8 @@
 use axum::extract::State;
-use conduwuit::{Result, matrix::pdu::PduBuilder};
 use ruma::{
 	api::client::redact::redact_event, events::room::redaction::RoomRedactionEventContent,
 };
+use tuwunel_core::{Result, matrix::pdu::PduBuilder};
 
 use crate::Ruma;
 

src/api/client/relations.rs

@@ -1,10 +1,4 @@
 use axum::extract::State;
-use conduwuit::{
-	Result, at,
-	matrix::pdu::PduCount,
-	utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt},
-};
-use conduwuit_service::{Services, rooms::timeline::PdusIterItem};
 use futures::StreamExt;
 use ruma::{
 	EventId, RoomId, UInt, UserId,
@@ -17,6 +11,12 @@ use ruma::{
 	},
 	events::{TimelineEventType, relation::RelationType},
 };
+use tuwunel_core::{
+	Result, at,
+	matrix::pdu::PduCount,
+	utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt},
+};
+use tuwunel_service::{Services, rooms::timeline::PdusIterItem};
 
 use crate::Ruma;
 

src/api/client/report.rs

@@ -2,8 +2,6 @@ use std::time::Duration;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{Err, Error, Result, debug_info, info, matrix::pdu::PduEvent, utils::ReadyExt};
-use conduwuit_service::Services;
 use rand::Rng;
 use ruma::{
 	EventId, RoomId, UserId,
@@ -15,6 +13,10 @@ use ruma::{
 	int,
 };
 use tokio::time::sleep;
+use tuwunel_core::{
+	Err, Error, Result, debug_info, info, matrix::pdu::PduEvent, utils::ReadyExt,
+};
+use tuwunel_service::Services;
 
 use crate::Ruma;
 

src/api/client/room/aliases.rs

@@ -1,7 +1,7 @@
 use axum::extract::State;
-use conduwuit::{Error, Result};
 use futures::StreamExt;
 use ruma::api::client::{error::ErrorKind, room::aliases};
+use tuwunel_core::{Error, Result};
 
 use crate::Ruma;
 

src/api/client/room/create.rs

@@ -1,12 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Error, Result, debug_info, debug_warn, err, error, info,
-	matrix::{StateKey, pdu::PduBuilder},
-	warn,
-};
-use conduwuit_service::{Services, appservice::RegistrationInfo};
 use futures::FutureExt;
 use ruma::{
 	CanonicalJsonObject, Int, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, RoomId, RoomVersionId,
@@ -32,6 +26,12 @@ use ruma::{
 	serde::{JsonObject, Raw},
 };
 use serde_json::{json, value::to_raw_value};
+use tuwunel_core::{
+	Err, Error, Result, debug_info, debug_warn, err, error, info,
+	matrix::{StateKey, pdu::PduBuilder},
+	warn,
+};
+use tuwunel_service::{Services, appservice::RegistrationInfo};
 
 use crate::{Ruma, client::invite_helper};
 

src/api/client/room/event.rs

@@ -1,7 +1,7 @@
 use axum::extract::State;
-use conduwuit::{Err, Event, Result, err};
 use futures::{FutureExt, TryFutureExt, future::try_join};
 use ruma::api::client::room::get_room_event;
+use tuwunel_core::{Err, Event, Result, err};
 
 use crate::{Ruma, client::is_ignored_pdu};
 

src/api/client/room/initial_sync.rs

@@ -1,10 +1,10 @@
 use axum::extract::State;
-use conduwuit::{
+use futures::TryStreamExt;
+use ruma::api::client::room::initial_sync::v3::{PaginationChunk, Request, Response};
+use tuwunel_core::{
 	Err, PduEvent, Result, at,
 	utils::{BoolExt, stream::TryTools},
 };
-use futures::TryStreamExt;
-use ruma::api::client::room::initial_sync::v3::{PaginationChunk, Request, Response};
 
 use crate::Ruma;
 

src/api/client/room/summary.rs

@@ -1,9 +1,5 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Result, debug_warn, trace,
-	utils::{IterStream, future::TryExtExt},
-};
 use futures::{
 	FutureExt, StreamExt,
 	future::{OptionFuture, join3},
@@ -18,7 +14,11 @@ use ruma::{
 	events::room::member::MembershipState,
 	space::SpaceRoomJoinRule::{self, *},
 };
-use service::Services;
+use tuwunel_core::{
+	Err, Result, debug_warn, trace,
+	utils::{IterStream, future::TryExtExt},
+};
+use tuwunel_service::Services;
 
 use crate::{Ruma, RumaResponse};
 

src/api/client/room/upgrade.rs

@@ -1,10 +1,6 @@
 use std::cmp::max;
 
 use axum::extract::State;
-use conduwuit::{
-	Error, Result, err, info,
-	matrix::{StateKey, pdu::PduBuilder},
-};
 use futures::StreamExt;
 use ruma::{
 	CanonicalJsonObject, RoomId, RoomVersionId,
@@ -20,6 +16,10 @@ use ruma::{
 	int,
 };
 use serde_json::{json, value::to_raw_value};
+use tuwunel_core::{
+	Error, Result, err, info,
+	matrix::{StateKey, pdu::PduBuilder},
+};
 
 use crate::Ruma;
 

src/api/client/search.rs

@@ -1,13 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Result, at, is_true,
-	matrix::pdu::PduEvent,
-	result::FlatOk,
-	utils::{IterStream, stream::ReadyExt},
-};
-use conduwuit_service::{Services, rooms::search::RoomQuery};
 use futures::{FutureExt, StreamExt, TryFutureExt, TryStreamExt, future::OptionFuture};
 use ruma::{
 	OwnedRoomId, RoomId, UInt, UserId,
@@ -19,6 +12,13 @@ use ruma::{
 	serde::Raw,
 };
 use search_events::v3::{Request, Response};
+use tuwunel_core::{
+	Err, Result, at, is_true,
+	matrix::pdu::PduEvent,
+	result::FlatOk,
+	utils::{IterStream, stream::ReadyExt},
+};
+use tuwunel_service::{Services, rooms::search::RoomQuery};
 
 use crate::Ruma;
 

src/api/client/send.rs

@@ -1,9 +1,9 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{Err, Result, err, matrix::pdu::PduBuilder, utils};
 use ruma::{api::client::message::send_message_event, events::MessageLikeEventType};
 use serde_json::from_str;
+use tuwunel_core::{Err, Result, err, matrix::pdu::PduBuilder, utils};
 
 use crate::Ruma;
 

src/api/client/session.rs

@@ -2,11 +2,6 @@ use std::time::Duration;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{
-	Err, Error, Result, debug, err, info, utils,
-	utils::{ReadyExt, hash},
-};
-use conduwuit_service::uiaa::SESSION_ID_LENGTH;
 use futures::StreamExt;
 use ruma::{
 	UserId,
@@ -26,6 +21,11 @@ use ruma::{
 		uiaa,
 	},
 };
+use tuwunel_core::{
+	Err, Error, Result, debug, err, info, utils,
+	utils::{ReadyExt, hash},
+};
+use tuwunel_service::uiaa::SESSION_ID_LENGTH;
 
 use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
 use crate::Ruma;

src/api/client/space.rs

@@ -4,20 +4,20 @@ use std::{
 };
 
 use axum::extract::State;
-use conduwuit::{
+use futures::{StreamExt, TryFutureExt, future::OptionFuture};
+use ruma::{
+	OwnedRoomId, OwnedServerName, RoomId, UInt, UserId, api::client::space::get_hierarchy,
+};
+use tuwunel_core::{
 	Err, Result,
 	utils::{future::TryExtExt, stream::IterStream},
 };
-use conduwuit_service::{
+use tuwunel_service::{
 	Services,
 	rooms::spaces::{
 		PaginationToken, SummaryAccessibility, get_parent_children_via, summary_to_chunk,
 	},
 };
-use futures::{StreamExt, TryFutureExt, future::OptionFuture};
-use ruma::{
-	OwnedRoomId, OwnedServerName, RoomId, UInt, UserId, api::client::space::get_hierarchy,
-};
 
 use crate::Ruma;
 

src/api/client/state.rs

@@ -1,10 +1,4 @@
 use axum::extract::State;
-use conduwuit::{
-	Err, Result, err,
-	matrix::pdu::{PduBuilder, PduEvent},
-	utils::BoolExt,
-};
-use conduwuit_service::Services;
 use futures::TryStreamExt;
 use ruma::{
 	OwnedEventId, RoomId, UserId,
@@ -21,6 +15,12 @@ use ruma::{
 	},
 	serde::Raw,
 };
+use tuwunel_core::{
+	Err, Result, err,
+	matrix::pdu::{PduBuilder, PduEvent},
+	utils::BoolExt,
+};
+use tuwunel_service::Services;
 
 use crate::{Ruma, RumaResponse};
 

src/api/client/sync/mod.rs

@@ -2,12 +2,6 @@ mod v3;
 mod v4;
 mod v5;
 
-use conduwuit::{
-	Error, PduCount, Result,
-	matrix::pdu::PduEvent,
-	utils::stream::{BroadbandExt, ReadyExt, TryIgnore},
-};
-use conduwuit_service::Services;
 use futures::{StreamExt, pin_mut};
 use ruma::{
 	RoomId, UserId,
@@ -15,6 +9,12 @@ use ruma::{
 		self, Beacon, CallInvite, PollStart, RoomEncrypted, RoomMessage, Sticker,
 	},
 };
+use tuwunel_core::{
+	Error, PduCount, Result,
+	matrix::pdu::PduEvent,
+	utils::stream::{BroadbandExt, ReadyExt, TryIgnore},
+};
+use tuwunel_service::Services;
 
 pub(crate) use self::{
 	v3::sync_events_route, v4::sync_events_v4_route, v5::sync_events_v5_route,

src/api/client/sync/v3.rs

@@ -5,30 +5,6 @@ use std::{
 };
 
 use axum::extract::State;
-use conduwuit::{
-	Result, at, err, error, extract_variant, is_equal_to,
-	matrix::{
-		Event,
-		pdu::{EventHash, PduCount, PduEvent},
-	},
-	pair_of, ref_at,
-	result::FlatOk,
-	utils::{
-		self, BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
-		future::{OptionStream, ReadyEqExt},
-		math::ruma_from_u64,
-		stream::{BroadbandExt, Tools, TryExpect, WidebandExt},
-	},
-	warn,
-};
-use conduwuit_service::{
-	Services,
-	rooms::{
-		lazy_loading,
-		lazy_loading::{Options, Witness},
-		short::ShortStateHash,
-	},
-};
 use futures::{
 	FutureExt, StreamExt, TryFutureExt, TryStreamExt,
 	future::{OptionFuture, join, join3, join4, join5, try_join, try_join4},
@@ -57,7 +33,30 @@ use ruma::{
 	serde::Raw,
 	uint,
 };
-use service::rooms::short::{ShortEventId, ShortStateKey};
+use tuwunel_core::{
+	Result, at, err, error, extract_variant, is_equal_to,
+	matrix::{
+		Event,
+		pdu::{EventHash, PduCount, PduEvent},
+	},
+	pair_of, ref_at,
+	result::FlatOk,
+	utils::{
+		self, BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
+		future::{OptionStream, ReadyEqExt},
+		math::ruma_from_u64,
+		stream::{BroadbandExt, Tools, TryExpect, WidebandExt},
+	},
+	warn,
+};
+use tuwunel_service::{
+	Services,
+	rooms::{
+		lazy_loading,
+		lazy_loading::{Options, Witness},
+		short::{ShortEventId, ShortStateHash, ShortStateKey},
+	},
+};
 
 use super::{load_timeline, share_encrypted_room};
 use crate::{Ruma, RumaResponse, client::ignored_filter};

src/api/client/sync/v4.rs

@@ -5,20 +5,6 @@ use std::{
 };
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Error, PduCount, PduEvent, Result, debug, error, extract_variant,
-	matrix::TypeStateKey,
-	utils::{
-		BoolExt, IterStream, ReadyExt, TryFutureExtExt,
-		math::{ruma_from_usize, usize_from_ruma, usize_from_u64_truncated},
-	},
-	warn,
-};
-use conduwuit_service::{
-	Services,
-	rooms::read_receipt::pack_receipts,
-	sync::{into_db_key, into_snake_key},
-};
 use futures::{FutureExt, StreamExt, TryFutureExt};
 use ruma::{
 	MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, RoomId, UInt, UserId,
@@ -35,6 +21,20 @@ use ruma::{
 	serde::Raw,
 	uint,
 };
+use tuwunel_core::{
+	Err, Error, PduCount, PduEvent, Result, debug, error, extract_variant,
+	matrix::TypeStateKey,
+	utils::{
+		BoolExt, IterStream, ReadyExt, TryFutureExtExt,
+		math::{ruma_from_usize, usize_from_ruma, usize_from_u64_truncated},
+	},
+	warn,
+};
+use tuwunel_service::{
+	Services,
+	rooms::read_receipt::pack_receipts,
+	sync::{into_db_key, into_snake_key},
+};
 
 use super::{load_timeline, share_encrypted_room};
 use crate::{

src/api/client/sync/v5.rs

@@ -6,21 +6,6 @@ use std::{
 };
 
 use axum::extract::State;
-use conduwuit::{
-	Err, Error, Result, error, extract_variant, is_equal_to,
-	matrix::{
-		TypeStateKey,
-		pdu::{PduCount, PduEvent},
-	},
-	trace,
-	utils::{
-		BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
-		future::ReadyEqExt,
-		math::{ruma_from_usize, usize_from_ruma},
-	},
-	warn,
-};
-use conduwuit_service::{Services, rooms::read_receipt::pack_receipts, sync::into_snake_key};
 use futures::{
 	FutureExt, Stream, StreamExt, TryFutureExt,
 	future::{OptionFuture, join3, try_join4},
@@ -37,6 +22,21 @@ use ruma::{
 	serde::Raw,
 	uint,
 };
+use tuwunel_core::{
+	Err, Error, Result, error, extract_variant, is_equal_to,
+	matrix::{
+		TypeStateKey,
+		pdu::{PduCount, PduEvent},
+	},
+	trace,
+	utils::{
+		BoolExt, FutureBoolExt, IterStream, ReadyExt, TryFutureExtExt,
+		future::ReadyEqExt,
+		math::{ruma_from_usize, usize_from_ruma},
+	},
+	warn,
+};
+use tuwunel_service::{Services, rooms::read_receipt::pack_receipts, sync::into_snake_key};
 
 use super::share_encrypted_room;
 use crate::{

src/api/client/tag.rs

@@ -1,7 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::Result;
 use ruma::{
 	api::client::tag::{create_tag, delete_tag, get_tags},
 	events::{
@@ -9,6 +8,7 @@ use ruma::{
 		tag::{TagEvent, TagEventContent},
 	},
 };
+use tuwunel_core::Result;
 
 use crate::Ruma;
 

src/api/client/thirdparty.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
-use conduwuit::Result;
 use ruma::api::client::thirdparty::get_protocols;
+use tuwunel_core::Result;
 
 use crate::{Ruma, RumaResponse};
 

src/api/client/threads.rs

@@ -1,10 +1,10 @@
 use axum::extract::State;
-use conduwuit::{
+use futures::StreamExt;
+use ruma::{api::client::threads::get_threads, uint};
+use tuwunel_core::{
 	Result, at,
 	matrix::pdu::{PduCount, PduEvent},
 };
-use futures::StreamExt;
-use ruma::{api::client::threads::get_threads, uint};
 
 use crate::Ruma;
 

src/api/client/to_device.rs

@@ -1,8 +1,6 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduwuit::{Error, Result};
-use conduwuit_service::sending::EduBuf;
 use futures::StreamExt;
 use ruma::{
 	api::{
@@ -11,6 +9,8 @@ use ruma::{
 	},
 	to_device::DeviceIdOrAllDevices,
 };
+use tuwunel_core::{Error, Result};
+use tuwunel_service::sending::EduBuf;
 
 use crate::Ruma;
 

src/api/client/typing.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
-use conduwuit::{Err, Result, utils, utils::math::Tried};
 use ruma::api::client::typing::create_typing_event;
+use tuwunel_core::{Err, Result, utils, utils::math::Tried};
 
 use crate::Ruma;
 

src/api/client/unstable.rs

@@ -2,7 +2,6 @@ use std::collections::BTreeMap;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduwuit::{Err, Error, Result};
 use futures::StreamExt;
 use ruma::{
 	OwnedRoomId,
@@ -19,6 +18,7 @@ use ruma::{
 	},
 	presence::PresenceState,
 };
+use tuwunel_core::{Err, Error, Result};
 
 use super::{update_avatar_url, update_displayname};
 use crate::Ruma;

src/api/client/unversioned.rs

@@ -1,9 +1,9 @@
 use std::collections::BTreeMap;
 
 use axum::{Json, extract::State, response::IntoResponse};
-use conduwuit::Result;
 use futures::StreamExt;
 use ruma::api::client::discovery::get_supported_versions;
+use tuwunel_core::Result;
 
 use crate::Ruma;
 
@@ -60,23 +60,23 @@ pub(crate) async fn get_supported_versions_route(
 	Ok(resp)
 }
 
-/// # `GET /_conduwuit/server_version`
+/// # `GET /_tuwunel/server_version`
 ///
-/// Conduwuit-specific API to get the server version, results akin to
+/// Tuwunel-specific API to get the server version, results akin to
 /// `/_matrix/federation/v1/version`
-pub(crate) async fn conduwuit_server_version() -> Result<impl IntoResponse> {
+pub(crate) async fn tuwunel_server_version() -> Result<impl IntoResponse> {
 	Ok(Json(serde_json::json!({
-		"name": conduwuit::version::name(),
-		"version": conduwuit::version::version(),
+		"name": tuwunel_core::version::name(),
+		"version": tuwunel_core::version::version(),
 	})))
 }
 
-/// # `GET /_conduwuit/local_user_count`
+/// # `GET /_tuwunel/local_user_count`
 ///
-/// conduwuit-specific API to return the amount of users registered on this
+/// Tuwunel-specific API to return the amount of users registered on this
 /// homeserver. Endpoint is disabled if federation is disabled for privacy. This
 /// only includes active users (not deactivated, no guests, etc)
-pub(crate) async fn conduwuit_local_user_count(
+pub(crate) async fn tuwunel_local_user_count(
 	State(services): State<crate::State>,
 ) -> Result<impl IntoResponse> {
 	let user_count = services.users.list_local_users().count().await;

src/api/client/user_directory.rs

@@ -1,16 +1,16 @@
 use axum::extract::State;
-use conduwuit::{
+use futures::{FutureExt, StreamExt, pin_mut};
+use ruma::{
+	api::client::user_directory::search_users::{self},
+	events::room::join_rules::JoinRule,
+};
+use tuwunel_core::{
 	Result,
 	utils::{
 		future::BoolExt,
 		stream::{BroadbandExt, ReadyExt},
 	},
 };
-use futures::{FutureExt, StreamExt, pin_mut};
-use ruma::{
-	api::client::user_directory::search_users::{self},
-	events::room::join_rules::JoinRule,
-};
 
 use crate::Ruma;
 

src/api/client/voip.rs

@@ -2,10 +2,10 @@ use std::time::{Duration, SystemTime};
 
 use axum::extract::State;
 use base64::{Engine as _, engine::general_purpose};
-use conduwuit::{Err, Result, utils};
 use hmac::{Hmac, Mac};
 use ruma::{SecondsSinceUnixEpoch, UserId, api::client::voip::get_turn_server_info};
 use sha1::Sha1;
+use tuwunel_core::{Err, Result, utils};
 
 use crate::Ruma;
 

src/api/client/well_known.rs

@@ -1,5 +1,4 @@
 use axum::{Json, extract::State, response::IntoResponse};
-use conduwuit::{Error, Result};
 use ruma::api::client::{
 	discovery::{
 		discover_homeserver::{self, HomeserverInfo, SlidingSyncProxyInfo},
@@ -7,6 +6,7 @@ use ruma::api::client::{
 	},
 	error::ErrorKind,
 };
+use tuwunel_core::{Error, Result};
 
 use crate::Ruma;
 
@@ -94,6 +94,6 @@ pub(crate) async fn syncv3_client_server_json(
 
 	Ok(Json(serde_json::json!({
 		"server": server_url,
-		"version": conduwuit::version(),
+		"version": tuwunel_core::version(),
 	})))
 }

src/api/mod.rs

@@ -5,10 +5,7 @@ pub mod client;
 pub mod router;
 pub mod server;
 
-extern crate conduwuit_core as conduwuit;
-extern crate conduwuit_service as service;
-
 pub(crate) use self::router::{Ruma, RumaResponse, State};
 
-conduwuit::mod_ctor! {}
-conduwuit::mod_dtor! {}
+tuwunel_core::mod_ctor! {}
+tuwunel_core::mod_dtor! {}

src/api/router.rs

@@ -12,8 +12,8 @@ use axum::{
 	response::{IntoResponse, Redirect},
 	routing::{any, get, post},
 };
-use conduwuit::{Server, err};
 use http::{Uri, uri};
+use tuwunel_core::{Server, err};
 
 use self::handler::RouterExt;
 pub(super) use self::{args::Args as Ruma, response::RumaResponse, state::State};
@@ -185,7 +185,7 @@ pub fn build(router: Router<State>, server: &Server) -> Router<State> {
 		)
 		.ruma_route(&client::well_known_support)
 		.ruma_route(&client::well_known_client)
-		.route("/_conduwuit/server_version", get(client::conduwuit_server_version))
+		.route("/_tuwunel/server_version", get(client::tuwunel_server_version))
 		.ruma_route(&client::room_initial_sync_route)
 		.route("/client/server.json", get(client::syncv3_client_server_json));
 
@@ -225,13 +225,13 @@ pub fn build(router: Router<State>, server: &Server) -> Router<State> {
 			.ruma_route(&server::well_known_server)
 			.ruma_route(&server::get_content_route)
 			.ruma_route(&server::get_content_thumbnail_route)
-			.route("/_conduwuit/local_user_count", get(client::conduwuit_local_user_count));
+			.route("/_tuwunel/local_user_count", get(client::tuwunel_local_user_count));
 	} else {
 		router = router
 			.route("/_matrix/federation/*path", any(federation_disabled))
 			.route("/.well-known/matrix/server", any(federation_disabled))
 			.route("/_matrix/key/*path", any(federation_disabled))
-			.route("/_conduwuit/local_user_count", any(federation_disabled));
+			.route("/_tuwunel/local_user_count", any(federation_disabled));
 	}
 
 	if config.allow_legacy_media {

src/api/router/args.rs

@@ -3,15 +3,15 @@ use std::{mem, ops::Deref};
 use async_trait::async_trait;
 use axum::{body::Body, extract::FromRequest};
 use bytes::{BufMut, Bytes, BytesMut};
-use conduwuit::{Error, Result, debug, debug_warn, err, trace, utils::string::EMPTY};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, DeviceId, OwnedDeviceId, OwnedServerName,
 	OwnedUserId, ServerName, UserId, api::IncomingRequest,
 };
-use service::Services;
+use tuwunel_core::{Error, Result, debug, debug_warn, err, trace, utils::string::EMPTY};
+use tuwunel_service::{Services, appservice::RegistrationInfo};
 
 use super::{auth, auth::Auth, request, request::Request};
-use crate::{State, service::appservice::RegistrationInfo};
+use crate::State;
 
 /// Extractor for Ruma request structs
 pub(crate) struct Args<T> {

src/api/router/auth.rs

@@ -4,7 +4,6 @@ use axum_extra::{
 	headers::{Authorization, authorization::Bearer},
 	typed_header::TypedHeaderRejectionReason,
 };
-use conduwuit::{Err, Error, Result, debug_error, err, warn};
 use ruma::{
 	CanonicalJsonObject, CanonicalJsonValue, OwnedDeviceId, OwnedServerName, OwnedUserId, UserId,
 	api::{
@@ -20,13 +19,14 @@ use ruma::{
 		federation::{authentication::XMatrix, openid::get_openid_userinfo},
 	},
 };
-use service::{
+use tuwunel_core::{Err, Error, Result, debug_error, err, warn};
+use tuwunel_service::{
 	Services,
+	appservice::RegistrationInfo,
 	server_keys::{PubKeyMap, PubKeys},
 };
 
 use super::request::Request;
-use crate::service::appservice::RegistrationInfo;
 
 enum Token {
 	Appservice(Box<RegistrationInfo>),

src/api/router/handler.rs

@@ -4,10 +4,10 @@ use axum::{
 	response::IntoResponse,
 	routing::{MethodFilter, on},
 };
-use conduwuit::Result;
 use futures::{Future, TryFutureExt};
 use http::Method;
 use ruma::api::IncomingRequest;
+use tuwunel_core::Result;
 
 use super::{Ruma, RumaResponse, State};
 

src/api/router/request.rs

@@ -2,10 +2,10 @@ use std::str;
 
 use axum::{RequestExt, RequestPartsExt, extract::Path};
 use bytes::Bytes;
-use conduwuit::{Result, err};
 use http::request::Parts;
 use serde::Deserialize;
-use service::Services;
+use tuwunel_core::{Result, err};
+use tuwunel_service::Services;
 
 #[derive(Deserialize)]
 pub(super) struct QueryParams {

src/api/router/response.rs

@@ -1,9 +1,9 @@
 use axum::response::{IntoResponse, Response};
 use bytes::BytesMut;
-use conduwuit::{Error, error};
 use http::StatusCode;
 use http_body_util::Full;
 use ruma::api::{OutgoingResponse, client::uiaa::UiaaResponse};
+use tuwunel_core::{Error, error};
 
 pub(crate) struct RumaResponse<T>(pub(crate) T)
 where

src/api/router/state.rs

@@ -1,6 +1,6 @@
 use std::{ops::Deref, sync::Arc};
 
-use conduwuit_service::Services;
+use tuwunel_service::Services;
 
 #[derive(Clone, Copy)]
 pub struct State {

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;