magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename conduit to conduwuit finally

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-12-14 21:58:01 -05:00
parent c6bf8f5ea1
commit 0317cc8cc5
No known key found for this signature in database
277 changed files with 559 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

37
.github/workflows/ci.yml vendored
View file

@ -377,10 +377,9 @@ jobs:
mkdir -v -p target/release/ mkdir -v -p target/release/
mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/ mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
cp -v -f result/bin/conduit target/release/conduwuit cp -v -f result/bin/conduwuit target/release/conduwuit
cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit cp -v -f result/bin/conduwuit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit
# -p conduit is the main crate name direnv exec . cargo deb --verbose --no-build --no-strip -p conduwuit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}.deb
direnv exec . cargo deb --verbose --no-build --no-strip -p conduit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}.deb
mv -v target/release/conduwuit static-${{ matrix.target }} mv -v target/release/conduwuit static-${{ matrix.target }}
mv -v target/release/${{ matrix.target }}.deb ${{ matrix.target }}.deb mv -v target/release/${{ matrix.target }}.deb ${{ matrix.target }}.deb
@ -394,10 +393,9 @@ jobs:
mkdir -v -p target/release/ mkdir -v -p target/release/
mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/ mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
cp -v -f result/bin/conduit target/release/conduwuit cp -v -f result/bin/conduwuit target/release/conduwuit
cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit cp -v -f result/bin/conduwuit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit
# -p conduit is the main crate name 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
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
mv -v target/release/conduwuit static-x86_64-linux-musl-x86_64-haswell-optimised 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 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' }} if: ${{ matrix.target == 'x86_64-linux-musl' }}
run: | run: |
# GH actions default runners are x86_64 only # GH actions default runners are x86_64 only
if file result/bin/conduit | grep x86-64; then if file result/bin/conduwuit | grep x86-64; then
result/bin/conduit --version result/bin/conduwuit --version
result/bin/conduit --help result/bin/conduwuit --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" 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 fi
- name: Build static debug ${{ matrix.target }}-all-features - 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 # so we need to coerce cargo-deb into thinking this is a release binary
mkdir -v -p target/release/ mkdir -v -p target/release/
mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/ mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
cp -v -f result/bin/conduit target/release/conduwuit cp -v -f result/bin/conduwuit target/release/conduwuit
cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit cp -v -f result/bin/conduwuit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit
# -p conduit is the main crate name direnv exec . cargo deb --verbose --no-build --no-strip -p conduwuit --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}-debug.deb
direnv exec . cargo deb --verbose --no-build --no-strip -p conduit --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/conduwuit static-${{ matrix.target }}-debug
mv -v target/release/${{ matrix.target }}-debug.deb ${{ matrix.target }}-debug.deb mv -v target/release/${{ matrix.target }}-debug.deb ${{ matrix.target }}-debug.deb
@ -441,8 +438,8 @@ jobs:
- name: Run x86_64 static debug binary - name: Run x86_64 static debug binary
run: | run: |
# GH actions default runners are x86_64 only # GH actions default runners are x86_64 only
if file result/bin/conduit | grep x86-64; then if file result/bin/conduwuit | grep x86-64; then
result/bin/conduit --version result/bin/conduwuit --version
fi fi
# check validity of produced deb package, invalid debs will error on these commands # check validity of produced deb package, invalid debs will error on these commands
@ -654,7 +651,7 @@ jobs:
if: ${{ matrix.os == 'macos-13' }} if: ${{ matrix.os == 'macos-13' }}
run: | run: |
CONDUWUIT_VERSION_EXTRA="$(git rev-parse --short ${{ github.sha }})" cargo build --release 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 otool -L conduwuit-macos-x86_64
# quick smoke test of the x86_64 macOS binary # quick smoke test of the x86_64 macOS binary
@ -667,7 +664,7 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }} if: ${{ matrix.os == 'macos-latest' }}
run: | run: |
CONDUWUIT_VERSION_EXTRA="$(git rev-parse --short ${{ github.sha }})" cargo build --release 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 otool -L conduwuit-macos-arm64
# quick smoke test of the arm64 macOS binary # quick smoke test of the arm64 macOS binary

94
Cargo.lock generated
View file

