rename conduit to conduwuit finally

Signed-off-by: strawberry <strawberry@puppygock.gay>

src/api/client/account.rs

@@ -2,7 +2,7 @@ use std::fmt::Write;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{debug_info, error, info, is_equal_to, utils, utils::ReadyExt, warn, Error, PduBuilder, Result};
+use conduwuit::{debug_info, error, info, is_equal_to, utils, utils::ReadyExt, warn, Error, PduBuilder, Result};
 use futures::{FutureExt, StreamExt};
 use register::RegistrationKind;
 use ruma::{

src/api/client/account_data.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{err, Err};
+use conduwuit::{err, Err};
 use ruma::{
 	api::client::config::{
 		get_global_account_data, get_room_account_data, set_global_account_data, set_room_account_data,

src/api/client/alias.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{debug, Err, Result};
+use conduwuit::{debug, Err, Result};
 use futures::StreamExt;
 use rand::seq::SliceRandom;
 use ruma::{

src/api/client/appservice.rs

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

src/api/client/backup.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{err, Err};
+use conduwuit::{err, Err};
 use ruma::{
 	api::client::backup::{
 		add_backup_keys, add_backup_keys_for_room, add_backup_keys_for_session, create_backup_version,

src/api/client/context.rs

@@ -1,7 +1,7 @@
 use std::iter::once;
 
 use axum::extract::State;
-use conduit::{
+use conduwuit::{
 	at, err, ref_at,
 	utils::{
 		future::TryExtExt,

src/api/client/device.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{err, Err};
+use conduwuit::{err, Err};
 use futures::StreamExt;
 use ruma::{
 	api::client::{

src/api/client/directory.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{info, warn, Err, Error, Result};
+use conduwuit::{info, warn, Err, Error, Result};
 use futures::{StreamExt, TryFutureExt};
 use ruma::{
 	api::{

src/api/client/filter.rs

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

src/api/client/keys.rs

@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, HashMap, HashSet};
 
 use axum::extract::State;
-use conduit::{err, utils, Error, Result};
+use conduwuit::{err, utils, Error, Result};
 use futures::{stream::FuturesUnordered, StreamExt};
 use ruma::{
 	api::{

src/api/client/media.rs

@@ -2,12 +2,12 @@ use std::time::Duration;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{
+use conduwuit::{
 	err,
 	utils::{self, content_disposition::make_content_disposition, math::ruma_from_usize},
 	Err, Result,
 };
-use conduit_service::{
+use conduwuit_service::{
 	media::{Dim, FileMeta, CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN, MXC_LENGTH},
 	Services,
 };

src/api/client/media_legacy.rs

@@ -2,12 +2,12 @@
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{
+use conduwuit::{
 	err,
 	utils::{content_disposition::make_content_disposition, math::ruma_from_usize},
 	Err, Result,
 };
-use conduit_service::media::{Dim, FileMeta, CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN};
+use conduwuit_service::media::{Dim, FileMeta, CACHE_CONTROL_IMMUTABLE, CORP_CROSS_ORIGIN};
 use reqwest::Url;
 use ruma::{
 	api::client::media::{

src/api/client/membership.rs

@@ -6,7 +6,7 @@ use std::{
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{
+use conduwuit::{
 	debug, debug_info, debug_warn, err, error, info,
 	pdu::{self, gen_event_id_canonical_json, PduBuilder},
 	result::FlatOk,
@@ -1457,7 +1457,7 @@ pub async fn leave_all_rooms(services: &Services, user_id: &UserId) {
 }
 
 pub async fn leave_room(services: &Services, user_id: &UserId, room_id: &RoomId, reason: Option<String>) -> Result<()> {
-	//use conduit::utils::stream::OptionStream;
+	//use conduwuit::utils::stream::OptionStream;
 	use futures::TryFutureExt;
 
 	// Ask a remote server if we don't have this room

src/api/client/message.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use axum::extract::State;
-use conduit::{
+use conduwuit::{
 	at, is_equal_to,
 	utils::{
 		result::{FlatOk, LogErr},

src/api/client/openid.rs

@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use axum::extract::State;
-use conduit::utils;
+use conduwuit::utils;
 use ruma::{
 	api::client::{account, error::ErrorKind},
 	authentication::TokenType,

src/api/client/profile.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduit::{
+use conduwuit::{
 	pdu::PduBuilder,
 	utils::{stream::TryIgnore, IterStream},
 	warn, Err, Error, Result,

src/api/client/push.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{err, Err};
+use conduwuit::{err, Err};
 use ruma::{
 	api::client::{
 		error::ErrorKind,

src/api/client/read_marker.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduit::{err, Err, PduCount};
+use conduwuit::{err, Err, PduCount};
 use ruma::{
 	api::client::{read_marker::set_read_marker, receipt::create_receipt},
 	events::{

src/api/client/relations.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{
+use conduwuit::{
 	at,
 	utils::{result::FlatOk, stream::WidebandExt, IterStream, ReadyExt},
 	PduCount, Result,

src/api/client/report.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{info, utils::ReadyExt, Err};
+use conduwuit::{info, utils::ReadyExt, Err};
 use rand::Rng;
 use ruma::{
 	api::client::{

src/api/client/room/aliases.rs

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

src/api/client/room/create.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduit::{debug_info, debug_warn, error, info, pdu::PduBuilder, warn, Err, Error, Result};
+use conduwuit::{debug_info, debug_warn, error, info, pdu::PduBuilder, warn, Err, Error, Result};
 use futures::FutureExt;
 use ruma::{
 	api::client::{

src/api/client/room/event.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{err, Err, Event, Result};
+use conduwuit::{err, Err, Event, Result};
 use futures::{try_join, FutureExt, TryFutureExt};
 use ruma::api::client::room::get_room_event;
 

src/api/client/room/initial_sync.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{at, utils::BoolExt, Err, Result};
+use conduwuit::{at, utils::BoolExt, Err, Result};
 use futures::StreamExt;
 use ruma::api::client::room::initial_sync::v3::{PaginationChunk, Request, Response};
 

src/api/client/room/upgrade.rs

@@ -1,7 +1,7 @@
 use std::cmp::max;
 
 use axum::extract::State;
-use conduit::{err, info, pdu::PduBuilder, Error, Result};
+use conduwuit::{err, info, pdu::PduBuilder, Error, Result};
 use futures::StreamExt;
 use ruma::{
 	api::client::{error::ErrorKind, room::upgrade_room},

src/api/client/search.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduit::{
+use conduwuit::{
 	at, is_true,
 	result::FlatOk,
 	utils::{stream::ReadyExt, IterStream},

src/api/client/send.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduit::{err, Err};
+use conduwuit::{err, Err};
 use ruma::{api::client::message::send_message_event, events::MessageLikeEventType};
 use serde_json::from_str;
 

src/api/client/session.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::{debug, err, info, utils::ReadyExt, warn, Err};
+use conduwuit::{debug, err, info, utils::ReadyExt, warn, Err};
 use futures::StreamExt;
 use ruma::{
 	api::client::{

src/api/client/state.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use axum::extract::State;
-use conduit::{err, pdu::PduBuilder, utils::BoolExt, Err, Error, PduEvent, Result};
+use conduwuit::{err, pdu::PduBuilder, utils::BoolExt, Err, Error, PduEvent, Result};
 use ruma::{
 	api::client::{
 		error::ErrorKind,

src/api/client/sync/mod.rs

@@ -1,7 +1,7 @@
 mod v3;
 mod v4;
 
-use conduit::{
+use conduwuit::{
 	utils::stream::{BroadbandExt, ReadyExt},
 	PduCount,
 };

src/api/client/sync/v3.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use axum::extract::State;
-use conduit::{
+use conduwuit::{
 	at, err, error, extract_variant, is_equal_to, is_false,
 	pdu::EventHash,
 	result::{FlatOk, LogDebugErr},
@@ -18,7 +18,7 @@ use conduit::{
 	},
 	Error, PduCount, PduEvent, Result,
 };
-use conduit_service::{
+use conduwuit_service::{
 	rooms::short::{ShortStateHash, ShortStateKey},
 	Services,
 };

src/api/client/sync/v4.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use axum::extract::State;
-use conduit::{
+use conduwuit::{
 	debug, error, extract_variant,
 	utils::{
 		math::{ruma_from_usize, usize_from_ruma, usize_from_u64_truncated},

src/api/client/threads.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::{at, PduCount, PduEvent};
+use conduwuit::{at, PduCount, PduEvent};
 use futures::StreamExt;
 use ruma::{api::client::threads::get_threads, uint};
 

src/api/client/to_device.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use axum::extract::State;
-use conduit::{Error, Result};
+use conduwuit::{Error, Result};
 use futures::StreamExt;
 use ruma::{
 	api::{

src/api/client/unstable.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use conduit::Err;
+use conduwuit::Err;
 use futures::StreamExt;
 use ruma::{
 	api::{

src/api/client/unversioned.rs

@@ -64,8 +64,8 @@ pub(crate) async fn get_supported_versions_route(
 /// `/_matrix/federation/v1/version`
 pub(crate) async fn conduwuit_server_version() -> Result<impl IntoResponse> {
 	Ok(Json(serde_json::json!({
-		"name": conduit::version::name(),
-		"version": conduit::version::version(),
+		"name": conduwuit::version::name(),
+		"version": conduwuit::version::version(),
 	})))
 }
 

src/api/client/user_directory.rs

@@ -1,5 +1,5 @@
 use axum::extract::State;
-use conduit::utils::TryFutureExtExt;
+use conduwuit::utils::TryFutureExtExt;
 use futures::{pin_mut, StreamExt};
 use ruma::{
 	api::client::user_directory::search_users,

src/api/client/voip.rs

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

src/api/client/well_known.rs

@@ -100,6 +100,6 @@ pub(crate) async fn syncv3_client_server_json(State(services): State<crate::Stat
 
 	Ok(Json(serde_json::json!({
 		"server": server_url,
-		"version": conduit::version(),
+		"version": conduwuit::version(),
 	})))
 }