diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dd47a30c..66c8f6359 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -377,10 +377,9 @@ jobs: mkdir -v -p target/release/ mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/ - cp -v -f result/bin/conduit target/release/conduwuit - cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit - # -p conduit is the main crate name - direnv exec . cargo deb --verbose --no-build --no-strip -p conduit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}.deb + cp -v -f result/bin/conduwuit target/release/conduwuit + cp -v -f result/bin/conduwuit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit + direnv exec . cargo deb --verbose --no-build --no-strip -p conduwuit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}.deb mv -v target/release/conduwuit static-${{ matrix.target }} mv -v target/release/${{ matrix.target }}.deb ${{ matrix.target }}.deb @@ -394,10 +393,9 @@ jobs: mkdir -v -p target/release/ mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/ - cp -v -f result/bin/conduit target/release/conduwuit - cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit - # -p conduit is the main crate name - direnv exec . cargo deb --verbose --no-build --no-strip -p conduit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/x86_64-linux-musl-x86_64-haswell-optimised.deb + cp -v -f result/bin/conduwuit target/release/conduwuit + cp -v -f result/bin/conduwuit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit + direnv exec . cargo deb --verbose --no-build --no-strip -p conduwuit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/x86_64-linux-musl-x86_64-haswell-optimised.deb mv -v target/release/conduwuit static-x86_64-linux-musl-x86_64-haswell-optimised mv -v target/release/x86_64-linux-musl-x86_64-haswell-optimised.deb x86_64-linux-musl-x86_64-haswell-optimised.deb @@ -406,10 +404,10 @@ jobs: if: ${{ matrix.target == 'x86_64-linux-musl' }} run: | # GH actions default runners are x86_64 only - if file result/bin/conduit | grep x86-64; then - result/bin/conduit --version - result/bin/conduit --help - result/bin/conduit -Oserver_name="'$(date -u +%s).local'" -Odatabase_path="'/tmp/$(date -u +%s)'" --execute "server admin-notice awawawawawawawawawawa" --execute "server memory-usage" --execute "server shutdown" + if file result/bin/conduwuit | grep x86-64; then + result/bin/conduwuit --version + result/bin/conduwuit --help + result/bin/conduwuit -Oserver_name="'$(date -u +%s).local'" -Odatabase_path="'/tmp/$(date -u +%s)'" --execute "server admin-notice awawawawawawawawawawa" --execute "server memory-usage" --execute "server shutdown" fi - name: Build static debug ${{ matrix.target }}-all-features @@ -430,10 +428,9 @@ jobs: # so we need to coerce cargo-deb into thinking this is a release binary mkdir -v -p target/release/ mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/ - cp -v -f result/bin/conduit target/release/conduwuit - cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit - # -p conduit is the main crate name - direnv exec . cargo deb --verbose --no-build --no-strip -p conduit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}-debug.deb + cp -v -f result/bin/conduwuit target/release/conduwuit + cp -v -f result/bin/conduwuit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit + direnv exec . cargo deb --verbose --no-build --no-strip -p conduwuit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}-debug.deb mv -v target/release/conduwuit static-${{ matrix.target }}-debug mv -v target/release/${{ matrix.target }}-debug.deb ${{ matrix.target }}-debug.deb @@ -441,8 +438,8 @@ jobs: - name: Run x86_64 static debug binary run: | # GH actions default runners are x86_64 only - if file result/bin/conduit | grep x86-64; then - result/bin/conduit --version + if file result/bin/conduwuit | grep x86-64; then + result/bin/conduwuit --version fi # check validity of produced deb package, invalid debs will error on these commands @@ -654,7 +651,7 @@ jobs: if: ${{ matrix.os == 'macos-13' }} run: | CONDUWUIT_VERSION_EXTRA="$(git rev-parse --short ${{ github.sha }})" cargo build --release - cp -v -f target/release/conduit conduwuit-macos-x86_64 + cp -v -f target/release/conduwuit conduwuit-macos-x86_64 otool -L conduwuit-macos-x86_64 # quick smoke test of the x86_64 macOS binary @@ -667,7 +664,7 @@ jobs: if: ${{ matrix.os == 'macos-latest' }} run: | CONDUWUIT_VERSION_EXTRA="$(git rev-parse --short ${{ github.sha }})" cargo build --release - cp -v -f target/release/conduit conduwuit-macos-arm64 + cp -v -f target/release/conduwuit conduwuit-macos-arm64 otool -L conduwuit-macos-arm64 # quick smoke test of the arm64 macOS binary diff --git a/Cargo.lock b/Cargo.lock index 94533ae12..95ab8d04f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -619,16 +619,16 @@ dependencies = [ ] [[package]] -name = "conduit" +name = "conduwuit" version = "0.5.0" dependencies = [ "clap", - "conduit_admin", - "conduit_api", - "conduit_core", - "conduit_database", - "conduit_router", - "conduit_service", + "conduwuit_admin", + "conduwuit_api", + "conduwuit_core", + "conduwuit_database", + "conduwuit_router", + "conduwuit_service", "console-subscriber", "const-str", "hardened_malloc-rs", @@ -648,15 +648,15 @@ dependencies = [ ] [[package]] -name = "conduit_admin" +name = "conduwuit_admin" version = "0.5.0" dependencies = [ "clap", - "conduit_api", - "conduit_core", - "conduit_database", - "conduit_macros", - "conduit_service", + "conduwuit_api", + "conduwuit_core", + "conduwuit_database", + "conduwuit_macros", + "conduwuit_service", "const-str", "futures", "log", @@ -669,7 +669,7 @@ dependencies = [ ] [[package]] -name = "conduit_api" +name = "conduwuit_api" version = "0.5.0" dependencies = [ "axum", @@ -677,9 +677,9 @@ dependencies = [ "axum-extra", "base64 0.22.1", "bytes", - "conduit_core", - "conduit_database", - "conduit_service", + "conduwuit_core", + "conduwuit_database", + "conduwuit_service", "const-str", "futures", "hmac", @@ -701,7 +701,7 @@ dependencies = [ ] [[package]] -name = "conduit_core" +name = "conduwuit_core" version = "0.5.0" dependencies = [ "argon2", @@ -713,7 +713,7 @@ dependencies = [ "checked_ops", "chrono", "clap", - "conduit_macros", + "conduwuit_macros", "const-str", "ctor", "cyborgtime", @@ -739,7 +739,7 @@ dependencies = [ "serde_json", "serde_regex", "serde_yaml", - "thiserror 2.0.6", + "thiserror 2.0.7", "tikv-jemalloc-ctl", "tikv-jemalloc-sys", "tikv-jemallocator", @@ -753,12 +753,12 @@ dependencies = [ ] [[package]] -name = "conduit_database" +name = "conduwuit_database" version = "0.5.0" dependencies = [ "arrayvec", "async-channel", - "conduit_core", + "conduwuit_core", "const-str", "futures", "log", @@ -771,7 +771,7 @@ dependencies = [ ] [[package]] -name = "conduit_macros" +name = "conduwuit_macros" version = "0.5.0" dependencies = [ "itertools 0.13.0", @@ -781,7 +781,7 @@ dependencies = [ ] [[package]] -name = "conduit_router" +name = "conduwuit_router" version = "0.5.0" dependencies = [ "axum", @@ -789,10 +789,10 @@ dependencies = [ "axum-server", "axum-server-dual-protocol", "bytes", - "conduit_admin", - "conduit_api", - "conduit_core", - "conduit_service", + "conduwuit_admin", + "conduwuit_api", + "conduwuit_core", + "conduwuit_service", "const-str", "futures", "http", @@ -814,15 +814,15 @@ dependencies = [ ] [[package]] -name = "conduit_service" +name = "conduwuit_service" version = "0.5.0" dependencies = [ "arrayvec", "async-trait", "base64 0.22.1", "bytes", - "conduit_core", - "conduit_database", + "conduwuit_core", + "conduwuit_database", "const-str", "either", "futures", @@ -2954,7 +2954,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustls", "socket2", - "thiserror 2.0.6", + "thiserror 2.0.7", "tokio", "tracing", ] @@ -2973,7 +2973,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.6", + "thiserror 2.0.7", "tinyvec", "tracing", "web-time 1.1.0", @@ -3211,7 +3211,7 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "thiserror 2.0.6", + "thiserror 2.0.7", "url", "web-time 1.1.0", ] @@ -3237,7 +3237,7 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "thiserror 2.0.6", + "thiserror 2.0.7", "time", "tracing", "url", @@ -3263,7 +3263,7 @@ dependencies = [ "ruma-macros", "serde", "serde_json", - "thiserror 2.0.6", + "thiserror 2.0.7", "tracing", "url", "web-time 1.1.0", @@ -3294,7 +3294,7 @@ version = "0.9.5" source = "git+https://github.com/girlbossceo/ruwuma?rev=08f58cd3236fdf175913b2bcaf8865359696d94d#08f58cd3236fdf175913b2bcaf8865359696d94d" dependencies = [ "js_int", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -3343,7 +3343,7 @@ dependencies = [ "http", "http-auth", "ruma-common", - "thiserror 2.0.6", + "thiserror 2.0.7", "tracing", ] @@ -3360,7 +3360,7 @@ dependencies = [ "serde_json", "sha2", "subslice", - "thiserror 2.0.6", + "thiserror 2.0.7", ] [[package]] @@ -3374,7 +3374,7 @@ dependencies = [ "ruma-events", "serde", "serde_json", - "thiserror 2.0.6", + "thiserror 2.0.7", "tracing", ] @@ -3526,7 +3526,7 @@ dependencies = [ "futures-util", "pin-project", "thingbuf", - "thiserror 2.0.6", + "thiserror 2.0.7", "unicode-segmentation", "unicode-width 0.2.0", ] @@ -4111,11 +4111,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" dependencies = [ - "thiserror-impl 2.0.6", + "thiserror-impl 2.0.7", ] [[package]] @@ -4131,9 +4131,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 8da6728c7..2d99db02f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ rust-version = "1.83.0" version = "0.5.0" [workspace.metadata.crane] -name = "conduit" +name = "conduwuit" [workspace.dependencies.arrayvec] version = "0.7.4" @@ -211,7 +211,7 @@ default-features = false version = "2.0.1" default-features = false -# used for conduit's CLI and admin room command parsing +# used for conduwuit's CLI and admin room command parsing [workspace.dependencies.clap] version = "4.5.23" default-features = false @@ -297,9 +297,9 @@ features = ["env", "toml"] version = "0.24.2" default-features = false -# Used for conduit::Error type +# Used for conduwuit::Error type [workspace.dependencies.thiserror] -version = "2.0.6" +version = "2.0.7" default-features = false # Used when hashing the state @@ -523,38 +523,38 @@ rev = "deaeb0694e2083f53d363b648da06e10fc13900c" # Our crates # -[workspace.dependencies.conduit-router] -package = "conduit_router" +[workspace.dependencies.conduwuit-router] +package = "conduwuit_router" path = "src/router" default-features = false -[workspace.dependencies.conduit-admin] -package = "conduit_admin" +[workspace.dependencies.conduwuit-admin] +package = "conduwuit_admin" path = "src/admin" default-features = false -[workspace.dependencies.conduit-api] -package = "conduit_api" +[workspace.dependencies.conduwuit-api] +package = "conduwuit_api" path = "src/api" default-features = false -[workspace.dependencies.conduit-service] -package = "conduit_service" +[workspace.dependencies.conduwuit-service] +package = "conduwuit_service" path = "src/service" default-features = false -[workspace.dependencies.conduit-database] -package = "conduit_database" +[workspace.dependencies.conduwuit-database] +package = "conduwuit_database" path = "src/database" default-features = false -[workspace.dependencies.conduit-core] -package = "conduit_core" +[workspace.dependencies.conduwuit-core] +package = "conduwuit_core" path = "src/core" default-features = false -[workspace.dependencies.conduit-macros] -package = "conduit_macros" +[workspace.dependencies.conduwuit-macros] +package = "conduwuit_macros" path = "src/macros" default-features = false @@ -613,7 +613,7 @@ codegen-units = 32 # '-Clink-arg=-Wl,--no-gc-sections', #] -[profile.release-max-perf.package.conduit_macros] +[profile.release-max-perf.package.conduwuit_macros] inherits = "release-max-perf.build-override" #rustflags = [ # '-Crelocation-model=pic', @@ -647,7 +647,7 @@ panic = "unwind" debug-assertions = true incremental = true #rustflags = [ -# '--cfg', 'conduit_mods', +# '--cfg', 'conduwuit_mods', # '-Ztime-passes', # '-Zmir-opt-level=0', # '-Zvalidate-mir=false', @@ -664,11 +664,11 @@ incremental = true # '-Clink-arg=-Wl,-z,lazy', #] -[profile.dev.package.conduit_core] +[profile.dev.package.conduwuit_core] inherits = "dev" incremental = false #rustflags = [ -# '--cfg', 'conduit_mods', +# '--cfg', 'conduwuit_mods', # '-Ztime-passes', # '-Zmir-opt-level=0', # '-Ztls-model=initial-exec', @@ -685,10 +685,10 @@ incremental = false # '-Clink-arg=-Wl,-z,nodelete', #] -[profile.dev.package.conduit] +[profile.dev.package.conduwuit] inherits = "dev" #rustflags = [ -# '--cfg', 'conduit_mods', +# '--cfg', 'conduwuit_mods', # '-Ztime-passes', # '-Zmir-opt-level=0', # '-Zvalidate-mir=false', @@ -710,7 +710,7 @@ incremental = false codegen-units = 1 opt-level = 'z' #rustflags = [ -# '--cfg', 'conduit_mods', +# '--cfg', 'conduwuit_mods', # '-Ztls-model=initial-exec', # '-Cprefer-dynamic=true', # '-Zstaticlib-prefer-dynamic=true', @@ -731,7 +731,7 @@ incremental = false codegen-units = 1 opt-level = 'z' #rustflags = [ -# '--cfg', 'conduit_mods', +# '--cfg', 'conduwuit_mods', # '-Ztls-model=global-dynamic', # '-Cprefer-dynamic=true', # '-Zstaticlib-prefer-dynamic=true', diff --git a/README.md b/README.md index 4faf1ad78..e6ad1981f 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,12 @@ is no harm or additional steps required for using conduwuit. See the [Migrating from Conduit](https://conduwuit.puppyirl.gay/deploying/generic.html#migrating-from-conduit) section on the generic deploying guide. +Note that as of conduwuit version 0.5.0, backwards compatibility with Conduit is +no longer supported. We only support migrating *from* Conduit, not back to +Conduit like before. If you are truly finding yourself wanting to migrate back +to Conduit, we would appreciate all your feedback and if we can assist with +any issues or concerns. + diff --git a/clippy.toml b/clippy.toml index b93b23775..3a0aa6958 100644 --- a/clippy.toml +++ b/clippy.toml @@ -7,9 +7,9 @@ too-many-lines-threshold = 700 # TODO reduce me to <= 100 type-complexity-threshold = 250 # reduce me to ~200 disallowed-macros = [ - { path = "log::error", reason = "use conduit_core::error" }, - { path = "log::warn", reason = "use conduit_core::warn" }, - { path = "log::info", reason = "use conduit_core::info" }, - { path = "log::debug", reason = "use conduit_core::debug" }, - { path = "log::trace", reason = "use conduit_core::trace" }, + { path = "log::error", reason = "use conduwuit_core::error" }, + { path = "log::warn", reason = "use conduwuit_core::warn" }, + { path = "log::info", reason = "use conduwuit_core::info" }, + { path = "log::debug", reason = "use conduwuit_core::debug" }, + { path = "log::trace", reason = "use conduwuit_core::trace" }, ] diff --git a/deps/rust-rocksdb/lib.rs b/deps/rust-rocksdb/lib.rs index 0551991a9..8dbbda987 100644 --- a/deps/rust-rocksdb/lib.rs +++ b/deps/rust-rocksdb/lib.rs @@ -1,7 +1,7 @@ pub use rust_rocksdb::*; -#[cfg_attr(not(conduit_mods), link(name = "rocksdb"))] -#[cfg_attr(conduit_mods, link(name = "rocksdb", kind = "static"))] +#[cfg_attr(not(conduwuit_mods), link(name = "rocksdb"))] +#[cfg_attr(conduwuit_mods, link(name = "rocksdb", kind = "static"))] unsafe extern "C" { pub unsafe fn rocksdb_list_column_families(); pub unsafe fn rocksdb_logger_create_stderr_logger(); diff --git a/docs/configuration.md b/docs/configuration.md index f4f7f4c70..0c670210d 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -42,7 +42,7 @@ The syntax of this is a standard admin command without the prefix such as An example output of a success is: ``` -INFO conduit_service::admin::startup: Startup command #0 completed: +INFO conduwuit_service::admin::startup: Startup command #0 completed: Created user with user_id: @june:girlboss.ceo and password: `` ``` diff --git a/docs/deploying/docker.md b/docs/deploying/docker.md index fffa77704..d0aa13b37 100644 --- a/docs/deploying/docker.md +++ b/docs/deploying/docker.md @@ -41,7 +41,7 @@ docker run -d -p 8448:6167 \ -v db:/var/lib/conduwuit/ \ -e CONDUWUIT_SERVER_NAME="your.server.name" \ -e CONDUWUIT_ALLOW_REGISTRATION=false \ - --name conduit $LINK + --name conduwuit $LINK ``` or you can use [docker compose](#docker-compose). diff --git a/docs/deploying/generic.md b/docs/deploying/generic.md index 70d4b561d..398ba67f6 100644 --- a/docs/deploying/generic.md +++ b/docs/deploying/generic.md @@ -26,7 +26,7 @@ allows easy cross-compilation. You can run the `nix build -L .#static-x86_64-linux-musl-all-features` or `nix build -L .#static-aarch64-linux-musl-all-features` commands based on architecture to cross-compile the necessary static binary located at -`result/bin/conduit`. This is reproducible with the static binaries produced in our CI. +`result/bin/conduwuit`. This is reproducible with the static binaries produced in our CI. Otherwise, follow standard Rust project build guides (installing git and cloning the repo, getting the Rust toolchain via rustup, installing LLVM toolchain + @@ -38,6 +38,12 @@ As mentioned in the README, there is little to no steps needed to migrate from Conduit. As long as you are using the RocksDB database backend, just replace the binary / container image / etc. +**WARNING**: As of conduwuit 0.5.0, all database and backwards compatibility +with Conduit is no longer supported. We only support migrating *from* Conduit, +not back to Conduit like before. If you are truly finding yourself wanting to +migrate back to Conduit, we would appreciate all your feedback and if we can +assist with any issues or concerns. + **Note**: If you are relying on Conduit's "automatic delegation" feature, this will **NOT** work on conduwuit and you must configure delegation manually. This is not a mistake and no support for this feature will be added. diff --git a/docs/development.md b/docs/development.md index 28b076675..fa7519c08 100644 --- a/docs/development.md +++ b/docs/development.md @@ -52,7 +52,7 @@ the said workspace crate(s) must define the feature there in its `Cargo.toml`. So, if this is adding a feature to the API such as `woof`, you define the feature in the `api` crate's `Cargo.toml` as `woof = []`. The feature definition in `main`'s -`Cargo.toml` will be `woof = ["conduit-api/woof"]`. +`Cargo.toml` will be `woof = ["conduwuit-api/woof"]`. The rationale for this is due to Rust / Cargo not supporting ["workspace level features"][9], we must make a choice of; either scattering diff --git a/src/admin/Cargo.toml b/src/admin/Cargo.toml index f5cab4496..3f8fbf793 100644 --- a/src/admin/Cargo.toml +++ b/src/admin/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduit_admin" +name = "conduwuit_admin" categories.workspace = true description.workspace = true edition.workspace = true @@ -27,11 +27,11 @@ release_max_log_level = [ [dependencies] clap.workspace = true -conduit-api.workspace = true -conduit-core.workspace = true -conduit-database.workspace = true -conduit-macros.workspace = true -conduit-service.workspace = true +conduwuit-api.workspace = true +conduwuit-core.workspace = true +conduwuit-database.workspace = true +conduwuit-macros.workspace = true +conduwuit-service.workspace = true const-str.workspace = true futures.workspace = true log.workspace = true diff --git a/src/admin/admin.rs b/src/admin/admin.rs index d1d8d3949..7b7074467 100644 --- a/src/admin/admin.rs +++ b/src/admin/admin.rs @@ -1,5 +1,5 @@ use clap::Parser; -use conduit::Result; +use conduwuit::Result; use ruma::events::room::message::RoomMessageEventContent; use crate::{ @@ -9,7 +9,7 @@ use crate::{ }; #[derive(Debug, Parser)] -#[command(name = "conduwuit", version = conduit::version())] +#[command(name = "conduwuit", version = conduwuit::version())] pub(super) enum AdminCommand { #[command(subcommand)] /// - Commands for managing appservices diff --git a/src/admin/appservice/mod.rs b/src/admin/appservice/mod.rs index ca5f46bba..2e0694aa2 100644 --- a/src/admin/appservice/mod.rs +++ b/src/admin/appservice/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use crate::admin_command_dispatch; diff --git a/src/admin/check/commands.rs b/src/admin/check/commands.rs index 88fca462f..ecb18c1a0 100644 --- a/src/admin/check/commands.rs +++ b/src/admin/check/commands.rs @@ -1,5 +1,5 @@ -use conduit::Result; -use conduit_macros::implement; +use conduwuit::Result; +use conduwuit_macros::implement; use futures::StreamExt; use ruma::events::room::message::RoomMessageEventContent; diff --git a/src/admin/check/mod.rs b/src/admin/check/mod.rs index e543e5b54..44b1ddf28 100644 --- a/src/admin/check/mod.rs +++ b/src/admin/check/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::events::room::message::RoomMessageEventContent; use crate::Command; diff --git a/src/admin/command.rs b/src/admin/command.rs index c594736d2..5277b976c 100644 --- a/src/admin/command.rs +++ b/src/admin/command.rs @@ -1,6 +1,6 @@ use std::time::SystemTime; -use conduit_service::Services; +use conduwuit_service::Services; use ruma::EventId; pub(crate) struct Command<'a> { diff --git a/src/admin/debug/commands.rs b/src/admin/debug/commands.rs index a17d08005..9d77a1de8 100644 --- a/src/admin/debug/commands.rs +++ b/src/admin/debug/commands.rs @@ -6,7 +6,7 @@ use std::{ time::{Instant, SystemTime}, }; -use conduit::{debug_error, err, info, trace, utils, utils::string::EMPTY, warn, Error, PduEvent, Result}; +use conduwuit::{debug_error, err, info, trace, utils, utils::string::EMPTY, warn, Error, PduEvent, Result}; use futures::{FutureExt, StreamExt}; use ruma::{ api::{client::error::ErrorKind, federation::event::get_room_state}, @@ -754,7 +754,7 @@ pub(super) async fn resolve_true_destination( #[admin_command] pub(super) async fn memory_stats(&self) -> Result { - let html_body = conduit::alloc::memory_stats(); + let html_body = conduwuit::alloc::memory_stats(); if html_body.is_none() { return Ok(RoomMessageEventContent::text_plain( diff --git a/src/admin/debug/mod.rs b/src/admin/debug/mod.rs index b74e9c36c..c87dbb0a8 100644 --- a/src/admin/debug/mod.rs +++ b/src/admin/debug/mod.rs @@ -2,7 +2,7 @@ mod commands; pub(crate) mod tester; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::{EventId, OwnedRoomOrAliasId, RoomId, ServerName}; use self::tester::TesterCommand; diff --git a/src/admin/debug/tester.rs b/src/admin/debug/tester.rs index c11f893e2..5f922ecec 100644 --- a/src/admin/debug/tester.rs +++ b/src/admin/debug/tester.rs @@ -1,4 +1,4 @@ -use conduit::Err; +use conduwuit::Err; use ruma::events::room::message::RoomMessageEventContent; use crate::{admin_command, admin_command_dispatch, Result}; diff --git a/src/admin/federation/commands.rs b/src/admin/federation/commands.rs index 0c9df4330..e0c1598da 100644 --- a/src/admin/federation/commands.rs +++ b/src/admin/federation/commands.rs @@ -1,6 +1,6 @@ use std::fmt::Write; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, RoomId, ServerName, UserId}; diff --git a/src/admin/federation/mod.rs b/src/admin/federation/mod.rs index 8f5d3fae5..3adfd459e 100644 --- a/src/admin/federation/mod.rs +++ b/src/admin/federation/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::{RoomId, ServerName, UserId}; use crate::admin_command_dispatch; diff --git a/src/admin/media/commands.rs b/src/admin/media/commands.rs index 82ac162eb..977ecdaea 100644 --- a/src/admin/media/commands.rs +++ b/src/admin/media/commands.rs @@ -1,7 +1,7 @@ use std::time::Duration; -use conduit::{debug, debug_info, debug_warn, error, info, trace, utils::time::parse_timepoint_ago, Result}; -use conduit_service::media::Dim; +use conduwuit::{debug, debug_info, debug_warn, error, info, trace, utils::time::parse_timepoint_ago, Result}; +use conduwuit_service::media::Dim; use ruma::{ events::room::message::RoomMessageEventContent, EventId, Mxc, MxcUri, OwnedMxcUri, OwnedServerName, ServerName, }; diff --git a/src/admin/media/mod.rs b/src/admin/media/mod.rs index fbf6532b3..046be556c 100644 --- a/src/admin/media/mod.rs +++ b/src/admin/media/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::{EventId, MxcUri, OwnedMxcUri, OwnedServerName, ServerName}; use crate::admin_command_dispatch; diff --git a/src/admin/mod.rs b/src/admin/mod.rs index 83db18fa7..ac51104a3 100644 --- a/src/admin/mod.rs +++ b/src/admin/mod.rs @@ -18,12 +18,12 @@ pub(crate) mod room; pub(crate) mod server; pub(crate) mod user; -extern crate conduit_api as api; -extern crate conduit_core as conduit; -extern crate conduit_service as service; +extern crate conduwuit_api as api; +extern crate conduwuit_core as conduwuit; +extern crate conduwuit_service as service; -pub(crate) use conduit::Result; -pub(crate) use conduit_macros::{admin_command, admin_command_dispatch}; +pub(crate) use conduwuit::Result; +pub(crate) use conduwuit_macros::{admin_command, admin_command_dispatch}; pub(crate) use crate::{ command::Command, @@ -32,9 +32,9 @@ pub(crate) use crate::{ pub(crate) const PAGE_SIZE: usize = 100; -conduit::mod_ctor! {} -conduit::mod_dtor! {} -conduit::rustc_flags_capture! {} +conduwuit::mod_ctor! {} +conduwuit::mod_dtor! {} +conduwuit::rustc_flags_capture! {} /// Install the admin command processor pub async fn init(admin_service: &service::admin::Service) { diff --git a/src/admin/processor.rs b/src/admin/processor.rs index caaa7d2dd..e041a8899 100644 --- a/src/admin/processor.rs +++ b/src/admin/processor.rs @@ -6,7 +6,7 @@ use std::{ }; use clap::{CommandFactory, Parser}; -use conduit::{ +use conduwuit::{ debug, error, log::{ capture, diff --git a/src/admin/query/account_data.rs b/src/admin/query/account_data.rs index 91217334f..53ed64dde 100644 --- a/src/admin/query/account_data.rs +++ b/src/admin/query/account_data.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, RoomId, UserId}; diff --git a/src/admin/query/appservice.rs b/src/admin/query/appservice.rs index 02e89e7a1..6bf9b9ad6 100644 --- a/src/admin/query/appservice.rs +++ b/src/admin/query/appservice.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::events::room::message::RoomMessageEventContent; use crate::Command; diff --git a/src/admin/query/globals.rs b/src/admin/query/globals.rs index 837d34e6e..68f68648e 100644 --- a/src/admin/query/globals.rs +++ b/src/admin/query/globals.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::{events::room::message::RoomMessageEventContent, ServerName}; use crate::Command; diff --git a/src/admin/query/mod.rs b/src/admin/query/mod.rs index 1f0f55057..b1849091b 100644 --- a/src/admin/query/mod.rs +++ b/src/admin/query/mod.rs @@ -10,7 +10,7 @@ mod sending; mod users; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use self::{ account_data::AccountDataCommand, appservice::AppserviceCommand, globals::GlobalsCommand, diff --git a/src/admin/query/presence.rs b/src/admin/query/presence.rs index 0963429e8..73e33bf68 100644 --- a/src/admin/query/presence.rs +++ b/src/admin/query/presence.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, UserId}; diff --git a/src/admin/query/pusher.rs b/src/admin/query/pusher.rs index a1bd32f99..3004af8be 100644 --- a/src/admin/query/pusher.rs +++ b/src/admin/query/pusher.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::{events::room::message::RoomMessageEventContent, UserId}; use crate::Command; diff --git a/src/admin/query/resolver.rs b/src/admin/query/resolver.rs index e8340dad8..43c637709 100644 --- a/src/admin/query/resolver.rs +++ b/src/admin/query/resolver.rs @@ -1,7 +1,7 @@ use std::fmt::Write; use clap::Subcommand; -use conduit::{utils::time, Result}; +use conduwuit::{utils::time, Result}; use ruma::{events::room::message::RoomMessageEventContent, OwnedServerName}; use crate::{admin_command, admin_command_dispatch}; diff --git a/src/admin/query/room_alias.rs b/src/admin/query/room_alias.rs index 382e4a784..19a727e99 100644 --- a/src/admin/query/room_alias.rs +++ b/src/admin/query/room_alias.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, RoomAliasId, RoomId}; diff --git a/src/admin/query/room_state_cache.rs b/src/admin/query/room_state_cache.rs index e32517fb1..6e84507a9 100644 --- a/src/admin/query/room_state_cache.rs +++ b/src/admin/query/room_state_cache.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, RoomId, ServerName, UserId}; diff --git a/src/admin/query/sending.rs b/src/admin/query/sending.rs index eaab1f5ee..efb4275f7 100644 --- a/src/admin/query/sending.rs +++ b/src/admin/query/sending.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, ServerName, UserId}; use service::sending::Destination; diff --git a/src/admin/query/users.rs b/src/admin/query/users.rs index 0792e4840..d58e2d2a1 100644 --- a/src/admin/query/users.rs +++ b/src/admin/query/users.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::stream::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, OwnedDeviceId, OwnedRoomId, OwnedUserId}; diff --git a/src/admin/room/alias.rs b/src/admin/room/alias.rs index 1ccde47dc..841bc51aa 100644 --- a/src/admin/room/alias.rs +++ b/src/admin/room/alias.rs @@ -1,7 +1,7 @@ use std::fmt::Write; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId}; diff --git a/src/admin/room/commands.rs b/src/admin/room/commands.rs index 35e40c8be..d2fdbfca9 100644 --- a/src/admin/room/commands.rs +++ b/src/admin/room/commands.rs @@ -1,4 +1,4 @@ -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId}; diff --git a/src/admin/room/directory.rs b/src/admin/room/directory.rs index 0bdaf56d7..d3ed25756 100644 --- a/src/admin/room/directory.rs +++ b/src/admin/room/directory.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, RoomId}; diff --git a/src/admin/room/info.rs b/src/admin/room/info.rs index 13a74a9d3..6a6ec6953 100644 --- a/src/admin/room/info.rs +++ b/src/admin/room/info.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduit::{utils::ReadyExt, Result}; +use conduwuit::{utils::ReadyExt, Result}; use futures::StreamExt; use ruma::{events::room::message::RoomMessageEventContent, RoomId}; diff --git a/src/admin/room/mod.rs b/src/admin/room/mod.rs index 8c6cbeaae..ad05d16dd 100644 --- a/src/admin/room/mod.rs +++ b/src/admin/room/mod.rs @@ -5,7 +5,7 @@ mod info; mod moderation; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::OwnedRoomId; use self::{ diff --git a/src/admin/room/moderation.rs b/src/admin/room/moderation.rs index cfc048bdd..427f3e427 100644 --- a/src/admin/room/moderation.rs +++ b/src/admin/room/moderation.rs @@ -1,6 +1,6 @@ use api::client::leave_room; use clap::Subcommand; -use conduit::{ +use conduwuit::{ debug, error, info, utils::{IterStream, ReadyExt}, warn, Result, diff --git a/src/admin/server/commands.rs b/src/admin/server/commands.rs index 94f695ceb..676f2d334 100644 --- a/src/admin/server/commands.rs +++ b/src/admin/server/commands.rs @@ -1,6 +1,6 @@ use std::{fmt::Write, sync::Arc}; -use conduit::{info, utils::time, warn, Err, Result}; +use conduwuit::{info, utils::time, warn, Err, Result}; use ruma::events::room::message::RoomMessageEventContent; use crate::admin_command; @@ -73,7 +73,7 @@ pub(super) async fn list_features( pub(super) async fn memory_usage(&self) -> Result { let services_usage = self.services.memory_usage().await?; let database_usage = self.services.db.db.memory_usage()?; - let allocator_usage = conduit::alloc::memory_usage().map_or(String::new(), |s| format!("\nAllocator:\n{s}")); + let allocator_usage = conduwuit::alloc::memory_usage().map_or(String::new(), |s| format!("\nAllocator:\n{s}")); Ok(RoomMessageEventContent::text_plain(format!( "Services:\n{services_usage}\nDatabase:\n{database_usage}{allocator_usage}", @@ -143,7 +143,7 @@ pub(super) async fn reload_mods(&self) -> Result { #[admin_command] #[cfg(unix)] pub(super) async fn restart(&self, force: bool) -> Result { - use conduit::utils::sys::current_exe_deleted; + use conduwuit::utils::sys::current_exe_deleted; if !force && current_exe_deleted() { return Err!( diff --git a/src/admin/server/mod.rs b/src/admin/server/mod.rs index 222c537a0..69ad7953f 100644 --- a/src/admin/server/mod.rs +++ b/src/admin/server/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use crate::admin_command_dispatch; diff --git a/src/admin/user/commands.rs b/src/admin/user/commands.rs index 610966257..017c6239f 100644 --- a/src/admin/user/commands.rs +++ b/src/admin/user/commands.rs @@ -1,12 +1,12 @@ use std::{collections::BTreeMap, fmt::Write as _}; use api::client::{full_user_deactivate, join_room_by_id_helper, leave_room}; -use conduit::{ +use conduwuit::{ debug_warn, error, info, is_equal_to, utils::{self, ReadyExt}, warn, PduBuilder, Result, }; -use conduit_api::client::{leave_all_rooms, update_avatar_url, update_displayname}; +use conduwuit_api::client::{leave_all_rooms, update_avatar_url, update_displayname}; use futures::StreamExt; use ruma::{ events::{ diff --git a/src/admin/user/mod.rs b/src/admin/user/mod.rs index 649cdfb87..60db6de84 100644 --- a/src/admin/user/mod.rs +++ b/src/admin/user/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduit::Result; +use conduwuit::Result; use ruma::{EventId, OwnedRoomOrAliasId, RoomId}; use crate::admin_command_dispatch; diff --git a/src/admin/utils.rs b/src/admin/utils.rs index ba98bbeac..8c67a0cad 100644 --- a/src/admin/utils.rs +++ b/src/admin/utils.rs @@ -1,4 +1,4 @@ -use conduit_core::{err, Err, Result}; +use conduwuit_core::{err, Err, Result}; use ruma::{OwnedRoomId, OwnedUserId, RoomId, UserId}; use service::Services; diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index a0fc09ded..f3a846644 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduit_api" +name = "conduwuit_api" categories.workspace = true description.workspace = true edition.workspace = true @@ -41,9 +41,9 @@ axum-extra.workspace = true axum.workspace = true base64.workspace = true bytes.workspace = true -conduit-core.workspace = true -conduit-database.workspace = true -conduit-service.workspace = true +conduwuit-core.workspace = true +conduwuit-database.workspace = true +conduwuit-service.workspace = true const-str.workspace = true futures.workspace = true hmac.workspace = true diff --git a/src/api/client/account.rs b/src/api/client/account.rs index 3595f5815..71e18fd3a 100644 --- a/src/api/client/account.rs +++ b/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::{ diff --git a/src/api/client/account_data.rs b/src/api/client/account_data.rs index 86ef41efd..2fc788088 100644 --- a/src/api/client/account_data.rs +++ b/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, diff --git a/src/api/client/alias.rs b/src/api/client/alias.rs index 83f3291d4..c60a2f4cf 100644 --- a/src/api/client/alias.rs +++ b/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::{ diff --git a/src/api/client/appservice.rs b/src/api/client/appservice.rs index d299185eb..9dbd141e3 100644 --- a/src/api/client/appservice.rs +++ b/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; diff --git a/src/api/client/backup.rs b/src/api/client/backup.rs index f435e0869..9e4746ca1 100644 --- a/src/api/client/backup.rs +++ b/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, diff --git a/src/api/client/context.rs b/src/api/client/context.rs index 45c04eb60..52f27692d 100644 --- a/src/api/client/context.rs +++ b/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, diff --git a/src/api/client/device.rs b/src/api/client/device.rs index 7e56f27e1..63f0c210d 100644 --- a/src/api/client/device.rs +++ b/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::{ diff --git a/src/api/client/directory.rs b/src/api/client/directory.rs index 6120c7b39..9407a0bd6 100644 --- a/src/api/client/directory.rs +++ b/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::{ diff --git a/src/api/client/filter.rs b/src/api/client/filter.rs index 2a8ebb9c2..a1576e8e9 100644 --- a/src/api/client/filter.rs +++ b/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}; diff --git a/src/api/client/keys.rs b/src/api/client/keys.rs index 18f7d21cf..13dc34679 100644 --- a/src/api/client/keys.rs +++ b/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::{ diff --git a/src/api/client/media.rs b/src/api/client/media.rs index 67a2bbdff..a9792c3b5 100644 --- a/src/api/client/media.rs +++ b/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, }; diff --git a/src/api/client/media_legacy.rs b/src/api/client/media_legacy.rs index f6837462e..a8b366edb 100644 --- a/src/api/client/media_legacy.rs +++ b/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::{ diff --git a/src/api/client/membership.rs b/src/api/client/membership.rs index a61011b0e..021662712 100644 --- a/src/api/client/membership.rs +++ b/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) -> 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 diff --git a/src/api/client/message.rs b/src/api/client/message.rs index 242c1681b..32e0b1e31 100644 --- a/src/api/client/message.rs +++ b/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}, diff --git a/src/api/client/openid.rs b/src/api/client/openid.rs index 3e4c6ca8c..b8bbfb911 100644 --- a/src/api/client/openid.rs +++ b/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, diff --git a/src/api/client/profile.rs b/src/api/client/profile.rs index 97ea21eac..ea74cdafb 100644 --- a/src/api/client/profile.rs +++ b/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, diff --git a/src/api/client/push.rs b/src/api/client/push.rs index 7efa59e83..e290c952b 100644 --- a/src/api/client/push.rs +++ b/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, diff --git a/src/api/client/read_marker.rs b/src/api/client/read_marker.rs index f6123614f..d7f241015 100644 --- a/src/api/client/read_marker.rs +++ b/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::{ diff --git a/src/api/client/relations.rs b/src/api/client/relations.rs index de54c4e44..c47bc60f1 100644 --- a/src/api/client/relations.rs +++ b/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, diff --git a/src/api/client/report.rs b/src/api/client/report.rs index 316673234..429cd033f 100644 --- a/src/api/client/report.rs +++ b/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::{ diff --git a/src/api/client/room/aliases.rs b/src/api/client/room/aliases.rs index e530b2602..f500e9c79 100644 --- a/src/api/client/room/aliases.rs +++ b/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}; diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs index 2e9852f8a..b98f1dab0 100644 --- a/src/api/client/room/create.rs +++ b/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::{ diff --git a/src/api/client/room/event.rs b/src/api/client/room/event.rs index 6deb567fb..ff9524e6f 100644 --- a/src/api/client/room/event.rs +++ b/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; diff --git a/src/api/client/room/initial_sync.rs b/src/api/client/room/initial_sync.rs index 16b3a53b5..8b2e45df9 100644 --- a/src/api/client/room/initial_sync.rs +++ b/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}; diff --git a/src/api/client/room/upgrade.rs b/src/api/client/room/upgrade.rs index fafce2d1e..401bf800a 100644 --- a/src/api/client/room/upgrade.rs +++ b/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}, diff --git a/src/api/client/search.rs b/src/api/client/search.rs index 38468abb2..28a8891c8 100644 --- a/src/api/client/search.rs +++ b/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}, diff --git a/src/api/client/send.rs b/src/api/client/send.rs index ff011efab..e909ebbf8 100644 --- a/src/api/client/send.rs +++ b/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; diff --git a/src/api/client/session.rs b/src/api/client/session.rs index e889a8672..e30c94d70 100644 --- a/src/api/client/session.rs +++ b/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::{ diff --git a/src/api/client/state.rs b/src/api/client/state.rs index aeabd6060..881eca982 100644 --- a/src/api/client/state.rs +++ b/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, diff --git a/src/api/client/sync/mod.rs b/src/api/client/sync/mod.rs index 6f7918604..2b8d478cb 100644 --- a/src/api/client/sync/mod.rs +++ b/src/api/client/sync/mod.rs @@ -1,7 +1,7 @@ mod v3; mod v4; -use conduit::{ +use conduwuit::{ utils::stream::{BroadbandExt, ReadyExt}, PduCount, }; diff --git a/src/api/client/sync/v3.rs b/src/api/client/sync/v3.rs index 815ec87c8..c5ec38863 100644 --- a/src/api/client/sync/v3.rs +++ b/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, }; diff --git a/src/api/client/sync/v4.rs b/src/api/client/sync/v4.rs index fddb81bfe..140b647d8 100644 --- a/src/api/client/sync/v4.rs +++ b/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}, diff --git a/src/api/client/threads.rs b/src/api/client/threads.rs index 906f779da..07badaf78 100644 --- a/src/api/client/threads.rs +++ b/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}; diff --git a/src/api/client/to_device.rs b/src/api/client/to_device.rs index 2b37a9ec5..aab59394a 100644 --- a/src/api/client/to_device.rs +++ b/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::{ diff --git a/src/api/client/unstable.rs b/src/api/client/unstable.rs index 3660d6744..c546d6a78 100644 --- a/src/api/client/unstable.rs +++ b/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::{ diff --git a/src/api/client/unversioned.rs b/src/api/client/unversioned.rs index ed3ce37a5..91fe5a7ca 100644 --- a/src/api/client/unversioned.rs +++ b/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 { Ok(Json(serde_json::json!({ - "name": conduit::version::name(), - "version": conduit::version::version(), + "name": conduwuit::version::name(), + "version": conduwuit::version::version(), }))) } diff --git a/src/api/client/user_directory.rs b/src/api/client/user_directory.rs index feb483460..bc7460f0e 100644 --- a/src/api/client/user_directory.rs +++ b/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, diff --git a/src/api/client/voip.rs b/src/api/client/voip.rs index 7ee4571f7..b41cc8a1b 100644 --- a/src/api/client/voip.rs +++ b/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; diff --git a/src/api/client/well_known.rs b/src/api/client/well_known.rs index 674c9bb0f..b66217e8a 100644 --- a/src/api/client/well_known.rs +++ b/src/api/client/well_known.rs @@ -100,6 +100,6 @@ pub(crate) async fn syncv3_client_server_json(State(services): State Result { Ok(get_server_version::v1::Response { server: Some(get_server_version::v1::Server { - name: Some(conduit::version::name().into()), - version: Some(conduit::version::version().into()), + name: Some(conduwuit::version::name().into()), + version: Some(conduwuit::version::version().into()), }), }) } diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index b93f9a777..27c6da52c 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduit_core" +name = "conduwuit_core" categories.workspace = true description.workspace = true edition.workspace = true @@ -62,7 +62,7 @@ cargo_toml.workspace = true checked_ops.workspace = true chrono.workspace = true clap.workspace = true -conduit-macros.workspace = true +conduwuit-macros.workspace = true const-str.workspace = true ctor.workspace = true cyborgtime.workspace = true diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index 413aa7f4c..a34514de1 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -8,7 +8,7 @@ use std::{ path::PathBuf, }; -use conduit_macros::config_example_generator; +use conduwuit_macros::config_example_generator; use either::{ Either, Either::{Left, Right}, diff --git a/src/core/debug.rs b/src/core/debug.rs index f7420784e..e19802341 100644 --- a/src/core/debug.rs +++ b/src/core/debug.rs @@ -3,7 +3,7 @@ use std::{any::Any, panic}; // Export debug proc_macros -pub use conduit_macros::recursion_depth; +pub use conduwuit_macros::recursion_depth; // Export all of the ancillary tools from here as well. pub use crate::{result::DebugInspect, utils::debug::*}; diff --git a/src/core/info/cargo.rs b/src/core/info/cargo.rs index 012a08e06..735ccee60 100644 --- a/src/core/info/cargo.rs +++ b/src/core/info/cargo.rs @@ -6,7 +6,7 @@ use std::sync::OnceLock; use cargo_toml::{DepsSet, Manifest}; -use conduit_macros::cargo_manifest; +use conduwuit_macros::cargo_manifest; use crate::Result; diff --git a/src/core/info/mod.rs b/src/core/info/mod.rs index 22ea7d3dd..ca39b348f 100644 --- a/src/core/info/mod.rs +++ b/src/core/info/mod.rs @@ -6,7 +6,7 @@ pub mod room_version; pub mod rustc; pub mod version; -pub use conduit_macros::rustc_flags_capture; +pub use conduwuit_macros::rustc_flags_capture; pub const MODULE_ROOT: &str = const_str::split!(std::module_path!(), "::")[0]; pub const CRATE_PREFIX: &str = const_str::split!(MODULE_ROOT, '_')[0]; diff --git a/src/core/mod.rs b/src/core/mod.rs index 4ab847307..87cb58ae6 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -21,11 +21,11 @@ pub use pdu::{Event, PduBuilder, PduCount, PduEvent, PduId, RawPduId}; pub use server::Server; pub use utils::{ctor, dtor, implement, result, result::Result}; -pub use crate as conduit_core; +pub use crate as conduwuit_core; rustc_flags_capture! {} -#[cfg(not(conduit_mods))] +#[cfg(not(conduwuit_mods))] pub mod mods { #[macro_export] macro_rules! mod_ctor { diff --git a/src/core/mods/mod.rs b/src/core/mods/mod.rs index 118bfc297..ac0c333bd 100644 --- a/src/core/mods/mod.rs +++ b/src/core/mods/mod.rs @@ -1,4 +1,4 @@ -#![cfg(conduit_mods)] +#![cfg(conduwuit_mods)] pub(crate) use libloading::os::unix::{Library, Symbol}; diff --git a/src/core/server.rs b/src/core/server.rs index 627e125d6..1e7215176 100644 --- a/src/core/server.rs +++ b/src/core/server.rs @@ -56,7 +56,7 @@ impl Server { } pub fn reload(&self) -> Result<()> { - if cfg!(not(conduit_mods)) { + if cfg!(not(conduwuit_mods)) { return Err!("Reloading not enabled"); } diff --git a/src/core/utils/debug.rs b/src/core/utils/debug.rs index e4151f391..cb9d7bab0 100644 --- a/src/core/utils/debug.rs +++ b/src/core/utils/debug.rs @@ -25,7 +25,7 @@ impl fmt::Debug for TruncatedSlice<'_, T> { /// See [`TruncatedSlice`]. Useful for `#[instrument]`: /// /// ``` -/// use conduit_core::utils::debug::slice_truncated; +/// use conduwuit_core::utils::debug::slice_truncated; /// /// #[tracing::instrument(fields(foos = slice_truncated(foos, 42)))] /// fn bar(foos: &[&str]); diff --git a/src/core/utils/mod.rs b/src/core/utils/mod.rs index f93102433..ad53bc424 100644 --- a/src/core/utils/mod.rs +++ b/src/core/utils/mod.rs @@ -19,7 +19,7 @@ pub mod sys; mod tests; pub mod time; -pub use ::conduit_macros::implement; +pub use ::conduwuit_macros::implement; pub use ::ctor::{ctor, dtor}; pub use self::{ diff --git a/src/core/utils/string.rs b/src/core/utils/string.rs index e65a33698..6baa9c35a 100644 --- a/src/core/utils/string.rs +++ b/src/core/utils/string.rs @@ -84,7 +84,7 @@ where /// Find the common prefix from a collection of strings and return a slice /// ``` -/// use conduit_core::utils::string::common_prefix; +/// use conduwiit_core::utils::string::common_prefix; /// let input = ["conduwuit", "conduit", "construct"]; /// common_prefix(&input) == "con"; /// ``` diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml index 1deaf9807..efd18a1a8 100644 --- a/src/database/Cargo.toml +++ b/src/database/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduit_database" +name = "conduwuit_database" categories.workspace = true description.workspace = true edition.workspace = true @@ -37,7 +37,7 @@ zstd_compression = [ [dependencies] arrayvec.workspace = true async-channel.workspace = true -conduit-core.workspace = true +conduwuit-core.workspace = true const-str.workspace = true futures.workspace = true log.workspace = true diff --git a/src/database/database.rs b/src/database/database.rs index 3df95dced..bd8dcb1ab 100644 --- a/src/database/database.rs +++ b/src/database/database.rs @@ -1,6 +1,6 @@ use std::{ops::Index, sync::Arc}; -use conduit::{err, Result, Server}; +use conduwuit::{err, Result, Server}; use crate::{ maps, diff --git a/src/database/de.rs b/src/database/de.rs index d303eab29..ac8c021f4 100644 --- a/src/database/de.rs +++ b/src/database/de.rs @@ -1,5 +1,5 @@ use arrayvec::ArrayVec; -use conduit::{checked, debug::DebugInspect, err, utils::string, Error, Result}; +use conduwuit::{checked, debug::DebugInspect, err, utils::string, Error, Result}; use serde::{ de, de::{DeserializeSeed, Visitor}, @@ -331,7 +331,7 @@ impl<'a, 'de: 'a> de::Deserializer<'de> for &'a mut Deserializer<'de> { fn deserialize_any>(self, visitor: V) -> Result { debug_assert_eq!( - conduit::debug::type_name::(), + conduwuit::debug::type_name::(), "serde_json::value::de::::deserialize::ValueVisitor", "deserialize_any: type not expected" diff --git a/src/database/deserialized.rs b/src/database/deserialized.rs index a59b2ce54..66541b2a9 100644 --- a/src/database/deserialized.rs +++ b/src/database/deserialized.rs @@ -1,6 +1,6 @@ use std::convert::identity; -use conduit::Result; +use conduwuit::Result; use serde::Deserialize; pub trait Deserialized { diff --git a/src/database/engine.rs b/src/database/engine.rs index d3bb727e4..72fe11e62 100644 --- a/src/database/engine.rs +++ b/src/database/engine.rs @@ -6,7 +6,7 @@ use std::{ sync::{atomic::AtomicU32, Arc, Mutex, RwLock}, }; -use conduit::{debug, error, info, utils::time::rfc2822_from_seconds, warn, Err, Result, Server}; +use conduwuit::{debug, error, info, utils::time::rfc2822_from_seconds, warn, Err, Result, Server}; use rocksdb::{ backup::{BackupEngine, BackupEngineOptions}, perf::get_memory_usage_stats, diff --git a/src/database/handle.rs b/src/database/handle.rs index 356bd8593..b4d34b85c 100644 --- a/src/database/handle.rs +++ b/src/database/handle.rs @@ -1,6 +1,6 @@ use std::{fmt, fmt::Debug, ops::Deref}; -use conduit::Result; +use conduwuit::Result; use rocksdb::DBPinnableSlice; use serde::{Deserialize, Serialize, Serializer}; diff --git a/src/database/keyval.rs b/src/database/keyval.rs index d4568600e..056e53d14 100644 --- a/src/database/keyval.rs +++ b/src/database/keyval.rs @@ -1,4 +1,4 @@ -use conduit::Result; +use conduwuit::Result; use serde::{Deserialize, Serialize}; use smallvec::SmallVec; diff --git a/src/database/map.rs b/src/database/map.rs index 0f4d740ae..09721b2a7 100644 --- a/src/database/map.rs +++ b/src/database/map.rs @@ -27,7 +27,7 @@ use std::{ sync::Arc, }; -use conduit::Result; +use conduwuit::Result; use rocksdb::{AsColumnFamilyRef, ColumnFamily, ReadOptions, ReadTier, WriteOptions}; use crate::{watchers::Watchers, Engine}; diff --git a/src/database/map/contains.rs b/src/database/map/contains.rs index 7016b744c..aa3ea676f 100644 --- a/src/database/map/contains.rs +++ b/src/database/map/contains.rs @@ -1,7 +1,7 @@ use std::{convert::AsRef, fmt::Debug, future::Future, io::Write, sync::Arc}; use arrayvec::ArrayVec; -use conduit::{ +use conduwuit::{ err, implement, utils::{future::TryExtExt, result::FlatOk}, Result, diff --git a/src/database/map/count.rs b/src/database/map/count.rs index 894fe12e1..7b632bb36 100644 --- a/src/database/map/count.rs +++ b/src/database/map/count.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, future::Future, sync::Arc}; -use conduit::implement; +use conduwuit::implement; use futures::stream::StreamExt; use serde::Serialize; diff --git a/src/database/map/get.rs b/src/database/map/get.rs index 795566568..88023b1ce 100644 --- a/src/database/map/get.rs +++ b/src/database/map/get.rs @@ -1,7 +1,7 @@ use std::{convert::AsRef, fmt::Debug, io::Write, sync::Arc}; use arrayvec::ArrayVec; -use conduit::{err, implement, utils::result::MapExpect, Err, Result}; +use conduwuit::{err, implement, utils::result::MapExpect, Err, Result}; use futures::{Future, FutureExt}; use serde::Serialize; use tokio::task; diff --git a/src/database/map/get_batch.rs b/src/database/map/get_batch.rs index bb904943a..5f444cce2 100644 --- a/src/database/map/get_batch.rs +++ b/src/database/map/get_batch.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{err, implement, utils::IterStream, Result}; +use conduwuit::{err, implement, utils::IterStream, Result}; use futures::{Stream, StreamExt}; use serde::Serialize; diff --git a/src/database/map/insert.rs b/src/database/map/insert.rs index 5b2e816c7..68c305af8 100644 --- a/src/database/map/insert.rs +++ b/src/database/map/insert.rs @@ -6,7 +6,7 @@ use std::{convert::AsRef, fmt::Debug, io::Write}; use arrayvec::ArrayVec; -use conduit::implement; +use conduwuit::implement; use rocksdb::WriteBatchWithTransaction; use serde::Serialize; diff --git a/src/database/map/keys.rs b/src/database/map/keys.rs index 3c4d491bf..3ab5baccf 100644 --- a/src/database/map/keys.rs +++ b/src/database/map/keys.rs @@ -1,4 +1,4 @@ -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{Stream, StreamExt}; use serde::Deserialize; diff --git a/src/database/map/keys_from.rs b/src/database/map/keys_from.rs index 40c608f2e..2f6d20206 100644 --- a/src/database/map/keys_from.rs +++ b/src/database/map/keys_from.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/keys_prefix.rs b/src/database/map/keys_prefix.rs index 9122d78eb..24112ac12 100644 --- a/src/database/map/keys_prefix.rs +++ b/src/database/map/keys_prefix.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{ future, stream::{Stream, StreamExt}, diff --git a/src/database/map/remove.rs b/src/database/map/remove.rs index 18080c644..ec37bbfe0 100644 --- a/src/database/map/remove.rs +++ b/src/database/map/remove.rs @@ -1,7 +1,7 @@ use std::{convert::AsRef, fmt::Debug, io::Write}; use arrayvec::ArrayVec; -use conduit::implement; +use conduwuit::implement; use serde::Serialize; use crate::{keyval::KeyBuf, ser, util::or_else}; diff --git a/src/database/map/rev_keys.rs b/src/database/map/rev_keys.rs index 1e000a47a..7eb4ce63d 100644 --- a/src/database/map/rev_keys.rs +++ b/src/database/map/rev_keys.rs @@ -1,4 +1,4 @@ -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{Stream, StreamExt}; use serde::Deserialize; diff --git a/src/database/map/rev_keys_from.rs b/src/database/map/rev_keys_from.rs index b5565aa4c..c895105cd 100644 --- a/src/database/map/rev_keys_from.rs +++ b/src/database/map/rev_keys_from.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/rev_keys_prefix.rs b/src/database/map/rev_keys_prefix.rs index 69dc54f2e..a5ed35ec2 100644 --- a/src/database/map/rev_keys_prefix.rs +++ b/src/database/map/rev_keys_prefix.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{ future, stream::{Stream, StreamExt}, diff --git a/src/database/map/rev_stream.rs b/src/database/map/rev_stream.rs index 5f61cb081..813598006 100644 --- a/src/database/map/rev_stream.rs +++ b/src/database/map/rev_stream.rs @@ -1,4 +1,4 @@ -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::stream::{Stream, StreamExt}; use serde::Deserialize; diff --git a/src/database/map/rev_stream_from.rs b/src/database/map/rev_stream_from.rs index 542a5ba81..2d6a76b79 100644 --- a/src/database/map/rev_stream_from.rs +++ b/src/database/map/rev_stream_from.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{ stream::{Stream, StreamExt}, FutureExt, TryFutureExt, TryStreamExt, diff --git a/src/database/map/rev_stream_prefix.rs b/src/database/map/rev_stream_prefix.rs index e5c2fbeae..13aa40f26 100644 --- a/src/database/map/rev_stream_prefix.rs +++ b/src/database/map/rev_stream_prefix.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{ future, stream::{Stream, StreamExt}, diff --git a/src/database/map/stream.rs b/src/database/map/stream.rs index 67cfff1b6..c2d9b6b81 100644 --- a/src/database/map/stream.rs +++ b/src/database/map/stream.rs @@ -1,4 +1,4 @@ -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::stream::{Stream, StreamExt}; use serde::Deserialize; diff --git a/src/database/map/stream_from.rs b/src/database/map/stream_from.rs index 6468846fb..c6fe439a8 100644 --- a/src/database/map/stream_from.rs +++ b/src/database/map/stream_from.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{ stream::{Stream, StreamExt}, FutureExt, TryFutureExt, TryStreamExt, diff --git a/src/database/map/stream_prefix.rs b/src/database/map/stream_prefix.rs index 3c7bce2ec..e7dad2114 100644 --- a/src/database/map/stream_prefix.rs +++ b/src/database/map/stream_prefix.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use futures::{ future, stream::{Stream, StreamExt}, diff --git a/src/database/maps.rs b/src/database/maps.rs index 9b8d326a0..d69cc7fd9 100644 --- a/src/database/maps.rs +++ b/src/database/maps.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, sync::Arc}; -use conduit::Result; +use conduwuit::Result; use crate::{Engine, Map}; diff --git a/src/database/mod.rs b/src/database/mod.rs index de060b3a3..183cba8dd 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -20,7 +20,7 @@ pub(crate) use self::{ util::{or_else, result}, }; -extern crate conduit_core as conduit; +extern crate conduwuit_core as conduwuit; extern crate rust_rocksdb as rocksdb; pub use self::{ @@ -33,6 +33,6 @@ pub use self::{ ser::{serialize, serialize_to, serialize_to_vec, Interfix, Json, Separator, SEP}, }; -conduit::mod_ctor! {} -conduit::mod_dtor! {} -conduit::rustc_flags_capture! {} +conduwuit::mod_ctor! {} +conduwuit::mod_dtor! {} +conduwuit::rustc_flags_capture! {} diff --git a/src/database/opts.rs b/src/database/opts.rs index b0b339274..52ed48189 100644 --- a/src/database/opts.rs +++ b/src/database/opts.rs @@ -1,6 +1,6 @@ use std::{cmp, collections::HashMap, convert::TryFrom}; -use conduit::{err, utils, Config, Result}; +use conduwuit::{err, utils, Config, Result}; use rocksdb::{ statistics::StatsLevel, BlockBasedOptions, Cache, DBCompactionStyle, DBCompressionType, DBRecoveryMode, Env, LogLevel, LruCacheOptions, Options, UniversalCompactOptions, UniversalCompactionStopStyle, diff --git a/src/database/pool.rs b/src/database/pool.rs index 79755ea67..3301b821a 100644 --- a/src/database/pool.rs +++ b/src/database/pool.rs @@ -7,7 +7,7 @@ use std::{ }; use async_channel::{bounded, Receiver, RecvError, Sender}; -use conduit::{debug, debug_warn, defer, err, implement, result::DebugInspect, Result, Server}; +use conduwuit::{debug, debug_warn, defer, err, implement, result::DebugInspect, Result, Server}; use futures::{channel::oneshot, TryFutureExt}; use oneshot::Sender as ResultSender; use rocksdb::Direction; diff --git a/src/database/ser.rs b/src/database/ser.rs index a60812aa1..8abe55218 100644 --- a/src/database/ser.rs +++ b/src/database/ser.rs @@ -1,6 +1,6 @@ use std::io::Write; -use conduit::{debug::type_name, err, result::DebugInspect, utils::exchange, Error, Result}; +use conduwuit::{debug::type_name, err, result::DebugInspect, utils::exchange, Error, Result}; use serde::{ser, Serialize}; use crate::util::unhandled; diff --git a/src/database/stream.rs b/src/database/stream.rs index 38c465966..775fb930d 100644 --- a/src/database/stream.rs +++ b/src/database/stream.rs @@ -5,7 +5,7 @@ mod keys_rev; use std::sync::Arc; -use conduit::{utils::exchange, Error, Result}; +use conduwuit::{utils::exchange, Error, Result}; use rocksdb::{ColumnFamily, DBRawIteratorWithThreadMode, ReadOptions}; pub(crate) use self::{items::Items, items_rev::ItemsRev, keys::Keys, keys_rev::KeysRev}; diff --git a/src/database/stream/items.rs b/src/database/stream/items.rs index 77b08a0bc..06cb6de98 100644 --- a/src/database/stream/items.rs +++ b/src/database/stream/items.rs @@ -1,6 +1,6 @@ use std::{convert, pin::Pin, sync::Arc}; -use conduit::Result; +use conduwuit::Result; use futures::{ stream::FusedStream, task::{Context, Poll}, diff --git a/src/database/stream/items_rev.rs b/src/database/stream/items_rev.rs index dfd3a1075..2d0c46391 100644 --- a/src/database/stream/items_rev.rs +++ b/src/database/stream/items_rev.rs @@ -1,6 +1,6 @@ use std::{convert, pin::Pin, sync::Arc}; -use conduit::Result; +use conduwuit::Result; use futures::{ stream::FusedStream, task::{Context, Poll}, diff --git a/src/database/stream/keys.rs b/src/database/stream/keys.rs index 2ce889597..a901b3421 100644 --- a/src/database/stream/keys.rs +++ b/src/database/stream/keys.rs @@ -1,6 +1,6 @@ use std::{convert, pin::Pin, sync::Arc}; -use conduit::Result; +use conduwuit::Result; use futures::{ stream::FusedStream, task::{Context, Poll}, diff --git a/src/database/stream/keys_rev.rs b/src/database/stream/keys_rev.rs index 12dae7599..73758a857 100644 --- a/src/database/stream/keys_rev.rs +++ b/src/database/stream/keys_rev.rs @@ -1,6 +1,6 @@ use std::{convert, pin::Pin, sync::Arc}; -use conduit::Result; +use conduwuit::Result; use futures::{ stream::FusedStream, task::{Context, Poll}, diff --git a/src/database/tests.rs b/src/database/tests.rs index bfab99ef0..7f486966a 100644 --- a/src/database/tests.rs +++ b/src/database/tests.rs @@ -4,7 +4,7 @@ use std::fmt::Debug; use arrayvec::ArrayVec; -use conduit::ruma::{serde::Raw, RoomId, UserId}; +use conduwuit::ruma::{serde::Raw, RoomId, UserId}; use serde::Serialize; use crate::{ @@ -53,7 +53,7 @@ fn ser_overflow() { #[test] fn ser_complex() { - use conduit::ruma::Mxc; + use conduwuit::ruma::Mxc; #[derive(Debug, Serialize)] struct Dim { @@ -90,7 +90,7 @@ fn ser_complex() { #[test] fn ser_json() { - use conduit::ruma::api::client::filter::FilterDefinition; + use conduwuit::ruma::api::client::filter::FilterDefinition; let filter = FilterDefinition { event_fields: Some(vec!["content.body".to_owned()]), @@ -105,7 +105,7 @@ fn ser_json() { #[test] fn ser_json_value() { - use conduit::ruma::api::client::filter::FilterDefinition; + use conduwuit::ruma::api::client::filter::FilterDefinition; let filter = FilterDefinition { event_fields: Some(vec!["content.body".to_owned()]), @@ -146,7 +146,7 @@ fn ser_json_macro() { #[test] #[should_panic(expected = "serializing string at the top-level")] fn ser_json_raw() { - use conduit::ruma::api::client::filter::FilterDefinition; + use conduwuit::ruma::api::client::filter::FilterDefinition; let filter = FilterDefinition { event_fields: Some(vec!["content.body".to_owned()]), @@ -162,7 +162,7 @@ fn ser_json_raw() { #[test] #[should_panic(expected = "you can skip serialization instead")] fn ser_json_raw_json() { - use conduit::ruma::api::client::filter::FilterDefinition; + use conduwuit::ruma::api::client::filter::FilterDefinition; let filter = FilterDefinition { event_fields: Some(vec!["content.body".to_owned()]), diff --git a/src/database/util.rs b/src/database/util.rs index 217643614..0fca3b68e 100644 --- a/src/database/util.rs +++ b/src/database/util.rs @@ -1,4 +1,4 @@ -use conduit::{err, Result}; +use conduwuit::{err, Result}; use rocksdb::{Direction, ErrorKind, IteratorMode}; //#[cfg(debug_assertions)] @@ -36,19 +36,19 @@ pub(crate) fn _into_direction(mode: &IteratorMode<'_>) -> Direction { } #[inline] -pub(crate) fn result(r: std::result::Result) -> Result { +pub(crate) fn result(r: std::result::Result) -> Result { r.map_or_else(or_else, and_then) } #[inline(always)] -pub(crate) fn and_then(t: T) -> Result { Ok(t) } +pub(crate) fn and_then(t: T) -> Result { Ok(t) } -pub(crate) fn or_else(e: rocksdb::Error) -> Result { Err(map_err(e)) } +pub(crate) fn or_else(e: rocksdb::Error) -> Result { Err(map_err(e)) } #[inline] pub(crate) fn is_incomplete(e: &rocksdb::Error) -> bool { e.kind() == ErrorKind::Incomplete } -pub(crate) fn map_err(e: rocksdb::Error) -> conduit::Error { +pub(crate) fn map_err(e: rocksdb::Error) -> conduwuit::Error { let string = e.into_string(); err!(Database(error!("{string}"))) } diff --git a/src/macros/Cargo.toml b/src/macros/Cargo.toml index 9e8665784..167de8c07 100644 --- a/src/macros/Cargo.toml +++ b/src/macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduit_macros" +name = "conduwuit_macros" categories.workspace = true description.workspace = true edition.workspace = true @@ -10,7 +10,7 @@ repository.workspace = true version.workspace = true [lib] -name = "conduit_macros" +name = "conduwuit_macros" path = "mod.rs" proc-macro = true diff --git a/src/macros/admin.rs b/src/macros/admin.rs index d4ce7ad5f..b0dc19560 100644 --- a/src/macros/admin.rs +++ b/src/macros/admin.rs @@ -8,7 +8,7 @@ use crate::{utils::camel_to_snake_string, Result}; pub(super) fn command(mut item: ItemFn, _args: &[Meta]) -> Result { let attr: Attribute = parse_quote! { - #[conduit_macros::implement(crate::Command, params = "<'_>")] + #[conduwuit_macros::implement(crate::Command, params = "<'_>")] }; item.attrs.push(attr); diff --git a/src/macros/rustc.rs b/src/macros/rustc.rs index d286ed33a..f484e5f50 100644 --- a/src/macros/rustc.rs +++ b/src/macros/rustc.rs @@ -5,7 +5,7 @@ pub(super) fn flags_capture(args: TokenStream) -> TokenStream { let cargo_crate_name = std::env::var("CARGO_CRATE_NAME"); let crate_name = match cargo_crate_name.as_ref() { Err(_) => return args, - Ok(crate_name) => crate_name.trim_start_matches("conduit_"), + Ok(crate_name) => crate_name.trim_start_matches("conduwuit_"), }; let flag = std::env::args().collect::>(); @@ -13,15 +13,15 @@ pub(super) fn flags_capture(args: TokenStream) -> TokenStream { let ret = quote! { pub static RUSTC_FLAGS: [&str; #flag_len] = [#( #flag ),*]; - #[conduit_core::ctor] + #[conduwuit_core::ctor] fn _set_rustc_flags() { - conduit_core::info::rustc::FLAGS.lock().expect("locked").insert(#crate_name, &RUSTC_FLAGS); + conduwuit_core::info::rustc::FLAGS.lock().expect("locked").insert(#crate_name, &RUSTC_FLAGS); } // static strings have to be yanked on module unload - #[conduit_core::dtor] + #[conduwuit_core::dtor] fn _unset_rustc_flags() { - conduit_core::info::rustc::FLAGS.lock().expect("locked").remove(#crate_name); + conduwuit_core::info::rustc::FLAGS.lock().expect("locked").remove(#crate_name); } }; diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index ee434ceb8..99d416142 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -1,7 +1,6 @@ [package] -# TODO: when can we rename to conduwuit? -name = "conduit" -default-run = "conduit" +name = "conduwuit" +default-run = "conduwuit" authors.workspace = true categories.workspace = true description.workspace = true @@ -48,49 +47,49 @@ default = [ ] brotli_compression = [ - "conduit-api/brotli_compression", - "conduit-core/brotli_compression", - "conduit-router/brotli_compression", - "conduit-service/brotli_compression", + "conduwuit-api/brotli_compression", + "conduwuit-core/brotli_compression", + "conduwuit-router/brotli_compression", + "conduwuit-service/brotli_compression", ] console = [ - "conduit-service/console", + "conduwuit-service/console", ] #dev_release_log_level = [ -# "conduit-admin/dev_release_log_level", -# "conduit-api/dev_release_log_level", -# "conduit-core/dev_release_log_level", -# "conduit-database/dev_release_log_level", -# "conduit-router/dev_release_log_level", -# "conduit-service/dev_release_log_level", +# "conduwuit-admin/dev_release_log_level", +# "conduwuit-api/dev_release_log_level", +# "conduwuit-core/dev_release_log_level", +# "conduwuit-database/dev_release_log_level", +# "conduwuit-router/dev_release_log_level", +# "conduwuit-service/dev_release_log_level", #] direct_tls = [ - "conduit-router/direct_tls" + "conduwuit-router/direct_tls" ] element_hacks = [ - "conduit-api/element_hacks", - "conduit-service/element_hacks", + "conduwuit-api/element_hacks", + "conduwuit-service/element_hacks", ] gzip_compression = [ - "conduit-api/gzip_compression", - "conduit-router/gzip_compression", - "conduit-service/gzip_compression", + "conduwuit-api/gzip_compression", + "conduwuit-router/gzip_compression", + "conduwuit-service/gzip_compression", ] hardened_malloc = [ - "conduit-core/hardened_malloc", + "conduwuit-core/hardened_malloc", ] io_uring = [ - "conduit-database/io_uring", + "conduwuit-database/io_uring", ] jemalloc = [ - "conduit-core/jemalloc", - "conduit-database/jemalloc", + "conduwuit-core/jemalloc", + "conduwuit-database/jemalloc", ] jemalloc_prof = [ - "conduit-core/jemalloc_prof", + "conduwuit-core/jemalloc_prof", ] jemalloc_stats = [ - "conduit-core/jemalloc_stats", + "conduwuit-core/jemalloc_stats", ] perf_measurements = [ "dep:opentelemetry", @@ -98,8 +97,8 @@ perf_measurements = [ "dep:tracing-opentelemetry", "dep:opentelemetry_sdk", "dep:opentelemetry-jaeger", - "conduit-core/perf_measurements", - "conduit-core/sentry_telemetry", + "conduwuit-core/perf_measurements", + "conduwuit-core/sentry_telemetry", ] # increases performance, reduces build times, and reduces binary size by not compiling or # genreating code for log level filters that users will generally not use (debug and trace) @@ -108,22 +107,22 @@ release_max_log_level = [ "tracing/release_max_level_info", "log/max_level_trace", "log/release_max_level_info", - "conduit-admin/release_max_log_level", - "conduit-api/release_max_log_level", - "conduit-core/release_max_log_level", - "conduit-database/release_max_log_level", - "conduit-router/release_max_log_level", - "conduit-service/release_max_log_level", + "conduwuit-admin/release_max_log_level", + "conduwuit-api/release_max_log_level", + "conduwuit-core/release_max_log_level", + "conduwuit-database/release_max_log_level", + "conduwuit-router/release_max_log_level", + "conduwuit-service/release_max_log_level", ] sentry_telemetry = [ "dep:sentry", "dep:sentry-tracing", "dep:sentry-tower", - "conduit-core/sentry_telemetry", - "conduit-router/sentry_telemetry", + "conduwuit-core/sentry_telemetry", + "conduwuit-router/sentry_telemetry", ] systemd = [ - "conduit-router/systemd", + "conduwuit-router/systemd", ] # enable the tokio_console server ncompatible with release_max_log_level tokio_console = [ @@ -131,19 +130,19 @@ tokio_console = [ "tokio/tracing", ] zstd_compression = [ - "conduit-api/zstd_compression", - "conduit-core/zstd_compression", - "conduit-database/zstd_compression", - "conduit-router/zstd_compression", + "conduwuit-api/zstd_compression", + "conduwuit-core/zstd_compression", + "conduwuit-database/zstd_compression", + "conduwuit-router/zstd_compression", ] [dependencies] -conduit-admin.workspace = true -conduit-api.workspace = true -conduit-core.workspace = true -conduit-database.workspace = true -conduit-router.workspace = true -conduit-service.workspace = true +conduwuit-admin.workspace = true +conduwuit-api.workspace = true +conduwuit-core.workspace = true +conduwuit-database.workspace = true +conduwuit-router.workspace = true +conduwuit-service.workspace = true tokio.workspace = true log.workspace = true @@ -184,5 +183,5 @@ hardened_malloc-rs.optional = true workspace = true [[bin]] -name = "conduit" +name = "conduwuit" path = "main.rs" diff --git a/src/main/clap.rs b/src/main/clap.rs index b10242be8..7e70bd800 100644 --- a/src/main/clap.rs +++ b/src/main/clap.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use clap::Parser; -use conduit::{ +use conduwuit::{ config::{Figment, FigmentValue}, err, toml, utils::available_parallelism, @@ -12,7 +12,7 @@ use conduit::{ /// Commandline arguments #[derive(Parser, Debug)] -#[clap(version = conduit::version(), about, long_about = None, name = "conduwuit")] +#[clap(version = conduwuit::version(), about, long_about = None, name = "conduwuit")] pub(crate) struct Args { #[arg(short, long)] /// Path to the config TOML file (optional) diff --git a/src/main/logging.rs b/src/main/logging.rs index efa47bab2..999265e77 100644 --- a/src/main/logging.rs +++ b/src/main/logging.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{ +use conduwuit::{ config::Config, debug_warn, err, log::{capture, fmt_span, LogLevelReloadHandles}, diff --git a/src/main/main.rs b/src/main/main.rs index 41b21b58a..5c0665847 100644 --- a/src/main/main.rs +++ b/src/main/main.rs @@ -6,14 +6,14 @@ mod sentry; mod server; mod signal; -extern crate conduit_core as conduit; +extern crate conduwuit_core as conduwuit; use std::{ sync::{atomic::Ordering, Arc}, time::Duration, }; -use conduit::{debug_info, error, rustc_flags_capture, Error, Result}; +use conduwuit::{debug_info, error, rustc_flags_capture, Error, Result}; use server::Server; use tokio::runtime; @@ -58,14 +58,14 @@ fn main() -> Result<(), Error> { /// Operate the server normally in release-mode static builds. This will start, /// run and stop the server within the asynchronous runtime. -#[cfg(not(conduit_mods))] +#[cfg(not(conduwuit_mods))] #[tracing::instrument( name = "main", parent = None, skip_all )] async fn async_main(server: &Arc) -> Result<(), Error> { - extern crate conduit_router as router; + extern crate conduwuit_router as router; match router::start(&server.server).await { Ok(services) => server.services.lock().await.insert(services), @@ -110,7 +110,7 @@ async fn async_main(server: &Arc) -> Result<(), Error> { /// Operate the server in developer-mode dynamic builds. This will start, run, /// and hot-reload portions of the server as-needed before returning for an /// actual shutdown. This is not available in release-mode or static builds. -#[cfg(conduit_mods)] +#[cfg(conduwuit_mods)] async fn async_main(server: &Arc) -> Result<(), Error> { let mut starts = true; let mut reloads = true; diff --git a/src/main/mods.rs b/src/main/mods.rs index 16d975cc4..ca984a641 100644 --- a/src/main/mods.rs +++ b/src/main/mods.rs @@ -1,7 +1,7 @@ -#![cfg(conduit_mods)] +#![cfg(conduwuit_mods)] #[unsafe(no_link)] -extern crate conduit_service; +extern crate conduwuit_service; use std::{ future::Future, @@ -9,13 +9,13 @@ use std::{ sync::{atomic::Ordering, Arc}, }; -use conduit::{debug, error, mods, Error, Result}; -use conduit_service::Services; +use conduwuit::{debug, error, mods, Error, Result}; +use conduwuit_service::Services; use crate::Server; type StartFuncResult = Pin>> + Send>>; -type StartFuncProto = fn(&Arc) -> StartFuncResult; +type StartFuncProto = fn(&Arc) -> StartFuncResult; type RunFuncResult = Pin> + Send>>; type RunFuncProto = fn(&Arc) -> RunFuncResult; @@ -23,19 +23,19 @@ type RunFuncProto = fn(&Arc) -> RunFuncResult; type StopFuncResult = Pin> + Send>>; type StopFuncProto = fn(Arc) -> StopFuncResult; -const RESTART_THRESH: &str = "conduit_service"; +const RESTART_THRESH: &str = "conduwuit_service"; const MODULE_NAMES: &[&str] = &[ - //"conduit_core", - "conduit_database", - "conduit_service", - "conduit_api", - "conduit_admin", - "conduit_router", + //"conduwuit_core", + "conduwuit_database", + "conduwuit_service", + "conduwuit_api", + "conduwuit_admin", + "conduwuit_router", ]; #[cfg(panic_trap)] -conduit::mod_init! {{ - conduit::debug::set_panic_trap(); +conduwuit::mod_init! {{ + conduwuit::debug::set_panic_trap(); }} pub(crate) async fn run(server: &Arc, starts: bool) -> Result<(bool, bool), Error> { diff --git a/src/main/restart.rs b/src/main/restart.rs index 009e5228a..e6f45b825 100644 --- a/src/main/restart.rs +++ b/src/main/restart.rs @@ -2,7 +2,7 @@ use std::{env, os::unix::process::CommandExt, process::Command}; -use conduit::{debug, info, utils}; +use conduwuit::{debug, info, utils}; #[cold] pub(super) fn restart() -> ! { diff --git a/src/main/sentry.rs b/src/main/sentry.rs index 04ad8654f..02835ec8a 100644 --- a/src/main/sentry.rs +++ b/src/main/sentry.rs @@ -5,7 +5,7 @@ use std::{ sync::{Arc, OnceLock}, }; -use conduit::{config::Config, debug, trace}; +use conduwuit::{config::Config, debug, trace}; use sentry::{ types::{ protocol::v7::{Context, Event}, @@ -43,7 +43,7 @@ fn options(config: &Config) -> ClientOptions { traces_sample_rate: config.sentry_traces_sample_rate, debug: cfg!(debug_assertions), release: sentry::release_name!(), - user_agent: conduit::version::user_agent().into(), + user_agent: conduwuit::version::user_agent().into(), attach_stacktrace: config.sentry_attach_stacktrace, before_send: Some(Arc::new(before_send)), before_breadcrumb: Some(Arc::new(before_breadcrumb)), diff --git a/src/main/server.rs b/src/main/server.rs index 179749b5f..7c3eec1f7 100644 --- a/src/main/server.rs +++ b/src/main/server.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{config::Config, info, log::Log, utils::sys, Error, Result}; +use conduwuit::{config::Config, info, log::Log, utils::sys, Error, Result}; use tokio::{runtime, sync::Mutex}; use crate::{clap::Args, logging::TracingFlameGuard}; @@ -8,18 +8,18 @@ use crate::{clap::Args, logging::TracingFlameGuard}; /// Server runtime state; complete pub(crate) struct Server { /// Server runtime state; public portion - pub(crate) server: Arc, + pub(crate) server: Arc, - pub(crate) services: Mutex>>, + pub(crate) services: Mutex>>, _tracing_flame_guard: TracingFlameGuard, #[cfg(feature = "sentry_telemetry")] _sentry_guard: Option<::sentry::ClientInitGuard>, - #[cfg(conduit_mods)] + #[cfg(conduwuit_mods)] // Module instances; TODO: move to mods::loaded mgmt vector - pub(crate) mods: tokio::sync::RwLock>, + pub(crate) mods: tokio::sync::RwLock>, } impl Server { @@ -45,11 +45,11 @@ impl Server { database_path = ?config.database_path, log_levels = %config.log, "{}", - conduit::version(), + conduwuit::version(), ); Ok(Arc::new(Self { - server: Arc::new(conduit::Server::new( + server: Arc::new(conduwuit::Server::new( config, runtime.cloned(), Log { @@ -65,7 +65,7 @@ impl Server { #[cfg(feature = "sentry_telemetry")] _sentry_guard: sentry_guard, - #[cfg(conduit_mods)] + #[cfg(conduwuit_mods)] mods: tokio::sync::RwLock::new(Vec::new()), })) } diff --git a/src/main/signal.rs b/src/main/signal.rs index 139aab783..0f5410995 100644 --- a/src/main/signal.rs +++ b/src/main/signal.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{debug_error, trace, warn}; +use conduwuit::{debug_error, trace, warn}; use tokio::signal; use super::server::Server; @@ -12,7 +12,7 @@ pub(super) async fn signal(server: Arc) { use unix::SignalKind; const CONSOLE: bool = cfg!(feature = "console"); - const RELOADING: bool = cfg!(all(conduit_mods, not(CONSOLE))); + const RELOADING: bool = cfg!(all(conduwuit_mods, not(CONSOLE))); let mut quit = unix::signal(SignalKind::quit()).expect("SIGQUIT handler"); let mut term = unix::signal(SignalKind::terminate()).expect("SIGTERM handler"); diff --git a/src/router/Cargo.toml b/src/router/Cargo.toml index e15358687..1b2c248e4 100644 --- a/src/router/Cargo.toml +++ b/src/router/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduit_router" +name = "conduwuit_router" categories.workspace = true description.workspace = true edition.workspace = true @@ -55,10 +55,10 @@ axum-server-dual-protocol.optional = true axum-server.workspace = true axum.workspace = true bytes.workspace = true -conduit-admin.workspace = true -conduit-api.workspace = true -conduit-core.workspace = true -conduit-service.workspace = true +conduwuit-admin.workspace = true +conduwuit-api.workspace = true +conduwuit-core.workspace = true +conduwuit-service.workspace = true const-str.workspace = true futures.workspace = true http.workspace = true diff --git a/src/router/layers.rs b/src/router/layers.rs index bb3ffe879..1c5beacec 100644 --- a/src/router/layers.rs +++ b/src/router/layers.rs @@ -5,9 +5,9 @@ use axum::{ Router, }; use axum_client_ip::SecureClientIpSource; -use conduit::{error, Result, Server}; -use conduit_api::router::state::Guard; -use conduit_service::Services; +use conduwuit::{error, Result, Server}; +use conduwuit_api::router::state::Guard; +use conduwuit_service::Services; use http::{ header::{self, HeaderName}, HeaderValue, Method, StatusCode, @@ -155,7 +155,7 @@ fn body_limit_layer(server: &Server) -> DefaultBodyLimit { DefaultBodyLimit::max fn catch_panic(err: Box) -> http::Response> { //TODO: XXX /* - conduit_service::services() + conduwuit_service::services() .server .metrics .requests_panic diff --git a/src/router/mod.rs b/src/router/mod.rs index 215000cba..aab0b1850 100644 --- a/src/router/mod.rs +++ b/src/router/mod.rs @@ -4,17 +4,17 @@ mod router; mod run; mod serve; -extern crate conduit_core as conduit; +extern crate conduwuit_core as conduwuit; use std::{panic::AssertUnwindSafe, pin::Pin, sync::Arc}; -use conduit::{Error, Result, Server}; -use conduit_service::Services; +use conduwuit::{Error, Result, Server}; +use conduwuit_service::Services; use futures::{Future, FutureExt, TryFutureExt}; -conduit::mod_ctor! {} -conduit::mod_dtor! {} -conduit::rustc_flags_capture! {} +conduwuit::mod_ctor! {} +conduwuit::mod_dtor! {} +conduwuit::rustc_flags_capture! {} #[unsafe(no_mangle)] pub extern "Rust" fn start(server: &Arc) -> Pin>> + Send>> { diff --git a/src/router/request.rs b/src/router/request.rs index 13d36981b..b17e9c4fd 100644 --- a/src/router/request.rs +++ b/src/router/request.rs @@ -4,8 +4,8 @@ use axum::{ extract::State, response::{IntoResponse, Response}, }; -use conduit::{debug, debug_error, debug_warn, defer, err, error, trace, Result}; -use conduit_service::Services; +use conduwuit::{debug, debug_error, debug_warn, defer, err, error, trace, Result}; +use conduwuit_service::Services; use http::{Method, StatusCode, Uri}; #[tracing::instrument( diff --git a/src/router/router.rs b/src/router/router.rs index 31b3f3e4b..b35314180 100644 --- a/src/router/router.rs +++ b/src/router/router.rs @@ -1,16 +1,16 @@ use std::sync::Arc; use axum::{response::IntoResponse, routing::get, Router}; -use conduit::Error; -use conduit_api::router::{state, state::Guard}; -use conduit_service::Services; +use conduwuit::Error; +use conduwuit_api::router::{state, state::Guard}; +use conduwuit_service::Services; use http::{StatusCode, Uri}; use ruma::api::client::error::ErrorKind; pub(crate) fn build(services: &Arc) -> (Router, Guard) { let router = Router::::new(); let (state, guard) = state::create(services.clone()); - let router = conduit_api::router::build(router, &services.server) + let router = conduwuit_api::router::build(router, &services.server) .route("/", get(it_works)) .fallback(not_found) .with_state(state); diff --git a/src/router/run.rs b/src/router/run.rs index 93b1339b7..6d5c8923c 100644 --- a/src/router/run.rs +++ b/src/router/run.rs @@ -1,6 +1,6 @@ -extern crate conduit_admin as admin; -extern crate conduit_core as conduit; -extern crate conduit_service as service; +extern crate conduwuit_admin as admin; +extern crate conduwuit_core as conduwuit; +extern crate conduwuit_service as service; use std::{ sync::{atomic::Ordering, Arc}, @@ -8,7 +8,7 @@ use std::{ }; use axum_server::Handle as ServerHandle; -use conduit::{debug, debug_error, debug_info, error, info, Error, Result, Server}; +use conduwuit::{debug, debug_error, debug_info, error, info, Error, Result, Server}; use service::Services; use tokio::{ sync::broadcast::{self, Sender}, diff --git a/src/router/serve/mod.rs b/src/router/serve/mod.rs index b02547727..357923595 100644 --- a/src/router/serve/mod.rs +++ b/src/router/serve/mod.rs @@ -6,8 +6,8 @@ mod unix; use std::sync::Arc; use axum_server::Handle as ServerHandle; -use conduit::Result; -use conduit_service::Services; +use conduwuit::Result; +use conduwuit_service::Services; use tokio::sync::broadcast; use super::layers; @@ -28,7 +28,7 @@ pub(super) async fn serve( return tls::serve(server, app, handle, addrs).await; #[cfg(not(feature = "direct_tls"))] - return conduit::Err!(Config( + return conduwuit::Err!(Config( "tls", "conduwuit was not built with direct TLS support (\"direct_tls\")" )); diff --git a/src/router/serve/plain.rs b/src/router/serve/plain.rs index 144bff85d..f6b6fba43 100644 --- a/src/router/serve/plain.rs +++ b/src/router/serve/plain.rs @@ -5,7 +5,7 @@ use std::{ use axum::Router; use axum_server::{bind, Handle as ServerHandle}; -use conduit::{debug_info, info, Result, Server}; +use conduwuit::{debug_info, info, Result, Server}; use tokio::task::JoinSet; pub(super) async fn serve( diff --git a/src/router/serve/tls.rs b/src/router/serve/tls.rs index f8d690488..7f54cfccc 100644 --- a/src/router/serve/tls.rs +++ b/src/router/serve/tls.rs @@ -6,7 +6,7 @@ use axum_server_dual_protocol::{ axum_server::{bind_rustls, tls_rustls::RustlsConfig}, ServerExt, }; -use conduit::{err, Result, Server}; +use conduwuit::{err, Result, Server}; use tokio::task::JoinSet; use tracing::{debug, info, warn}; diff --git a/src/router/serve/unix.rs b/src/router/serve/unix.rs index dd2ecf6a5..fb37e125f 100644 --- a/src/router/serve/unix.rs +++ b/src/router/serve/unix.rs @@ -10,7 +10,7 @@ use axum::{ extract::{connect_info::IntoMakeServiceWithConnectInfo, Request}, Router, }; -use conduit::{debug, debug_error, info, result::UnwrapInfallible, trace, warn, Err, Result, Server}; +use conduwuit::{debug, debug_error, info, result::UnwrapInfallible, trace, warn, Err, Result, Server}; use hyper::{body::Incoming, service::service_fn}; use hyper_util::{ rt::{TokioExecutor, TokioIo}, diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 197478472..85c4ead9d 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduit_service" +name = "conduwuit_service" categories.workspace = true description.workspace = true edition.workspace = true @@ -44,8 +44,8 @@ arrayvec.workspace = true async-trait.workspace = true base64.workspace = true bytes.workspace = true -conduit-core.workspace = true -conduit-database.workspace = true +conduwuit-core.workspace = true +conduwuit-database.workspace = true const-str.workspace = true either.workspace = true futures.workspace = true diff --git a/src/service/account_data/mod.rs b/src/service/account_data/mod.rs index 5dc17640b..536a24e86 100644 --- a/src/service/account_data/mod.rs +++ b/src/service/account_data/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{ +use conduwuit::{ err, implement, utils::{result::LogErr, stream::TryIgnore, ReadyExt}, Err, Result, diff --git a/src/service/admin/console.rs b/src/service/admin/console.rs index 37af7452e..c25eb6c69 100644 --- a/src/service/admin/console.rs +++ b/src/service/admin/console.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, Mutex}, }; -use conduit::{debug, defer, error, log, Server}; +use conduwuit::{debug, defer, error, log, Server}; use futures::future::{AbortHandle, Abortable}; use ruma::events::room::message::RoomMessageEventContent; use rustyline_async::{Readline, ReadlineError, ReadlineEvent}; diff --git a/src/service/admin/create.rs b/src/service/admin/create.rs index 897d412d0..971fdf671 100644 --- a/src/service/admin/create.rs +++ b/src/service/admin/create.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use conduit::{pdu::PduBuilder, Result}; +use conduwuit::{pdu::PduBuilder, Result}; use ruma::{ events::room::{ canonical_alias::RoomCanonicalAliasEventContent, @@ -67,7 +67,7 @@ pub async fn create_admin_room(services: &Services) -> Result<()> { ) .await?; - // 2. Make conduit bot join + // 2. Make server user/bot join services .rooms .timeline diff --git a/src/service/admin/grant.rs b/src/service/admin/grant.rs index 090c0294a..2b05bfc78 100644 --- a/src/service/admin/grant.rs +++ b/src/service/admin/grant.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use conduit::{error, implement, Result}; +use conduwuit::{error, implement, Result}; use ruma::{ events::{ room::{ @@ -16,9 +16,9 @@ use ruma::{ use crate::pdu::PduBuilder; -/// Invite the user to the conduit admin room. +/// Invite the user to the conduwuit admin room. /// -/// In conduit, this is equivalent to granting admin privileges. +/// This is equivalent to granting server admin privileges. #[implement(super::Service)] pub async fn make_user_admin(&self, user_id: &UserId) -> Result<()> { let Ok(room_id) = self.get_admin_room().await else { diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs index 2860bd1bb..c4783565a 100644 --- a/src/service/admin/mod.rs +++ b/src/service/admin/mod.rs @@ -10,7 +10,7 @@ use std::{ }; use async_trait::async_trait; -use conduit::{debug, err, error, error::default_log, pdu::PduBuilder, Error, PduEvent, Result, Server}; +use conduwuit::{debug, err, error, error::default_log, pdu::PduBuilder, Error, PduEvent, Result, Server}; pub use create::create_admin_room; use futures::{FutureExt, TryFutureExt}; use loole::{Receiver, Sender}; diff --git a/src/service/admin/startup.rs b/src/service/admin/startup.rs index 9c02c9022..68ad4be1c 100644 --- a/src/service/admin/startup.rs +++ b/src/service/admin/startup.rs @@ -1,4 +1,4 @@ -use conduit::{debug, debug_info, error, implement, info, Err, Result}; +use conduwuit::{debug, debug_info, error, implement, info, Err, Result}; use ruma::events::room::message::RoomMessageEventContent; use tokio::time::{sleep, Duration}; diff --git a/src/service/appservice/mod.rs b/src/service/appservice/mod.rs index a55d65349..cf2921a72 100644 --- a/src/service/appservice/mod.rs +++ b/src/service/appservice/mod.rs @@ -4,7 +4,7 @@ mod registration_info; use std::{collections::BTreeMap, sync::Arc}; use async_trait::async_trait; -use conduit::{err, utils::stream::TryIgnore, Result}; +use conduwuit::{err, utils::stream::TryIgnore, Result}; use database::Map; use futures::{Future, StreamExt, TryStreamExt}; use ruma::{api::appservice::Registration, RoomAliasId, RoomId, UserId}; diff --git a/src/service/appservice/namespace_regex.rs b/src/service/appservice/namespace_regex.rs index 3529fc0ef..fe0fd91fd 100644 --- a/src/service/appservice/namespace_regex.rs +++ b/src/service/appservice/namespace_regex.rs @@ -1,4 +1,4 @@ -use conduit::Result; +use conduwuit::Result; use regex::RegexSet; use ruma::api::appservice::Namespace; diff --git a/src/service/appservice/registration_info.rs b/src/service/appservice/registration_info.rs index 2c8595b1b..612933be0 100644 --- a/src/service/appservice/registration_info.rs +++ b/src/service/appservice/registration_info.rs @@ -1,4 +1,4 @@ -use conduit::Result; +use conduwuit::Result; use ruma::{api::appservice::Registration, UserId}; use super::NamespaceRegex; diff --git a/src/service/client/mod.rs b/src/service/client/mod.rs index 71545541c..f2bc82561 100644 --- a/src/service/client/mod.rs +++ b/src/service/client/mod.rs @@ -1,6 +1,6 @@ use std::{sync::Arc, time::Duration}; -use conduit::{err, implement, trace, Config, Result}; +use conduwuit::{err, implement, trace, Config, Result}; use either::Either; use ipaddress::IPAddress; use reqwest::redirect; @@ -124,7 +124,7 @@ fn base(config: &Config) -> Result { .timeout(Duration::from_secs(config.request_total_timeout)) .pool_idle_timeout(Duration::from_secs(config.request_idle_timeout)) .pool_max_idle_per_host(config.request_idle_per_host.into()) - .user_agent(conduit::version::user_agent()) + .user_agent(conduwuit::version::user_agent()) .redirect(redirect::Policy::limited(6)) .connection_verbose(true); @@ -188,7 +188,7 @@ fn builder_interface(builder: reqwest::ClientBuilder, config: Option<&str>) -> R #[cfg(not(any(target_os = "android", target_os = "fuchsia", target_os = "linux")))] fn builder_interface(builder: reqwest::ClientBuilder, config: Option<&str>) -> Result { - use conduit::Err; + use conduwuit::Err; if let Some(iface) = config { Err!("Binding to network-interface {iface:?} by name is not supported on this platform.") diff --git a/src/service/emergency/mod.rs b/src/service/emergency/mod.rs index c99a0891e..5063fbd47 100644 --- a/src/service/emergency/mod.rs +++ b/src/service/emergency/mod.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use async_trait::async_trait; -use conduit::{error, warn, Result}; +use conduwuit::{error, warn, Result}; use ruma::{ events::{push_rules::PushRulesEventContent, GlobalAccountDataEvent, GlobalAccountDataEventType}, push::Ruleset, @@ -38,7 +38,7 @@ impl crate::Service for Service { self.set_emergency_access() .await - .inspect_err(|e| error!("Could not set the configured emergency password for the conduit user: {e}"))?; + .inspect_err(|e| error!("Could not set the configured emergency password for the server user: {e}"))?; Ok(()) } @@ -47,17 +47,17 @@ impl crate::Service for Service { } impl Service { - /// Sets the emergency password and push rules for the @conduit account in - /// case emergency password is set + /// Sets the emergency password and push rules for the server user account + /// in case emergency password is set async fn set_emergency_access(&self) -> Result { - let conduit_user = &self.services.globals.server_user; + let server_user = &self.services.globals.server_user; self.services .users - .set_password(conduit_user, self.services.globals.emergency_password().as_deref())?; + .set_password(server_user, self.services.globals.emergency_password().as_deref())?; let (ruleset, pwd_set) = match self.services.globals.emergency_password() { - Some(_) => (Ruleset::server_default(conduit_user), true), + Some(_) => (Ruleset::server_default(server_user), true), None => (Ruleset::new(), false), }; @@ -65,7 +65,7 @@ impl Service { .account_data .update( None, - conduit_user, + server_user, GlobalAccountDataEventType::PushRules.to_string().into(), &serde_json::to_value(&GlobalAccountDataEvent { content: PushRulesEventContent { @@ -83,7 +83,7 @@ impl Service { ); } else { // logs out any users still in the server service account and removes sessions - self.services.users.deactivate_account(conduit_user).await?; + self.services.users.deactivate_account(server_user).await?; } Ok(pwd_set) diff --git a/src/service/globals/data.rs b/src/service/globals/data.rs index f715e944a..5edd1f30a 100644 --- a/src/service/globals/data.rs +++ b/src/service/globals/data.rs @@ -1,6 +1,6 @@ use std::sync::{Arc, RwLock}; -use conduit::{utils, Result}; +use conduwuit::{utils, Result}; use database::{Database, Deserialized, Map}; pub struct Data { diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs index 081794e2e..2403b7033 100644 --- a/src/service/globals/mod.rs +++ b/src/service/globals/mod.rs @@ -7,7 +7,7 @@ use std::{ time::Instant, }; -use conduit::{error, Config, Result}; +use conduwuit::{error, Config, Result}; use data::Data; use regex::RegexSet; use ruma::{OwnedEventId, OwnedRoomAliasId, OwnedServerName, OwnedUserId, RoomAliasId, ServerName, UserId}; @@ -83,8 +83,8 @@ impl crate::Service for Service { .server .supported_room_version(&config.default_room_version) { - error!(config=?s.config.default_room_version, fallback=?conduit::config::default_default_room_version(), "Room version in config isn't supported, falling back to default version"); - s.config.default_room_version = conduit::config::default_default_room_version(); + error!(config=?s.config.default_room_version, fallback=?conduwuit::config::default_default_room_version(), "Room version in config isn't supported, falling back to default version"); + s.config.default_room_version = conduwuit::config::default_default_room_version(); }; Ok(Arc::new(s)) diff --git a/src/service/key_backups/mod.rs b/src/service/key_backups/mod.rs index bae6f2144..140fc7013 100644 --- a/src/service/key_backups/mod.rs +++ b/src/service/key_backups/mod.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, sync::Arc}; -use conduit::{ +use conduwuit::{ err, implement, utils::stream::{ReadyExt, TryIgnore}, Err, Result, diff --git a/src/service/manager.rs b/src/service/manager.rs index 7384e5127..3ce2e0a53 100644 --- a/src/service/manager.rs +++ b/src/service/manager.rs @@ -1,6 +1,6 @@ use std::{panic::AssertUnwindSafe, sync::Arc, time::Duration}; -use conduit::{debug, debug_warn, error, trace, utils::time, warn, Err, Error, Result, Server}; +use conduwuit::{debug, debug_warn, error, trace, utils::time, warn, Err, Error, Result, Server}; use futures::FutureExt; use tokio::{ sync::{Mutex, MutexGuard}, diff --git a/src/service/media/data.rs b/src/service/media/data.rs index 3922dec93..71fb1cdb3 100644 --- a/src/service/media/data.rs +++ b/src/service/media/data.rs @@ -1,6 +1,6 @@ use std::{sync::Arc, time::Duration}; -use conduit::{ +use conduwuit::{ debug, debug_info, err, utils::{str_from_bytes, stream::TryIgnore, string_from_bytes, ReadyExt}, Err, Error, Result, diff --git a/src/service/media/migrations.rs b/src/service/media/migrations.rs index 3d9c395ec..5932643bc 100644 --- a/src/service/media/migrations.rs +++ b/src/service/media/migrations.rs @@ -7,7 +7,7 @@ use std::{ time::Instant, }; -use conduit::{ +use conduwuit::{ debug, debug_info, debug_warn, error, info, utils::{stream::TryIgnore, ReadyExt}, warn, Config, Result, diff --git a/src/service/media/mod.rs b/src/service/media/mod.rs index c0b15726f..989e1c27f 100644 --- a/src/service/media/mod.rs +++ b/src/service/media/mod.rs @@ -9,7 +9,7 @@ use std::{path::PathBuf, sync::Arc, time::SystemTime}; use async_trait::async_trait; use base64::{engine::general_purpose, Engine as _}; -use conduit::{ +use conduwuit::{ debug, debug_error, debug_info, debug_warn, err, error, trace, utils::{self, MutexMap}, warn, Err, Result, Server, diff --git a/src/service/media/preview.rs b/src/service/media/preview.rs index eb9be560d..d571ac563 100644 --- a/src/service/media/preview.rs +++ b/src/service/media/preview.rs @@ -1,7 +1,7 @@ use std::{io::Cursor, time::SystemTime}; -use conduit::{debug, utils, Err, Result}; -use conduit_core::implement; +use conduwuit::{debug, utils, Err, Result}; +use conduwuit_core::implement; use image::ImageReader as ImgReader; use ipaddress::IPAddress; use ruma::Mxc; diff --git a/src/service/media/remote.rs b/src/service/media/remote.rs index 1c6c9ca02..8ec917b76 100644 --- a/src/service/media/remote.rs +++ b/src/service/media/remote.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, time::Duration}; -use conduit::{debug_warn, err, implement, utils::content_disposition::make_content_disposition, Err, Error, Result}; +use conduwuit::{debug_warn, err, implement, utils::content_disposition::make_content_disposition, Err, Error, Result}; use http::header::{HeaderValue, CONTENT_DISPOSITION, CONTENT_TYPE}; use ruma::{ api::{ diff --git a/src/service/media/thumbnail.rs b/src/service/media/thumbnail.rs index 04ec03039..42fc40e70 100644 --- a/src/service/media/thumbnail.rs +++ b/src/service/media/thumbnail.rs @@ -1,6 +1,6 @@ use std::{cmp, io::Cursor, num::Saturating as Sat}; -use conduit::{checked, err, Result}; +use conduwuit::{checked, err, Result}; use image::{imageops::FilterType, DynamicImage}; use ruma::{http_headers::ContentDisposition, media::Method, Mxc, UInt, UserId}; use tokio::{ diff --git a/src/service/migrations.rs b/src/service/migrations.rs index f9057036e..102ac7d4e 100644 --- a/src/service/migrations.rs +++ b/src/service/migrations.rs @@ -1,6 +1,6 @@ use std::cmp; -use conduit::{ +use conduwuit::{ debug, debug_info, debug_warn, error, info, result::NotFound, utils::{ @@ -41,9 +41,9 @@ pub(crate) async fn migrations(services: &Services) -> Result<()> { // Matrix resource ownership is based on the server name; changing it // requires recreating the database from scratch. if users_count > 0 { - let conduit_user = &services.globals.server_user; - if !services.users.exists(conduit_user).await { - error!("The {conduit_user} server user does not exist, and the database is not new."); + let server_user = &services.globals.server_user; + if !services.users.exists(server_user).await { + error!("The {server_user} server user does not exist, and the database is not new."); return Err!(Database( "Cannot reuse an existing database after changing the server name, please delete the old one first.", )); diff --git a/src/service/mod.rs b/src/service/mod.rs index c7dcc0c61..789994d30 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -25,14 +25,14 @@ pub mod uiaa; pub mod updates; pub mod users; -extern crate conduit_core as conduit; -extern crate conduit_database as database; +extern crate conduwuit_core as conduwuit; +extern crate conduwuit_database as database; -pub use conduit::{pdu, PduBuilder, PduCount, PduEvent}; +pub use conduwuit::{pdu, PduBuilder, PduCount, PduEvent}; pub(crate) use service::{Args, Dep, Service}; pub use crate::services::Services; -conduit::mod_ctor! {} -conduit::mod_dtor! {} -conduit::rustc_flags_capture! {} +conduwuit::mod_ctor! {} +conduwuit::mod_dtor! {} +conduwuit::rustc_flags_capture! {} diff --git a/src/service/presence/data.rs b/src/service/presence/data.rs index 68b2c3feb..dd0d8e726 100644 --- a/src/service/presence/data.rs +++ b/src/service/presence/data.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{ +use conduwuit::{ debug_warn, utils, utils::{stream::TryIgnore, ReadyExt}, Result, diff --git a/src/service/presence/mod.rs b/src/service/presence/mod.rs index 8e1521c5f..7e80e05ed 100644 --- a/src/service/presence/mod.rs +++ b/src/service/presence/mod.rs @@ -4,7 +4,7 @@ mod presence; use std::{sync::Arc, time::Duration}; use async_trait::async_trait; -use conduit::{checked, debug, error, result::LogErr, Error, Result, Server}; +use conduwuit::{checked, debug, error, result::LogErr, Error, Result, Server}; use futures::{stream::FuturesUnordered, Stream, StreamExt, TryFutureExt}; use ruma::{events::presence::PresenceEvent, presence::PresenceState, OwnedUserId, UInt, UserId}; use tokio::{sync::Mutex, time::sleep}; diff --git a/src/service/presence/presence.rs b/src/service/presence/presence.rs index c43720034..aed4a3f8c 100644 --- a/src/service/presence/presence.rs +++ b/src/service/presence/presence.rs @@ -1,4 +1,4 @@ -use conduit::{utils, Error, Result}; +use conduwuit::{utils, Error, Result}; use ruma::{ events::presence::{PresenceEvent, PresenceEventContent}, presence::PresenceState, diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs index ff1837db8..ffe822b7a 100644 --- a/src/service/pusher/mod.rs +++ b/src/service/pusher/mod.rs @@ -1,7 +1,7 @@ use std::{fmt::Debug, mem, sync::Arc}; use bytes::BytesMut; -use conduit::{ +use conduwuit::{ debug_warn, err, trace, utils::{stream::TryIgnore, string_from_bytes}, warn, Err, PduEvent, Result, diff --git a/src/service/resolver/actual.rs b/src/service/resolver/actual.rs index a4475216c..4d2da6958 100644 --- a/src/service/resolver/actual.rs +++ b/src/service/resolver/actual.rs @@ -3,7 +3,7 @@ use std::{ net::{IpAddr, SocketAddr}, }; -use conduit::{debug, debug_error, debug_info, debug_warn, err, error, trace, Err, Result}; +use conduwuit::{debug, debug_error, debug_info, debug_warn, err, error, trace, Err, Result}; use hickory_resolver::error::ResolveError; use ipaddress::IPAddress; use ruma::ServerName; diff --git a/src/service/resolver/cache.rs b/src/service/resolver/cache.rs index a13399dc8..ca65db353 100644 --- a/src/service/resolver/cache.rs +++ b/src/service/resolver/cache.rs @@ -6,7 +6,7 @@ use std::{ }; use arrayvec::ArrayVec; -use conduit::{trace, utils::rand}; +use conduwuit::{trace, utils::rand}; use ruma::{OwnedServerName, ServerName}; use super::fed::FedDest; diff --git a/src/service/resolver/dns.rs b/src/service/resolver/dns.rs index d3e9f5c93..54905647c 100644 --- a/src/service/resolver/dns.rs +++ b/src/service/resolver/dns.rs @@ -1,6 +1,6 @@ use std::{net::SocketAddr, sync::Arc, time::Duration}; -use conduit::{err, Result, Server}; +use conduwuit::{err, Result, Server}; use futures::FutureExt; use hickory_resolver::TokioAsyncResolver; use reqwest::dns::{Addrs, Name, Resolve, Resolving}; diff --git a/src/service/resolver/mod.rs b/src/service/resolver/mod.rs index 111de2924..e18cf0bdb 100644 --- a/src/service/resolver/mod.rs +++ b/src/service/resolver/mod.rs @@ -6,7 +6,7 @@ mod tests; use std::{fmt::Write, sync::Arc}; -use conduit::{Result, Server}; +use conduwuit::{Result, Server}; use self::{cache::Cache, dns::Resolver}; use crate::{client, Dep}; diff --git a/src/service/rooms/alias/mod.rs b/src/service/rooms/alias/mod.rs index 0cdec8eeb..57db0e157 100644 --- a/src/service/rooms/alias/mod.rs +++ b/src/service/rooms/alias/mod.rs @@ -2,7 +2,7 @@ mod remote; use std::sync::Arc; -use conduit::{ +use conduwuit::{ err, utils::{stream::TryIgnore, ReadyExt}, Err, Error, Result, diff --git a/src/service/rooms/alias/remote.rs b/src/service/rooms/alias/remote.rs index d9acccc9c..00661da26 100644 --- a/src/service/rooms/alias/remote.rs +++ b/src/service/rooms/alias/remote.rs @@ -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}; diff --git a/src/service/rooms/auth_chain/data.rs b/src/service/rooms/auth_chain/data.rs index 3c36928af..1548cd550 100644 --- a/src/service/rooms/auth_chain/data.rs +++ b/src/service/rooms/auth_chain/data.rs @@ -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; diff --git a/src/service/rooms/auth_chain/mod.rs b/src/service/rooms/auth_chain/mod.rs index e7e5edf48..b875bf9c9 100644 --- a/src/service/rooms/auth_chain/mod.rs +++ b/src/service/rooms/auth_chain/mod.rs @@ -6,7 +6,7 @@ use std::{ sync::Arc, }; -use conduit::{ +use conduwuit::{ debug, debug_error, trace, utils::{stream::ReadyExt, IterStream}, validated, warn, Err, Result, diff --git a/src/service/rooms/directory/mod.rs b/src/service/rooms/directory/mod.rs index 63ed3519f..3046a328f 100644 --- a/src/service/rooms/directory/mod.rs +++ b/src/service/rooms/directory/mod.rs @@ -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}; diff --git a/src/service/rooms/event_handler/acl_check.rs b/src/service/rooms/event_handler/acl_check.rs index f2ff1b003..ef12a25c7 100644 --- a/src/service/rooms/event_handler/acl_check.rs +++ b/src/service/rooms/event_handler/acl_check.rs @@ -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, diff --git a/src/service/rooms/event_handler/fetch_and_handle_outliers.rs b/src/service/rooms/event_handler/fetch_and_handle_outliers.rs index 8c418acb0..316a1722b 100644 --- a/src/service/rooms/event_handler/fetch_and_handle_outliers.rs +++ b/src/service/rooms/event_handler/fetch_and_handle_outliers.rs @@ -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; diff --git a/src/service/rooms/event_handler/fetch_prev.rs b/src/service/rooms/event_handler/fetch_prev.rs index 4acdba1dc..577b3ff22 100644 --- a/src/service/rooms/event_handler/fetch_prev.rs +++ b/src/service/rooms/event_handler/fetch_prev.rs @@ -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, diff --git a/src/service/rooms/event_handler/fetch_state.rs b/src/service/rooms/event_handler/fetch_state.rs index 228b7d0c5..9c7bc65eb 100644 --- a/src/service/rooms/event_handler/fetch_state.rs +++ b/src/service/rooms/event_handler/fetch_state.rs @@ -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, diff --git a/src/service/rooms/event_handler/handle_incoming_pdu.rs b/src/service/rooms/event_handler/handle_incoming_pdu.rs index 193675827..d63f96f91 100644 --- a/src/service/rooms/event_handler/handle_incoming_pdu.rs +++ b/src/service/rooms/event_handler/handle_incoming_pdu.rs @@ -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, diff --git a/src/service/rooms/event_handler/handle_outlier_pdu.rs b/src/service/rooms/event_handler/handle_outlier_pdu.rs index 21504b663..9391ebf3d 100644 --- a/src/service/rooms/event_handler/handle_outlier_pdu.rs +++ b/src/service/rooms/event_handler/handle_outlier_pdu.rs @@ -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, diff --git a/src/service/rooms/event_handler/handle_prev_pdu.rs b/src/service/rooms/event_handler/handle_prev_pdu.rs index 90ff7f06b..1b4e9fe28 100644 --- a/src/service/rooms/event_handler/handle_prev_pdu.rs +++ b/src/service/rooms/event_handler/handle_prev_pdu.rs @@ -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)] diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs index 3fb7d5c4b..de3d2f498 100644 --- a/src/service/rooms/event_handler/mod.rs +++ b/src/service/rooms/event_handler/mod.rs @@ -17,7 +17,7 @@ use std::{ time::Instant, }; -use conduit::{ +use conduwuit::{ utils::{MutexMap, TryFutureExtExt}, Err, PduEvent, Result, Server, }; diff --git a/src/service/rooms/event_handler/parse_incoming_pdu.rs b/src/service/rooms/event_handler/parse_incoming_pdu.rs index 42f44deec..6c19f43f6 100644 --- a/src/service/rooms/event_handler/parse_incoming_pdu.rs +++ b/src/service/rooms/event_handler/parse_incoming_pdu.rs @@ -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; diff --git a/src/service/rooms/event_handler/resolve_state.rs b/src/service/rooms/event_handler/resolve_state.rs index 3329a1467..8ba4e4f43 100644 --- a/src/service/rooms/event_handler/resolve_state.rs +++ b/src/service/rooms/event_handler/resolve_state.rs @@ -4,7 +4,7 @@ use std::{ sync::Arc, }; -use conduit::{ +use conduwuit::{ debug, err, implement, utils::stream::{IterStream, WidebandExt}, Result, diff --git a/src/service/rooms/event_handler/state_at_incoming.rs b/src/service/rooms/event_handler/state_at_incoming.rs index 9b30a830f..6c76d9b53 100644 --- a/src/service/rooms/event_handler/state_at_incoming.rs +++ b/src/service/rooms/event_handler/state_at_incoming.rs @@ -4,7 +4,7 @@ use std::{ sync::Arc, }; -use conduit::{ +use conduwuit::{ debug, err, implement, result::LogErr, utils::stream::{BroadbandExt, IterStream}, diff --git a/src/service/rooms/event_handler/upgrade_outlier_pdu.rs b/src/service/rooms/event_handler/upgrade_outlier_pdu.rs index 13e2b281d..83267563d 100644 --- a/src/service/rooms/event_handler/upgrade_outlier_pdu.rs +++ b/src/service/rooms/event_handler/upgrade_outlier_pdu.rs @@ -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, diff --git a/src/service/rooms/lazy_loading/mod.rs b/src/service/rooms/lazy_loading/mod.rs index 7a4da2a64..a4bd4e8ff 100644 --- a/src/service/rooms/lazy_loading/mod.rs +++ b/src/service/rooms/lazy_loading/mod.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, Mutex}, }; -use conduit::{ +use conduwuit::{ implement, utils::{stream::TryIgnore, ReadyExt}, PduCount, Result, diff --git a/src/service/rooms/metadata/mod.rs b/src/service/rooms/metadata/mod.rs index 4ee390a5c..8f65eec3f 100644 --- a/src/service/rooms/metadata/mod.rs +++ b/src/service/rooms/metadata/mod.rs @@ -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; diff --git a/src/service/rooms/outlier/mod.rs b/src/service/rooms/outlier/mod.rs index 03e778389..9cd3d805d 100644 --- a/src/service/rooms/outlier/mod.rs +++ b/src/service/rooms/outlier/mod.rs @@ -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}; diff --git a/src/service/rooms/pdu_metadata/data.rs b/src/service/rooms/pdu_metadata/data.rs index 3d05a1c8f..be9e4ba91 100644 --- a/src/service/rooms/pdu_metadata/data.rs +++ b/src/service/rooms/pdu_metadata/data.rs @@ -1,7 +1,7 @@ use std::{mem::size_of, sync::Arc}; use arrayvec::ArrayVec; -use conduit::{ +use conduwuit::{ result::LogErr, utils::{ stream::{TryIgnore, WidebandExt}, diff --git a/src/service/rooms/pdu_metadata/mod.rs b/src/service/rooms/pdu_metadata/mod.rs index 82d2ee35b..23c6d90b0 100644 --- a/src/service/rooms/pdu_metadata/mod.rs +++ b/src/service/rooms/pdu_metadata/mod.rs @@ -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}; diff --git a/src/service/rooms/read_receipt/data.rs b/src/service/rooms/read_receipt/data.rs index 9a1dba454..03d04b656 100644 --- a/src/service/rooms/read_receipt/data.rs +++ b/src/service/rooms/read_receipt/data.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{ +use conduwuit::{ utils::{stream::TryIgnore, ReadyExt}, Result, }; diff --git a/src/service/rooms/read_receipt/mod.rs b/src/service/rooms/read_receipt/mod.rs index 5cac535d9..d92b9759d 100644 --- a/src/service/rooms/read_receipt/mod.rs +++ b/src/service/rooms/read_receipt/mod.rs @@ -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::{ diff --git a/src/service/rooms/search/mod.rs b/src/service/rooms/search/mod.rs index ae3567ce4..025fc42a7 100644 --- a/src/service/rooms/search/mod.rs +++ b/src/service/rooms/search/mod.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use arrayvec::ArrayVec; -use conduit::{ +use conduwuit::{ implement, utils::{ set, diff --git a/src/service/rooms/short/mod.rs b/src/service/rooms/short/mod.rs index a7c32856b..465ce1a95 100644 --- a/src/service/rooms/short/mod.rs +++ b/src/service/rooms/short/mod.rs @@ -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}; diff --git a/src/service/rooms/spaces/mod.rs b/src/service/rooms/spaces/mod.rs index 3e972ca68..aa5238716 100644 --- a/src/service/rooms/spaces/mod.rs +++ b/src/service/rooms/spaces/mod.rs @@ -7,7 +7,7 @@ use std::{ sync::Arc, }; -use conduit::{ +use conduwuit::{ checked, debug_info, err, utils::{math::usize_from_f64, IterStream}, Error, Result, diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state/mod.rs index d0d21fa84..e083ed341 100644 --- a/src/service/rooms/state/mod.rs +++ b/src/service/rooms/state/mod.rs @@ -5,7 +5,7 @@ use std::{ sync::Arc, }; -use conduit::{ +use conduwuit::{ err, result::FlatOk, utils::{ diff --git a/src/service/rooms/state_accessor/data.rs b/src/service/rooms/state_accessor/data.rs index bca540696..9947b036b 100644 --- a/src/service/rooms/state_accessor/data.rs +++ b/src/service/rooms/state_accessor/data.rs @@ -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, diff --git a/src/service/rooms/state_accessor/mod.rs b/src/service/rooms/state_accessor/mod.rs index bcc1263d4..798bcbed7 100644 --- a/src/service/rooms/state_accessor/mod.rs +++ b/src/service/rooms/state_accessor/mod.rs @@ -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}, diff --git a/src/service/rooms/state_cache/mod.rs b/src/service/rooms/state_cache/mod.rs index cbd72cdb4..6b7d35d22 100644 --- a/src/service/rooms/state_cache/mod.rs +++ b/src/service/rooms/state_cache/mod.rs @@ -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 + Send + 'a { - use conduit::utils::set; + use conduwuit::utils::set; let a = self.rooms_joined(user_a); let b = self.rooms_joined(user_b); diff --git a/src/service/rooms/state_compressor/mod.rs b/src/service/rooms/state_compressor/mod.rs index 8c6eccbe3..36bc92c03 100644 --- a/src/service/rooms/state_compressor/mod.rs +++ b/src/service/rooms/state_compressor/mod.rs @@ -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, diff --git a/src/service/rooms/threads/mod.rs b/src/service/rooms/threads/mod.rs index a304e4820..f65be902d 100644 --- a/src/service/rooms/threads/mod.rs +++ b/src/service/rooms/threads/mod.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, sync::Arc}; -use conduit::{ +use conduwuit::{ err, utils::{ stream::{TryIgnore, WidebandExt}, diff --git a/src/service/rooms/timeline/data.rs b/src/service/rooms/timeline/data.rs index 94621385b..a32ff54f4 100644 --- a/src/service/rooms/timeline/data.rs +++ b/src/service/rooms/timeline/data.rs @@ -4,7 +4,7 @@ use std::{ sync::Arc, }; -use conduit::{ +use conduwuit::{ at, err, result::{LogErr, NotFound}, utils, diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs index 8603b7e7a..2bc5cf734 100644 --- a/src/service/rooms/timeline/mod.rs +++ b/src/service/rooms/timeline/mod.rs @@ -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, diff --git a/src/service/rooms/typing/mod.rs b/src/service/rooms/typing/mod.rs index 8ee34f44d..59862a852 100644 --- a/src/service/rooms/typing/mod.rs +++ b/src/service/rooms/typing/mod.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, sync::Arc}; -use conduit::{ +use conduwuit::{ debug_info, trace, utils::{self, IterStream}, Result, Server, diff --git a/src/service/rooms/user/mod.rs b/src/service/rooms/user/mod.rs index 537fe69bb..80d33de4a 100644 --- a/src/service/rooms/user/mod.rs +++ b/src/service/rooms/user/mod.rs @@ -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}; diff --git a/src/service/sending/appservice.rs b/src/service/sending/appservice.rs index 55092523e..9008a21fd 100644 --- a/src/service/sending/appservice.rs +++ b/src/service/sending/appservice.rs @@ -1,7 +1,7 @@ use std::{fmt::Debug, mem}; use bytes::BytesMut; -use conduit::{debug_error, err, trace, utils, warn, Err, Result}; +use conduwuit::{debug_error, err, trace, utils, warn, Err, Result}; use reqwest::Client; use ruma::api::{appservice::Registration, IncomingResponse, MatrixVersion, OutgoingRequest, SendAccessToken}; diff --git a/src/service/sending/data.rs b/src/service/sending/data.rs index bc70e875e..372d8e14f 100644 --- a/src/service/sending/data.rs +++ b/src/service/sending/data.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, sync::Arc}; -use conduit::{ +use conduwuit::{ at, utils, utils::{stream::TryIgnore, ReadyExt}, Error, Result, diff --git a/src/service/sending/dest.rs b/src/service/sending/dest.rs index d35350c50..0a5893b72 100644 --- a/src/service/sending/dest.rs +++ b/src/service/sending/dest.rs @@ -1,6 +1,6 @@ use std::fmt::Debug; -use conduit::implement; +use conduwuit::implement; use ruma::{OwnedServerName, OwnedUserId}; #[derive(Clone, Debug, PartialEq, Eq, Hash)] diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs index 611940bea..f98281782 100644 --- a/src/service/sending/mod.rs +++ b/src/service/sending/mod.rs @@ -7,7 +7,7 @@ mod sender; use std::{fmt::Debug, iter::once, sync::Arc}; use async_trait::async_trait; -use conduit::{ +use conduwuit::{ debug_warn, err, utils::{ReadyExt, TryReadyExt}, warn, Result, Server, diff --git a/src/service/sending/send.rs b/src/service/sending/send.rs index df39bcd1b..862d2a426 100644 --- a/src/service/sending/send.rs +++ b/src/service/sending/send.rs @@ -1,7 +1,7 @@ use std::mem; use bytes::Bytes; -use conduit::{ +use conduwuit::{ debug, debug_error, debug_warn, err, error::inspect_debug_log, implement, trace, utils::string::EMPTY, Err, Error, Result, }; diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs index 49ce1be43..77fd7d5ce 100644 --- a/src/service/sending/sender.rs +++ b/src/service/sending/sender.rs @@ -6,7 +6,7 @@ use std::{ }; use base64::{engine::general_purpose, Engine as _}; -use conduit::{ +use conduwuit::{ debug, err, error, result::LogErr, trace, diff --git a/src/service/server_keys/acquire.rs b/src/service/server_keys/acquire.rs index 1080d79ef..886c4750f 100644 --- a/src/service/server_keys/acquire.rs +++ b/src/service/server_keys/acquire.rs @@ -4,7 +4,7 @@ use std::{ time::Duration, }; -use conduit::{debug, debug_error, debug_warn, error, implement, info, result::FlatOk, trace, warn}; +use conduwuit::{debug, debug_error, debug_warn, error, implement, info, result::FlatOk, trace, warn}; use futures::{stream::FuturesUnordered, StreamExt}; use ruma::{ api::federation::discovery::ServerSigningKeys, serde::Raw, CanonicalJsonObject, OwnedServerName, diff --git a/src/service/server_keys/get.rs b/src/service/server_keys/get.rs index dc4627f7a..94d2575a5 100644 --- a/src/service/server_keys/get.rs +++ b/src/service/server_keys/get.rs @@ -1,6 +1,6 @@ use std::borrow::Borrow; -use conduit::{implement, Err, Result}; +use conduwuit::{implement, Err, Result}; use ruma::{api::federation::discovery::VerifyKey, CanonicalJsonObject, RoomVersionId, ServerName, ServerSigningKeyId}; use super::{extract_key, PubKeyMap, PubKeys}; diff --git a/src/service/server_keys/keypair.rs b/src/service/server_keys/keypair.rs index 31a24cdf3..927171f3f 100644 --- a/src/service/server_keys/keypair.rs +++ b/src/service/server_keys/keypair.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{debug, debug_info, err, error, utils, utils::string_from_bytes, Result}; +use conduwuit::{debug, debug_info, err, error, utils, utils::string_from_bytes, Result}; use database::Database; use ruma::{api::federation::discovery::VerifyKey, serde::Base64, signatures::Ed25519KeyPair}; diff --git a/src/service/server_keys/mod.rs b/src/service/server_keys/mod.rs index 08bcefb63..45c01c0b4 100644 --- a/src/service/server_keys/mod.rs +++ b/src/service/server_keys/mod.rs @@ -7,7 +7,7 @@ mod verify; use std::{collections::BTreeMap, sync::Arc, time::Duration}; -use conduit::{ +use conduwuit::{ implement, utils::{timepoint_from_now, IterStream}, Result, Server, diff --git a/src/service/server_keys/request.rs b/src/service/server_keys/request.rs index 7078f7cd0..da7fa08a4 100644 --- a/src/service/server_keys/request.rs +++ b/src/service/server_keys/request.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, fmt::Debug}; -use conduit::{debug, implement, Err, Result}; +use conduwuit::{debug, implement, Err, Result}; use ruma::{ api::federation::discovery::{ get_remote_server_keys, diff --git a/src/service/server_keys/sign.rs b/src/service/server_keys/sign.rs index 28fd7e803..715653808 100644 --- a/src/service/server_keys/sign.rs +++ b/src/service/server_keys/sign.rs @@ -1,4 +1,4 @@ -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use ruma::{CanonicalJsonObject, RoomVersionId}; #[implement(super::Service)] diff --git a/src/service/server_keys/verify.rs b/src/service/server_keys/verify.rs index c836e324a..d06b55ab7 100644 --- a/src/service/server_keys/verify.rs +++ b/src/service/server_keys/verify.rs @@ -1,4 +1,4 @@ -use conduit::{implement, pdu::gen_event_id_canonical_json, Err, Result}; +use conduwuit::{implement, pdu::gen_event_id_canonical_json, Err, Result}; use ruma::{signatures::Verified, CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, RoomVersionId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/src/service/service.rs b/src/service/service.rs index 7ec2ea0fe..4b1774cc6 100644 --- a/src/service/service.rs +++ b/src/service/service.rs @@ -7,7 +7,7 @@ use std::{ }; use async_trait::async_trait; -use conduit::{err, error::inspect_log, utils::string::SplitInfallible, Err, Result, Server}; +use conduwuit::{err, error::inspect_log, utils::string::SplitInfallible, Err, Result, Server}; use database::Database; /// Abstract interface for a Service diff --git a/src/service/services.rs b/src/service/services.rs index b86e7a721..9f9d10f54 100644 --- a/src/service/services.rs +++ b/src/service/services.rs @@ -5,7 +5,7 @@ use std::{ sync::{Arc, RwLock}, }; -use conduit::{debug, debug_info, info, trace, Result, Server}; +use conduwuit::{debug, debug_info, info, trace, Result, Server}; use database::Database; use tokio::sync::Mutex; diff --git a/src/service/sync/mod.rs b/src/service/sync/mod.rs index f1a6ae75e..a45232465 100644 --- a/src/service/sync/mod.rs +++ b/src/service/sync/mod.rs @@ -5,7 +5,7 @@ use std::{ sync::{Arc, Mutex, Mutex as StdMutex}, }; -use conduit::{Result, Server}; +use conduwuit::{Result, Server}; use database::Map; use ruma::{ api::client::sync::sync_events::{ diff --git a/src/service/sync/watch.rs b/src/service/sync/watch.rs index 3eb663c12..50959ded0 100644 --- a/src/service/sync/watch.rs +++ b/src/service/sync/watch.rs @@ -1,4 +1,4 @@ -use conduit::{implement, trace, Result}; +use conduwuit::{implement, trace, Result}; use futures::{pin_mut, stream::FuturesUnordered, FutureExt, StreamExt}; use ruma::{DeviceId, UserId}; diff --git a/src/service/transaction_ids/mod.rs b/src/service/transaction_ids/mod.rs index 72f60adb1..2b979f996 100644 --- a/src/service/transaction_ids/mod.rs +++ b/src/service/transaction_ids/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduit::{implement, Result}; +use conduwuit::{implement, Result}; use database::{Handle, Map}; use ruma::{DeviceId, TransactionId, UserId}; diff --git a/src/service/uiaa/mod.rs b/src/service/uiaa/mod.rs index d2865d882..4d30a612c 100644 --- a/src/service/uiaa/mod.rs +++ b/src/service/uiaa/mod.rs @@ -3,7 +3,7 @@ use std::{ sync::{Arc, RwLock}, }; -use conduit::{ +use conduwuit::{ err, error, implement, utils, utils::{hash, string::EMPTY}, Error, Result, diff --git a/src/service/updates/mod.rs b/src/service/updates/mod.rs index 82decd262..1d13337d6 100644 --- a/src/service/updates/mod.rs +++ b/src/service/updates/mod.rs @@ -1,7 +1,7 @@ use std::{sync::Arc, time::Duration}; use async_trait::async_trait; -use conduit::{debug, info, warn, Result, Server}; +use conduwuit::{debug, info, warn, Result, Server}; use database::{Deserialized, Map}; use ruma::events::room::message::RoomMessageEventContent; use serde::Deserialize; diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs index 70868ec83..8ceec2a01 100644 --- a/src/service/users/mod.rs +++ b/src/service/users/mod.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, mem, mem::size_of, sync::Arc}; -use conduit::{ +use conduwuit::{ debug_warn, err, utils, utils::{stream::TryIgnore, string::Unquoted, ReadyExt}, Err, Error, Result, Server, diff --git a/tests/cargo_smoke.sh b/tests/cargo_smoke.sh index 6ee20ee26..946790c32 100755 --- a/tests/cargo_smoke.sh +++ b/tests/cargo_smoke.sh @@ -38,8 +38,8 @@ element () { run cargo "$TOOLCHAIN" build $ELEMENT_OPTS --all-targets run cargo "$TOOLCHAIN" test $ELEMENT_OPTS --all-targets run cargo "$TOOLCHAIN" bench $ELEMENT_OPTS --all-targets - run cargo "$TOOLCHAIN" run $ELEMENT_OPTS --bin conduit -- -V - run conduwuit "$TOOLCHAIN" run $ELEMENT_OPTS --bin conduit + run cargo "$TOOLCHAIN" run $ELEMENT_OPTS --bin conduwuit -- -V + run conduwuit "$TOOLCHAIN" run $ELEMENT_OPTS --bin conduwuit fi }