@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 4
[[package]] [[package]]
name = "addr2line" name = "addr2line"
@ -619,16 +619,16 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit" name = "conduwuit"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"clap", "clap",
"conduit_admin", "conduwuit_admin",
"conduit_api", "conduwuit_api",
"conduit_core", "conduwuit_core",
"conduit_database", "conduwuit_database",
"conduit_router", "conduwuit_router",
"conduit_service", "conduwuit_service",
"console-subscriber", "console-subscriber",
"const-str", "const-str",
"hardened_malloc-rs", "hardened_malloc-rs",
@ -648,15 +648,15 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit_admin" name = "conduwuit_admin"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"clap", "clap",
"conduit_api", "conduwuit_api",
"conduit_core", "conduwuit_core",
"conduit_database", "conduwuit_database",
"conduit_macros", "conduwuit_macros",
"conduit_service", "conduwuit_service",
"const-str", "const-str",
"futures", "futures",
"log", "log",
@ -669,7 +669,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit_api" name = "conduwuit_api"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"axum", "axum",
@ -677,9 +677,9 @@ dependencies = [
"axum-extra", "axum-extra",
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
"conduit_core", "conduwuit_core",
"conduit_database", "conduwuit_database",
"conduit_service", "conduwuit_service",
"const-str", "const-str",
"futures", "futures",
"hmac", "hmac",
@ -701,7 +701,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit_core" name = "conduwuit_core"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"argon2", "argon2",
@ -713,7 +713,7 @@ dependencies = [
"checked_ops", "checked_ops",
"chrono", "chrono",
"clap", "clap",
"conduit_macros", "conduwuit_macros",
"const-str", "const-str",
"ctor", "ctor",
"cyborgtime", "cyborgtime",
@ -739,7 +739,7 @@ dependencies = [
"serde_json", "serde_json",
"serde_regex", "serde_regex",
"serde_yaml", "serde_yaml",
"thiserror 2.0.6", "thiserror 2.0.7",
"tikv-jemalloc-ctl", "tikv-jemalloc-ctl",
"tikv-jemalloc-sys", "tikv-jemalloc-sys",
"tikv-jemallocator", "tikv-jemallocator",
@ -753,12 +753,12 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit_database" name = "conduwuit_database"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"async-channel", "async-channel",
"conduit_core", "conduwuit_core",
"const-str", "const-str",
"futures", "futures",
"log", "log",
@ -771,7 +771,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit_macros" name = "conduwuit_macros"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"itertools 0.13.0", "itertools 0.13.0",
@ -781,7 +781,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit_router" name = "conduwuit_router"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"axum", "axum",
@ -789,10 +789,10 @@ dependencies = [
"axum-server", "axum-server",
"axum-server-dual-protocol", "axum-server-dual-protocol",
"bytes", "bytes",
"conduit_admin", "conduwuit_admin",
"conduit_api", "conduwuit_api",
"conduit_core", "conduwuit_core",
"conduit_service", "conduwuit_service",
"const-str", "const-str",
"futures", "futures",
"http", "http",
@ -814,15 +814,15 @@ dependencies = [
] ]
[[package]] [[package]]
name = "conduit_service" name = "conduwuit_service"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"async-trait", "async-trait",
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
"conduit_core", "conduwuit_core",
"conduit_database", "conduwuit_database",
"const-str", "const-str",
"either", "either",
"futures", "futures",
@ -2954,7 +2954,7 @@ dependencies = [
"rustc-hash 2.1.0", "rustc-hash 2.1.0",
"rustls", "rustls",
"socket2", "socket2",
"thiserror 2.0.6", "thiserror 2.0.7",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -2973,7 +2973,7 @@ dependencies = [
"rustls", "rustls",
"rustls-pki-types", "rustls-pki-types",
"slab", "slab",
"thiserror 2.0.6", "thiserror 2.0.7",
"tinyvec", "tinyvec",
"tracing", "tracing",
"web-time 1.1.0", "web-time 1.1.0",
@ -3211,7 +3211,7 @@ dependencies = [
"serde", "serde",
"serde_html_form", "serde_html_form",
"serde_json", "serde_json",
"thiserror 2.0.6", "thiserror 2.0.7",
"url", "url",
"web-time 1.1.0", "web-time 1.1.0",
] ]
@ -3237,7 +3237,7 @@ dependencies = [
"serde", "serde",
"serde_html_form", "serde_html_form",
"serde_json", "serde_json",
"thiserror 2.0.6", "thiserror 2.0.7",
"time", "time",
"tracing", "tracing",
"url", "url",
@ -3263,7 +3263,7 @@ dependencies = [
"ruma-macros", "ruma-macros",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 2.0.6", "thiserror 2.0.7",
"tracing", "tracing",
"url", "url",
"web-time 1.1.0", "web-time 1.1.0",
@ -3294,7 +3294,7 @@ version = "0.9.5"
source = "git+https://github.com/girlbossceo/ruwuma?rev=08f58cd3236fdf175913b2bcaf8865359696d94d#08f58cd3236fdf175913b2bcaf8865359696d94d" source = "git+https://github.com/girlbossceo/ruwuma?rev=08f58cd3236fdf175913b2bcaf8865359696d94d#08f58cd3236fdf175913b2bcaf8865359696d94d"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.6", "thiserror 2.0.7",
] ]
[[package]] [[package]]
@ -3343,7 +3343,7 @@ dependencies = [
"http", "http",
"http-auth", "http-auth",
"ruma-common", "ruma-common",
"thiserror 2.0.6", "thiserror 2.0.7",
"tracing", "tracing",
] ]
@ -3360,7 +3360,7 @@ dependencies = [
"serde_json", "serde_json",
"sha2", "sha2",
"subslice", "subslice",
"thiserror 2.0.6", "thiserror 2.0.7",
] ]
[[package]] [[package]]
@ -3374,7 +3374,7 @@ dependencies = [
"ruma-events", "ruma-events",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 2.0.6", "thiserror 2.0.7",
"tracing", "tracing",
] ]
@ -3526,7 +3526,7 @@ dependencies = [
"futures-util", "futures-util",
"pin-project", "pin-project",
"thingbuf", "thingbuf",
"thiserror 2.0.6", "thiserror 2.0.7",
"unicode-segmentation", "unicode-segmentation",
"unicode-width 0.2.0", "unicode-width 0.2.0",
] ]
@ -4111,11 +4111,11 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "2.0.6" version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767"
dependencies = [ dependencies = [
"thiserror-impl 2.0.6", "thiserror-impl 2.0.7",
] ]
[[package]] [[package]]
@ -4131,9 +4131,9 @@ dependencies = [
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "2.0.6" version = "2.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

52
Cargo.toml
View file

@ -23,7 +23,7 @@ rust-version = "1.83.0"
version = "0.5.0" version = "0.5.0"
[workspace.metadata.crane] [workspace.metadata.crane]
name = "conduit" name = "conduwuit"
[workspace.dependencies.arrayvec] [workspace.dependencies.arrayvec]
version = "0.7.4" version = "0.7.4"
@ -211,7 +211,7 @@ default-features = false
version = "2.0.1" version = "2.0.1"
default-features = false 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] [workspace.dependencies.clap]
version = "4.5.23" version = "4.5.23"
default-features = false default-features = false
@ -297,9 +297,9 @@ features = ["env", "toml"]
version = "0.24.2" version = "0.24.2"
default-features = false default-features = false
# Used for conduit::Error type # Used for conduwuit::Error type
[workspace.dependencies.thiserror] [workspace.dependencies.thiserror]
version = "2.0.6" version = "2.0.7"
default-features = false default-features = false
# Used when hashing the state # Used when hashing the state
@ -523,38 +523,38 @@ rev = "deaeb0694e2083f53d363b648da06e10fc13900c"
# Our crates # Our crates
# #
[workspace.dependencies.conduit-router] [workspace.dependencies.conduwuit-router]
package = "conduit_router" package = "conduwuit_router"
path = "src/router" path = "src/router"
default-features = false default-features = false
[workspace.dependencies.conduit-admin] [workspace.dependencies.conduwuit-admin]
package = "conduit_admin" package = "conduwuit_admin"
path = "src/admin" path = "src/admin"
default-features = false default-features = false
[workspace.dependencies.conduit-api] [workspace.dependencies.conduwuit-api]
package = "conduit_api" package = "conduwuit_api"
path = "src/api" path = "src/api"
default-features = false default-features = false
[workspace.dependencies.conduit-service] [workspace.dependencies.conduwuit-service]
package = "conduit_service" package = "conduwuit_service"
path = "src/service" path = "src/service"
default-features = false default-features = false
[workspace.dependencies.conduit-database] [workspace.dependencies.conduwuit-database]
package = "conduit_database" package = "conduwuit_database"
path = "src/database" path = "src/database"
default-features = false default-features = false
[workspace.dependencies.conduit-core] [workspace.dependencies.conduwuit-core]
package = "conduit_core" package = "conduwuit_core"
path = "src/core" path = "src/core"
default-features = false default-features = false
[workspace.dependencies.conduit-macros] [workspace.dependencies.conduwuit-macros]
package = "conduit_macros" package = "conduwuit_macros"
path = "src/macros" path = "src/macros"
default-features = false default-features = false
@ -613,7 +613,7 @@ codegen-units = 32
# '-Clink-arg=-Wl,--no-gc-sections', # '-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" inherits = "release-max-perf.build-override"
#rustflags = [ #rustflags = [
# '-Crelocation-model=pic', # '-Crelocation-model=pic',
@ -647,7 +647,7 @@ panic = "unwind"
debug-assertions = true debug-assertions = true
incremental = true incremental = true
#rustflags = [ #rustflags = [
# '--cfg', 'conduit_mods', # '--cfg', 'conduwuit_mods',
# '-Ztime-passes', # '-Ztime-passes',
# '-Zmir-opt-level=0', # '-Zmir-opt-level=0',
# '-Zvalidate-mir=false', # '-Zvalidate-mir=false',
@ -664,11 +664,11 @@ incremental = true
# '-Clink-arg=-Wl,-z,lazy', # '-Clink-arg=-Wl,-z,lazy',
#] #]
[profile.dev.package.conduit_core] [profile.dev.package.conduwuit_core]
inherits = "dev" inherits = "dev"
incremental = false incremental = false
#rustflags = [ #rustflags = [
# '--cfg', 'conduit_mods', # '--cfg', 'conduwuit_mods',
# '-Ztime-passes', # '-Ztime-passes',
# '-Zmir-opt-level=0', # '-Zmir-opt-level=0',
# '-Ztls-model=initial-exec', # '-Ztls-model=initial-exec',
@ -685,10 +685,10 @@ incremental = false
# '-Clink-arg=-Wl,-z,nodelete', # '-Clink-arg=-Wl,-z,nodelete',
#] #]
[profile.dev.package.conduit] [profile.dev.package.conduwuit]
inherits = "dev" inherits = "dev"
#rustflags = [ #rustflags = [
# '--cfg', 'conduit_mods', # '--cfg', 'conduwuit_mods',
# '-Ztime-passes', # '-Ztime-passes',
# '-Zmir-opt-level=0', # '-Zmir-opt-level=0',
# '-Zvalidate-mir=false', # '-Zvalidate-mir=false',
@ -710,7 +710,7 @@ incremental = false
codegen-units = 1 codegen-units = 1
opt-level = 'z' opt-level = 'z'
#rustflags = [ #rustflags = [
# '--cfg', 'conduit_mods', # '--cfg', 'conduwuit_mods',
# '-Ztls-model=initial-exec', # '-Ztls-model=initial-exec',
# '-Cprefer-dynamic=true', # '-Cprefer-dynamic=true',
# '-Zstaticlib-prefer-dynamic=true', # '-Zstaticlib-prefer-dynamic=true',
@ -731,7 +731,7 @@ incremental = false
codegen-units = 1 codegen-units = 1
opt-level = 'z' opt-level = 'z'
#rustflags = [ #rustflags = [
# '--cfg', 'conduit_mods', # '--cfg', 'conduwuit_mods',
# '-Ztls-model=global-dynamic', # '-Ztls-model=global-dynamic',
# '-Cprefer-dynamic=true', # '-Cprefer-dynamic=true',
# '-Zstaticlib-prefer-dynamic=true', # '-Zstaticlib-prefer-dynamic=true',

6
README.md
View file

@ -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 [Migrating from Conduit](https://conduwuit.puppyirl.gay/deploying/generic.html#migrating-from-conduit) section
on the generic deploying guide. 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.
<!-- ANCHOR_END: body --> <!-- ANCHOR_END: body -->
<!-- ANCHOR: footer --> <!-- ANCHOR: footer -->

10
clippy.toml
View file

@ -7,9 +7,9 @@ too-many-lines-threshold = 700 # TODO reduce me to <= 100
type-complexity-threshold = 250 # reduce me to ~200 type-complexity-threshold = 250 # reduce me to ~200
disallowed-macros = [ disallowed-macros = [
{ path = "log::error", reason = "use conduit_core::error" }, { path = "log::error", reason = "use conduwuit_core::error" },
{ path = "log::warn", reason = "use conduit_core::warn" }, { path = "log::warn", reason = "use conduwuit_core::warn" },
{ path = "log::info", reason = "use conduit_core::info" }, { path = "log::info", reason = "use conduwuit_core::info" },
{ path = "log::debug", reason = "use conduit_core::debug" }, { path = "log::debug", reason = "use conduwuit_core::debug" },
{ path = "log::trace", reason = "use conduit_core::trace" }, { path = "log::trace", reason = "use conduwuit_core::trace" },
] ]

4
deps/rust-rocksdb/lib.rs vendored
View file

@ -1,7 +1,7 @@
pub use rust_rocksdb::*; pub use rust_rocksdb::*;
#[cfg_attr(not(conduit_mods), link(name = "rocksdb"))] #[cfg_attr(not(conduwuit_mods), link(name = "rocksdb"))]
#[cfg_attr(conduit_mods, link(name = "rocksdb", kind = "static"))] #[cfg_attr(conduwuit_mods, link(name = "rocksdb", kind = "static"))]
unsafe extern "C" { unsafe extern "C" {
pub unsafe fn rocksdb_list_column_families(); pub unsafe fn rocksdb_list_column_families();
pub unsafe fn rocksdb_logger_create_stderr_logger(); pub unsafe fn rocksdb_logger_create_stderr_logger();

2
docs/configuration.md
View file

@ -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: 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: `<redacted>` Created user with user_id: @june:girlboss.ceo and password: `<redacted>`
``` ```

2
docs/deploying/docker.md
View file

@ -41,7 +41,7 @@ docker run -d -p 8448:6167 \
-v db:/var/lib/conduwuit/ \ -v db:/var/lib/conduwuit/ \
-e CONDUWUIT_SERVER_NAME="your.server.name" \ -e CONDUWUIT_SERVER_NAME="your.server.name" \
-e CONDUWUIT_ALLOW_REGISTRATION=false \ -e CONDUWUIT_ALLOW_REGISTRATION=false \
--name conduit $LINK --name conduwuit $LINK
``` ```
or you can use [docker compose](#docker-compose). or you can use [docker compose](#docker-compose).

8
docs/deploying/generic.md
View file

@ -26,7 +26,7 @@ allows easy cross-compilation.
You can run the `nix build -L .#static-x86_64-linux-musl-all-features` or 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 `nix build -L .#static-aarch64-linux-musl-all-features` commands based
on architecture to cross-compile the necessary static binary located at 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 Otherwise, follow standard Rust project build guides (installing git and cloning
the repo, getting the Rust toolchain via rustup, installing LLVM toolchain + 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 from Conduit. As long as you are using the RocksDB database backend, just
replace the binary / container image / etc. 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, **Note**: If you are relying on Conduit's "automatic delegation" feature,
this will **NOT** work on conduwuit and you must configure delegation manually. 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. This is not a mistake and no support for this feature will be added.

2
docs/development.md
View file

@ -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 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 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 The rationale for this is due to Rust / Cargo not supporting
["workspace level features"][9], we must make a choice of; either scattering ["workspace level features"][9], we must make a choice of; either scattering

12
src/admin/Cargo.toml
View file

@ -1,5 +1,5 @@
[package] [package]
name = "conduit_admin" name = "conduwuit_admin"
categories.workspace = true categories.workspace = true
description.workspace = true description.workspace = true
edition.workspace = true edition.workspace = true
@ -27,11 +27,11 @@ release_max_log_level = [
[dependencies] [dependencies]
clap.workspace = true clap.workspace = true
conduit-api.workspace = true conduwuit-api.workspace = true
conduit-core.workspace = true conduwuit-core.workspace = true
conduit-database.workspace = true conduwuit-database.workspace = true
conduit-macros.workspace = true conduwuit-macros.workspace = true
conduit-service.workspace = true conduwuit-service.workspace = true
const-str.workspace = true const-str.workspace = true
futures.workspace = true futures.workspace = true
log.workspace = true log.workspace = true

4
src/admin/admin.rs
View file

@ -1,5 +1,5 @@
use clap::Parser; use clap::Parser;
use conduit::Result; use conduwuit::Result;
use ruma::events::room::message::RoomMessageEventContent; use ruma::events::room::message::RoomMessageEventContent;
use crate::{ use crate::{
@ -9,7 +9,7 @@ use crate::{
}; };
#[derive(Debug, Parser)] #[derive(Debug, Parser)]
#[command(name = "conduwuit", version = conduit::version())] #[command(name = "conduwuit", version = conduwuit::version())]
pub(super) enum AdminCommand { pub(super) enum AdminCommand {
#[command(subcommand)] #[command(subcommand)]
/// - Commands for managing appservices /// - Commands for managing appservices

2
src/admin/appservice/mod.rs
View file

@ -1,7 +1,7 @@
mod commands; mod commands;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use crate::admin_command_dispatch; use crate::admin_command_dispatch;

4
src/admin/check/commands.rs
View file

@ -1,5 +1,5 @@
use conduit::Result; use conduwuit::Result;
use conduit_macros::implement; use conduwuit_macros::implement;
use futures::StreamExt; use futures::StreamExt;
use ruma::events::room::message::RoomMessageEventContent; use ruma::events::room::message::RoomMessageEventContent;

2
src/admin/check/mod.rs
View file

@ -1,7 +1,7 @@
mod commands; mod commands;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::events::room::message::RoomMessageEventContent; use ruma::events::room::message::RoomMessageEventContent;
use crate::Command; use crate::Command;

2
src/admin/command.rs
View file

@ -1,6 +1,6 @@
use std::time::SystemTime; use std::time::SystemTime;
use conduit_service::Services; use conduwuit_service::Services;
use ruma::EventId; use ruma::EventId;
pub(crate) struct Command<'a> { pub(crate) struct Command<'a> {

4
src/admin/debug/commands.rs
View file

@ -6,7 +6,7 @@ use std::{
time::{Instant, SystemTime}, 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 futures::{FutureExt, StreamExt};
use ruma::{ use ruma::{
api::{client::error::ErrorKind, federation::event::get_room_state}, api::{client::error::ErrorKind, federation::event::get_room_state},
@ -754,7 +754,7 @@ pub(super) async fn resolve_true_destination(
#[admin_command] #[admin_command]
pub(super) async fn memory_stats(&self) -> Result<RoomMessageEventContent> { pub(super) async fn memory_stats(&self) -> Result<RoomMessageEventContent> {
let html_body = conduit::alloc::memory_stats(); let html_body = conduwuit::alloc::memory_stats();
if html_body.is_none() { if html_body.is_none() {
return Ok(RoomMessageEventContent::text_plain( return Ok(RoomMessageEventContent::text_plain(

2
src/admin/debug/mod.rs
View file

@ -2,7 +2,7 @@ mod commands;
pub(crate) mod tester; pub(crate) mod tester;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::{EventId, OwnedRoomOrAliasId, RoomId, ServerName}; use ruma::{EventId, OwnedRoomOrAliasId, RoomId, ServerName};
use self::tester::TesterCommand; use self::tester::TesterCommand;

2
src/admin/debug/tester.rs
View file

@ -1,4 +1,4 @@
use conduit::Err; use conduwuit::Err;
use ruma::events::room::message::RoomMessageEventContent; use ruma::events::room::message::RoomMessageEventContent;
use crate::{admin_command, admin_command_dispatch, Result}; use crate::{admin_command, admin_command_dispatch, Result};

2
src/admin/federation/commands.rs
View file

@ -1,6 +1,6 @@
use std::fmt::Write; use std::fmt::Write;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, RoomId, ServerName, UserId}; use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, RoomId, ServerName, UserId};

2
src/admin/federation/mod.rs
View file

@ -1,7 +1,7 @@
mod commands; mod commands;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::{RoomId, ServerName, UserId}; use ruma::{RoomId, ServerName, UserId};
use crate::admin_command_dispatch; use crate::admin_command_dispatch;

4
src/admin/media/commands.rs
View file

@ -1,7 +1,7 @@
use std::time::Duration; use std::time::Duration;
use conduit::{debug, debug_info, debug_warn, error, info, trace, utils::time::parse_timepoint_ago, Result}; use conduwuit::{debug, debug_info, debug_warn, error, info, trace, utils::time::parse_timepoint_ago, Result};
use conduit_service::media::Dim; use conduwuit_service::media::Dim;
use ruma::{ use ruma::{
events::room::message::RoomMessageEventContent, EventId, Mxc, MxcUri, OwnedMxcUri, OwnedServerName, ServerName, events::room::message::RoomMessageEventContent, EventId, Mxc, MxcUri, OwnedMxcUri, OwnedServerName, ServerName,
}; };

2
src/admin/media/mod.rs
View file

@ -1,7 +1,7 @@
mod commands; mod commands;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::{EventId, MxcUri, OwnedMxcUri, OwnedServerName, ServerName}; use ruma::{EventId, MxcUri, OwnedMxcUri, OwnedServerName, ServerName};
use crate::admin_command_dispatch; use crate::admin_command_dispatch;

16
src/admin/mod.rs
View file

@ -18,12 +18,12 @@ pub(crate) mod room;
pub(crate) mod server; pub(crate) mod server;
pub(crate) mod user; pub(crate) mod user;
extern crate conduit_api as api; extern crate conduwuit_api as api;
extern crate conduit_core as conduit; extern crate conduwuit_core as conduwuit;
extern crate conduit_service as service; extern crate conduwuit_service as service;
pub(crate) use conduit::Result; pub(crate) use conduwuit::Result;
pub(crate) use conduit_macros::{admin_command, admin_command_dispatch}; pub(crate) use conduwuit_macros::{admin_command, admin_command_dispatch};
pub(crate) use crate::{ pub(crate) use crate::{
command::Command, command::Command,
@ -32,9 +32,9 @@ pub(crate) use crate::{
pub(crate) const PAGE_SIZE: usize = 100; pub(crate) const PAGE_SIZE: usize = 100;
conduit::mod_ctor! {} conduwuit::mod_ctor! {}
conduit::mod_dtor! {} conduwuit::mod_dtor! {}
conduit::rustc_flags_capture! {} conduwuit::rustc_flags_capture! {}
/// Install the admin command processor /// Install the admin command processor
pub async fn init(admin_service: &service::admin::Service) { pub async fn init(admin_service: &service::admin::Service) {

2
src/admin/processor.rs
View file

@ -6,7 +6,7 @@ use std::{
}; };
use clap::{CommandFactory, Parser}; use clap::{CommandFactory, Parser};
use conduit::{ use conduwuit::{
debug, error, debug, error,
log::{ log::{
capture, capture,

2
src/admin/query/account_data.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, RoomId, UserId}; use ruma::{events::room::message::RoomMessageEventContent, RoomId, UserId};

2
src/admin/query/appservice.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::events::room::message::RoomMessageEventContent; use ruma::events::room::message::RoomMessageEventContent;
use crate::Command; use crate::Command;

2
src/admin/query/globals.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::{events::room::message::RoomMessageEventContent, ServerName}; use ruma::{events::room::message::RoomMessageEventContent, ServerName};
use crate::Command; use crate::Command;

2
src/admin/query/mod.rs
View file

@ -10,7 +10,7 @@ mod sending;
mod users; mod users;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use self::{ use self::{
account_data::AccountDataCommand, appservice::AppserviceCommand, globals::GlobalsCommand, account_data::AccountDataCommand, appservice::AppserviceCommand, globals::GlobalsCommand,

2
src/admin/query/presence.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, UserId}; use ruma::{events::room::message::RoomMessageEventContent, UserId};

2
src/admin/query/pusher.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::{events::room::message::RoomMessageEventContent, UserId}; use ruma::{events::room::message::RoomMessageEventContent, UserId};
use crate::Command; use crate::Command;

2
src/admin/query/resolver.rs
View file

@ -1,7 +1,7 @@
use std::fmt::Write; use std::fmt::Write;
use clap::Subcommand; use clap::Subcommand;
use conduit::{utils::time, Result}; use conduwuit::{utils::time, Result};
use ruma::{events::room::message::RoomMessageEventContent, OwnedServerName}; use ruma::{events::room::message::RoomMessageEventContent, OwnedServerName};
use crate::{admin_command, admin_command_dispatch}; use crate::{admin_command, admin_command_dispatch};

2
src/admin/query/room_alias.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, RoomAliasId, RoomId}; use ruma::{events::room::message::RoomMessageEventContent, RoomAliasId, RoomId};

2
src/admin/query/room_state_cache.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, RoomId, ServerName, UserId}; use ruma::{events::room::message::RoomMessageEventContent, RoomId, ServerName, UserId};

2
src/admin/query/sending.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, ServerName, UserId}; use ruma::{events::room::message::RoomMessageEventContent, ServerName, UserId};
use service::sending::Destination; use service::sending::Destination;

2
src/admin/query/users.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::stream::StreamExt; use futures::stream::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, OwnedDeviceId, OwnedRoomId, OwnedUserId}; use ruma::{events::room::message::RoomMessageEventContent, OwnedDeviceId, OwnedRoomId, OwnedUserId};

2
src/admin/room/alias.rs
View file

@ -1,7 +1,7 @@
use std::fmt::Write; use std::fmt::Write;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId}; use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomAliasId, OwnedRoomId, RoomAliasId, RoomId};

2
src/admin/room/commands.rs
View file

@ -1,4 +1,4 @@
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId}; use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId};

2
src/admin/room/directory.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, RoomId}; use ruma::{events::room::message::RoomMessageEventContent, RoomId};

2
src/admin/room/info.rs
View file

@ -1,5 +1,5 @@
use clap::Subcommand; use clap::Subcommand;
use conduit::{utils::ReadyExt, Result}; use conduwuit::{utils::ReadyExt, Result};
use futures::StreamExt; use futures::StreamExt;
use ruma::{events::room::message::RoomMessageEventContent, RoomId}; use ruma::{events::room::message::RoomMessageEventContent, RoomId};

2
src/admin/room/mod.rs
View file

@ -5,7 +5,7 @@ mod info;
mod moderation; mod moderation;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::OwnedRoomId; use ruma::OwnedRoomId;
use self::{ use self::{

2
src/admin/room/moderation.rs
View file

@ -1,6 +1,6 @@
use api::client::leave_room; use api::client::leave_room;
use clap::Subcommand; use clap::Subcommand;
use conduit::{ use conduwuit::{
debug, error, info, debug, error, info,
utils::{IterStream, ReadyExt}, utils::{IterStream, ReadyExt},
warn, Result, warn, Result,

6
src/admin/server/commands.rs
View file

@ -1,6 +1,6 @@
use std::{fmt::Write, sync::Arc}; 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 ruma::events::room::message::RoomMessageEventContent;
use crate::admin_command; use crate::admin_command;
@ -73,7 +73,7 @@ pub(super) async fn list_features(
pub(super) async fn memory_usage(&self) -> Result<RoomMessageEventContent> { pub(super) async fn memory_usage(&self) -> Result<RoomMessageEventContent> {
let services_usage = self.services.memory_usage().await?; let services_usage = self.services.memory_usage().await?;
let database_usage = self.services.db.db.memory_usage()?; 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!( Ok(RoomMessageEventContent::text_plain(format!(
"Services:\n{services_usage}\nDatabase:\n{database_usage}{allocator_usage}", "Services:\n{services_usage}\nDatabase:\n{database_usage}{allocator_usage}",
@ -143,7 +143,7 @@ pub(super) async fn reload_mods(&self) -> Result<RoomMessageEventContent> {
#[admin_command] #[admin_command]
#[cfg(unix)] #[cfg(unix)]
pub(super) async fn restart(&self, force: bool) -> Result<RoomMessageEventContent> { pub(super) async fn restart(&self, force: bool) -> Result<RoomMessageEventContent> {
use conduit::utils::sys::current_exe_deleted; use conduwuit::utils::sys::current_exe_deleted;
if !force && current_exe_deleted() { if !force && current_exe_deleted() {
return Err!( return Err!(

2
src/admin/server/mod.rs
View file

@ -1,7 +1,7 @@
mod commands; mod commands;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use crate::admin_command_dispatch; use crate::admin_command_dispatch;

4
src/admin/user/commands.rs
View file

@ -1,12 +1,12 @@
use std::{collections::BTreeMap, fmt::Write as _}; use std::{collections::BTreeMap, fmt::Write as _};
use api::client::{full_user_deactivate, join_room_by_id_helper, leave_room}; use api::client::{full_user_deactivate, join_room_by_id_helper, leave_room};
use conduit::{ use conduwuit::{
debug_warn, error, info, is_equal_to, debug_warn, error, info, is_equal_to,
utils::{self, ReadyExt}, utils::{self, ReadyExt},
warn, PduBuilder, Result, 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 futures::StreamExt;
use ruma::{ use ruma::{
events::{ events::{

2
src/admin/user/mod.rs
View file

@ -1,7 +1,7 @@
mod commands; mod commands;
use clap::Subcommand; use clap::Subcommand;
use conduit::Result; use conduwuit::Result;
use ruma::{EventId, OwnedRoomOrAliasId, RoomId}; use ruma::{EventId, OwnedRoomOrAliasId, RoomId};
use crate::admin_command_dispatch; use crate::admin_command_dispatch;

2
src/admin/utils.rs
View file

@ -1,4 +1,4 @@
use conduit_core::{err, Err, Result}; use conduwuit_core::{err, Err, Result};
use ruma::{OwnedRoomId, OwnedUserId, RoomId, UserId}; use ruma::{OwnedRoomId, OwnedUserId, RoomId, UserId};
use service::Services; use service::Services;

8
src/api/Cargo.toml
View file

@ -1,5 +1,5 @@
[package] [package]
name = "conduit_api" name = "conduwuit_api"
categories.workspace = true categories.workspace = true
description.workspace = true description.workspace = true
edition.workspace = true edition.workspace = true
@ -41,9 +41,9 @@ axum-extra.workspace = true
axum.workspace = true axum.workspace = true
base64.workspace = true base64.workspace = true
bytes.workspace = true bytes.workspace = true
conduit-core.workspace = true conduwuit-core.workspace = true
conduit-database.workspace = true conduwuit-database.workspace = true
conduit-service.workspace = true conduwuit-service.workspace = true
const-str.workspace = true const-str.workspace = true
futures.workspace = true futures.workspace = true
hmac.workspace = true hmac.workspace = true

2
src/api/client/account.rs
View file

@ -2,7 +2,7 @@ use std::fmt::Write;
use axum::extract::State; use axum::extract::State;
use axum_client_ip::InsecureClientIp; 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 futures::{FutureExt, StreamExt};
use register::RegistrationKind; use register::RegistrationKind;
use ruma::{ use ruma::{

2
src/api/client/account_data.rs
View file

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

2
src/api/client/alias.rs
View file

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

2
src/api/client/appservice.rs
View file

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

2
src/api/client/backup.rs
View file

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

2
src/api/client/context.rs
View file

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

2
src/api/client/device.rs
View file

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

2
src/api/client/directory.rs
View file

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

2
src/api/client/filter.rs
View file

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

2
src/api/client/keys.rs
View file

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

4
src/api/client/media.rs
View file

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

4
src/api/client/media_legacy.rs
View file

@ -2,12 +2,12 @@
use axum::extract::State; use axum::extract::State;
use axum_client_ip::InsecureClientIp; use axum_client_ip::InsecureClientIp;
use conduit::{ use conduwuit::{
err, err,
utils::{content_disposition::make_content_disposition, math::ruma_from_usize}, utils::{content_disposition::make_content_disposition, math::ruma_from_usize},
Err, Result, 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 reqwest::Url;
use ruma::{ use ruma::{
api::client::media::{ api::client::media::{

4
src/api/client/membership.rs
View file

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

2
src/api/client/message.rs
View file

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

2
src/api/client/openid.rs
View file

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

2
src/api/client/profile.rs
View file

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

2
src/api/client/push.rs
View file

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

2
src/api/client/read_marker.rs
View file

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

2
src/api/client/relations.rs
View file

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

2
src/api/client/report.rs
View file

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

2
src/api/client/room/aliases.rs
View file

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

2
src/api/client/room/create.rs
View file

@ -1,7 +1,7 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use axum::extract::State; 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 futures::FutureExt;
use ruma::{ use ruma::{
api::client::{ api::client::{

2
src/api/client/room/event.rs
View file

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

2
src/api/client/room/initial_sync.rs
View file

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

2
src/api/client/room/upgrade.rs
View file

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

2
src/api/client/search.rs
View file

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

2
src/api/client/send.rs
View file

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

2
src/api/client/session.rs
View file

@ -1,6 +1,6 @@
use axum::extract::State; use axum::extract::State;
use axum_client_ip::InsecureClientIp; 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 futures::StreamExt;
use ruma::{ use ruma::{
api::client::{ api::client::{

2
src/api/client/state.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc; use std::sync::Arc;
use axum::extract::State; 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::{ use ruma::{
api::client::{ api::client::{
error::ErrorKind, error::ErrorKind,

2
src/api/client/sync/mod.rs
View file

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

4
src/api/client/sync/v3.rs
View file

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

2
src/api/client/sync/v4.rs
View file

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

2
src/api/client/threads.rs
View file

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

2
src/api/client/to_device.rs
View file

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

2
src/api/client/unstable.rs
View file

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

4
src/api/client/unversioned.rs
View file

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

2
src/api/client/user_directory.rs
View file

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

2
src/api/client/voip.rs
View file

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

2
src/api/client/well_known.rs
View file

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

10
src/api/mod.rs
View file

@ -4,12 +4,12 @@ pub mod client;
pub mod router; pub mod router;
pub mod server; pub mod server;
extern crate conduit_core as conduit; extern crate conduwuit_core as conduwuit;
extern crate conduit_service as service; extern crate conduwuit_service as service;
pub(crate) use conduit::{debug_info, pdu::PduEvent, utils, Error, Result}; pub(crate) use conduwuit::{debug_info, pdu::PduEvent, utils, Error, Result};
pub(crate) use self::router::{Ruma, RumaResponse, State}; pub(crate) use self::router::{Ruma, RumaResponse, State};
conduit::mod_ctor! {} conduwuit::mod_ctor! {}
conduit::mod_dtor! {} conduwuit::mod_dtor! {}

2
src/api/router.rs
View file

@ -12,7 +12,7 @@ use axum::{
routing::{any, get, post}, routing::{any, get, post},
Router, Router,
}; };
use conduit::{err, Server}; use conduwuit::{err, Server};
use http::{uri, Uri}; use http::{uri, Uri};
use self::handler::RouterExt; use self::handler::RouterExt;

2
src/api/router/args.rs
View file

@ -2,7 +2,7 @@ use std::{mem, ops::Deref};
use axum::{async_trait, body::Body, extract::FromRequest}; use axum::{async_trait, body::Body, extract::FromRequest};
use bytes::{BufMut, Bytes, BytesMut}; use bytes::{BufMut, Bytes, BytesMut};
use conduit::{debug, debug_warn, err, trace, utils::string::EMPTY, Error, Result}; use conduwuit::{debug, debug_warn, err, trace, utils::string::EMPTY, Error, Result};
use ruma::{ use ruma::{
api::IncomingRequest, CanonicalJsonObject, CanonicalJsonValue, DeviceId, OwnedDeviceId, OwnedServerName, api::IncomingRequest, CanonicalJsonObject, CanonicalJsonValue, DeviceId, OwnedDeviceId, OwnedServerName,
OwnedUserId, ServerName, UserId, OwnedUserId, ServerName, UserId,

2
src/api/router/auth.rs
View file

@ -4,7 +4,7 @@ use axum_extra::{
typed_header::TypedHeaderRejectionReason, typed_header::TypedHeaderRejectionReason,
TypedHeader, TypedHeader,
}; };
use conduit::{debug_error, err, warn, Err, Error, Result}; use conduwuit::{debug_error, err, warn, Err, Error, Result};
use ruma::{ use ruma::{
api::{ api::{
client::{ client::{

2
src/api/router/handler.rs
View file

@ -4,7 +4,7 @@ use axum::{
routing::{on, MethodFilter}, routing::{on, MethodFilter},
Router, Router,
}; };
use conduit::Result; use conduwuit::Result;
use futures::{Future, TryFutureExt}; use futures::{Future, TryFutureExt};
use http::Method; use http::Method;
use ruma::api::IncomingRequest; use ruma::api::IncomingRequest;

2
src/api/router/request.rs
View file

@ -2,7 +2,7 @@ use std::str;
use axum::{extract::Path, RequestExt, RequestPartsExt}; use axum::{extract::Path, RequestExt, RequestPartsExt};
use bytes::Bytes; use bytes::Bytes;
use conduit::{err, Result}; use conduwuit::{err, Result};
use http::request::Parts; use http::request::Parts;
use serde::Deserialize; use serde::Deserialize;
use service::Services; use service::Services;

2
src/api/router/response.rs
View file

@ -1,6 +1,6 @@
use axum::response::{IntoResponse, Response}; use axum::response::{IntoResponse, Response};
use bytes::BytesMut; use bytes::BytesMut;
use conduit::{error, Error}; use conduwuit::{error, Error};
use http::StatusCode; use http::StatusCode;
use http_body_util::Full; use http_body_util::Full;
use ruma::api::{client::uiaa::UiaaResponse, OutgoingResponse}; use ruma::api::{client::uiaa::UiaaResponse, OutgoingResponse};

2
src/api/router/state.rs
View file

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

2
src/api/server/backfill.rs
View file

@ -1,7 +1,7 @@
use std::cmp; use std::cmp;
use axum::extract::State; use axum::extract::State;
use conduit::{ use conduwuit::{
utils::{IterStream, ReadyExt}, utils::{IterStream, ReadyExt},
PduCount, Result, PduCount, Result,
}; };

2
src/api/server/event.rs
View file

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

2
src/api/server/event_auth.rs
View file

@ -1,7 +1,7 @@
use std::{borrow::Borrow, iter::once}; use std::{borrow::Borrow, iter::once};
use axum::extract::State; use axum::extract::State;
use conduit::{Error, Result}; use conduwuit::{Error, Result};
use futures::StreamExt; use futures::StreamExt;
use ruma::{ use ruma::{
api::{client::error::ErrorKind, federation::authorization::get_event_authorization}, api::{client::error::ErrorKind, federation::authorization::get_event_authorization},

2
src/api/server/get_missing_events.rs
View file

@ -1,5 +1,5 @@
use axum::extract::State; use axum::extract::State;
use conduit::{Error, Result}; use conduwuit::{Error, Result};
use ruma::{ use ruma::{
api::{client::error::ErrorKind, federation::event::get_missing_events}, api::{client::error::ErrorKind, federation::event::get_missing_events},
CanonicalJsonValue, EventId, RoomId, CanonicalJsonValue, EventId, RoomId,

2
src/api/server/invite.rs
View file

@ -1,7 +1,7 @@
use axum::extract::State; use axum::extract::State;
use axum_client_ip::InsecureClientIp; use axum_client_ip::InsecureClientIp;
use base64::{engine::general_purpose, Engine as _}; use base64::{engine::general_purpose, Engine as _};
use conduit::{err, utils, utils::hash::sha256, warn, Err, Error, PduEvent, Result}; use conduwuit::{err, utils, utils::hash::sha256, warn, Err, Error, PduEvent, Result};
use ruma::{ use ruma::{
api::{client::error::ErrorKind, federation::membership::create_invite}, api::{client::error::ErrorKind, federation::membership::create_invite},
events::room::member::{MembershipState, RoomMemberEventContent}, events::room::member::{MembershipState, RoomMemberEventContent},

Some files were not shown because too many files have changed in this diff Show more