diff --git a/.dockerignore b/.dockerignore index b6ca47be9..3378e831d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,6 @@ # Local build and dev artifacts target/ -!target/debug/conduwuit +!target/debug/continuwuity # Docker files Dockerfile* diff --git a/.forgejo/actions/upload-docker-artifacts/action.yml b/.forgejo/actions/upload-docker-artifacts/action.yml index ac91e31a1..5596a79d6 100644 --- a/.forgejo/actions/upload-docker-artifacts/action.yml +++ b/.forgejo/actions/upload-docker-artifacts/action.yml @@ -26,7 +26,7 @@ inputs: outputs: binary_artifact_name: description: The name of the uploaded binary artifact - value: conduwuit${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} + value: continuwuity${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} runs: using: composite @@ -51,13 +51,13 @@ runs: - name: Rename extracted binary shell: bash - run: mv /tmp/binaries/sbin/conduwuit /tmp/binaries/conduwuit${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} + run: mv /tmp/binaries/sbin/continuwuity /tmp/binaries/continuwuity${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} - name: Upload binary artifact uses: forgejo/upload-artifact@v4 with: - name: conduwuit${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} - path: /tmp/binaries/conduwuit${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} + name: continuwuity${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} + path: /tmp/binaries/continuwuity${{ inputs.cpu_suffix }}-${{ inputs.slug }}${{ inputs.artifact_suffix }} if-no-files-found: error - name: Upload digest diff --git a/.forgejo/workflows/build-debian.yml b/.forgejo/workflows/build-debian.yml index 81ea4cedc..904f0f73c 100644 --- a/.forgejo/workflows/build-debian.yml +++ b/.forgejo/workflows/build-debian.yml @@ -123,7 +123,7 @@ jobs: - name: Get package version and component id: package-meta run: | - BASE_VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r ".packages[] | select(.name == \"conduwuit\").version" | sed 's/[^a-zA-Z0-9.+]/~/g') + BASE_VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r ".packages[] | select(.name == \"continuwuity\").version" | sed 's/[^a-zA-Z0-9.+]/~/g') # VERSION is the package version, COMPONENT is used in # apt's repository config like a git repo branch VERSION=$BASE_VERSION @@ -185,9 +185,9 @@ jobs: echo "Installing: ${{ steps.cargo-deb.outputs.path }}" apt-get install -y ${{ steps.cargo-deb.outputs.path }} dpkg -s continuwuity - [ -f /usr/bin/conduwuit ] && echo "✅ Binary installed successfully" - [ -f /usr/lib/systemd/system/conduwuit.service ] && echo "✅ Systemd service installed" - [ -f /etc/conduwuit/conduwuit.toml ] && echo "✅ Config file installed" + [ -f /usr/bin/continuwuity ] && echo "✅ Binary installed successfully" + [ -f /usr/lib/systemd/system/continuwuity.service ] && echo "✅ Systemd service installed" + [ -f /etc/continuwuity/continuwuity.toml ] && echo "✅ Config file installed" - name: Upload deb artifact uses: forgejo/upload-artifact@v4 diff --git a/.forgejo/workflows/build-nix.yml b/.forgejo/workflows/build-nix.yml index ee16f0d25..058354fba 100644 --- a/.forgejo/workflows/build-nix.yml +++ b/.forgejo/workflows/build-nix.yml @@ -21,14 +21,14 @@ jobs: matrix: include: - package: default-static-x86_64 - filename: conduwuit-linux-static-amd64 + filename: continuwuity-linux-static-amd64 - package: default-static-aarch64 - filename: conduwuit-linux-static-arm64 + filename: continuwuity-linux-static-arm64 - package: max-perf-static-aarch64 - filename: conduwuit-linux-static-arm64-maxperf + filename: continuwuity-linux-static-arm64-maxperf - package: max-perf-haswell-static-x86_64 - filename: conduwuit-haswell-linux-static-amd64-maxperf + filename: continuwuity-haswell-linux-static-amd64-maxperf steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 @@ -41,7 +41,7 @@ jobs: - name: Build static binary run: | nix build .#${{ matrix.package }} - install -D result/bin/conduwuit /tmp/binaries/${{ matrix.filename }} + install -D result/bin/continuwuity /tmp/binaries/${{ matrix.filename }} - name: Upload binary artifact uses: forgejo/upload-artifact@v4 @@ -61,7 +61,7 @@ jobs: - name: Download binary artifacts uses: forgejo/download-artifact@v4 with: - pattern: conduwuit* + pattern: continuwuity* path: binaries merge-multiple: true - name: Create Release and Upload diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml index 6673755d2..51bbc5c62 100644 --- a/.forgejo/workflows/release-image.yml +++ b/.forgejo/workflows/release-image.yml @@ -214,7 +214,7 @@ jobs: - name: Download binary artifacts uses: forgejo/download-artifact@v4 with: - pattern: conduwuit* + pattern: continuwuity* path: binaries merge-multiple: true - name: Create Release and Upload diff --git a/Cargo.lock b/Cargo.lock index 449d1cc25..d8622a387 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -894,326 +894,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "conduwuit" -version = "26.9.1" -dependencies = [ - "aws-lc-rs", - "clap", - "conduwuit_admin", - "conduwuit_api", - "conduwuit_build_metadata", - "conduwuit_core", - "conduwuit_database", - "conduwuit_macros", - "conduwuit_router", - "conduwuit_service", - "console-subscriber", - "const-str", - "ctor", - "dtor", - "hardened_malloc-rs", - "log", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry_sdk", - "parking_lot", - "reqwest 0.13.5", - "rustls", - "sentry", - "sentry-tower", - "sentry-tracing", - "tokio", - "tokio-metrics", - "tracing", - "tracing-flame", - "tracing-journald", - "tracing-opentelemetry", - "tracing-subscriber", -] - -[[package]] -name = "conduwuit_admin" -version = "26.9.1" -dependencies = [ - "clap", - "conduwuit_api", - "conduwuit_core", - "conduwuit_database", - "conduwuit_macros", - "conduwuit_service", - "const-str", - "ctor", - "dtor", - "futures", - "lettre", - "log", - "resolvematrix", - "ruma", - "serde-saphyr", - "serde_json", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "conduwuit_api" -version = "26.9.1" -dependencies = [ - "axum", - "base64 0.23.1", - "bytes", - "client-ip", - "conduwuit_core", - "conduwuit_macros", - "conduwuit_service", - "const-str", - "ctor", - "dtor", - "futures", - "hmac 0.13.0", - "http", - "http-body-util", - "hyper", - "itertools 0.15.0", - "lettre", - "log", - "rand 0.10.3", - "reqwest 0.13.5", - "ruma", - "ruminuwuity", - "serde", - "serde_json", - "sha1 0.11.0", - "tokio", - "tracing", -] - -[[package]] -name = "conduwuit_build_metadata" -version = "26.9.1" -dependencies = [ - "built", - "cargo_metadata", -] - -[[package]] -name = "conduwuit_core" -version = "26.9.1" -dependencies = [ - "argon2", - "arrayvec", - "axum", - "axum-extra", - "bytes", - "bytesize", - "cargo_toml", - "checked_ops", - "chrono", - "clap", - "conduwuit_build_metadata", - "conduwuit_macros", - "const-str", - "core_affinity", - "ctor", - "cyborgtime", - "dtor", - "either", - "figment", - "futures", - "hardened_malloc-rs", - "http", - "http-body-util", - "hyper-util", - "ipaddress", - "lettre", - "libc", - "libloading 0.9.0", - "lock_api", - "log", - "maplit", - "nix", - "num-traits", - "openidconnect", - "parking_lot", - "rand 0.10.3", - "regex", - "reqwest 0.13.5", - "resolvematrix", - "ruma", - "sanitize-filename", - "serde", - "serde-saphyr", - "serde_json", - "serde_regex", - "sha2 0.11.0", - "smallstr", - "smallvec", - "thiserror 2.0.21", - "tikv-jemalloc-ctl", - "tikv-jemalloc-sys", - "tikv-jemallocator", - "tokio", - "tokio-metrics", - "toml 1.1.6+spec-1.1.0", - "tracing", - "tracing-core", - "tracing-subscriber", - "url", -] - -[[package]] -name = "conduwuit_database" -version = "26.9.1" -dependencies = [ - "async-channel", - "conduwuit_core", - "conduwuit_macros", - "const-str", - "ctor", - "dtor", - "futures", - "log", - "minicbor", - "minicbor-serde", - "rust-rocksdb", - "serde", - "serde_json", - "tokio", - "tracing", -] - -[[package]] -name = "conduwuit_macros" -version = "26.9.1" -dependencies = [ - "itertools 0.15.0", - "proc-macro2", - "quote", - "syn 3.0.6", -] - -[[package]] -name = "conduwuit_router" -version = "26.9.1" -dependencies = [ - "axum", - "axum-server", - "axum-server-dual-protocol", - "bytes", - "conduwuit_admin", - "conduwuit_api", - "conduwuit_core", - "conduwuit_macros", - "conduwuit_service", - "conduwuit_web", - "const-str", - "ctor", - "dtor", - "futures", - "http", - "http-body-util", - "hyper", - "hyper-util", - "log", - "ruma", - "rustls", - "sd-notify", - "sentry", - "sentry-tower", - "sentry-tracing", - "serde_json", - "tokio", - "tower", - "tower-http 0.7.1", - "tracing", -] - -[[package]] -name = "conduwuit_service" -version = "26.9.1" -dependencies = [ - "askama", - "assign", - "async-trait", - "base64 0.23.1", - "bytes", - "conduwuit_core", - "conduwuit_database", - "conduwuit_macros", - "const-str", - "ctor", - "dtor", - "either", - "futures", - "governor", - "hickory-resolver", - "http", - "httpdate", - "image", - "ipaddress", - "itertools 0.15.0", - "lettre", - "log", - "loole", - "lru-cache", - "nonzero_ext", - "openidconnect", - "p256", - "rand 0.10.3", - "regex", - "reqwest 0.13.5", - "resolvematrix", - "ruma", - "ruminuwuity", - "rustyline-async", - "sd-notify", - "serde", - "serde-saphyr", - "serde_json", - "serde_urlencoded", - "sha2 0.11.0", - "termimad", - "tokio", - "tracing", - "url", - "web-push-native", - "webpage", - "yansi", -] - -[[package]] -name = "conduwuit_web" -version = "26.9.1" -dependencies = [ - "askama", - "async-trait", - "axum", - "conduwuit_api", - "conduwuit_build_metadata", - "conduwuit_core", - "conduwuit_database", - "conduwuit_service", - "form_urlencoded", - "futures", - "lettre", - "memory-serve", - "openidconnect", - "ruma", - "serde", - "serde_json", - "serde_urlencoded", - "thiserror 2.0.21", - "tower-http 0.7.1", - "tower-sec-fetch", - "tower-sessions", - "tower-sessions-core", - "tracing", - "url", - "validator", -] - [[package]] name = "console-api" version = "0.9.0" @@ -1281,6 +961,326 @@ dependencies = [ "typewit", ] +[[package]] +name = "continuwuity" +version = "26.9.1" +dependencies = [ + "aws-lc-rs", + "clap", + "console-subscriber", + "const-str", + "continuwuity_admin", + "continuwuity_api", + "continuwuity_build_metadata", + "continuwuity_core", + "continuwuity_database", + "continuwuity_macros", + "continuwuity_router", + "continuwuity_service", + "ctor", + "dtor", + "hardened_malloc-rs", + "log", + "opentelemetry", + "opentelemetry-otlp", + "opentelemetry_sdk", + "parking_lot", + "reqwest 0.13.5", + "rustls", + "sentry", + "sentry-tower", + "sentry-tracing", + "tokio", + "tokio-metrics", + "tracing", + "tracing-flame", + "tracing-journald", + "tracing-opentelemetry", + "tracing-subscriber", +] + +[[package]] +name = "continuwuity_admin" +version = "26.9.1" +dependencies = [ + "clap", + "const-str", + "continuwuity_api", + "continuwuity_core", + "continuwuity_database", + "continuwuity_macros", + "continuwuity_service", + "ctor", + "dtor", + "futures", + "lettre", + "log", + "resolvematrix", + "ruma", + "serde-saphyr", + "serde_json", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "continuwuity_api" +version = "26.9.1" +dependencies = [ + "axum", + "base64 0.23.1", + "bytes", + "client-ip", + "const-str", + "continuwuity_core", + "continuwuity_macros", + "continuwuity_service", + "ctor", + "dtor", + "futures", + "hmac 0.13.0", + "http", + "http-body-util", + "hyper", + "itertools 0.15.0", + "lettre", + "log", + "rand 0.10.3", + "reqwest 0.13.5", + "ruma", + "ruminuwuity", + "serde", + "serde_json", + "sha1 0.11.0", + "tokio", + "tracing", +] + +[[package]] +name = "continuwuity_build_metadata" +version = "26.9.1" +dependencies = [ + "built", + "cargo_metadata", +] + +[[package]] +name = "continuwuity_core" +version = "26.9.1" +dependencies = [ + "argon2", + "arrayvec", + "axum", + "axum-extra", + "bytes", + "bytesize", + "cargo_toml", + "checked_ops", + "chrono", + "clap", + "const-str", + "continuwuity_build_metadata", + "continuwuity_macros", + "core_affinity", + "ctor", + "cyborgtime", + "dtor", + "either", + "figment", + "futures", + "hardened_malloc-rs", + "http", + "http-body-util", + "hyper-util", + "ipaddress", + "lettre", + "libc", + "libloading 0.9.0", + "lock_api", + "log", + "maplit", + "nix", + "num-traits", + "openidconnect", + "parking_lot", + "rand 0.10.3", + "regex", + "reqwest 0.13.5", + "resolvematrix", + "ruma", + "sanitize-filename", + "serde", + "serde-saphyr", + "serde_json", + "serde_regex", + "sha2 0.11.0", + "smallstr", + "smallvec", + "thiserror 2.0.21", + "tikv-jemalloc-ctl", + "tikv-jemalloc-sys", + "tikv-jemallocator", + "tokio", + "tokio-metrics", + "toml 1.1.6+spec-1.1.0", + "tracing", + "tracing-core", + "tracing-subscriber", + "url", +] + +[[package]] +name = "continuwuity_database" +version = "26.9.1" +dependencies = [ + "async-channel", + "const-str", + "continuwuity_core", + "continuwuity_macros", + "ctor", + "dtor", + "futures", + "log", + "minicbor", + "minicbor-serde", + "rust-rocksdb", + "serde", + "serde_json", + "tokio", + "tracing", +] + +[[package]] +name = "continuwuity_macros" +version = "26.9.1" +dependencies = [ + "itertools 0.15.0", + "proc-macro2", + "quote", + "syn 3.0.6", +] + +[[package]] +name = "continuwuity_router" +version = "26.9.1" +dependencies = [ + "axum", + "axum-server", + "axum-server-dual-protocol", + "bytes", + "const-str", + "continuwuity_admin", + "continuwuity_api", + "continuwuity_core", + "continuwuity_macros", + "continuwuity_service", + "continuwuity_web", + "ctor", + "dtor", + "futures", + "http", + "http-body-util", + "hyper", + "hyper-util", + "log", + "ruma", + "rustls", + "sd-notify", + "sentry", + "sentry-tower", + "sentry-tracing", + "serde_json", + "tokio", + "tower", + "tower-http 0.7.1", + "tracing", +] + +[[package]] +name = "continuwuity_service" +version = "26.9.1" +dependencies = [ + "askama", + "assign", + "async-trait", + "base64 0.23.1", + "bytes", + "const-str", + "continuwuity_core", + "continuwuity_database", + "continuwuity_macros", + "ctor", + "dtor", + "either", + "futures", + "governor", + "hickory-resolver", + "http", + "httpdate", + "image", + "ipaddress", + "itertools 0.15.0", + "lettre", + "log", + "loole", + "lru-cache", + "nonzero_ext", + "openidconnect", + "p256", + "rand 0.10.3", + "regex", + "reqwest 0.13.5", + "resolvematrix", + "ruma", + "ruminuwuity", + "rustyline-async", + "sd-notify", + "serde", + "serde-saphyr", + "serde_json", + "serde_urlencoded", + "sha2 0.11.0", + "termimad", + "tokio", + "tracing", + "url", + "web-push-native", + "webpage", + "yansi", +] + +[[package]] +name = "continuwuity_web" +version = "26.9.1" +dependencies = [ + "askama", + "async-trait", + "axum", + "continuwuity_api", + "continuwuity_build_metadata", + "continuwuity_core", + "continuwuity_database", + "continuwuity_service", + "form_urlencoded", + "futures", + "lettre", + "memory-serve", + "openidconnect", + "ruma", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror 2.0.21", + "tower-http 0.7.1", + "tower-sec-fetch", + "tower-sessions", + "tower-sessions-core", + "tracing", + "url", + "validator", +] + [[package]] name = "convert_case" version = "0.10.0" @@ -7290,7 +7290,7 @@ dependencies = [ "askama", "cargo_metadata", "clap", - "conduwuit_admin", + "continuwuity_admin", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index bd605174f..7803e1af5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ default-members = ["src/*"] [workspace.package] authors = ["Continuwuity Team and contributors "] -description = "A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver." +description = "A community-driven Matrix homeserver" edition = "2024" homepage = "https://continuwuity.org/" license = "Apache-2.0" @@ -15,7 +15,7 @@ repository = "https://forgejo.ellis.link/continuwuation/continuwuity" version = "26.9.1" [workspace.metadata.crane] -name = "conduwuit" +name = "continuwuity" [workspace.dependencies.arrayvec] version = "0.7.6" @@ -121,7 +121,7 @@ features = ["typed-header", "tracing", "cookie"] version = "0.8.0" default-features = false -# to listen on both HTTP and HTTPS if listening on TLS dierctly from conduwuit for complement or sytest +# to listen on both HTTP and HTTPS if listening on TLS dierctly from continuwuity for complement or sytest [workspace.dependencies.axum-server-dual-protocol] # version = "0.7" git = "https://github.com/vinchona/axum-server-dual-protocol.git" @@ -223,7 +223,7 @@ default-features = false version = "2.0.1" default-features = false -# used for conduwuit's CLI and admin room command parsing +# used for continuwuity's CLI and admin room command parsing [workspace.dependencies.clap] version = "4.5.35" default-features = false @@ -314,7 +314,7 @@ features = [ "tokio", ] -# Used for conduwuit::Error type +# Used for continuwuity::Error type [workspace.dependencies.thiserror] version = "2.0.12" default-features = false @@ -610,49 +610,49 @@ rev = "09fcd3bf4656c81a8ad573bee410ab2b57f60b86" # Our crates # -[workspace.dependencies.conduwuit-router] -package = "conduwuit_router" +[workspace.dependencies.continuwuity-router] +package = "continuwuity_router" path = "src/router" default-features = false -[workspace.dependencies.conduwuit-admin] -package = "conduwuit_admin" +[workspace.dependencies.continuwuity-admin] +package = "continuwuity_admin" path = "src/admin" default-features = false -[workspace.dependencies.conduwuit-api] -package = "conduwuit_api" +[workspace.dependencies.continuwuity-api] +package = "continuwuity_api" path = "src/api" default-features = false -[workspace.dependencies.conduwuit-service] -package = "conduwuit_service" +[workspace.dependencies.continuwuity-service] +package = "continuwuity_service" path = "src/service" default-features = false -[workspace.dependencies.conduwuit-database] -package = "conduwuit_database" +[workspace.dependencies.continuwuity-database] +package = "continuwuity_database" path = "src/database" default-features = false -[workspace.dependencies.conduwuit-core] -package = "conduwuit_core" +[workspace.dependencies.continuwuity-core] +package = "continuwuity_core" path = "src/core" default-features = false -[workspace.dependencies.conduwuit-macros] -package = "conduwuit_macros" +[workspace.dependencies.continuwuity-macros] +package = "continuwuity_macros" path = "src/macros" default-features = false -[workspace.dependencies.conduwuit-web] -package = "conduwuit_web" +[workspace.dependencies.continuwuity-web] +package = "continuwuity_web" path = "src/web" default-features = false -[workspace.dependencies.conduwuit-build-metadata] -package = "conduwuit_build_metadata" +[workspace.dependencies.continuwuity-build-metadata] +package = "continuwuity_build_metadata" path = "src/build_metadata" default-features = false @@ -697,7 +697,7 @@ codegen-units = 32 # '-Clink-arg=-Wl,--no-gc-sections', #] -[profile.release-max-perf.package.conduwuit_macros] +[profile.release-max-perf.package.continuwuity_macros] inherits = "release-max-perf.build-override" #rustflags = [ # '-Crelocation-model=pic', @@ -731,7 +731,7 @@ panic = "unwind" debug-assertions = true incremental = true #rustflags = [ -# '--cfg', 'conduwuit_mods', +# '--cfg', 'continuwuity_mods', # '-Ztime-passes', # '-Zmir-opt-level=0', # '-Zvalidate-mir=false', @@ -748,12 +748,12 @@ incremental = true # '-Clink-arg=-Wl,-z,lazy', #] -[profile.dev.package.conduwuit_core] +[profile.dev.package.continuwuity_core] inherits = "dev" -[profile.dev.package.conduwuit] +[profile.dev.package.continuwuity] inherits = "dev" #rustflags = [ -# '--cfg', 'conduwuit_mods', +# '--cfg', 'continuwuity_mods', # '-Ztime-passes', # '-Zmir-opt-level=0', # '-Zvalidate-mir=false', @@ -774,7 +774,7 @@ debug = 'limited' codegen-units = 1 opt-level = 'z' #rustflags = [ -# '--cfg', 'conduwuit_mods', +# '--cfg', 'continuwuity_mods', # '-Ztls-model=global-dynamic', # '-Cprefer-dynamic=true', # '-Zstaticlib-prefer-dynamic=true', @@ -974,7 +974,7 @@ suspicious = { level = "warn", priority = -1 } ## some sadness let_underscore_future = { level = "allow", priority = 1 } -# rust doesnt understand conduwuit's custom log macros +# rust doesnt understand continuwuity's custom log macros literal_string_with_formatting_args = { level = "allow", priority = 1 } # This lint is stupid, there's no point defining generics for simple trait params diff --git a/README.md b/README.md index dc473ced8..cfebd3adb 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ [opencollective]: https://opencollective.com/continuwuity [continuwuity] is a Matrix homeserver written in Rust. -It's the official community continuation of the [conduwuit](https://github.com/girlbossceo/conduwuit) homeserver. + [![forgejo.ellis.link][forge-badge]][forge-link] [![Stars][forge-stars-badge]][forge-stars-link] diff --git a/bin/complement b/bin/complement index f1ac017d1..49bf63c71 100755 --- a/bin/complement +++ b/bin/complement @@ -99,7 +99,7 @@ fi if ! docker image inspect "$COMPLEMENT_BASE_IMAGE" > /dev/null 2>&1; then echo "Complement base image not found: $COMPLEMENT_BASE_IMAGE" - echo "Build it with: cargo build -p conduwuit && docker build -t $COMPLEMENT_BASE_IMAGE -f docker/complement.Dockerfile ." + echo "Build it with: cargo build -p continuwuity && docker build -t $COMPLEMENT_BASE_IMAGE -f docker/complement.Dockerfile ." exit 1 fi @@ -141,6 +141,7 @@ if [ -n "$MSC" ]; then fi # `COMPLEMENT_ENABLE_DIRTY_RUNS=1` reuses the same complement container for faster complement, at the possible expense of test environment pollution +# TODO: upstream complement handling to replace conduwuit_blacklist set +e (cd "$COMPLEMENT_SRC" && \ COMPLEMENT_BASE_IMAGE="$COMPLEMENT_BASE_IMAGE" \ diff --git a/bin/nix-build-and-cache b/bin/nix-build-and-cache deleted file mode 100755 index ac64ff232..000000000 --- a/bin/nix-build-and-cache +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/env bash - -set -eo pipefail - -toplevel="$(git rev-parse --show-toplevel)" - -# Build just the single installable and forward any other arguments too -just() { - # uses nix-output-monitor (nom) if available - if command -v nom &> /dev/null; then - nom build "$@" - else - nix build -L "$@" - fi - - if [ -z "$ATTIC_TOKEN" ]; then - echo "\$ATTIC_TOKEN is unset, skipping uploading to the binary cache" - return - fi - - # historical "conduit" store for compatibility purposes, same as conduwuit - nix run --inputs-from "$toplevel" attic -- \ - login \ - conduit \ - "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduit}" \ - "$ATTIC_TOKEN" - - # Find all output paths of the installables and their build dependencies - #readarray -t derivations < <(nix path-info --derivation "$@") - derivations=() - while IFS=$'\n' read derivation; do - derivations+=("$derivation") - done < <(nix path-info --derivation "$@") - - cache=() - for derivation in "${derivations[@]}"; do - cache+=( - "$(nix-store --query --requisites --include-outputs "$derivation")" - ) - done - - withattic() { - nix shell --inputs-from "$toplevel" attic --command xargs attic push "$@" <<< "${cache[*]}" - } - # Upload them to Attic (conduit store) - # - # Use `xargs` and a here-string because something would probably explode if - # several thousand arguments got passed to a command at once. Hopefully no - # store paths include a newline in them. - ( - IFS=$'\n' - withattic conduit || withattic conduit || withattic conduit || true - ) - - # main "conduwuit" store - nix run --inputs-from "$toplevel" attic -- \ - login \ - conduwuit \ - "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduwuit}" \ - "$ATTIC_TOKEN" - - # Upload them to Attic (conduwuit store) and Cachix - # - # Use `xargs` and a here-string because something would probably explode if - # several thousand arguments got passed to a command at once. Hopefully no - # store paths include a newline in them. - ( - IFS=$'\n' - withattic conduwuit || withattic conduwuit || withattic conduwuit || true - - # push to cachix if available - if [ "$CACHIX_AUTH_TOKEN" ]; then - nix shell --inputs-from "$toplevel" cachix -c xargs \ - cachix push conduwuit <<< "${cache[*]}" - fi - ) -} - -# Build and cache things needed for CI -ci() { - cache=( - --inputs-from "$toplevel" - - # Keep sorted - #"$toplevel#devShells.x86_64-linux.default" - #"$toplevel#devShells.x86_64-linux.all-features" - attic#default - cachix#default - nixpkgs#direnv - nixpkgs#jq - nixpkgs#nix-direnv - ) - - just "${cache[@]}" -} - -# Build and cache *all* the package outputs from the flake.nix -packages() { - declare -a cache="($( - nix flake show --json 2> /dev/null | - nix run --inputs-from "$toplevel" nixpkgs#jq -- \ - -r \ - '.packages."x86_64-linux" | keys | map("'"$toplevel"'#" + .) | @sh' - ))" - - just "${cache[@]}" -} - - -eval "$@" diff --git a/clippy.toml b/clippy.toml index 7ee0fd457..8cb7e8f8a 100644 --- a/clippy.toml +++ b/clippy.toml @@ -8,25 +8,25 @@ type-complexity-threshold = 250 # reduce me to ~200 large-error-threshold = 256 # TODO reduce me ALARA disallowed-macros = [ - { 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" }, + { path = "log::error", reason = "use continuwuity_core::error" }, + { path = "log::warn", reason = "use continuwuity_core::warn" }, + { path = "log::info", reason = "use continuwuity_core::info" }, + { path = "log::debug", reason = "use continuwuity_core::debug" }, + { path = "log::trace", reason = "use continuwuity_core::trace" }, ] [[disallowed-methods]] path = "tokio::spawn" -reason = "use and pass conduwuit_core::server::Server::runtime() to spawn from" +reason = "use and pass continuwuity_core::server::Server::runtime() to spawn from" [[disallowed-methods]] path = "reqwest::Response::bytes" -reason = "bytes is unsafe, use limit_read via the conduwuit_core::utils::LimitReadExt trait instead" +reason = "bytes is unsafe, use limit_read via the continuwuity_core::utils::LimitReadExt trait instead" [[disallowed-methods]] path = "reqwest::Response::text" -reason = "text is unsafe, use limit_read_text via the conduwuit_core::utils::LimitReadExt trait instead" +reason = "text is unsafe, use limit_read_text via the continuwuity_core::utils::LimitReadExt trait instead" [[disallowed-methods]] path = "reqwest::Response::json" -reason = "json is unsafe, use limit_read_text via the conduwuit_core::utils::LimitReadExt trait instead" +reason = "json is unsafe, use limit_read_text via the continuwuity_core::utils::LimitReadExt trait instead" diff --git a/complement/complement-entrypoint.sh b/complement/complement-entrypoint.sh index 276e40328..b63ad8520 100644 --- a/complement/complement-entrypoint.sh +++ b/complement/complement-entrypoint.sh @@ -64,4 +64,4 @@ export CONTINUWUITY_SERVER_NAME="$SERVER_NAME" echo "Starting Continuwuity with SERVER_NAME=$SERVER_NAME" # Start continuwuity -/usr/local/bin/conduwuit --config /etc/continuwuity/config.toml +/usr/local/bin/continuwuity --config /etc/continuwuity/config.toml diff --git a/complement/complement.config.toml b/complement/complement.config.toml index dc7e66d6c..8e5d55602 100644 --- a/complement/complement.config.toml +++ b/complement/complement.config.toml @@ -10,7 +10,7 @@ allow_device_name_federation = true allow_public_room_directory_over_federation = true allow_registration = true database_path = "/database" -log = "trace,h2=debug,hyper=debug,conduwuit_database=warn,conduwuit_service::manager=info,conduwuit_api::router=error,conduwuit_router=error,tower_http=error" +log = "trace,h2=debug,hyper=debug,continuwuity_database=warn,continuwuity_service::manager=info,continuwuity_api::router=error,continuwuity_router=error,tower_http=error" port = [8008, 8448] trusted_servers = [] only_query_trusted_key_servers = false diff --git a/conduwuit-example.toml b/continuwuity-example.toml similarity index 99% rename from conduwuit-example.toml rename to continuwuity-example.toml index d0bf4e51f..75a1befb6 100644 --- a/conduwuit-example.toml +++ b/continuwuity-example.toml @@ -84,10 +84,10 @@ # including media. Note: this was previously "/var/lib/matrix-conduit". # # YOU NEED TO EDIT THIS, UNLESS you are running continuwuity as a -# `systemd` service. The service file sets it to `/var/lib/conduwuit` +# `systemd` service. The service file sets it to `/var/lib/continuwuity` # using an environment variable and also grants write access. # -# example: "/var/lib/conduwuit" +# example: "/var/lib/continuwuity" # #database_path = @@ -1548,7 +1548,7 @@ # Check consistency of the media directory at startup: # 1. When `media_compat_file_link` is enabled, this check will upgrade -# media when switching back and forth between Conduit and conduwuit. +# media when switching back and forth between Conduit and continuwuity. # Both options must be enabled to handle this. # 2. When media is deleted from the directory, this check will also delete # its database entry. diff --git a/docker/Dockerfile b/docker/Dockerfile index 31cc70212..0cc1928bc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -149,7 +149,7 @@ ARG TARGETPLATFORM # Verify environment configuration RUN xx-cargo --print-target-triple -# Conduwuit version info +# Continuwuity version info ARG GIT_COMMIT_HASH ARG GIT_COMMIT_HASH_SHORT ARG GIT_REMOTE_URL @@ -191,7 +191,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ TARGET_DIR=($(cargo metadata --no-deps --format-version 1 | \ jq -r ".target_directory")) mkdir /out/sbin - PACKAGE=conduwuit + PACKAGE=continuwuity CARGO_LOG=debug xx-cargo build --locked --profile ${RUST_PROFILE} \ --no-default-features --features ${CARGO_FEATURES} \ -p $PACKAGE; @@ -202,6 +202,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ xx-verify $TARGET_DIR/$(xx-cargo --print-target-triple)/${RUST_PROFILE_DIR}/$BINARY cp $TARGET_DIR/$(xx-cargo --print-target-triple)/${RUST_PROFILE_DIR}/$BINARY /out/sbin/$BINARY done + ln -s continuwuity /out/sbin/conduwuit EOF # Generate Software Bill of Materials (SBOM) @@ -213,6 +214,9 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ mkdir /out/sbom typeset -A PACKAGES for BINARY in /out/sbin/*; do + if [ -L "$BINARY" ]; then + continue + fi BINARY_BASE=$(basename ${BINARY}) package=$(cargo metadata --no-deps --format-version 1 | jq -r ".packages[] | select(.targets[] | select( .kind | map(. == \"bin\") | any ) | .name == \"$BINARY_BASE\") | .name") if [ -z "$package" ]; then @@ -233,6 +237,9 @@ RUN <<'DEPS_EOF' # Process each binary for BINARY in /out/sbin/*; do + if [ -L "$BINARY" ]; then + continue + fi if lddtree_output=$(lddtree "$BINARY" 2>/dev/null) && [ -n "$lddtree_output" ]; then echo "$lddtree_output" | awk '{print $(NF-0) " " $1}' | sort -u -k 1,1 | \ awk '{dest = ($2 ~ /^\//) ? "/out/libs-root" $2 : "/out/libs/" $2; print "install -D " $1 " " dest}' | \ @@ -285,4 +292,4 @@ ENV LD_LIBRARY_PATH=/usr/lib # Continuwuity default port EXPOSE 8008 -CMD ["/sbin/conduwuit"] +CMD ["/sbin/continuwuity"] diff --git a/docker/complement.Dockerfile b/docker/complement.Dockerfile index 1cef3527d..c5a780e97 100644 --- a/docker/complement.Dockerfile +++ b/docker/complement.Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y ca-certificates liburing2 && rm -rf /va RUN mkdir -p /etc/continuwuity /var/lib/continuwuity /usr/local/bin/ COPY complement/complement-entrypoint.sh /usr/local/bin/complement-entrypoint.sh COPY complement/complement.config.toml /etc/continuwuity/config.toml -COPY target/debug/conduwuit /usr/local/bin/conduwuit -RUN chmod +x /usr/local/bin/conduwuit /usr/local/bin/complement-entrypoint.sh +COPY target/debug/continuwuity /usr/local/bin/continuwuity +RUN chmod +x /usr/local/bin/continuwuity /usr/local/bin/complement-entrypoint.sh #HEALTHCHECK --interval=30s --timeout=5s CMD curl --fail http://localhost:8008/_continuwuity/server_version || exit 1 ENTRYPOINT ["/usr/local/bin/complement-entrypoint.sh"] diff --git a/docker/musl.Dockerfile b/docker/musl.Dockerfile index 7f4fbb7fb..b5936a86c 100644 --- a/docker/musl.Dockerfile +++ b/docker/musl.Dockerfile @@ -103,7 +103,7 @@ ARG TARGETPLATFORM # Verify environment configuration RUN xx-cargo --print-target-triple -# Conduwuit version info +# Continuwuity version info ARG GIT_COMMIT_HASH ARG GIT_COMMIT_HASH_SHORT ARG GIT_REMOTE_URL @@ -130,7 +130,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ TARGET_DIR=($(cargo metadata --no-deps --format-version 1 | \ jq -r ".target_directory")) mkdir /out/sbin - PACKAGE=conduwuit + PACKAGE=continuwuity xx-cargo build --locked --profile ${RUST_PROFILE} \ -p $PACKAGE --no-default-features --features bindgen-static,release_max_log_level,standard; BINARIES=($(cargo metadata --no-deps --format-version 1 | \ @@ -197,4 +197,4 @@ ENV LD_LIBRARY_PATH=/usr/lib # Continuwuity default port EXPOSE 8008 -CMD ["/sbin/conduwuit"] +CMD ["/sbin/continuwuity"] diff --git a/docs/configuration.mdx b/docs/configuration.mdx index 085df4328..12cd67c06 100644 --- a/docs/configuration.mdx +++ b/docs/configuration.mdx @@ -9,7 +9,7 @@ Continuwuity uses a TOML config file for all of its settings. This is the recomm You can specify the config file to be used by Continuwuity with the command-line flag `-c` or `--config`: ```bash -./conduwuit -c /path/to/continuwuity.toml +./continuwuity -c /path/to/continuwuity.toml ``` Alternatively, you can use the environment variable `CONTINUWUITY_CONFIG` to specify the config file to be used; see [the section on environment variables](#environment-variables) for more information. @@ -80,10 +80,10 @@ Therefore, you can use environment variables or the options flags to override va Continuwuity supports running admin commands on startup using the command-line flag `--execute`. This is treated as a standard admin command, without the need for the `!admin` prefix. For example, to create a new user: ```bash -# Equivalent to `!admin users create_user june` -./conduwuit --execute "users create_user june" -INFO conduwuit_service::admin::startup: Startup command #0 completed: -Created user with user_id: @june:girlboss.ceo and password: `` +# Equivalent to `!admin users create_user jade` +./continuwuity --execute "users create_user jade" +INFO continuwuity_service::admin::startup: Startup command #0 completed: +Created user with user_id: @jade:continuwuity.org and password: `` ``` Alternatively, you can configure `CONTINUWUITY_ADMIN_EXECUTE` or the config file value `admin_execute` with a list of commands. diff --git a/docs/deploying/arch-linux.mdx b/docs/deploying/arch-linux.mdx index 928d1c8e5..b999a2d4a 100644 --- a/docs/deploying/arch-linux.mdx +++ b/docs/deploying/arch-linux.mdx @@ -8,4 +8,4 @@ The development version is available on the AUR as [`continuwuity-git`][aur-cont [aur-continuwuity]: https://aur.archlinux.org/packages/continuwuity [aur-continuwuity-git]: https://aur.archlinux.org/packages/continuwuity-git -Simply install the `continuwuity` package. Configure the service in `/etc/conduwuit/conduwuit.toml`, then enable and start the `continuwuity.service`. +Simply install the `continuwuity` package. Configure the service in `/etc/continuwuity/continuwuity.toml`, then enable and start the `continuwuity.service`. diff --git a/docs/deploying/docker.mdx b/docs/deploying/docker.mdx index d7133ee68..6430400b2 100644 --- a/docs/deploying/docker.mdx +++ b/docs/deploying/docker.mdx @@ -247,7 +247,7 @@ Get a working Continuwuity server with an admin user in four steps: -e CONTINUWUITY_ALLOW_FEDERATION="false" \ --name continuwuity \ forgejo.ellis.link/continuwuation/continuwuity:latest \ - /sbin/conduwuit + /sbin/continuwuity ``` 3. Fetch the one-time initial registration token diff --git a/docs/deploying/generic.mdx b/docs/deploying/generic.mdx index cbcac08ac..3291d181e 100644 --- a/docs/deploying/generic.mdx +++ b/docs/deploying/generic.mdx @@ -70,16 +70,16 @@ sudo useradd -r --shell /usr/bin/nologin --no-create-home continuwuity You can find an example unit for continuwuity below. You may need to change the `ExecStart=` path to match where you placed the Continuwuity -binary if it is not in `/usr/bin/conduwuit`. +binary if it is not in `/usr/bin/continuwuity`. On systems where rsyslog is used alongside journald (i.e. Red Hat-based distros and OpenSUSE), put `$EscapeControlCharactersOnReceive off` inside `/etc/rsyslog.conf` to allow color in logs. If you are using a different `database_path` than the systemd unit's -configured default (`/var/lib/conduwuit`), you need to add your path to the +configured default (`/var/lib/continuwuity`), you need to add your path to the systemd unit's `ReadWritePaths=`. You can do this by either directly editing -`conduwuit.service` and reloading systemd, or by running `systemctl edit conduwuit.service` +`continuwuity.service` and reloading systemd, or by running `systemctl edit continuwuity.service` and entering the following: ``` @@ -90,9 +90,9 @@ ReadWritePaths=/path/to/custom/database/path ### Example systemd Unit File
-Click to expand systemd unit file (conduwuit.service) +Click to expand systemd unit file (continuwuity.service) -```ini file="../../pkg/conduwuit.service" +```ini file="../../pkg/continuwuity.service" ``` @@ -100,13 +100,13 @@ ReadWritePaths=/path/to/custom/database/path You can also [view the file on Foregejo][systemd-file]. -[systemd-file]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/pkg/conduwuit.service +[systemd-file]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/pkg/continuwuity.service ## Creating the Continuwuity configuration file Now you need to create the Continuwuity configuration file in -`/etc/conduwuit/conduwuit.toml`. You can find an example configuration at -[conduwuit-example.toml](../reference/config.mdx). +`/etc/continuwuity/continuwuity.toml`. You can find an example configuration at +[continuwuity-example.toml](../reference/config.mdx). **Please take a moment to read the config. You need to change at least the server name.** @@ -117,16 +117,16 @@ If you are using a dedicated user for Continuwuity, you need to allow it to read the configuration. To do this, run: ```bash -sudo chown -R root:root /etc/conduwuit -sudo chmod -R 755 /etc/conduwuit +sudo chown -R root:root /etc/continuwuity +sudo chmod -R 755 /etc/continuwuity ``` If you use the default database path you also need to run this: ```bash -sudo mkdir -p /var/lib/conduwuit/ -sudo chown -R continuwuity:continuwuity /var/lib/conduwuit/ -sudo chmod 700 /var/lib/conduwuit/ +sudo mkdir -p /var/lib/continuwuity/ +sudo chown -R continuwuity:continuwuity /var/lib/continuwuity/ +sudo chmod 700 /var/lib/continuwuity/ ``` ## Exposing ports in the firewall or the router @@ -197,26 +197,26 @@ header, making federation non-functional. If you find a workaround, please share - `proxy_pass http://127.0.0.1:6167$request_uri;` - `proxy_pass http://127.0.0.1:6167;` - Furthermore, Nginx users need to increase the `client_max_body_size` setting (default is 1M) to match the `max_request_size` defined in conduwuit.toml. + Furthermore, Nginx users need to increase the `client_max_body_size` setting (default is 1M) to match the `max_request_size` defined in continuwuity.toml. ## Starting Your Server Now you can start Continuwuity with: ```bash -sudo systemctl start conduwuit +sudo systemctl start continuwuity ``` Set it to start automatically when your system boots with: ```bash -sudo systemctl enable conduwuit +sudo systemctl enable continuwuity ``` Check Continuwuity logs with the following command: ```bash -sudo journalctl -u conduwuit.service +sudo journalctl -u continuwuity.service ``` If Continuwuity has successfully initialized, you'll see output as below. diff --git a/docs/deploying/kubernetes.mdx b/docs/deploying/kubernetes.mdx index 458744507..dbe1b0201 100644 --- a/docs/deploying/kubernetes.mdx +++ b/docs/deploying/kubernetes.mdx @@ -39,7 +39,7 @@ spec: - name: continuwuity # use a sha hash <3 image: forgejo.ellis.link/continuwuation/continuwuity:latest - command: ["/sbin/conduwuit"] + command: ["/sbin/continuwuity"] imagePullPolicy: IfNotPresent ports: - name: http diff --git a/docs/deploying/nixos.mdx b/docs/deploying/nixos.mdx index 0d193b4a2..5b285bff1 100644 --- a/docs/deploying/nixos.mdx +++ b/docs/deploying/nixos.mdx @@ -57,7 +57,7 @@ The NixOS module provides these configuration options: - `max-perf`: Takes longer to build, but has more runtime optimizations - `max-perf-haswell`: Optimized for modern CPUs, don't use if your CPU is not Haswell or later. -- `admin.enable`: Whether to add the `conduwuit` binary to `PATH` for administration (enabled by default) +- `admin.enable`: Whether to add the `continuwuity` binary to `PATH` for administration (enabled by default) - `settings`: The Continuwuity configuration Use the `settings` option to configure Continuwuity itself. See the [example configuration file](../reference/config.mdx) for all available options. diff --git a/docs/deploying/nomad.mdx b/docs/deploying/nomad.mdx index f7d06143b..8be38e364 100644 --- a/docs/deploying/nomad.mdx +++ b/docs/deploying/nomad.mdx @@ -112,7 +112,7 @@ EOF data = < LICENSE.dependencies %install -install -Dpm0755 target/rpm/conduwuit -t %{buildroot}%{_bindir} -install -Dpm0644 pkg/conduwuit.service -t %{buildroot}%{_unitdir} -install -Dpm0600 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/conduwuit.toml +install -Dpm0755 target/rpm/continuwuity -t %{buildroot}%{_bindir} +install -Dpm0644 pkg/continuwuity.service -t %{buildroot}%{_unitdir} +install -Dpm0600 continuwuity-example.toml %{buildroot}%{_sysconfdir}/continuwuity/continuwuity.toml %files %license LICENSE @@ -60,20 +60,20 @@ install -Dpm0600 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/con %doc CONTRIBUTING.md %doc README.md %doc SECURITY.md -%config(noreplace) %{_sysconfdir}/conduwuit/conduwuit.toml +%config(noreplace) %{_sysconfdir}/continuwuity/continuwuity.toml -%{_bindir}/conduwuit -%{_unitdir}/conduwuit.service -# Do not create /var/lib/conduwuit, systemd will create it if necessary +%{_bindir}/continuwuity +%{_unitdir}/continuwuity.service +# Do not create /var/lib/continuwuity, systemd will create it if necessary %post -%systemd_post conduwuit.service +%systemd_post continuwuity.service %preun -%systemd_preun conduwuit.service +%systemd_preun continuwuity.service %postun -%systemd_postun_with_restart conduwuit.service +%systemd_postun_with_restart continuwuity.service %changelog {{{ git_repo_changelog }}} diff --git a/src/admin/Cargo.toml b/src/admin/Cargo.toml index 6495ad400..7ab056b96 100644 --- a/src/admin/Cargo.toml +++ b/src/admin/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_admin" +name = "continuwuity_admin" description.workspace = true edition.workspace = true homepage.workspace = true @@ -17,68 +17,68 @@ crate-type = [ [features] brotli_compression = [ - "conduwuit-api/brotli_compression", - "conduwuit-core/brotli_compression", - "conduwuit-service/brotli_compression", + "continuwuity-api/brotli_compression", + "continuwuity-core/brotli_compression", + "continuwuity-service/brotli_compression", ] gzip_compression = [ - "conduwuit-api/gzip_compression", - "conduwuit-core/gzip_compression", - "conduwuit-service/gzip_compression", + "continuwuity-api/gzip_compression", + "continuwuity-core/gzip_compression", + "continuwuity-service/gzip_compression", ] io_uring = [ - "conduwuit-api/io_uring", - "conduwuit-database/io_uring", - "conduwuit-service/io_uring", + "continuwuity-api/io_uring", + "continuwuity-database/io_uring", + "continuwuity-service/io_uring", ] jemalloc = [ - "conduwuit-api/jemalloc", - "conduwuit-core/jemalloc", - "conduwuit-database/jemalloc", - "conduwuit-service/jemalloc", + "continuwuity-api/jemalloc", + "continuwuity-core/jemalloc", + "continuwuity-database/jemalloc", + "continuwuity-service/jemalloc", ] jemalloc_conf = [ - "conduwuit-api/jemalloc_conf", - "conduwuit-core/jemalloc_conf", - "conduwuit-database/jemalloc_conf", - "conduwuit-service/jemalloc_conf", + "continuwuity-api/jemalloc_conf", + "continuwuity-core/jemalloc_conf", + "continuwuity-database/jemalloc_conf", + "continuwuity-service/jemalloc_conf", ] jemalloc_prof = [ - "conduwuit-api/jemalloc_prof", - "conduwuit-core/jemalloc_prof", - "conduwuit-database/jemalloc_prof", - "conduwuit-service/jemalloc_prof", + "continuwuity-api/jemalloc_prof", + "continuwuity-core/jemalloc_prof", + "continuwuity-database/jemalloc_prof", + "continuwuity-service/jemalloc_prof", ] jemalloc_stats = [ - "conduwuit-api/jemalloc_stats", - "conduwuit-core/jemalloc_stats", - "conduwuit-database/jemalloc_stats", - "conduwuit-service/jemalloc_stats", + "continuwuity-api/jemalloc_stats", + "continuwuity-core/jemalloc_stats", + "continuwuity-database/jemalloc_stats", + "continuwuity-service/jemalloc_stats", ] release_max_log_level = [ - "conduwuit-api/release_max_log_level", - "conduwuit-core/release_max_log_level", - "conduwuit-database/release_max_log_level", - "conduwuit-service/release_max_log_level", + "continuwuity-api/release_max_log_level", + "continuwuity-core/release_max_log_level", + "continuwuity-database/release_max_log_level", + "continuwuity-service/release_max_log_level", "tracing/max_level_trace", "tracing/release_max_level_info", "log/max_level_trace", "log/release_max_level_info", ] zstd_compression = [ - "conduwuit-api/zstd_compression", - "conduwuit-core/zstd_compression", - "conduwuit-database/zstd_compression", - "conduwuit-service/zstd_compression", + "continuwuity-api/zstd_compression", + "continuwuity-core/zstd_compression", + "continuwuity-database/zstd_compression", + "continuwuity-service/zstd_compression", ] [dependencies] clap.workspace = true -conduwuit-api.workspace = true -conduwuit-core.workspace = true -conduwuit-database.workspace = true -conduwuit-macros.workspace = true -conduwuit-service.workspace = true +continuwuity-api.workspace = true +continuwuity-core.workspace = true +continuwuity-database.workspace = true +continuwuity-macros.workspace = true +continuwuity-service.workspace = true const-str.workspace = true ctor.workspace = true dtor.workspace = true diff --git a/src/admin/admin.rs b/src/admin/admin.rs index bb9574a5c..3e7fe38d5 100644 --- a/src/admin/admin.rs +++ b/src/admin/admin.rs @@ -1,5 +1,5 @@ use clap::Parser; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use crate::{ appservice::{self, AppserviceCommand}, @@ -17,7 +17,7 @@ use crate::{ }; #[derive(Debug, Parser)] -#[command(name = conduwuit_core::BRANDING, version = conduwuit_core::version())] +#[command(name = continuwuity_core::BRANDING, version = continuwuity_core::version())] pub enum AdminCommand { /// Commands for managing appservices #[command(subcommand)] diff --git a/src/admin/appservice/commands.rs b/src/admin/appservice/commands.rs index 9bccc643d..24bbc164c 100644 --- a/src/admin/appservice/commands.rs +++ b/src/admin/appservice/commands.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result, checked}; +use continuwuity::{Err, Result, checked}; use futures::{FutureExt, StreamExt, TryFutureExt}; impl crate::Context<'_> { diff --git a/src/admin/appservice/mod.rs b/src/admin/appservice/mod.rs index 1e69a67a8..7f039cbf4 100644 --- a/src/admin/appservice/mod.rs +++ b/src/admin/appservice/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use crate::admin_command_dispatch; diff --git a/src/admin/check/commands.rs b/src/admin/check/commands.rs index db17bb109..11bcdffe0 100644 --- a/src/admin/check/commands.rs +++ b/src/admin/check/commands.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::Result; use futures::StreamExt; use crate::Context; diff --git a/src/admin/check/mod.rs b/src/admin/check/mod.rs index fe2f04feb..f14afdf46 100644 --- a/src/admin/check/mod.rs +++ b/src/admin/check/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use crate::admin_command_dispatch; diff --git a/src/admin/context.rs b/src/admin/context.rs index 458f57ef1..8de0819d8 100644 --- a/src/admin/context.rs +++ b/src/admin/context.rs @@ -1,7 +1,7 @@ use std::{fmt, time::SystemTime}; -use conduwuit::{Err, Result}; -use conduwuit_service::Services; +use continuwuity::{Err, Result}; +use continuwuity_service::Services; use futures::{ Future, FutureExt, TryFutureExt, io::{AsyncWriteExt, BufWriter}, diff --git a/src/admin/debug/commands.rs b/src/admin/debug/commands.rs index 9fc69aae9..b749cc0a8 100644 --- a/src/admin/debug/commands.rs +++ b/src/admin/debug/commands.rs @@ -5,7 +5,7 @@ use std::{ time::{Instant, SystemTime}, }; -use conduwuit::{ +use continuwuity::{ Err, Result, at, debug_error, err, info, matrix::{ Event, StateKey, @@ -539,7 +539,7 @@ impl crate::Context<'_> { let mut pdus: HashMap<(StateEventType, StateKey), CanonicalJsonObject> = state_ids .iter() - .try_stream::() + .try_stream::() .and_then(|id| async { let pdu_json = self.services.rooms.timeline.get_pdu_json(id).await?; let event_type = pdu_json @@ -1017,7 +1017,7 @@ impl crate::Context<'_> { }) .collect(); - let stats = conduwuit::alloc::memory_stats(&opts).unwrap_or_default(); + let stats = continuwuity::alloc::memory_stats(&opts).unwrap_or_default(); self.write_str("```\n").await?; self.write_str(&stats).await?; @@ -1123,7 +1123,7 @@ impl crate::Context<'_> { } pub(super) async fn trim_memory(&self) -> Result { - conduwuit::alloc::trim(None)?; + continuwuity::alloc::trim(None)?; writeln!(self, "done").await } diff --git a/src/admin/debug/mod.rs b/src/admin/debug/mod.rs index f544637ab..989e0d69c 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 conduwuit::Result; +use continuwuity::Result; use ruma::{OwnedEventId, OwnedRoomId, OwnedRoomOrAliasId, OwnedServerName}; use service::rooms::short::{ShortEventId, ShortRoomId}; diff --git a/src/admin/debug/tester.rs b/src/admin/debug/tester.rs index 9c1b57e06..3838402cc 100644 --- a/src/admin/debug/tester.rs +++ b/src/admin/debug/tester.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use crate::admin_command_dispatch; diff --git a/src/admin/federation/commands.rs b/src/admin/federation/commands.rs index 966c7bdcf..912d3b13f 100644 --- a/src/admin/federation/commands.rs +++ b/src/admin/federation/commands.rs @@ -1,6 +1,6 @@ use std::fmt::Write; -use conduwuit::{Err, Result, utils::response::LimitReadExt}; +use continuwuity::{Err, Result, utils::response::LimitReadExt}; use futures::StreamExt; use ruma::{MilliSecondsSinceUnixEpoch, OwnedRoomId, OwnedServerName, OwnedUserId}; diff --git a/src/admin/federation/mod.rs b/src/admin/federation/mod.rs index 7a5d88c16..db3c1ca8f 100644 --- a/src/admin/federation/mod.rs +++ b/src/admin/federation/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use ruma::{OwnedRoomId, OwnedServerName, OwnedUserId}; use crate::admin_command_dispatch; diff --git a/src/admin/media/commands.rs b/src/admin/media/commands.rs index ef34b979a..122768aa8 100644 --- a/src/admin/media/commands.rs +++ b/src/admin/media/commands.rs @@ -1,11 +1,11 @@ use std::time::Duration; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, debug_info, debug_warn, error, info, trace, utils::time::{TimeDirection, parse_timepoint_ago}, warn, }; -use conduwuit_service::media::Dim; +use continuwuity_service::media::Dim; use ruma::{OwnedEventId, OwnedMxcUri, OwnedServerName}; use service::media::mxc::Mxc; diff --git a/src/admin/media/mod.rs b/src/admin/media/mod.rs index f90c1740e..15cb2990c 100644 --- a/src/admin/media/mod.rs +++ b/src/admin/media/mod.rs @@ -2,7 +2,7 @@ mod commands; use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use ruma::{OwnedEventId, OwnedMxcUri, OwnedServerName}; use crate::admin_command_dispatch; diff --git a/src/admin/mod.rs b/src/admin/mod.rs index fd73c3f15..704642ed3 100644 --- a/src/admin/mod.rs +++ b/src/admin/mod.rs @@ -3,7 +3,7 @@ #![allow(clippy::enum_glob_use)] #![allow(clippy::too_many_arguments)] -conduwuit_macros::introspect_crate! {} +continuwuity_macros::introspect_crate! {} pub(crate) mod admin; pub(crate) mod context; @@ -23,18 +23,18 @@ pub(crate) mod server; pub(crate) mod token; pub(crate) mod user; -extern crate conduwuit_api as api; -extern crate conduwuit_core as conduwuit; -extern crate conduwuit_service as service; +extern crate continuwuity_api as api; +extern crate continuwuity_core as continuwuity; +extern crate continuwuity_service as service; -pub(crate) use conduwuit_macros::admin_command_dispatch; +pub(crate) use continuwuity_macros::admin_command_dispatch; pub(crate) use crate::{context::Context, utils::get_room_info}; pub(crate) const PAGE_SIZE: usize = 100; -conduwuit::mod_ctor! {} -conduwuit::mod_dtor! {} +continuwuity::mod_ctor! {} +continuwuity::mod_dtor! {} pub use crate::admin::AdminCommand; diff --git a/src/admin/oidc/commands.rs b/src/admin/oidc/commands.rs index 439d40e2c..29b0ee484 100644 --- a/src/admin/oidc/commands.rs +++ b/src/admin/oidc/commands.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::Result; use crate::utils::parse_active_local_user_id; diff --git a/src/admin/oidc/mod.rs b/src/admin/oidc/mod.rs index 591563919..9dcf28c06 100644 --- a/src/admin/oidc/mod.rs +++ b/src/admin/oidc/mod.rs @@ -1,8 +1,8 @@ mod commands; use clap::Subcommand; -use conduwuit::Result; -use conduwuit_macros::admin_command_dispatch; +use continuwuity::Result; +use continuwuity_macros::admin_command_dispatch; #[admin_command_dispatch] #[derive(Debug, Subcommand)] diff --git a/src/admin/processor.rs b/src/admin/processor.rs index ba935fc7d..520c93b34 100644 --- a/src/admin/processor.rs +++ b/src/admin/processor.rs @@ -1,7 +1,7 @@ use std::{fmt::Write, mem::take, panic::AssertUnwindSafe, sync::Arc, time::SystemTime}; use clap::{CommandFactory, Parser}; -use conduwuit::{ +use continuwuity::{ Error, Result, SyncMutex, debug, error, log::{ capture, diff --git a/src/admin/query/account_data.rs b/src/admin/query/account_data.rs index 82e881e0b..942a97df9 100644 --- a/src/admin/query/account_data.rs +++ b/src/admin/query/account_data.rs @@ -1,6 +1,6 @@ use clap::Subcommand; -use conduwuit::Result; -use conduwuit_database::Deserialized as _; +use continuwuity::Result; +use continuwuity_database::Deserialized as _; use futures::StreamExt; use ruma::{OwnedRoomId, OwnedUserId, exports::serde::Serialize}; diff --git a/src/admin/query/appservice.rs b/src/admin/query/appservice.rs index e2f04acf3..67e202e5c 100644 --- a/src/admin/query/appservice.rs +++ b/src/admin/query/appservice.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use futures::TryStreamExt; use crate::Context; diff --git a/src/admin/query/globals.rs b/src/admin/query/globals.rs index b55a350ff..f7bd2d0e7 100644 --- a/src/admin/query/globals.rs +++ b/src/admin/query/globals.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use crate::Context; diff --git a/src/admin/query/mod.rs b/src/admin/query/mod.rs index 26bd12141..a1139311c 100644 --- a/src/admin/query/mod.rs +++ b/src/admin/query/mod.rs @@ -13,7 +13,7 @@ mod short; mod users; use clap::Subcommand; -use conduwuit::Result; +use continuwuity::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 d135593a1..d8f9b3b38 100644 --- a/src/admin/query/presence.rs +++ b/src/admin/query/presence.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use futures::StreamExt; use ruma::OwnedUserId; diff --git a/src/admin/query/pusher.rs b/src/admin/query/pusher.rs index 1f10a2e4c..8603eea58 100644 --- a/src/admin/query/pusher.rs +++ b/src/admin/query/pusher.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::{ +use continuwuity::{ Result, utils::{IterStream, stream::BroadbandExt}, }; diff --git a/src/admin/query/raw.rs b/src/admin/query/raw.rs index 557c6d844..4324e8060 100644 --- a/src/admin/query/raw.rs +++ b/src/admin/query/raw.rs @@ -1,15 +1,15 @@ use std::{borrow::Cow, collections::BTreeMap, ops::Deref, sync::Arc}; use clap::Subcommand; -use conduwuit::{ +use continuwuity::{ Err, Result, apply, at, is_zero, utils::{ stream::{IterStream, ReadyExt, TryIgnore, TryParallelExt}, string::EMPTY, }, }; -use conduwuit_database::Map; -use conduwuit_service::Services; +use continuwuity_database::Map; +use continuwuity_service::Services; use futures::{FutureExt, Stream, StreamExt, TryStreamExt}; use tokio::time::Instant; @@ -170,7 +170,7 @@ impl crate::Context<'_> { parallelism: Option, exhaustive: bool, ) -> Result { - use conduwuit_database::compact::Options; + use continuwuity_database::compact::Options; let default_all_maps: Option<_> = map.is_none().then(|| { self.services @@ -209,7 +209,7 @@ impl crate::Context<'_> { let parallelism = parallelism.unwrap_or(1); let results = maps .into_iter() - .try_stream::() + .try_stream::() .paralleln_and_then(runtime, parallelism, move |map| { map.compact_blocking(options.clone())?; Ok(map.name().to_owned()) diff --git a/src/admin/query/resolver.rs b/src/admin/query/resolver.rs index fb15ceeda..17472232e 100644 --- a/src/admin/query/resolver.rs +++ b/src/admin/query/resolver.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::{Err, Result, utils::time}; +use continuwuity::{Err, Result, utils::time}; use resolvematrix::resolution::Resolution; use ruma::OwnedServerName; diff --git a/src/admin/query/room_alias.rs b/src/admin/query/room_alias.rs index a390e3bb1..be9ffeaeb 100644 --- a/src/admin/query/room_alias.rs +++ b/src/admin/query/room_alias.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use futures::StreamExt; use ruma::{OwnedRoomAliasId, OwnedRoomId}; diff --git a/src/admin/query/room_state_cache.rs b/src/admin/query/room_state_cache.rs index b66ac5103..8111faed4 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 conduwuit::Result; +use continuwuity::Result; use futures::StreamExt; use ruma::{OwnedRoomId, OwnedServerName, OwnedUserId}; diff --git a/src/admin/query/room_timeline.rs b/src/admin/query/room_timeline.rs index 2b2a9b8d4..9f8f38250 100644 --- a/src/admin/query/room_timeline.rs +++ b/src/admin/query/room_timeline.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::{PduCount, Result, utils::stream::TryTools}; +use continuwuity::{PduCount, Result, utils::stream::TryTools}; use futures::TryStreamExt; use ruma::OwnedRoomOrAliasId; diff --git a/src/admin/query/sending.rs b/src/admin/query/sending.rs index 3d18a192f..9bbbc8761 100644 --- a/src/admin/query/sending.rs +++ b/src/admin/query/sending.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::StreamExt; use ruma::{OwnedServerName, OwnedUserId}; use service::sending::Destination; diff --git a/src/admin/query/short.rs b/src/admin/query/short.rs index 6bcd2d4c0..6cff6e0f4 100644 --- a/src/admin/query/short.rs +++ b/src/admin/query/short.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use ruma::{OwnedEventId, OwnedRoomOrAliasId}; use crate::admin_command_dispatch; diff --git a/src/admin/query/users.rs b/src/admin/query/users.rs index 7449f0689..c21111496 100644 --- a/src/admin/query/users.rs +++ b/src/admin/query/users.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use futures::stream::StreamExt; use ruma::{OwnedDeviceId, OwnedRoomId, OwnedUserId}; diff --git a/src/admin/room/alias.rs b/src/admin/room/alias.rs index 939b36a9a..c7b51104a 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 conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::StreamExt; use ruma::{OwnedRoomAliasId, OwnedRoomId, RoomAliasId}; diff --git a/src/admin/room/commands.rs b/src/admin/room/commands.rs index 50849186b..abd50dcc7 100644 --- a/src/admin/room/commands.rs +++ b/src/admin/room/commands.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::StreamExt; use ruma::OwnedRoomId; diff --git a/src/admin/room/directory.rs b/src/admin/room/directory.rs index f5481741a..a10764aec 100644 --- a/src/admin/room/directory.rs +++ b/src/admin/room/directory.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::StreamExt; use ruma::OwnedRoomId; diff --git a/src/admin/room/info.rs b/src/admin/room/info.rs index a035027c7..c9b2817fd 100644 --- a/src/admin/room/info.rs +++ b/src/admin/room/info.rs @@ -1,5 +1,5 @@ use clap::Subcommand; -use conduwuit::{Err, Result, utils::ReadyExt}; +use continuwuity::{Err, Result, utils::ReadyExt}; use futures::StreamExt; use ruma::OwnedRoomId; diff --git a/src/admin/room/mod.rs b/src/admin/room/mod.rs index 5878cc852..c64f23b93 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 conduwuit::Result; +use continuwuity::Result; use ruma::OwnedRoomId; use self::{ diff --git a/src/admin/room/moderation.rs b/src/admin/room/moderation.rs index 7168d7571..57ddcc3e5 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 conduwuit::{ +use continuwuity::{ Err, Result, debug, info, utils::{IterStream, ReadyExt}, warn, diff --git a/src/admin/server/commands.rs b/src/admin/server/commands.rs index 1173c5457..8e768da1f 100644 --- a/src/admin/server/commands.rs +++ b/src/admin/server/commands.rs @@ -1,6 +1,6 @@ use std::{fmt::Write, path::PathBuf, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Err, Result, utils::{stream::IterStream, time}, warn, @@ -59,7 +59,7 @@ impl crate::Context<'_> { 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 = conduwuit::alloc::memory_usage() + let allocator_usage = continuwuity::alloc::memory_usage() .map_or(String::new(), |s| format!("\nAllocator:\n{s}")); self.write_str(&format!( @@ -120,7 +120,7 @@ impl crate::Context<'_> { #[cfg(unix)] pub(super) async fn restart(&self, force: bool) -> Result { - use conduwuit::utils::sys::current_exe_deleted; + use continuwuity::utils::sys::current_exe_deleted; if !force && current_exe_deleted() { return Err!( @@ -144,7 +144,7 @@ impl crate::Context<'_> { } pub(super) async fn list_features(&self) -> Result { - let mut enabled_features = conduwuit::info::introspection::ENABLED_FEATURES + let mut enabled_features = continuwuity::info::introspection::ENABLED_FEATURES .lock() .expect("locked") .values() @@ -154,7 +154,7 @@ impl crate::Context<'_> { enabled_features.sort_unstable(); enabled_features.dedup(); - let mut available_features = conduwuit::build_metadata::WORKSPACE_FEATURES + let mut available_features = continuwuity::build_metadata::WORKSPACE_FEATURES .iter() .flat_map(|(_, f)| f.iter()) .collect::>(); @@ -175,7 +175,7 @@ impl crate::Context<'_> { } pub(super) async fn build_info(&self) -> Result { - use conduwuit::build_metadata::built; + use continuwuity::build_metadata::built; let mut info = String::new(); @@ -187,16 +187,16 @@ impl crate::Context<'_> { // Git information writeln!(info, "\n## Git Information\n")?; - if let Some(hash) = conduwuit::build_metadata::GIT_COMMIT_HASH { + if let Some(hash) = continuwuity::build_metadata::GIT_COMMIT_HASH { writeln!(info, "**Commit Hash:** {hash}")?; } - if let Some(hash) = conduwuit::build_metadata::GIT_COMMIT_HASH_SHORT { + if let Some(hash) = continuwuity::build_metadata::GIT_COMMIT_HASH_SHORT { writeln!(info, "**Commit Hash (short):** {hash}")?; } - if let Some(url) = conduwuit::build_metadata::GIT_REMOTE_WEB_URL { + if let Some(url) = continuwuity::build_metadata::GIT_REMOTE_WEB_URL { writeln!(info, "**Repository:** {url}")?; } - if let Some(url) = conduwuit::build_metadata::GIT_REMOTE_COMMIT_URL { + if let Some(url) = continuwuity::build_metadata::GIT_REMOTE_COMMIT_URL { writeln!(info, "**Commit URL:** {url}")?; } diff --git a/src/admin/server/mod.rs b/src/admin/server/mod.rs index ff6933ef9..02b41fb7d 100644 --- a/src/admin/server/mod.rs +++ b/src/admin/server/mod.rs @@ -3,7 +3,7 @@ mod commands; use std::path::PathBuf; use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use crate::admin_command_dispatch; diff --git a/src/admin/token/commands.rs b/src/admin/token/commands.rs index a3ddeff49..e7fa2f83f 100644 --- a/src/admin/token/commands.rs +++ b/src/admin/token/commands.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result, utils}; +use continuwuity::{Err, Result, utils}; use futures::StreamExt; use service::registration_tokens::TokenExpires; @@ -57,7 +57,7 @@ impl crate::Context<'_> { .get_client_domain() .join(&format!( "{}/account/register/?flow=trusted&token={token}", - conduwuit::ROUTE_PREFIX + continuwuity::ROUTE_PREFIX )) .unwrap() )) diff --git a/src/admin/token/mod.rs b/src/admin/token/mod.rs index f274e55d5..f1dd82dfe 100644 --- a/src/admin/token/mod.rs +++ b/src/admin/token/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::{Args, Subcommand}; -use conduwuit::Result; +use continuwuity::Result; use crate::admin_command_dispatch; diff --git a/src/admin/user/commands.rs b/src/admin/user/commands.rs index cda825563..c75f32cbc 100644 --- a/src/admin/user/commands.rs +++ b/src/admin/user/commands.rs @@ -3,7 +3,7 @@ use std::collections::{BTreeMap, HashSet}; use api::client::{ full_user_deactivate, leave_room, recreate_push_rules_and_return, remote_leave_room, }; -use conduwuit::{ +use continuwuity::{ Err, Result, debug_warn, info, matrix::{Event, pdu::PartialPdu}, utils::{self, ReadyExt}, diff --git a/src/admin/user/mod.rs b/src/admin/user/mod.rs index 3b2e2fb09..8a22811b7 100644 --- a/src/admin/user/mod.rs +++ b/src/admin/user/mod.rs @@ -1,7 +1,7 @@ mod commands; use clap::Subcommand; -use conduwuit::Result; +use continuwuity::Result; use ruma::{OwnedEventId, OwnedRoomId, OwnedRoomOrAliasId}; use crate::admin_command_dispatch; diff --git a/src/admin/utils.rs b/src/admin/utils.rs index f39985417..1222df89e 100644 --- a/src/admin/utils.rs +++ b/src/admin/utils.rs @@ -1,6 +1,6 @@ #![allow(dead_code)] -use conduwuit_core::{Err, Result, err}; +use continuwuity_core::{Err, Result, err}; use ruma::{OwnedRoomId, OwnedUserId, RoomId, UserId}; use service::Services; diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index 4385fbe7f..8fbc84d95 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_api" +name = "continuwuity_api" description.workspace = true edition.workspace = true homepage.workspace = true @@ -17,48 +17,48 @@ crate-type = [ [features] brotli_compression = [ - "conduwuit-core/brotli_compression", - "conduwuit-service/brotli_compression", + "continuwuity-core/brotli_compression", + "continuwuity-service/brotli_compression", "reqwest/brotli", ] element_hacks = [ - "conduwuit-service/element_hacks", + "continuwuity-service/element_hacks", ] gzip_compression = [ - "conduwuit-core/gzip_compression", - "conduwuit-service/gzip_compression", + "continuwuity-core/gzip_compression", + "continuwuity-service/gzip_compression", "reqwest/gzip", ] io_uring = [ - "conduwuit-service/io_uring", + "continuwuity-service/io_uring", ] jemalloc = [ - "conduwuit-core/jemalloc", - "conduwuit-service/jemalloc", + "continuwuity-core/jemalloc", + "continuwuity-service/jemalloc", ] jemalloc_conf = [ - "conduwuit-core/jemalloc_conf", - "conduwuit-service/jemalloc_conf", + "continuwuity-core/jemalloc_conf", + "continuwuity-service/jemalloc_conf", ] jemalloc_prof = [ - "conduwuit-core/jemalloc_prof", - "conduwuit-service/jemalloc_prof", + "continuwuity-core/jemalloc_prof", + "continuwuity-service/jemalloc_prof", ] jemalloc_stats = [ - "conduwuit-core/jemalloc_stats", - "conduwuit-service/jemalloc_stats", + "continuwuity-core/jemalloc_stats", + "continuwuity-service/jemalloc_stats", ] release_max_log_level = [ - "conduwuit-core/release_max_log_level", - "conduwuit-service/release_max_log_level", + "continuwuity-core/release_max_log_level", + "continuwuity-service/release_max_log_level", "log/max_level_trace", "log/release_max_level_info", "tracing/max_level_trace", "tracing/release_max_level_info", ] zstd_compression = [ - "conduwuit-core/zstd_compression", - "conduwuit-service/zstd_compression", + "continuwuity-core/zstd_compression", + "continuwuity-service/zstd_compression", "reqwest/zstd", ] @@ -67,9 +67,9 @@ axum.workspace = true base64.workspace = true bytes.workspace = true client-ip.workspace = true -conduwuit-core.workspace = true -conduwuit-macros.workspace = true -conduwuit-service.workspace = true +continuwuity-core.workspace = true +continuwuity-macros.workspace = true +continuwuity-service.workspace = true const-str.workspace = true ctor.workspace = true dtor.workspace = true diff --git a/src/api/admin/rooms/ban.rs b/src/api/admin/rooms/ban.rs index 384934644..590260bd1 100644 --- a/src/api/admin/rooms/ban.rs +++ b/src/api/admin/rooms/ban.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, info, utils::ReadyExt, warn}; +use continuwuity::{Err, Result, info, utils::ReadyExt, warn}; use futures::{FutureExt, StreamExt}; use ruma::{OwnedRoomAliasId, events::room::message::RoomMessageEventContent}; use ruminuwuity::admin::continuwuity::rooms; diff --git a/src/api/admin/rooms/list.rs b/src/api/admin/rooms/list.rs index af81f2eec..2174cff61 100644 --- a/src/api/admin/rooms/list.rs +++ b/src/api/admin/rooms/list.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::StreamExt; use ruma::OwnedRoomId; use ruminuwuity::admin::continuwuity::rooms; diff --git a/src/api/client/account/mod.rs b/src/api/client/account/mod.rs index 6a5dcba8b..d201b02d8 100644 --- a/src/api/client/account/mod.rs +++ b/src/api/client/account/mod.rs @@ -1,10 +1,10 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, err, info, pdu::PartialPdu, utils::{ReadyExt, stream::BroadbandExt}, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::{FutureExt, StreamExt}; use lettre::{Address, message::Mailbox}; use ruma::{ diff --git a/src/api/client/account/register.rs b/src/api/client/account/register.rs index 44b22ac2c..4c67ffb98 100644 --- a/src/api/client/account/register.rs +++ b/src/api/client/account/register.rs @@ -1,8 +1,8 @@ use std::collections::HashMap; use axum::extract::State; -use conduwuit::{Err, Result, info}; -use conduwuit_service::Services; +use continuwuity::{Err, Result, info}; +use continuwuity_service::Services; use futures::StreamExt; use lettre::{Address, message::Mailbox}; use ruma::{ diff --git a/src/api/client/account/threepid.rs b/src/api/client/account/threepid.rs index 93531eb02..20b15e1f7 100644 --- a/src/api/client/account/threepid.rs +++ b/src/api/client/account/threepid.rs @@ -1,7 +1,7 @@ use std::time::SystemTime; use axum::extract::State; -use conduwuit::{Err, Result, err}; +use continuwuity::{Err, Result, err}; use lettre::{Address, message::Mailbox}; use ruma::{ MilliSecondsSinceUnixEpoch, diff --git a/src/api/client/account_data.rs b/src/api/client/account_data.rs index 60fec42ab..3a284d7ac 100644 --- a/src/api/client/account_data.rs +++ b/src/api/client/account_data.rs @@ -1,6 +1,6 @@ use axum::extract::State; -use conduwuit::{Err, Result, err}; -use conduwuit_service::Services; +use continuwuity::{Err, Result, err}; +use continuwuity_service::Services; use ruma::{ RoomId, UserId, api::client::config::{ diff --git a/src/api/client/admin/lock.rs b/src/api/client/admin/lock.rs index abefe8d39..6771a2c4f 100644 --- a/src/api/client/admin/lock.rs +++ b/src/api/client/admin/lock.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::api::client::admin::{is_user_locked, lock_user}; use crate::Ruma; diff --git a/src/api/client/admin/suspend.rs b/src/api/client/admin/suspend.rs index f8975257b..d1c631b55 100644 --- a/src/api/client/admin/suspend.rs +++ b/src/api/client/admin/suspend.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::api::client::admin::{is_user_suspended, suspend_user}; use crate::Ruma; diff --git a/src/api/client/alias.rs b/src/api/client/alias.rs index 5d4dec081..6f1d2ae09 100644 --- a/src/api/client/alias.rs +++ b/src/api/client/alias.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::api::client::alias::{create_alias, delete_alias, get_alias}; use crate::Ruma; diff --git a/src/api/client/appservice.rs b/src/api/client/appservice.rs index 8011a98b0..e2f0155e2 100644 --- a/src/api/client/appservice.rs +++ b/src/api/client/appservice.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::{ api::{appservice::ping, client::appservice::request_ping}, assign, diff --git a/src/api/client/backup.rs b/src/api/client/backup.rs index 92e51cd75..05266db06 100644 --- a/src/api/client/backup.rs +++ b/src/api/client/backup.rs @@ -1,8 +1,8 @@ use std::cmp::Ordering; use axum::extract::State; -use conduwuit::{Err, Result, err}; -use conduwuit_service::Services; +use continuwuity::{Err, Result, err}; +use continuwuity_service::Services; use ruma::{ UInt, UserId, api::client::backup::{ diff --git a/src/api/client/capabilities.rs b/src/api/client/capabilities.rs index af5eb6ea2..60ea776dd 100644 --- a/src/api/client/capabilities.rs +++ b/src/api/client/capabilities.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use axum::extract::State; -use conduwuit::{Result, Server}; +use continuwuity::{Result, Server}; use ruma::{ RoomVersionId, api::client::discovery::get_capabilities::{ diff --git a/src/api/client/context.rs b/src/api/client/context.rs index cc7f3fbe8..75772e758 100644 --- a/src/api/client/context.rs +++ b/src/api/client/context.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Event, Result, at, debug_warn, err, ref_at, result::LogErr, utils::{ @@ -8,7 +8,7 @@ use conduwuit::{ stream::{BroadbandExt, ReadyExt, TryIgnore, WidebandExt}, }, }; -use conduwuit_service::rooms::{lazy_loading, lazy_loading::Options, short::ShortStateKey}; +use continuwuity_service::rooms::{lazy_loading, lazy_loading::Options, short::ShortStateKey}; use futures::{ FutureExt, StreamExt, TryFutureExt, TryStreamExt, future::{OptionFuture, join, join3, try_join3}, diff --git a/src/api/client/dehydrated_device.rs b/src/api/client/dehydrated_device.rs index 72ae2b955..778e1b569 100644 --- a/src/api/client/dehydrated_device.rs +++ b/src/api/client/dehydrated_device.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, at}; +use continuwuity::{Err, Result, at}; use futures::StreamExt; use ruma::{ api::client::dehydrated_device::{ diff --git a/src/api/client/device.rs b/src/api/client/device.rs index 0c3161808..681216819 100644 --- a/src/api/client/device.rs +++ b/src/api/client/device.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, debug, err}; +use continuwuity::{Err, Result, debug, err}; use futures::StreamExt; use ruma::{ MilliSecondsSinceUnixEpoch, diff --git a/src/api/client/directory.rs b/src/api/client/directory.rs index 2c1607280..db6903165 100644 --- a/src/api/client/directory.rs +++ b/src/api/client/directory.rs @@ -1,12 +1,12 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, err, info, utils::{ math::Expected, stream::{ReadyExt, WidebandExt}, }, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::StreamExt; use ruma::{ RoomId, ServerName, UInt, UserId, diff --git a/src/api/client/filter.rs b/src/api/client/filter.rs index 8594beeab..6e97072b5 100644 --- a/src/api/client/filter.rs +++ b/src/api/client/filter.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Result, err}; +use continuwuity::{Result, err}; use ruma::api::client::filter::{create_filter, get_filter}; use crate::Ruma; diff --git a/src/api/client/keys.rs b/src/api/client/keys.rs index c9a002804..ac2effb4e 100644 --- a/src/api/client/keys.rs +++ b/src/api/client/keys.rs @@ -4,12 +4,12 @@ use std::{ }; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, debug_warn, err, result::FlatOk, utils::{IterStream, TryFutureExtExt, stream::WidebandExt}, }; -use conduwuit_service::{Services, users::parse_master_key}; +use continuwuity_service::{Services, users::parse_master_key}; use futures::{StreamExt, stream::FuturesUnordered}; use ruma::{ OneTimeKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId, diff --git a/src/api/client/media.rs b/src/api/client/media.rs index 824d98541..9607ee035 100644 --- a/src/api/client/media.rs +++ b/src/api/client/media.rs @@ -1,12 +1,12 @@ use std::time::Duration; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, err, utils::{self, content_disposition::make_content_disposition, math::ruma_from_usize}, }; -use conduwuit_core::error; -use conduwuit_service::{ +use continuwuity_core::error; +use continuwuity_service::{ Services, media::{Dim, FileMeta, MXC_LENGTH}, }; @@ -91,7 +91,7 @@ pub(crate) async fn get_content_thumbnail_route( content_disposition, } = match fetch_thumbnail_meta(&services, &mxc, user, body.timeout_ms, &dim).await { | Ok(meta) => meta, - | Err(conduwuit::Error::Io(e)) => match e.kind() { + | Err(continuwuity::Error::Io(e)) => match e.kind() { | std::io::ErrorKind::NotFound => return Err!(Request(NotFound("Thumbnail not found."))), | std::io::ErrorKind::PermissionDenied => { @@ -132,7 +132,7 @@ pub(crate) async fn get_content_route( content_disposition, } = match fetch_file_meta(&services, &mxc, user, body.timeout_ms).await { | Ok(meta) => meta, - | Err(conduwuit::Error::Io(e)) => match e.kind() { + | Err(continuwuity::Error::Io(e)) => match e.kind() { | std::io::ErrorKind::NotFound => return Err!(Request(NotFound("Media not found."))), | std::io::ErrorKind::PermissionDenied => { error!("Permission denied when trying to read file: {e:?}"); @@ -173,7 +173,7 @@ pub(crate) async fn get_content_as_filename_route( content_disposition, } = match fetch_file_meta(&services, &mxc, user, body.timeout_ms).await { | Ok(meta) => meta, - | Err(conduwuit::Error::Io(e)) => match e.kind() { + | Err(continuwuity::Error::Io(e)) => match e.kind() { | std::io::ErrorKind::NotFound => return Err!(Request(NotFound("Media not found."))), | std::io::ErrorKind::PermissionDenied => { error!("Permission denied when trying to read file: {e:?}"); diff --git a/src/api/client/media_legacy.rs b/src/api/client/media_legacy.rs index ddc7e9c92..f530fc659 100644 --- a/src/api/client/media_legacy.rs +++ b/src/api/client/media_legacy.rs @@ -1,11 +1,11 @@ #![allow(deprecated)] use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, err, utils::{content_disposition::make_content_disposition, math::ruma_from_usize}, }; -use conduwuit_service::media::{CORP_CROSS_ORIGIN, Dim, FileMeta}; +use continuwuity_service::media::{CORP_CROSS_ORIGIN, Dim, FileMeta}; use reqwest::Url; use ruma::{ api::client::media::{ @@ -33,7 +33,7 @@ pub(crate) async fn get_media_config_legacy_route( /// # `GET /_matrix/media/v1/config` /// /// This is a legacy endpoint ("/v1/") that some very old homeservers and/or -/// clients may call. conduwuit adds these for compatibility purposes. +/// clients may call. continuwuity adds these for compatibility purposes. /// See /// /// Returns max upload size. @@ -86,7 +86,7 @@ pub(crate) async fn get_media_preview_legacy_route( /// # `GET /_matrix/media/v1/preview_url` /// /// This is a legacy endpoint ("/v1/") that some very old homeservers and/or -/// clients may call. conduwuit adds these for compatibility purposes. +/// clients may call. continuwuity adds these for compatibility purposes. /// See /// /// Returns URL preview. @@ -104,7 +104,7 @@ pub(crate) async fn get_media_preview_legacy_legacy_route( /// Permanently save media in the server. /// /// This is a legacy endpoint ("/v1/") that some very old homeservers and/or -/// clients may call. conduwuit adds these for compatibility purposes. +/// clients may call. continuwuity adds these for compatibility purposes. /// See /// /// - Some metadata will be saved in the database @@ -195,7 +195,7 @@ pub(crate) async fn get_content_legacy_route( /// Load media from our server or over federation. /// /// This is a legacy endpoint ("/v1/") that some very old homeservers and/or -/// clients may call. conduwuit adds these for compatibility purposes. +/// clients may call. continuwuity adds these for compatibility purposes. /// See /// /// - Only allows federation if `allow_remote` is true @@ -287,7 +287,7 @@ pub(crate) async fn get_content_as_filename_legacy_route( /// Load media from our server or over federation, permitting desired filename. /// /// This is a legacy endpoint ("/v1/") that some very old homeservers and/or -/// clients may call. conduwuit adds these for compatibility purposes. +/// clients may call. continuwuity adds these for compatibility purposes. /// See /// /// - Only allows federation if `allow_remote` is true @@ -381,7 +381,7 @@ pub(crate) async fn get_content_thumbnail_legacy_route( /// Load media thumbnail from our server or over federation. /// /// This is a legacy endpoint ("/v1/") that some very old homeservers and/or -/// clients may call. conduwuit adds these for compatibility purposes. +/// clients may call. continuwuity adds these for compatibility purposes. /// See /// /// - Only allows federation if `allow_remote` is true diff --git a/src/api/client/membership/ban.rs b/src/api/client/membership/ban.rs index 77e0c9c4e..b07a91e98 100644 --- a/src/api/client/membership/ban.rs +++ b/src/api/client/membership/ban.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, matrix::pdu::PartialPdu}; +use continuwuity::{Err, Result, matrix::pdu::PartialPdu}; use ruma::{ api::client::membership::ban_user, assign, diff --git a/src/api/client/membership/forget.rs b/src/api/client/membership/forget.rs index 61c84572f..61bd75b6d 100644 --- a/src/api/client/membership/forget.rs +++ b/src/api/client/membership/forget.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, is_matching, result::NotFound, utils::FutureBoolExt}; +use continuwuity::{Err, Result, is_matching, result::NotFound, utils::FutureBoolExt}; use futures::pin_mut; use ruma::{api::client::membership::forget_room, events::room::member::MembershipState}; diff --git a/src/api/client/membership/invite.rs b/src/api/client/membership/invite.rs index ab53e2eed..27d9979db 100644 --- a/src/api/client/membership/invite.rs +++ b/src/api/client/membership/invite.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, debug_error, err, info, matrix::{event::gen_event_id_canonical_json, pdu::PartialPdu}, trace, warn, diff --git a/src/api/client/membership/join.rs b/src/api/client/membership/join.rs index 037941e79..023e6fe10 100644 --- a/src/api/client/membership/join.rs +++ b/src/api/client/membership/join.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, result::FlatOk, utils::{shuffle, stream::IterStream}, diff --git a/src/api/client/membership/kick.rs b/src/api/client/membership/kick.rs index 33f73f560..46979be93 100644 --- a/src/api/client/membership/kick.rs +++ b/src/api/client/membership/kick.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, matrix::pdu::PartialPdu}; +use continuwuity::{Err, Result, matrix::pdu::PartialPdu}; use ruma::{ api::client::membership::kick_user, assign, diff --git a/src/api/client/membership/knock.rs b/src/api/client/membership/knock.rs index f24ede158..5ba03d0bc 100644 --- a/src/api/client/membership/knock.rs +++ b/src/api/client/membership/knock.rs @@ -1,7 +1,7 @@ use std::{borrow::Borrow, collections::HashMap, iter::once, sync::Arc}; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, debug_info, debug_warn, err, info, matrix::{ event::gen_event_id, diff --git a/src/api/client/membership/leave.rs b/src/api/client/membership/leave.rs index 1ef0b21fa..415c1f657 100644 --- a/src/api/client/membership/leave.rs +++ b/src/api/client/membership/leave.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Pdu, Result, debug_info, debug_warn, err, matrix::{event::gen_event_id, pdu::PartialPdu}, utils::{self, FutureBoolExt, future::ReadyEqExt}, diff --git a/src/api/client/membership/members.rs b/src/api/client/membership/members.rs index 5c8d00829..5d2f4dba2 100644 --- a/src/api/client/membership/members.rs +++ b/src/api/client/membership/members.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Event, Result, at, utils::{ future::TryExtExt, diff --git a/src/api/client/membership/mod.rs b/src/api/client/membership/mod.rs index 06847ea7b..557616de6 100644 --- a/src/api/client/membership/mod.rs +++ b/src/api/client/membership/mod.rs @@ -9,7 +9,7 @@ mod members; mod unban; use axum::extract::State; -use conduwuit::{Err, Result, warn}; +use continuwuity::{Err, Result, warn}; use futures::{FutureExt, StreamExt}; use ruma::{OwnedRoomId, RoomId, ServerName, UserId, api::client::membership::joined_rooms}; use service::Services; diff --git a/src/api/client/membership/unban.rs b/src/api/client/membership/unban.rs index 13b41ee00..511cbedd4 100644 --- a/src/api/client/membership/unban.rs +++ b/src/api/client/membership/unban.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, matrix::pdu::PartialPdu}; +use continuwuity::{Err, Result, matrix::pdu::PartialPdu}; use ruma::{ api::client::membership::unban_user, events::room::member::{MembershipState, RoomMemberEventContent}, diff --git a/src/api/client/message.rs b/src/api/client/message.rs index 72b1b29e5..b88260be9 100644 --- a/src/api/client/message.rs +++ b/src/api/client/message.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, at, debug_warn, matrix::{ event::{Event, Matches}, @@ -12,7 +12,7 @@ use conduwuit::{ stream::{BroadbandExt, TryIgnore, WidebandExt}, }, }; -use conduwuit_service::{ +use continuwuity_service::{ Services, rooms::{ lazy_loading, diff --git a/src/api/client/mutual_rooms.rs b/src/api/client/mutual_rooms.rs index 532a5cc79..77ab407ec 100644 --- a/src/api/client/mutual_rooms.rs +++ b/src/api/client/mutual_rooms.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::StreamExt; use ruma::{OwnedRoomId, api::client::membership::get_mutual_rooms}; diff --git a/src/api/client/oauth/mod.rs b/src/api/client/oauth/mod.rs index b47f717c1..35bdaa06c 100644 --- a/src/api/client/oauth/mod.rs +++ b/src/api/client/oauth/mod.rs @@ -15,14 +15,15 @@ mod register_client; mod server_metadata; mod token; -const BASE_PATH: &str = concat!(conduwuit_core::ROUTE_PREFIX, "/oauth2/"); +const BASE_PATH: &str = concat!(continuwuity_core::ROUTE_PREFIX, "/oauth2/"); const AUTH_CODE_PATH: &str = "grant/authorization_code"; const JWKS_URI_PATH: &str = "client/keys.json"; const CLIENT_REGISTER_PATH: &str = "client/register"; const TOKEN_REVOKE_PATH: &str = "client/revoke"; const TOKEN_PATH: &str = "grant/token"; const DEVICE_AUTHORIZATION_PATH: &str = "device"; -const ACCOUNT_MANAGEMENT_PATH: &str = concat!(conduwuit_core::ROUTE_PREFIX, "/account/deeplink"); +const ACCOUNT_MANAGEMENT_PATH: &str = + concat!(continuwuity_core::ROUTE_PREFIX, "/account/deeplink"); pub(crate) fn router(state: crate::State) -> Router { Router::new() diff --git a/src/api/client/oauth/server_metadata.rs b/src/api/client/oauth/server_metadata.rs index 331289af2..96c9c33cf 100644 --- a/src/api/client/oauth/server_metadata.rs +++ b/src/api/client/oauth/server_metadata.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::{ api::client::discovery::get_authorization_server_metadata::{ self, v1::AccountManagementAction, diff --git a/src/api/client/openid.rs b/src/api/client/openid.rs index 5a95d1672..26aae453c 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 conduwuit::{Err, Result, utils}; +use continuwuity::{Err, Result, utils}; use ruma::{api::client::account, authentication::TokenType}; use super::TOKEN_LENGTH; diff --git a/src/api/client/presence.rs b/src/api/client/presence.rs index ffa1760ba..a94b29648 100644 --- a/src/api/client/presence.rs +++ b/src/api/client/presence.rs @@ -1,7 +1,7 @@ use std::time::Duration; use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::{ api::client::presence::{get_presence, set_presence}, assign, diff --git a/src/api/client/profile.rs b/src/api/client/profile.rs index 5739f3781..67b81ef79 100644 --- a/src/api/client/profile.rs +++ b/src/api/client/profile.rs @@ -1,8 +1,8 @@ use std::collections::BTreeMap; use axum::extract::State; -use conduwuit::{Err, Result}; -use conduwuit_service::Services; +use continuwuity::{Err, Result}; +use continuwuity_service::Services; use ruma::{ UserId, api::{ diff --git a/src/api/client/push.rs b/src/api/client/push.rs index d04db0571..f604ddbf6 100644 --- a/src/api/client/push.rs +++ b/src/api/client/push.rs @@ -1,8 +1,8 @@ use std::sync::LazyLock; use axum::extract::State; -use conduwuit::{Err, Error, Result, err, utils::IterStream}; -use conduwuit_service::{Services, pusher::ActivationOutcome}; +use continuwuity::{Err, Error, Result, err, utils::IterStream}; +use continuwuity_service::{Services, pusher::ActivationOutcome}; use futures::StreamExt; use ruma::{ CanonicalJsonObject, CanonicalJsonValue, diff --git a/src/api/client/read_marker.rs b/src/api/client/read_marker.rs index 8b2f4dbc9..13196c0ce 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 conduwuit::{Err, PduCount, Result, err}; +use continuwuity::{Err, PduCount, Result, err}; use ruma::{ MilliSecondsSinceUnixEpoch, api::client::{read_marker::set_read_marker, receipt::create_receipt}, diff --git a/src/api/client/redact.rs b/src/api/client/redact.rs index 540e3c0a6..b22e89483 100644 --- a/src/api/client/redact.rs +++ b/src/api/client/redact.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, matrix::pdu::PartialPdu}; +use continuwuity::{Err, Result, matrix::pdu::PartialPdu}; use ruma::{ api::client::redact::redact_event, assign, events::room::redaction::RoomRedactionEventContent, }; diff --git a/src/api/client/relations.rs b/src/api/client/relations.rs index 6d1bd4ffd..158a3af2e 100644 --- a/src/api/client/relations.rs +++ b/src/api/client/relations.rs @@ -1,10 +1,10 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, at, debug_warn, err, matrix::{Event, event::RelationTypeEqual, pdu::PduCount}, utils::{IterStream, ReadyExt, result::FlatOk, stream::WidebandExt}, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::StreamExt; use ruma::{ EventId, RoomId, UInt, UserId, diff --git a/src/api/client/report.rs b/src/api/client/report.rs index bb71aeb36..a9f148bf8 100644 --- a/src/api/client/report.rs +++ b/src/api/client/report.rs @@ -1,8 +1,10 @@ use std::{fmt::Write as _, time::Duration}; use axum::extract::State; -use conduwuit::{Err, Event, Result, debug_info, info, matrix::pdu::PduEvent, utils::ReadyExt}; -use conduwuit_service::Services; +use continuwuity::{ + Err, Event, Result, debug_info, info, matrix::pdu::PduEvent, utils::ReadyExt, +}; +use continuwuity_service::Services; use ruma::{ EventId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, UserId, api::client::{ diff --git a/src/api/client/room/aliases.rs b/src/api/client/room/aliases.rs index f5a5a57c0..7b45f26f8 100644 --- a/src/api/client/room/aliases.rs +++ b/src/api/client/room/aliases.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::StreamExt; use ruma::api::client::room::aliases; diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs index 582169346..5201b1be3 100644 --- a/src/api/client/room/create.rs +++ b/src/api/client/room/create.rs @@ -1,14 +1,14 @@ use std::collections::{BTreeMap, BTreeSet, HashSet}; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, debug, debug_info, err, info, matrix::{StateKey, pdu::PartialPdu}, trace, utils::to_canonical_object, warn, }; -use conduwuit_service::{Services, appservice::RegistrationInfo}; +use continuwuity_service::{Services, appservice::RegistrationInfo}; use futures::FutureExt; use ruma::{ CanonicalJsonObject, CanonicalJsonValue, Int, MilliSecondsSinceUnixEpoch, OwnedRoomAliasId, diff --git a/src/api/client/room/event.rs b/src/api/client/room/event.rs index 268ca92c1..116394faf 100644 --- a/src/api/client/room/event.rs +++ b/src/api/client/room/event.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Event, Result, debug_warn, err}; +use continuwuity::{Err, Event, Result, debug_warn, err}; use ruma::api::client::room::get_room_event; use crate::{Ruma, client::is_ignored_pdu}; diff --git a/src/api/client/room/initial_sync.rs b/src/api/client/room/initial_sync.rs index 807753389..4682d7ddf 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 conduwuit::{ +use continuwuity::{ Err, Event, Result, at, debug_warn, result::LogErr, utils::{BoolExt, stream::TryTools}, diff --git a/src/api/client/room/summary.rs b/src/api/client/room/summary.rs index da6958242..96881a87e 100644 --- a/src/api/client/room/summary.rs +++ b/src/api/client/room/summary.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::api::client::room::get_summary; use service::rooms::summary::Accessibility; diff --git a/src/api/client/room/upgrade.rs b/src/api/client/room/upgrade.rs index 1d4a623f1..ea10279f8 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 conduwuit::{ +use continuwuity::{ Err, Error, Event, Result, debug, debug::DebugInspect, err, error, diff --git a/src/api/client/search.rs b/src/api/client/search.rs index 5e27fdbd9..e4169cf82 100644 --- a/src/api/client/search.rs +++ b/src/api/client/search.rs @@ -1,13 +1,13 @@ use std::collections::BTreeMap; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, at, debug_warn, is_true, matrix::Event, result::FlatOk, utils::{IterStream, stream::ReadyExt}, }; -use conduwuit_service::{Services, rooms::search::RoomQuery}; +use continuwuity_service::{Services, rooms::search::RoomQuery}; use futures::{FutureExt, StreamExt, TryFutureExt, TryStreamExt}; use ruma::{ OwnedRoomId, RoomId, UInt, UserId, diff --git a/src/api/client/send.rs b/src/api/client/send.rs index ff07073f0..ffb8647e9 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 conduwuit::{ +use continuwuity::{ Err, Result, err, matrix::pdu::{PartialPdu, sticky}, utils, diff --git a/src/api/client/session.rs b/src/api/client/session.rs index 7ec24c28b..0efda1815 100644 --- a/src/api/client/session.rs +++ b/src/api/client/session.rs @@ -1,12 +1,12 @@ use std::time::Duration; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, err, info, utils::{ReadyExt, stream::BroadbandExt}, warn, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::StreamExt; use lettre::Address; use ruma::{ diff --git a/src/api/client/space.rs b/src/api/client/space.rs index fc8773def..d1edf8d7f 100644 --- a/src/api/client/space.rs +++ b/src/api/client/space.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::{UInt, api::client::space::get_hierarchy, assign}; use service::rooms::summary::Accessibility; diff --git a/src/api/client/state.rs b/src/api/client/state.rs index 60d382202..730bf231f 100644 --- a/src/api/client/state.rs +++ b/src/api/client/state.rs @@ -1,7 +1,7 @@ #[cfg(test)] mod tests; use axum::extract::State; -use conduwuit::{Err, Result, err, matrix::Event}; +use continuwuity::{Err, Result, err, matrix::Event}; use futures::{FutureExt, TryStreamExt}; use ruma::{ RoomId, diff --git a/src/api/client/sync/mod.rs b/src/api/client/sync/mod.rs index e3ad680ca..f281ceeb3 100644 --- a/src/api/client/sync/mod.rs +++ b/src/api/client/sync/mod.rs @@ -3,7 +3,7 @@ mod v5; use std::collections::VecDeque; -use conduwuit::{ +use continuwuity::{ Event, PduCount, Result, debug_warn, err, matrix::pdu::PduEvent, ref_at, @@ -11,7 +11,7 @@ use conduwuit::{ trace, utils::stream::{BroadbandExt, ReadyExt, TryIgnore, WidebandExt}, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::StreamExt; use ruma::{ OwnedUserId, RoomId, UserId, diff --git a/src/api/client/sync/v3/joined.rs b/src/api/client/sync/v3/joined.rs index d2e8a8909..a1a35d61a 100644 --- a/src/api/client/sync/v3/joined.rs +++ b/src/api/client/sync/v3/joined.rs @@ -1,6 +1,6 @@ use std::collections::{BTreeMap, HashSet}; -use conduwuit::{ +use continuwuity::{ Result, at, debug_warn, err, extract_variant, matrix::{ Event, @@ -15,7 +15,7 @@ use conduwuit::{ }, warn, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::{ FutureExt, StreamExt, TryFutureExt, future::{OptionFuture, join, join3, join4, try_join, try_join3}, diff --git a/src/api/client/sync/v3/left.rs b/src/api/client/sync/v3/left.rs index d5d453da1..a4c28763f 100644 --- a/src/api/client/sync/v3/left.rs +++ b/src/api/client/sync/v3/left.rs @@ -1,4 +1,4 @@ -use conduwuit::{ +use continuwuity::{ Event, PduEvent, Result, at, debug_warn, pdu::EventHash, trace, diff --git a/src/api/client/sync/v3/mod.rs b/src/api/client/sync/v3/mod.rs index 4987534cf..991f776e6 100644 --- a/src/api/client/sync/v3/mod.rs +++ b/src/api/client/sync/v3/mod.rs @@ -9,14 +9,14 @@ use std::{ }; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Result, at, error, extract_variant, utils::{ ReadyExt, TryFutureExtExt, stream::{BroadbandExt, Tools, WidebandExt}, }, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::{FutureExt, StreamExt, TryFutureExt, future::OptionFuture}; use ruma::{ DeviceId, OwnedUserId, RoomId, UserId, diff --git a/src/api/client/sync/v3/state.rs b/src/api/client/sync/v3/state.rs index 5f48c62ee..90295dbfd 100644 --- a/src/api/client/sync/v3/state.rs +++ b/src/api/client/sync/v3/state.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use conduwuit::{ +use continuwuity::{ Result, at, matrix::{Event, pdu::PduEvent}, utils::{ @@ -8,7 +8,7 @@ use conduwuit::{ stream::{BroadbandExt, TryIgnore}, }, }; -use conduwuit_service::{ +use continuwuity_service::{ Services, rooms::{lazy_loading::MemberSet, short::ShortStateHash}, }; diff --git a/src/api/client/sync/v5.rs b/src/api/client/sync/v5.rs index 7f8997aec..ae44da2fc 100644 --- a/src/api/client/sync/v5.rs +++ b/src/api/client/sync/v5.rs @@ -5,7 +5,7 @@ use std::{ }; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, at, error, extract_variant, is_equal_to, matrix::{ Event, TypeStateKey, @@ -21,7 +21,7 @@ use conduwuit::{ }, warn, }; -use conduwuit_service::{ +use continuwuity_service::{ Services, rooms::read_receipt::pack_receipts, sync::{SnakeConnectionsKey, into_snake_key}, diff --git a/src/api/client/tag.rs b/src/api/client/tag.rs index 7a7c11f79..34d972fe0 100644 --- a/src/api/client/tag.rs +++ b/src/api/client/tag.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use axum::extract::State; -use conduwuit::Result; +use continuwuity::Result; use ruma::{ api::client::tag::{create_tag, delete_tag, get_tags}, events::{ diff --git a/src/api/client/thirdparty.rs b/src/api/client/thirdparty.rs index 336931c97..ff4d86891 100644 --- a/src/api/client/thirdparty.rs +++ b/src/api/client/thirdparty.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use conduwuit::Result; +use continuwuity::Result; use ruma::api::client::thirdparty::get_protocols; use crate::{Ruma, RumaResponse}; diff --git a/src/api/client/threads.rs b/src/api/client/threads.rs index a6cd50ba9..aa1ab7323 100644 --- a/src/api/client/threads.rs +++ b/src/api/client/threads.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Result, at, debug_warn, matrix::{ Event, diff --git a/src/api/client/to_device.rs b/src/api/client/to_device.rs index 1659d8c00..d15ed967d 100644 --- a/src/api/client/to_device.rs +++ b/src/api/client/to_device.rs @@ -1,8 +1,8 @@ use std::collections::BTreeMap; use axum::extract::State; -use conduwuit::{Err, Result}; -use conduwuit_service::sending::EduBuf; +use continuwuity::{Err, Result}; +use continuwuity_service::sending::EduBuf; use futures::StreamExt; use ruma::{ api::{ diff --git a/src/api/client/typing.rs b/src/api/client/typing.rs index 37d8d7ffe..987852f3f 100644 --- a/src/api/client/typing.rs +++ b/src/api/client/typing.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, utils, utils::math::Tried}; +use continuwuity::{Err, Result, utils, utils::math::Tried}; use ruma::api::client::typing::create_typing_event::{self, v3::TypingInfo}; use crate::{Ruma, client_ip::ClientIp}; diff --git a/src/api/client/unversioned.rs b/src/api/client/unversioned.rs index 8f5233aaf..d6fedbcd7 100644 --- a/src/api/client/unversioned.rs +++ b/src/api/client/unversioned.rs @@ -1,5 +1,5 @@ use axum::{Json, extract::State, response::IntoResponse}; -use conduwuit::{ +use continuwuity::{ Result, matrix::versions::{unstable_features, versions}, }; @@ -38,18 +38,18 @@ pub(crate) async fn get_supported_versions_route( /// # `GET /_continuwuity/server_version` /// -/// Conduwuit-specific API to get the server version, results akin to +/// Continuwuity-specific API to get the server version, results akin to /// `/_matrix/federation/v1/version` pub(crate) async fn continuwuity_server_version() -> Result { Ok(Json(serde_json::json!({ - "name": conduwuit::BRANDING, - "version": conduwuit::version(), + "name": continuwuity::BRANDING, + "version": continuwuity::version(), }))) } /// # `GET /_continuwuity/local_user_count` /// -/// conduwuit-specific API to return the amount of users registered on this +/// continuwuity-specific API to return the amount of users registered on this /// homeserver. Endpoint is disabled if federation is disabled for privacy. This /// /// only includes active users (not deactivated, etc) diff --git a/src/api/client/user_directory.rs b/src/api/client/user_directory.rs index 7d8a9a9c4..fb7c8dd22 100644 --- a/src/api/client/user_directory.rs +++ b/src/api/client/user_directory.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Result, utils::{future::BoolExt, stream::BroadbandExt}, }; @@ -12,7 +12,7 @@ use ruma::{ use crate::Ruma; -// conduwuit can handle a lot more results than synapse +// continuwuity can handle a lot more results than synapse const LIMIT_MAX: usize = 500; const LIMIT_DEFAULT: usize = 10; diff --git a/src/api/client/voip.rs b/src/api/client/voip.rs index b214836ae..0dea99ebc 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 as _, engine::general_purpose}; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use hmac::{Hmac, KeyInit, Mac}; use ruma::{SecondsSinceUnixEpoch, api::client::voip::get_turn_server_info}; use sha1::Sha1; diff --git a/src/api/client/well_known.rs b/src/api/client/well_known.rs index 749571f99..4d627cd63 100644 --- a/src/api/client/well_known.rs +++ b/src/api/client/well_known.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::{ api::client::discovery::{ discover_homeserver::{self, HomeserverInfo}, diff --git a/src/api/client_ip.rs b/src/api/client_ip.rs index 704938e18..c8987c7b9 100644 --- a/src/api/client_ip.rs +++ b/src/api/client_ip.rs @@ -5,7 +5,7 @@ use axum::{ extract::{ConnectInfo, FromRequestParts}, response::{IntoResponse, Response}, }; -use conduwuit::{debug_info, debug_warn}; +use continuwuity::{debug_info, debug_warn}; use http::{HeaderMap, StatusCode, request::Parts}; use service::Services; diff --git a/src/api/mod.rs b/src/api/mod.rs index c2e71ba8c..39c13e207 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -2,10 +2,10 @@ #![recursion_limit = "256"] // My Giant Async Function #![allow(clippy::toplevel_ref_arg)] -extern crate conduwuit_core as conduwuit; -extern crate conduwuit_service as service; +extern crate continuwuity_core as continuwuity; +extern crate continuwuity_service as service; -conduwuit_macros::introspect_crate! {} +continuwuity_macros::introspect_crate! {} pub mod client; pub mod router; @@ -17,5 +17,5 @@ pub mod admin; pub(crate) use self::router::{Ruma, RumaResponse, State}; -conduwuit::mod_ctor! {} -conduwuit::mod_dtor! {} +continuwuity::mod_ctor! {} +continuwuity::mod_dtor! {} diff --git a/src/api/router.rs b/src/api/router.rs index 1912f096a..dc429e547 100644 --- a/src/api/router.rs +++ b/src/api/router.rs @@ -10,8 +10,8 @@ use axum::{ response::{IntoResponse, Redirect}, routing::{any, get, post}, }; -use conduwuit::err; -pub(super) use conduwuit_service::state::State; +use continuwuity::err; +pub(super) use continuwuity_service::state::State; use http::{Uri, uri}; use self::handler::RouterExt; diff --git a/src/api/router/args.rs b/src/api/router/args.rs index 6a868fe70..d58a6d74d 100644 --- a/src/api/router/args.rs +++ b/src/api/router/args.rs @@ -5,7 +5,7 @@ use axum::{ body::Body, extract::{FromRequest, Path, Query}, }; -use conduwuit::{Error, Result, err}; +use continuwuity::{Error, Result, err}; use ruma::{ CanonicalJsonObject, api::{IncomingRequest, IncomingRequestExt}, diff --git a/src/api/router/auth.rs b/src/api/router/auth.rs index b29dc2e13..3fb63e910 100644 --- a/src/api/router/auth.rs +++ b/src/api/router/auth.rs @@ -1,6 +1,6 @@ use std::any::{Any, TypeId}; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, err, utils::{IterStream, millis_since_unix_epoch}, }; diff --git a/src/api/router/handler.rs b/src/api/router/handler.rs index 9fd425eeb..1727f4fce 100644 --- a/src/api/router/handler.rs +++ b/src/api/router/handler.rs @@ -4,7 +4,7 @@ use axum::{ response::IntoResponse, routing::{MethodFilter, on}, }; -use conduwuit::Result; +use continuwuity::Result; use futures::{Future, TryFutureExt}; use http::Method; use ruma::api::IncomingRequest; diff --git a/src/api/router/response.rs b/src/api/router/response.rs index ddbbcf453..d73cbfb98 100644 --- a/src/api/router/response.rs +++ b/src/api/router/response.rs @@ -1,6 +1,6 @@ use axum::response::{IntoResponse, Response}; use bytes::BytesMut; -use conduwuit::{Error, error}; +use continuwuity::{Error, error}; use http::StatusCode; use http_body_util::Full; use ruma::api::{OutgoingResponse, OutgoingResponseExt, client::uiaa::UiaaResponse}; diff --git a/src/api/server/backfill.rs b/src/api/server/backfill.rs index 4fade6b54..645f59f4f 100644 --- a/src/api/server/backfill.rs +++ b/src/api/server/backfill.rs @@ -1,7 +1,7 @@ use std::cmp; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Event, PduCount, Result, info, utils::{IterStream, ReadyExt, stream::TryTools}, }; diff --git a/src/api/server/event.rs b/src/api/server/event.rs index 9e0c8d751..48ba6d7ab 100644 --- a/src/api/server/event.rs +++ b/src/api/server/event.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, err, info}; +use continuwuity::{Err, Result, err, info}; use ruma::{MilliSecondsSinceUnixEpoch, RoomId, api::federation::event::get_event}; use super::AccessCheck; diff --git a/src/api/server/event_auth.rs b/src/api/server/event_auth.rs index 5cd49b834..ccd97b817 100644 --- a/src/api/server/event_auth.rs +++ b/src/api/server/event_auth.rs @@ -1,7 +1,7 @@ use std::{borrow::Borrow, iter::once}; use axum::extract::State; -use conduwuit::{Err, Event, Result, info, utils::stream::ReadyExt}; +use continuwuity::{Err, Event, Result, info, utils::stream::ReadyExt}; use futures::StreamExt; use ruma::api::federation::authorization::get_event_authorization; diff --git a/src/api/server/get_missing_events.rs b/src/api/server/get_missing_events.rs index 7c5b8799f..4a6f36c6f 100644 --- a/src/api/server/get_missing_events.rs +++ b/src/api/server/get_missing_events.rs @@ -1,7 +1,7 @@ use std::collections::{HashSet, VecDeque}; use axum::extract::State; -use conduwuit::{Err, Event, Result, debug, info, trace, utils::to_canonical_object, warn}; +use continuwuity::{Err, Event, Result, debug, info, trace, utils::to_canonical_object, warn}; use ruma::{OwnedEventId, api::federation::event::get_missing_events}; use serde_json::value::RawValue; use service::rooms::event_handler::GET_MISSING_EVENTS_MAX_BATCH_SIZE; diff --git a/src/api/server/hierarchy.rs b/src/api/server/hierarchy.rs index 342f68c38..1938c37f2 100644 --- a/src/api/server/hierarchy.rs +++ b/src/api/server/hierarchy.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, info}; +use continuwuity::{Err, Result, info}; use ruma::api::federation::space::get_hierarchy; use service::rooms::summary::Accessibility; diff --git a/src/api/server/invite.rs b/src/api/server/invite.rs index f9ad2dbb6..cee48f3c5 100644 --- a/src/api/server/invite.rs +++ b/src/api/server/invite.rs @@ -2,7 +2,7 @@ use std::collections::{HashMap, hash_map::Entry}; use axum::extract::State; use base64::{Engine as _, engine::general_purpose}; -use conduwuit::{ +use continuwuity::{ Err, Error, EventTypeExt, PduEvent, Result, debug, err, error, matrix::{Event, StateKey}, result::FlatOk, diff --git a/src/api/server/key.rs b/src/api/server/key.rs index b547ea15c..cccc4d0bc 100644 --- a/src/api/server/key.rs +++ b/src/api/server/key.rs @@ -1,7 +1,7 @@ use std::{collections::BTreeMap, mem::take, time::Duration}; use axum::{Json, extract::State, response::IntoResponse}; -use conduwuit::{Result, utils::timepoint_from_now}; +use continuwuity::{Result, utils::timepoint_from_now}; use futures::StreamExt; use ruma::{ MilliSecondsSinceUnixEpoch, diff --git a/src/api/server/make_join.rs b/src/api/server/make_join.rs index 411a322f5..9bee9f0a5 100644 --- a/src/api/server/make_join.rs +++ b/src/api/server/make_join.rs @@ -1,10 +1,10 @@ use std::{borrow::ToOwned, pin::pin}; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, debug, debug_info, info, matrix::pdu::PartialPdu, utils, warn, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::StreamExt; use ruma::{ OwnedUserId, RoomId, UserId, diff --git a/src/api/server/make_knock.rs b/src/api/server/make_knock.rs index 4c918daa8..88831a8fd 100644 --- a/src/api/server/make_knock.rs +++ b/src/api/server/make_knock.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Error, Result, debug_warn, info, matrix::pdu::PartialPdu, utils, warn}; +use continuwuity::{Err, Error, Result, debug_warn, info, matrix::pdu::PartialPdu, utils, warn}; use ruma::{ api::{ error::{ErrorKind, IncompatibleRoomVersionErrorData}, diff --git a/src/api/server/make_leave.rs b/src/api/server/make_leave.rs index 1a472aa69..5f4b43d0f 100644 --- a/src/api/server/make_leave.rs +++ b/src/api/server/make_leave.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, info, matrix::pdu::PartialPdu, utils}; +use continuwuity::{Err, Result, info, matrix::pdu::PartialPdu, utils}; use ruma::{ api::federation::membership::prepare_leave_event, events::room::member::{MembershipState, RoomMemberEventContent}, diff --git a/src/api/server/media.rs b/src/api/server/media.rs index 98b3ae7ed..c47aff225 100644 --- a/src/api/server/media.rs +++ b/src/api/server/media.rs @@ -1,6 +1,6 @@ use axum::extract::State; -use conduwuit::{Err, Result, utils::content_disposition::make_content_disposition}; -use conduwuit_service::media::{Dim, FileMeta}; +use continuwuity::{Err, Result, utils::content_disposition::make_content_disposition}; +use continuwuity_service::media::{Dim, FileMeta}; use ruma::api::federation::authenticated_media::{ Content, ContentMetadata, FileOrLocation, get_content, get_content_thumbnail, }; diff --git a/src/api/server/openid.rs b/src/api/server/openid.rs index a09cd7adb..142eb3750 100644 --- a/src/api/server/openid.rs +++ b/src/api/server/openid.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::Result; +use continuwuity::Result; use ruma::api::federation::openid::get_openid_userinfo; use crate::Ruma; diff --git a/src/api/server/publicrooms.rs b/src/api/server/publicrooms.rs index 42baf081f..f397f4f6f 100644 --- a/src/api/server/publicrooms.rs +++ b/src/api/server/publicrooms.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, err}; +use continuwuity::{Err, Result, err}; use ruma::{ api::federation::directory::{get_public_rooms, get_public_rooms_filtered}, assign, diff --git a/src/api/server/query.rs b/src/api/server/query.rs index dccbce067..4d6c58b45 100644 --- a/src/api/server/query.rs +++ b/src/api/server/query.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, err}; +use continuwuity::{Err, Result, err}; use futures::StreamExt; use rand::seq::SliceRandom; use ruma::{ diff --git a/src/api/server/send.rs b/src/api/server/send.rs index 5c2c61467..0b424d215 100644 --- a/src/api/server/send.rs +++ b/src/api/server/send.rs @@ -4,7 +4,7 @@ use std::{ }; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, debug, debug_error, debug_warn, err, error, result::LogErr, trace, @@ -14,7 +14,7 @@ use conduwuit::{ }, warn, }; -use conduwuit_service::{ +use continuwuity_service::{ Services, sending::{EDU_LIMIT, PDU_LIMIT}, }; diff --git a/src/api/server/send_join.rs b/src/api/server/send_join.rs index 7b0e2f2df..c60e5230d 100644 --- a/src/api/server/send_join.rs +++ b/src/api/server/send_join.rs @@ -1,12 +1,12 @@ use std::{borrow::Borrow, time::Instant, vec}; use axum::extract::State; -use conduwuit::{ +use continuwuity::{ Err, Event, Result, at, debug, err, info, trace, utils::stream::{BroadbandExt, IterStream, TryBroadbandExt}, warn, }; -use conduwuit_service::Services; +use continuwuity_service::Services; use futures::{FutureExt, StreamExt, TryStreamExt}; use ruma::{ CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, RoomId, ServerName, UserId, diff --git a/src/api/server/send_knock.rs b/src/api/server/send_knock.rs index 15edc6a11..7426e4b53 100644 --- a/src/api/server/send_knock.rs +++ b/src/api/server/send_knock.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Event, Result, debug_info, err, matrix::pdu::PduEvent, warn}; +use continuwuity::{Err, Event, Result, debug_info, err, matrix::pdu::PduEvent, warn}; use futures::FutureExt; use ruma::{ api::federation::membership::create_knock_event, events::room::member::MembershipState, diff --git a/src/api/server/send_leave.rs b/src/api/server/send_leave.rs index cbbb4d475..4497eebc5 100644 --- a/src/api/server/send_leave.rs +++ b/src/api/server/send_leave.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result, debug_info, err}; +use continuwuity::{Err, Result, debug_info, err}; use futures::FutureExt; use ruma::{ api::federation::membership::create_leave_event, events::room::member::MembershipState, diff --git a/src/api/server/state.rs b/src/api/server/state.rs index e2ba6a289..6ea5141e0 100644 --- a/src/api/server/state.rs +++ b/src/api/server/state.rs @@ -1,7 +1,7 @@ use std::{borrow::Borrow, iter::once}; use axum::extract::State; -use conduwuit::{Err, Event, Result, at, err, info, utils::IterStream}; +use continuwuity::{Err, Event, Result, at, err, info, utils::IterStream}; use futures::{FutureExt, StreamExt, TryStreamExt}; use ruma::{OwnedEventId, api::federation::event::get_room_state}; diff --git a/src/api/server/state_ids.rs b/src/api/server/state_ids.rs index 19b5cf609..c5b77b519 100644 --- a/src/api/server/state_ids.rs +++ b/src/api/server/state_ids.rs @@ -1,7 +1,7 @@ use std::{borrow::Borrow, iter::once}; use axum::extract::State; -use conduwuit::{Err, Event, Result, at, err, info}; +use continuwuity::{Err, Event, Result, at, err, info}; use futures::{StreamExt, TryStreamExt}; use ruma::{OwnedEventId, api::federation::event::get_room_state_ids}; diff --git a/src/api/server/user.rs b/src/api/server/user.rs index ca0cf7148..e64d6f8fc 100644 --- a/src/api/server/user.rs +++ b/src/api/server/user.rs @@ -1,7 +1,7 @@ use std::time::Duration; use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use futures::{FutureExt, StreamExt, TryFutureExt}; use ruma::{ api::federation::{ diff --git a/src/api/server/utils.rs b/src/api/server/utils.rs index a6803eb61..0519f41ba 100644 --- a/src/api/server/utils.rs +++ b/src/api/server/utils.rs @@ -1,5 +1,5 @@ -use conduwuit::{Err, Result, err, is_false}; -use conduwuit_service::Services; +use continuwuity::{Err, Result, err, is_false}; +use continuwuity_service::Services; use futures::{FutureExt, future::OptionFuture, join}; use ruma::{ CanonicalJsonObject, EventId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, ServerName, diff --git a/src/api/server/version.rs b/src/api/server/version.rs index b0c299379..21d8a6ed3 100644 --- a/src/api/server/version.rs +++ b/src/api/server/version.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::Result; use ruma::{api::federation::discovery::get_server_version, assign}; use crate::Ruma; @@ -11,8 +11,8 @@ pub(crate) async fn get_server_version_route( ) -> Result { Ok(assign!(get_server_version::v1::Response::new(), { server: Some(assign!(get_server_version::v1::Server::new(), { - name: Some(conduwuit::BRANDING.into()), - version: Some(conduwuit::version().into()), + name: Some(continuwuity::BRANDING.into()), + version: Some(continuwuity::version().into()), })), })) } diff --git a/src/api/server/well_known.rs b/src/api/server/well_known.rs index c8d1c6234..8f4bb0994 100644 --- a/src/api/server/well_known.rs +++ b/src/api/server/well_known.rs @@ -1,5 +1,5 @@ use axum::extract::State; -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use ruma::api::federation::discovery::discover_homeserver; use crate::Ruma; diff --git a/src/build_metadata/Cargo.toml b/src/build_metadata/Cargo.toml index d6ea31a30..d82bfdd68 100644 --- a/src/build_metadata/Cargo.toml +++ b/src/build_metadata/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_build_metadata" +name = "continuwuity_build_metadata" description.workspace = true edition.workspace = true homepage.workspace = true @@ -12,7 +12,7 @@ version.workspace = true build = "build.rs" # [[bin]] # path = "main.rs" -# name = "conduwuit_build_metadata" +# name = "continuwuity_build_metadata" [lib] path = "mod.rs" diff --git a/src/build_metadata/build.rs b/src/build_metadata/build.rs index b605b7578..3224ff7e5 100644 --- a/src/build_metadata/build.rs +++ b/src/build_metadata/build.rs @@ -47,7 +47,7 @@ fn main() { for package in &workspace_packages { let crate_name = package .name - .trim_start_matches("conduwuit-") + .trim_start_matches("continuwuity-") .replace('-', "_"); let features: Vec = package.features.keys().cloned().collect(); if !features.is_empty() { diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 674355770..280259719 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_core" +name = "continuwuity_core" description.workspace = true edition.workspace = true homepage.workspace = true @@ -20,7 +20,7 @@ crate-type = [ brotli_compression = [ "reqwest/brotli", ] -conduwuit_mods = [ +continuwuity_mods = [ "dep:libloading" ] gzip_compression = [ @@ -67,8 +67,8 @@ cargo_toml.workspace = true checked_ops.workspace = true chrono.workspace = true clap.workspace = true -conduwuit-macros.workspace = true -conduwuit-build-metadata.workspace = true +continuwuity-macros.workspace = true +continuwuity-build-metadata.workspace = true const-str.workspace = true core_affinity.workspace = true ctor.workspace = true diff --git a/src/core/config/check.rs b/src/core/config/check.rs index 6990abcff..bf24bf7ac 100644 --- a/src/core/config/check.rs +++ b/src/core/config/check.rs @@ -26,7 +26,7 @@ pub fn reload(old: &Config, new: &Config) -> Result { #[allow(clippy::cognitive_complexity)] pub fn check(config: &Config) -> Result { if cfg!(debug_assertions) { - warn!("Note: conduwuit was built without optimisations (i.e. debug build)"); + warn!("Note: continuwuity was built without optimisations (i.e. debug build)"); } if config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure { @@ -90,7 +90,7 @@ pub fn check(config: &Config) -> Result { error!( "You are detected using Docker with a loopback/localhost listening \ address of {addr}. If you are using a reverse proxy on the host and \ - require communication to conduwuit in the Docker container via \ + require communication to continuwuity in the Docker container via \ NAT-based networking, this will NOT work. Please change this to \ \"0.0.0.0\". If this is expected, you can ignore.", ); @@ -98,7 +98,7 @@ pub fn check(config: &Config) -> Result { error!( "You are detected using Podman with a loopback/localhost listening \ address of {addr}. If you are using a reverse proxy on the host and \ - require communication to conduwuit in the Podman container via \ + require communication to continuwuity in the Podman container via \ NAT-based networking, this will NOT work. Please change this to \ \"0.0.0.0\". If this is expected, you can ignore.", ); @@ -379,7 +379,7 @@ fn warn_unknown_key(config: &Config) { .keys() .filter(|key| "config".to_owned().ne(key.to_owned()) /* "config" is expected */) { - warn!("Config parameter \"{}\" is unknown to conduwuit, ignoring.", key); + warn!("Config parameter \"{}\" is unknown to continuwuity, ignoring.", key); } } diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index e59077d78..6e9710ca9 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -9,7 +9,7 @@ use std::{ path::PathBuf, }; -use conduwuit_macros::config_example_generator; +use continuwuity_macros::config_example_generator; use either::{ Either, Either::{Left, Right}, @@ -41,7 +41,7 @@ use crate::{Result, err, error::Error, utils::sys}; #[allow(rustdoc::broken_intra_doc_links, rustdoc::bare_urls)] #[derive(Clone, Debug, Deserialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global", undocumented = "# This item is undocumented. Please contribute documentation for it.", header = r#"### continuwuity Configuration @@ -143,10 +143,10 @@ pub struct Config { /// including media. Note: this was previously "/var/lib/matrix-conduit". /// /// YOU NEED TO EDIT THIS, UNLESS you are running continuwuity as a - /// `systemd` service. The service file sets it to `/var/lib/conduwuit` + /// `systemd` service. The service file sets it to `/var/lib/continuwuity` /// using an environment variable and also grants write access. /// - /// example: "/var/lib/conduwuit" + /// example: "/var/lib/continuwuity" pub database_path: PathBuf, /// continuwuity supports online database backups using RocksDB's Backup @@ -1819,7 +1819,7 @@ pub struct Config { /// Check consistency of the media directory at startup: /// 1. When `media_compat_file_link` is enabled, this check will upgrade - /// media when switching back and forth between Conduit and conduwuit. + /// media when switching back and forth between Conduit and continuwuity. /// Both options must be enabled to handle this. /// 2. When media is deleted from the directory, this check will also delete /// its database entry. @@ -2451,7 +2451,7 @@ pub struct Config { } #[derive(Clone, Debug, Deserialize, Default)] -#[config_example_generator(filename = "conduwuit-example.toml", section = "global.tls")] +#[config_example_generator(filename = "continuwuity-example.toml", section = "global.tls")] pub struct TlsConfig { /// Path to a valid TLS certificate file. /// @@ -2470,7 +2470,7 @@ pub struct TlsConfig { #[allow(rustdoc::broken_intra_doc_links, rustdoc::bare_urls)] #[derive(Clone, Debug, Deserialize, Default)] -#[config_example_generator(filename = "conduwuit-example.toml", section = "global.well_known")] +#[config_example_generator(filename = "continuwuity-example.toml", section = "global.well_known")] pub struct WellKnownConfig { /// The server URL that the client well-known file will serve. This should /// not contain a port, and should just be a valid HTTPS URL. @@ -2519,7 +2519,7 @@ pub struct WellKnownConfig { } #[derive(Clone, Debug, Deserialize, Default)] -#[config_example_generator(filename = "conduwuit-example.toml", section = "global.matrix_rtc")] +#[config_example_generator(filename = "continuwuity-example.toml", section = "global.matrix_rtc")] pub struct MatrixRtcConfig { /// A list of MatrixRTC foci (transports) which will be served via the /// MSC4143 RTC transports endpoint at @@ -2555,7 +2555,7 @@ struct ListeningAddr { #[derive(Clone, Debug, Deserialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global.antispam", optional = "true" )] @@ -2568,7 +2568,7 @@ pub struct Antispam { #[derive(Clone, Debug, Deserialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global.antispam.meowlnir", optional = "true" )] @@ -2598,7 +2598,7 @@ pub struct MeowlnirConfig { // Maybe management_room could just become an Option<> and these structs merged? #[derive(Clone, Debug, Deserialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global.antispam.draupnir", optional = "true" )] @@ -2615,7 +2615,7 @@ pub struct DraupnirConfig { #[derive(Clone, Debug, Deserialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global.smtp", optional = "true" )] @@ -2675,7 +2675,7 @@ pub struct SmtpConfig { #[derive(Clone, Debug, Default, Deserialize, Serialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global.registration_terms", optional = "true" )] @@ -2705,7 +2705,7 @@ pub struct TermsDocument { #[derive(Clone, Debug, Default, Deserialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global.oauth", optional = "true" )] @@ -2757,7 +2757,7 @@ impl OAuthMode { #[derive(Clone, Debug, Deserialize)] #[config_example_generator( - filename = "conduwuit-example.toml", + filename = "continuwuity-example.toml", section = "global.oauth.oidc", optional = "true", subheader = "\ diff --git a/src/core/debug.rs b/src/core/debug.rs index eda1df6c4..171bb4684 100644 --- a/src/core/debug.rs +++ b/src/core/debug.rs @@ -3,7 +3,7 @@ use std::{any::Any, env, panic, sync::LazyLock}; // Export debug proc_macros -pub use conduwuit_macros::recursion_depth; +pub use continuwuity_macros::recursion_depth; use tracing::Level; // Export all of the ancillary tools from here as well. diff --git a/src/core/error/mod.rs b/src/core/error/mod.rs index ad3040fff..4e3fa269f 100644 --- a/src/core/error/mod.rs +++ b/src/core/error/mod.rs @@ -92,7 +92,7 @@ pub enum Error { #[error(transparent)] ServerResolutionError(#[from] resolvematrix::error::ServerResolutionError), - // ruma/conduwuit + // ruma/continuwuity #[error("Arithmetic operation failed: {0}")] Arithmetic(Cow<'static, str>), #[error("{0:?}: {1}")] diff --git a/src/core/info/version.rs b/src/core/info/version.rs index c8f0d4995..85ff3900f 100644 --- a/src/core/info/version.rs +++ b/src/core/info/version.rs @@ -1,9 +1,9 @@ -//! one true function for returning the conduwuit version with the necessary -//! CONDUWUIT_VERSION_EXTRA env variables used if specified +//! one true function for returning the continuwuity version with the necessary +//! CONTINUWUITY_VERSION_EXTRA env variables used if specified //! -//! Set the environment variable `CONDUWUIT_VERSION_EXTRA` to any UTF-8 string -//! to include it in parenthesis after the SemVer version. A common value are -//! git commit hashes. +//! Set the environment variable `CONTINUWUITY_VERSION_EXTRA` to any UTF-8 +//! string to include it in parenthesis after the SemVer version. A common value +//! are git commit hashes. use std::sync::OnceLock; @@ -36,11 +36,11 @@ fn init_user_agent_media() -> String { } fn init_version_ua() -> String { - conduwuit_build_metadata::version_tag() + continuwuity_build_metadata::version_tag() .map_or_else(|| SEMANTIC.to_owned(), |extra| format!("{SEMANTIC}+{extra}")) } fn init_version() -> String { - conduwuit_build_metadata::version_tag() + continuwuity_build_metadata::version_tag() .map_or_else(|| SEMANTIC.to_owned(), |extra| format!("{SEMANTIC} ({extra})")) } diff --git a/src/core/matrix/state_res/benches.rs b/src/core/matrix/state_res/benches.rs index 31e0848d4..12dc4164b 100644 --- a/src/core/matrix/state_res/benches.rs +++ b/src/core/matrix/state_res/benches.rs @@ -1,4 +1,4 @@ -#[cfg(conduwuit_bench)] +#[cfg(continuwuity_bench)] extern crate test; use std::{ @@ -32,8 +32,8 @@ use crate::{ static SERVER_TIMESTAMP: AtomicU64 = AtomicU64::new(0); -#[cfg(conduwuit_bench)] -#[cfg_attr(conduwuit_bench, bench)] +#[cfg(continuwuity_bench)] +#[cfg_attr(continuwuity_bench, bench)] fn lexico_topo_sort(c: &mut test::Bencher) { let graph = hashmap! { event_id("l") => hashset![event_id("o")], @@ -50,8 +50,8 @@ fn lexico_topo_sort(c: &mut test::Bencher) { }); } -#[cfg(conduwuit_bench)] -#[cfg_attr(conduwuit_bench, bench)] +#[cfg(continuwuity_bench)] +#[cfg_attr(continuwuity_bench, bench)] fn resolution_shallow_auth_chain(c: &mut test::Bencher) { let mut store = TestStore(hashmap! {}); @@ -87,8 +87,8 @@ fn resolution_shallow_auth_chain(c: &mut test::Bencher) { }); } -#[cfg(conduwuit_bench)] -#[cfg_attr(conduwuit_bench, bench)] +#[cfg(continuwuity_bench)] +#[cfg_attr(continuwuity_bench, bench)] fn resolve_deeper_event_set(c: &mut test::Bencher) { let mut inner = INITIAL_EVENTS(); let ban = BAN_STATE_SET(); diff --git a/src/core/mod.rs b/src/core/mod.rs index 20d49fc50..e3a5ba906 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -10,7 +10,7 @@ pub mod matrix; pub mod metrics; pub mod mods; -#[cfg(any(not(conduwuit_mods), not(feature = "conduwuit_mods")))] +#[cfg(any(not(continuwuity_mods), not(feature = "continuwuity_mods")))] pub mod mods { #[macro_export] macro_rules! mod_ctor { @@ -31,8 +31,8 @@ pub use ::smallstr; pub use ::smallvec; pub use ::toml; pub use ::tracing; -pub use conduwuit_build_metadata as build_metadata; pub use config::Config; +pub use continuwuity_build_metadata as build_metadata; pub use error::Error; pub use info::version::*; pub use matrix::{Event, EventTypeExt, Pdu, PduCount, PduEvent, PduId, pdu, state_res}; @@ -40,6 +40,6 @@ pub use parking_lot::{Mutex as SyncMutex, RwLock as SyncRwLock}; pub use server::Server; pub use utils::{result, result::Result}; -pub use crate as conduwuit_core; +pub use crate as continuwuity_core; -conduwuit_macros::introspect_crate! {} +continuwuity_macros::introspect_crate! {} diff --git a/src/core/mods/mod.rs b/src/core/mods/mod.rs index b8f06f29f..018efcf78 100644 --- a/src/core/mods/mod.rs +++ b/src/core/mods/mod.rs @@ -1,4 +1,4 @@ -#![cfg(all(conduwuit_mods, feature = "conduwuit_mods"))] +#![cfg(all(continuwuity_mods, feature = "continuwuity_mods"))] pub(crate) use libloading::os::unix::{Library, Symbol}; diff --git a/src/core/server.rs b/src/core/server.rs index 4b673f321..f0501ff07 100644 --- a/src/core/server.rs +++ b/src/core/server.rs @@ -65,7 +65,7 @@ impl Server { } pub fn reload(&self) -> Result<()> { - if cfg!(any(not(conduwuit_mods), not(feature = "conduwuit_mods"))) { + if cfg!(any(not(continuwuity_mods), not(feature = "continuwuity_mods"))) { return Err!("Reloading not enabled"); } diff --git a/src/core/utils/debug.rs b/src/core/utils/debug.rs index 9ff04c0ee..9adc2469c 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 conduwuit_core::utils::debug::slice_truncated; +/// use continuwuity_core::utils::debug::slice_truncated; /// /// #[tracing::instrument(fields(foos = slice_truncated(foos, 42)))] /// fn bar(foos: &[&str]) {}; diff --git a/src/core/utils/string.rs b/src/core/utils/string.rs index 7d81903db..13670a052 100644 --- a/src/core/utils/string.rs +++ b/src/core/utils/string.rs @@ -87,8 +87,8 @@ where /// Find the common prefix from a collection of strings and return a slice /// ``` -/// use conduwuit_core::utils::string::common_prefix; -/// let input = ["conduwuit", "conduit", "construct"]; +/// use continuwuity_core::utils::string::common_prefix; +/// let input = ["continuwuity", "conduit", "construct"]; /// common_prefix(&input) == "con"; /// ``` #[must_use] diff --git a/src/core/utils/string/tests.rs b/src/core/utils/string/tests.rs index e8c17de6d..5b9fac7bf 100644 --- a/src/core/utils/string/tests.rs +++ b/src/core/utils/string/tests.rs @@ -2,7 +2,7 @@ #[test] fn common_prefix() { - let input = ["conduwuit", "conduit", "construct"]; + let input = ["continuwuity", "conduit", "construct"]; let output = super::common_prefix(&input); assert_eq!(output, "con"); } diff --git a/src/core/utils/time/jitter.rs b/src/core/utils/time/jitter.rs index cc90d89d3..d1a92cb25 100644 --- a/src/core/utils/time/jitter.rs +++ b/src/core/utils/time/jitter.rs @@ -6,7 +6,7 @@ use std::{ops::RangeInclusive, time::Duration}; /// /// # Example /// ``` -/// use conduwuit_core::utils::time::jitter; +/// use continuwuity_core::utils::time::jitter; /// let sleep_duration = jitter(Duration::from_secs(1), -10..=10); /// // Adds a jitter of between -10% and 10% to the duration. /// ``` diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml index 6b04c624d..2e9304b5e 100644 --- a/src/database/Cargo.toml +++ b/src/database/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_database" +name = "continuwuity_database" description.workspace = true edition.workspace = true homepage.workspace = true @@ -20,27 +20,27 @@ io_uring = [ "rust-rocksdb/io-uring", ] jemalloc = [ - "conduwuit-core/jemalloc", + "continuwuity-core/jemalloc", "rust-rocksdb/jemalloc", ] jemalloc_conf = [ - "conduwuit-core/jemalloc_conf", + "continuwuity-core/jemalloc_conf", ] jemalloc_prof = [ - "conduwuit-core/jemalloc_prof", + "continuwuity-core/jemalloc_prof", ] jemalloc_stats = [ - "conduwuit-core/jemalloc_stats", + "continuwuity-core/jemalloc_stats", ] release_max_log_level = [ - "conduwuit-core/release_max_log_level", + "continuwuity-core/release_max_log_level", "log/max_level_trace", "log/release_max_level_info", "tracing/max_level_trace", "tracing/release_max_level_info", ] zstd_compression = [ - "conduwuit-core/zstd_compression", + "continuwuity-core/zstd_compression", "rust-rocksdb/zstd", ] bindgen-static = [ @@ -54,8 +54,8 @@ bindgen-runtime = [ [dependencies] async-channel.workspace = true -conduwuit-core.workspace = true -conduwuit-macros.workspace = true +continuwuity-core.workspace = true +continuwuity-macros.workspace = true const-str.workspace = true ctor.workspace = true dtor.workspace = true diff --git a/src/database/benches.rs b/src/database/benches.rs index 56d1411cd..f69a7850b 100644 --- a/src/database/benches.rs +++ b/src/database/benches.rs @@ -1,10 +1,10 @@ -#[cfg(conduwuit_bench)] +#[cfg(continuwuity_bench)] extern crate test; -#[cfg(conduwuit_bench)] -#[cfg_attr(conduwuit_bench, bench)] +#[cfg(continuwuity_bench)] +#[cfg_attr(continuwuity_bench, bench)] fn ser_str(b: &mut test::Bencher) { - use conduwuit::ruma::{RoomId, UserId}; + use continuwuity::ruma::{RoomId, UserId}; use crate::ser::serialize_to_vec; diff --git a/src/database/de.rs b/src/database/de.rs index 9ff209f0f..21ccb4f2e 100644 --- a/src/database/de.rs +++ b/src/database/de.rs @@ -1,4 +1,4 @@ -use conduwuit::{ +use continuwuity::{ Error, Result, arrayvec::ArrayVec, checked, debug::DebugInspect, err, utils::string, }; use serde::{ diff --git a/src/database/deserialized.rs b/src/database/deserialized.rs index 66541b2a9..3d9d31af6 100644 --- a/src/database/deserialized.rs +++ b/src/database/deserialized.rs @@ -1,6 +1,6 @@ use std::convert::identity; -use conduwuit::Result; +use continuwuity::Result; use serde::Deserialize; pub trait Deserialized { diff --git a/src/database/engine.rs b/src/database/engine.rs index a0a99ad60..6a53d37c5 100644 --- a/src/database/engine.rs +++ b/src/database/engine.rs @@ -17,7 +17,7 @@ use std::{ }, }; -use conduwuit::{Err, Result, debug, err, info, warn}; +use continuwuity::{Err, Result, debug, err, info, warn}; use rocksdb::{ AsColumnFamilyRef, BoundColumnFamily, DBCommon, DBWithThreadMode, MultiThreaded, WaitForCompactOptions, diff --git a/src/database/engine/backup.rs b/src/database/engine/backup.rs index 9c6d899c7..49fedd78e 100644 --- a/src/database/engine/backup.rs +++ b/src/database/engine/backup.rs @@ -1,6 +1,6 @@ use std::{ffi::OsString, path::PathBuf}; -use conduwuit::{Err, Result, error, info, utils::time::rfc2822_from_seconds, warn}; +use continuwuity::{Err, Result, error, info, utils::time::rfc2822_from_seconds, warn}; use rocksdb::backup::{BackupEngine, BackupEngineOptions}; use crate::util::map_err; diff --git a/src/database/engine/cf_opts.rs b/src/database/engine/cf_opts.rs index 4417be5a0..159e1c90f 100644 --- a/src/database/engine/cf_opts.rs +++ b/src/database/engine/cf_opts.rs @@ -1,4 +1,4 @@ -use conduwuit::{Config, Result, err, utils::math::Expected}; +use continuwuity::{Config, Result, err, utils::math::Expected}; use rocksdb::{ BlockBasedIndexType, BlockBasedOptions, BlockBasedPinningTier, Cache, DBCompressionType as CompressionType, DataBlockIndexType, FifoCompactOptions, diff --git a/src/database/engine/context.rs b/src/database/engine/context.rs index 3b9238bd6..00e99cb7c 100644 --- a/src/database/engine/context.rs +++ b/src/database/engine/context.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, sync::Arc}; -use conduwuit::{Result, Server, SyncMutex, debug, utils::math::usize_from_f64}; +use continuwuity::{Result, Server, SyncMutex, debug, utils::math::usize_from_f64}; use rocksdb::{Cache, Env, LruCacheOptions}; use crate::{or_else, pool::Pool}; diff --git a/src/database/engine/db_opts.rs b/src/database/engine/db_opts.rs index 4e9181135..4b424308a 100644 --- a/src/database/engine/db_opts.rs +++ b/src/database/engine/db_opts.rs @@ -1,6 +1,6 @@ use std::{cmp, convert::TryFrom}; -use conduwuit::{Config, Result, utils, warn}; +use continuwuity::{Config, Result, utils, warn}; use rocksdb::{ Cache, DBCompressionType, DBRecoveryMode, Env, LogLevel, Options, statistics::StatsLevel, }; diff --git a/src/database/engine/descriptor.rs b/src/database/engine/descriptor.rs index 2274da9cd..de82e60f0 100644 --- a/src/database/engine/descriptor.rs +++ b/src/database/engine/descriptor.rs @@ -1,4 +1,4 @@ -use conduwuit::utils::string::EMPTY; +use continuwuity::utils::string::EMPTY; use rocksdb::{ DBCompactionPri as CompactionPri, DBCompactionStyle as CompactionStyle, DBCompressionType as CompressionType, diff --git a/src/database/engine/files.rs b/src/database/engine/files.rs index acbda4189..2aeebd03d 100644 --- a/src/database/engine/files.rs +++ b/src/database/engine/files.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::Result; use rocksdb::LiveFile as SstFile; use crate::util::map_err; diff --git a/src/database/engine/logger.rs b/src/database/engine/logger.rs index ffdfe91b3..dd51621b2 100644 --- a/src/database/engine/logger.rs +++ b/src/database/engine/logger.rs @@ -1,4 +1,4 @@ -use conduwuit::{debug, error, warn}; +use continuwuity::{debug, error, warn}; use rocksdb::LogLevel; #[tracing::instrument( diff --git a/src/database/engine/memory_usage.rs b/src/database/engine/memory_usage.rs index d5e5945d8..b18b887b9 100644 --- a/src/database/engine/memory_usage.rs +++ b/src/database/engine/memory_usage.rs @@ -1,6 +1,6 @@ use std::fmt::Write; -use conduwuit::Result; +use continuwuity::Result; use rocksdb::perf::get_memory_usage_stats; use crate::or_else; diff --git a/src/database/engine/open.rs b/src/database/engine/open.rs index 73d9d6c8a..bcc209aeb 100644 --- a/src/database/engine/open.rs +++ b/src/database/engine/open.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, atomic::AtomicU32}, }; -use conduwuit::{Result, debug, info, warn}; +use continuwuity::{Result, debug, info, warn}; use rocksdb::{ColumnFamilyDescriptor, Options}; use super::{ diff --git a/src/database/engine/repair.rs b/src/database/engine/repair.rs index aeec0caff..60ae62205 100644 --- a/src/database/engine/repair.rs +++ b/src/database/engine/repair.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use conduwuit::{Err, Result, info, warn}; +use continuwuity::{Err, Result, info, warn}; use rocksdb::Options; use super::Db; diff --git a/src/database/handle.rs b/src/database/handle.rs index 484e56180..56e7ca1f8 100644 --- a/src/database/handle.rs +++ b/src/database/handle.rs @@ -1,6 +1,6 @@ use std::{fmt, fmt::Debug, ops::Deref}; -use conduwuit::Result; +use continuwuity::Result; use rocksdb::DBPinnableSlice; use serde::{Deserialize, Serialize, Serializer}; diff --git a/src/database/keyval.rs b/src/database/keyval.rs index 6059cd535..c6d5869ba 100644 --- a/src/database/keyval.rs +++ b/src/database/keyval.rs @@ -1,4 +1,4 @@ -use conduwuit::{Result, smallvec::SmallVec}; +use continuwuity::{Result, smallvec::SmallVec}; use serde::{Deserialize, Serialize}; use crate::{de, ser}; diff --git a/src/database/map.rs b/src/database/map.rs index ed38e1fc3..4471858b4 100644 --- a/src/database/map.rs +++ b/src/database/map.rs @@ -33,7 +33,7 @@ use std::{ sync::Arc, }; -use conduwuit::Result; +use continuwuity::Result; use rocksdb::{AsColumnFamilyRef, ColumnFamily, ReadOptions, WriteOptions}; pub(crate) use self::options::{ diff --git a/src/database/map/clear.rs b/src/database/map/clear.rs index f95a608ed..f62da4821 100644 --- a/src/database/map/clear.rs +++ b/src/database/map/clear.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{ +use continuwuity::{ Result, utils::stream::{ReadyExt, TryIgnore}, }; diff --git a/src/database/map/compact.rs b/src/database/map/compact.rs index 9a5c0b718..00284a54c 100644 --- a/src/database/map/compact.rs +++ b/src/database/map/compact.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result}; +use continuwuity::{Err, Result}; use rocksdb::{BottommostLevelCompaction, CompactOptions}; use crate::keyval::KeyBuf; diff --git a/src/database/map/contains.rs b/src/database/map/contains.rs index 0785a87e3..597323410 100644 --- a/src/database/map/contains.rs +++ b/src/database/map/contains.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, future::Future, io::Write, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Result, arrayvec::ArrayVec, err, diff --git a/src/database/map/get.rs b/src/database/map/get.rs index c8407f7dd..f806e5eea 100644 --- a/src/database/map/get.rs +++ b/src/database/map/get.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduwuit::{Err, Result, err, utils::result::MapExpect}; +use continuwuity::{Err, Result, err, utils::result::MapExpect}; use futures::{Future, FutureExt, TryFutureExt, future::ready}; use rocksdb::{DBPinnableSlice, ReadOptions}; use tokio::task; diff --git a/src/database/map/get_batch.rs b/src/database/map/get_batch.rs index c52c9a3c5..3688c9a56 100644 --- a/src/database/map/get_batch.rs +++ b/src/database/map/get_batch.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Result, utils::{ IterStream, diff --git a/src/database/map/insert.rs b/src/database/map/insert.rs index 80e8c448c..f874c6558 100644 --- a/src/database/map/insert.rs +++ b/src/database/map/insert.rs @@ -5,7 +5,7 @@ use std::{convert::AsRef, fmt::Debug, io::Write}; -use conduwuit::arrayvec::ArrayVec; +use continuwuity::arrayvec::ArrayVec; use rocksdb::WriteBatchWithTransaction; use serde::Serialize; diff --git a/src/database/map/keys.rs b/src/database/map/keys.rs index 67cd99511..b6346348f 100644 --- a/src/database/map/keys.rs +++ b/src/database/map/keys.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::Result; +use continuwuity::Result; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::Deserialize; diff --git a/src/database/map/keys_from.rs b/src/database/map/keys_from.rs index 47b5d7e6b..b5b054d1b 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 conduwuit::Result; +use continuwuity::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 9477ec06d..29ec089a1 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 conduwuit::Result; +use continuwuity::Result; use futures::{Stream, StreamExt, TryStreamExt, future}; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/qry.rs b/src/database/map/qry.rs index 79f95dade..5d719ced3 100644 --- a/src/database/map/qry.rs +++ b/src/database/map/qry.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, io::Write, sync::Arc}; -use conduwuit::{Result, arrayvec::ArrayVec}; +use continuwuity::{Result, arrayvec::ArrayVec}; use futures::Future; use serde::Serialize; diff --git a/src/database/map/qry_batch.rs b/src/database/map/qry_batch.rs index 115798b56..10ed0a77d 100644 --- a/src/database/map/qry_batch.rs +++ b/src/database/map/qry_batch.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Result, utils::{ IterStream, diff --git a/src/database/map/remove.rs b/src/database/map/remove.rs index 11ec3143c..464e21a71 100644 --- a/src/database/map/remove.rs +++ b/src/database/map/remove.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, io::Write}; -use conduwuit::arrayvec::ArrayVec; +use continuwuity::arrayvec::ArrayVec; 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 cb264fc12..2465df3c5 100644 --- a/src/database/map/rev_keys.rs +++ b/src/database/map/rev_keys.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::Result; +use continuwuity::Result; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::Deserialize; diff --git a/src/database/map/rev_keys_from.rs b/src/database/map/rev_keys_from.rs index c5dfe52a4..6894f116d 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 conduwuit::Result; +use continuwuity::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 2cbc11129..781bfdf3e 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 conduwuit::Result; +use continuwuity::Result; use futures::{Stream, StreamExt, TryStreamExt, future}; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/rev_stream.rs b/src/database/map/rev_stream.rs index 380205ed7..e3a4c39ef 100644 --- a/src/database/map/rev_stream.rs +++ b/src/database/map/rev_stream.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::Result; +use continuwuity::Result; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::Deserialize; diff --git a/src/database/map/rev_stream_from.rs b/src/database/map/rev_stream_from.rs index 1ced851d5..03e87ffb1 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 conduwuit::Result; +use continuwuity::Result; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/rev_stream_prefix.rs b/src/database/map/rev_stream_prefix.rs index f042d5d71..f5919e451 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 conduwuit::Result; +use continuwuity::Result; use futures::{Stream, StreamExt, TryStreamExt, future}; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/stream.rs b/src/database/map/stream.rs index b2da4743e..ce253a647 100644 --- a/src/database/map/stream.rs +++ b/src/database/map/stream.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::Result; +use continuwuity::Result; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::Deserialize; diff --git a/src/database/map/stream_from.rs b/src/database/map/stream_from.rs index 76398ba63..869f496a8 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 conduwuit::Result; +use continuwuity::Result; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/stream_prefix.rs b/src/database/map/stream_prefix.rs index 5b9e59d0f..f7da8b8eb 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 conduwuit::Result; +use continuwuity::Result; use futures::{Stream, StreamExt, TryStreamExt, future}; use serde::{Deserialize, Serialize}; diff --git a/src/database/maps.rs b/src/database/maps.rs index 013fc9270..f754edb10 100644 --- a/src/database/maps.rs +++ b/src/database/maps.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, sync::Arc}; -use conduwuit::Result; +use continuwuity::Result; use crate::{ Engine, Map, diff --git a/src/database/mod.rs b/src/database/mod.rs index fcc4f4df7..77a121d02 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -1,12 +1,12 @@ #![type_length_limit = "3072"] -extern crate conduwuit_core as conduwuit; +extern crate continuwuity_core as continuwuity; extern crate rust_rocksdb as rocksdb; -conduwuit_macros::introspect_crate! {} +continuwuity_macros::introspect_crate! {} -conduwuit::mod_ctor! {} -conduwuit::mod_dtor! {} +continuwuity::mod_ctor! {} +continuwuity::mod_dtor! {} #[cfg(test)] mod benches; @@ -28,7 +28,7 @@ mod watchers; use std::{ops::Index, sync::Arc}; -use conduwuit::{Result, Server, err}; +use continuwuity::{Result, Server, err}; pub use self::{ de::{Ignore, IgnoreAll}, diff --git a/src/database/pool.rs b/src/database/pool.rs index f13de6272..60223933e 100644 --- a/src/database/pool.rs +++ b/src/database/pool.rs @@ -11,7 +11,7 @@ use std::{ }; use async_channel::{QueueStrategy, Receiver, RecvError, Sender}; -use conduwuit::{ +use continuwuity::{ Error, Result, Server, SyncMutex, debug, err, error, result::DebugInspect, smallvec::SmallVec, @@ -70,7 +70,7 @@ const QUEUE_LIMIT: (usize, usize) = (1, 4096); const BATCH_INLINE: usize = 1; const WORKER_STACK_SIZE: usize = 1_048_576; -const WORKER_NAME: &str = "conduwuit:db"; +const WORKER_NAME: &str = "continuwuity:db"; impl Pool { pub(crate) fn new(server: &Arc) -> Result> { @@ -261,8 +261,8 @@ impl Pool { set_affinity(affinity.clone()); #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))] - if affinity.clone().count() == 1 && conduwuit::alloc::je::is_affine_arena() { - use conduwuit::{ + if affinity.clone().count() == 1 && continuwuity::alloc::je::is_affine_arena() { + use continuwuity::{ alloc::je::this_thread::{arena_id, set_arena}, result::LogDebugErr, }; diff --git a/src/database/pool/configure.rs b/src/database/pool/configure.rs index f3d8e9401..da373d691 100644 --- a/src/database/pool/configure.rs +++ b/src/database/pool/configure.rs @@ -1,6 +1,6 @@ use std::{path::PathBuf, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Server, debug, debug_info, expected, is_equal_to, utils::{ math::usize_from_f64, diff --git a/src/database/ser.rs b/src/database/ser.rs index a198bc1c0..61f3b9d2f 100644 --- a/src/database/ser.rs +++ b/src/database/ser.rs @@ -1,6 +1,6 @@ use std::io::Write; -use conduwuit::{Error, Result, debug::type_name, err, result::DebugInspect, utils::exchange}; +use continuwuity::{Error, Result, debug::type_name, err, result::DebugInspect, utils::exchange}; use serde::{Deserialize, Serialize, ser}; use crate::util::unhandled; diff --git a/src/database/stream.rs b/src/database/stream.rs index ddcaa32c8..7b3829716 100644 --- a/src/database/stream.rs +++ b/src/database/stream.rs @@ -5,7 +5,7 @@ mod keys_rev; use std::sync::Arc; -use conduwuit::{Result, utils::exchange}; +use continuwuity::{Result, utils::exchange}; use rocksdb::{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 ede2b8223..b4fe6dca7 100644 --- a/src/database/stream/items.rs +++ b/src/database/stream/items.rs @@ -1,6 +1,6 @@ use std::pin::Pin; -use conduwuit::Result; +use continuwuity::Result; use futures::{ Stream, stream::FusedStream, diff --git a/src/database/stream/items_rev.rs b/src/database/stream/items_rev.rs index dba8d16cf..c6712b524 100644 --- a/src/database/stream/items_rev.rs +++ b/src/database/stream/items_rev.rs @@ -1,6 +1,6 @@ use std::pin::Pin; -use conduwuit::Result; +use continuwuity::Result; use futures::{ Stream, stream::FusedStream, diff --git a/src/database/stream/keys.rs b/src/database/stream/keys.rs index 7c89869be..431998d67 100644 --- a/src/database/stream/keys.rs +++ b/src/database/stream/keys.rs @@ -1,6 +1,6 @@ use std::pin::Pin; -use conduwuit::Result; +use continuwuity::Result; use futures::{ Stream, stream::FusedStream, diff --git a/src/database/stream/keys_rev.rs b/src/database/stream/keys_rev.rs index 51561e5c9..cbd5a97d7 100644 --- a/src/database/stream/keys_rev.rs +++ b/src/database/stream/keys_rev.rs @@ -1,6 +1,6 @@ use std::pin::Pin; -use conduwuit::Result; +use continuwuity::Result; use futures::{ Stream, stream::FusedStream, diff --git a/src/database/tests.rs b/src/database/tests.rs index 4949d4f9e..c2537d80a 100644 --- a/src/database/tests.rs +++ b/src/database/tests.rs @@ -2,7 +2,7 @@ use std::borrow::Cow; -use conduwuit::{ +use continuwuity::{ arrayvec::ArrayVec, ruma::{ EventId, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, UserId, room_id, serde::Raw, @@ -79,7 +79,7 @@ fn ser_overflow() { #[test] fn ser_json() { - use conduwuit::ruma::api::client::filter::FilterDefinition; + use continuwuity::ruma::api::client::filter::FilterDefinition; let mut filter = FilterDefinition::default(); filter.event_fields = Some(vec!["content.body".to_owned()]); @@ -92,7 +92,7 @@ fn ser_json() { #[test] fn ser_json_value() { - use conduwuit::ruma::api::client::filter::FilterDefinition; + use continuwuity::ruma::api::client::filter::FilterDefinition; let mut filter = FilterDefinition::default(); filter.event_fields = Some(vec!["content.body".to_owned()]); @@ -129,7 +129,7 @@ fn ser_json_macro() { #[test] #[cfg_attr(debug_assertions, should_panic(expected = "serializing string at the top-level"))] fn ser_json_raw() { - use conduwuit::ruma::api::client::filter::FilterDefinition; + use continuwuity::ruma::api::client::filter::FilterDefinition; let mut filter = FilterDefinition::default(); filter.event_fields = Some(vec!["content.body".to_owned()]); @@ -144,7 +144,7 @@ fn ser_json_raw() { #[test] #[cfg_attr(debug_assertions, should_panic(expected = "you can skip serialization instead"))] fn ser_json_raw_json() { - use conduwuit::ruma::api::client::filter::FilterDefinition; + use continuwuity::ruma::api::client::filter::FilterDefinition; let mut filter = FilterDefinition::default(); filter.event_fields = Some(vec!["content.body".to_owned()]); diff --git a/src/database/util.rs b/src/database/util.rs index bcefa2867..f7eb8de08 100644 --- a/src/database/util.rs +++ b/src/database/util.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::Result; use rocksdb::{Direction, ErrorKind, IteratorMode}; //#[cfg(debug_assertions)] @@ -39,19 +39,19 @@ pub(crate) fn _into_direction(mode: &IteratorMode<'_>) -> Direction { #[inline] pub(crate) fn result( r: std::result::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) -> conduwuit::Error { +pub(crate) fn map_err(e: rocksdb::Error) -> continuwuity::Error { let kind = io_error_kind(&e.kind()); let string = e.into_string(); diff --git a/src/database/watchers.rs b/src/database/watchers.rs index 0e911c82d..d7d14be4a 100644 --- a/src/database/watchers.rs +++ b/src/database/watchers.rs @@ -4,7 +4,7 @@ use std::{ pin::Pin, }; -use conduwuit::SyncRwLock; +use continuwuity::SyncRwLock; use tokio::sync::watch; type Watcher = SyncRwLock, (watch::Sender<()>, watch::Receiver<()>)>>; diff --git a/src/macros/Cargo.toml b/src/macros/Cargo.toml index 805228649..4bd110ceb 100644 --- a/src/macros/Cargo.toml +++ b/src/macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_macros" +name = "continuwuity_macros" description.workspace = true edition.workspace = true homepage.workspace = true @@ -9,7 +9,7 @@ repository.workspace = true version.workspace = true [lib] -name = "conduwuit_macros" +name = "continuwuity_macros" path = "mod.rs" proc-macro = true diff --git a/src/macros/build_info.rs b/src/macros/build_info.rs index 801fb8bf0..8df1d3193 100644 --- a/src/macros/build_info.rs +++ b/src/macros/build_info.rs @@ -5,8 +5,8 @@ use crate::Result; pub(super) fn introspect(_args: TokenStream) -> Result { let cargo_crate_name = std::env::var("CARGO_CRATE_NAME").unwrap(); - let crate_name = cargo_crate_name.trim_start_matches("conduwuit_"); - let is_core = cargo_crate_name == "conduwuit_core"; + let crate_name = cargo_crate_name.trim_start_matches("continuwuity_"); + let is_core = cargo_crate_name == "continuwuity_core"; let flags = std::env::args().collect::>(); @@ -16,9 +16,9 @@ pub(super) fn introspect(_args: TokenStream) -> Result { let enabled_count = enabled_features.len(); let import_path = if is_core { - quote! { use crate::conduwuit_core; } + quote! { use crate::continuwuity_core; } } else { - quote! { use ::conduwuit_core; } + quote! { use ::continuwuity_core; } }; let ret = quote! { @@ -34,11 +34,11 @@ pub(super) fn introspect(_args: TokenStream) -> Result { /// Register this crate's features with the global registry during static initialization #[::ctor::ctor(unsafe)] fn register() { - conduwuit_core::info::introspection::ENABLED_FEATURES.lock().unwrap().insert(#crate_name, &ENABLED); + continuwuity_core::info::introspection::ENABLED_FEATURES.lock().unwrap().insert(#crate_name, &ENABLED); } #[::dtor::dtor(unsafe)] fn unregister() { - conduwuit_core::info::introspection::ENABLED_FEATURES.lock().unwrap().remove(#crate_name); + continuwuity_core::info::introspection::ENABLED_FEATURES.lock().unwrap().remove(#crate_name); } } }; diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index 611b0d5ef..4364f9596 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "conduwuit" -default-run = "conduwuit" +name = "continuwuity" +default-run = "continuwuity" authors.workspace = true description.workspace = true edition.workspace = true @@ -28,21 +28,20 @@ license-file = ["../../LICENSE", "3"] depends = "$auto, ca-certificates" breaks = ["conduwuit (<<0.5.0)"] replaces = ["conduwuit (<<0.5.0)"] -extended-description = """\ -A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver.""" +extended-description = """A community-driven Matrix homeserver.""" section = "net" priority = "optional" -conf-files = ["/etc/conduwuit/conduwuit.toml"] +conf-files = ["/etc/continuwuity/continuwuity.toml"] maintainer-scripts = "../../pkg/debian/" -systemd-units = { unit-name = "conduwuit", start = false, unit-scripts = "../../pkg/" } +systemd-units = { unit-name = "continuwuity", start = false, unit-scripts = "../../pkg/" } assets = [ - ["../../pkg/debian/README.md", "usr/share/doc/conduwuit/README.Debian", "644"], - ["../../README.md", "usr/share/doc/conduwuit/", "644"], + ["../../pkg/debian/README.md", "usr/share/doc/continuwuity/README.Debian", "644"], + ["../../README.md", "usr/share/doc/continuwuity/", "644"], # cargo-deb only treats the exact prefix "target/release/" as the magic # path that resolves to the real build dir (e.g. target//release # when cross-compiling); a ../../ prefix would be read as a literal path - ["target/release/conduwuit", "usr/bin/conduwuit", "755"], - ["../../conduwuit-example.toml", "etc/conduwuit/conduwuit.toml", "640"], + ["target/release/continuwuity", "usr/bin/continuwuity", "755"], + ["../../continuwuity-example.toml", "etc/continuwuity/continuwuity.toml", "640"], ] [features] @@ -77,29 +76,29 @@ full = [ ] brotli_compression = [ - "conduwuit-api/brotli_compression", - "conduwuit-core/brotli_compression", - "conduwuit-router/brotli_compression", - "conduwuit-service/brotli_compression", + "continuwuity-api/brotli_compression", + "continuwuity-core/brotli_compression", + "continuwuity-router/brotli_compression", + "continuwuity-service/brotli_compression", ] console = [ - "conduwuit-service/console", + "continuwuity-service/console", ] direct_tls = [ - "conduwuit-router/direct_tls" + "continuwuity-router/direct_tls" ] element_hacks = [ - "conduwuit-api/element_hacks", - "conduwuit-service/element_hacks", + "continuwuity-api/element_hacks", + "continuwuity-service/element_hacks", ] gzip_compression = [ - "conduwuit-api/gzip_compression", - "conduwuit-core/gzip_compression", - "conduwuit-router/gzip_compression", - "conduwuit-service/gzip_compression", + "continuwuity-api/gzip_compression", + "continuwuity-core/gzip_compression", + "continuwuity-router/gzip_compression", + "continuwuity-service/gzip_compression", ] hardened_malloc = [ - "conduwuit-core/hardened_malloc", + "continuwuity-core/hardened_malloc", ] http3 = [ "reqwest/http3" @@ -112,23 +111,23 @@ aws_lc_rs = [ "dep:aws-lc-rs" ] io_uring = [ - "conduwuit-database/io_uring", + "continuwuity-database/io_uring", ] jemalloc = [ - "conduwuit-core/jemalloc", - "conduwuit-database/jemalloc", + "continuwuity-core/jemalloc", + "continuwuity-database/jemalloc", ] jemalloc_prof = [ - "conduwuit-core/jemalloc_prof", + "continuwuity-core/jemalloc_prof", ] jemalloc_stats = [ - "conduwuit-core/jemalloc_stats", + "continuwuity-core/jemalloc_stats", ] jemalloc_conf = [ - "conduwuit-core/jemalloc_conf", + "continuwuity-core/jemalloc_conf", ] media_thumbnail = [ - "conduwuit-service/media_thumbnail", + "continuwuity-service/media_thumbnail", ] otlp_telemetry = [ "dep:opentelemetry", @@ -139,8 +138,8 @@ otlp_telemetry = [ perf_measurements = [ "dep:tracing-flame", "otlp_telemetry", - "conduwuit-core/perf_measurements", - "conduwuit-core/sentry_telemetry", + "continuwuity-core/perf_measurements", + "continuwuity-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) @@ -149,28 +148,28 @@ release_max_log_level = [ "tracing/release_max_level_info", "log/max_level_trace", "log/release_max_level_info", - "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", + "continuwuity-admin/release_max_log_level", + "continuwuity-api/release_max_log_level", + "continuwuity-core/release_max_log_level", + "continuwuity-database/release_max_log_level", + "continuwuity-router/release_max_log_level", + "continuwuity-service/release_max_log_level", ] sentry_telemetry = [ "dep:sentry", "dep:sentry-tracing", "dep:sentry-tower", - "conduwuit-core/sentry_telemetry", - "conduwuit-router/sentry_telemetry", + "continuwuity-core/sentry_telemetry", + "continuwuity-router/sentry_telemetry", ] systemd = [ - "conduwuit-router/systemd", - "conduwuit-service/systemd" + "continuwuity-router/systemd", + "continuwuity-service/systemd" ] journald = [# This is a stub on non-unix platforms "dep:tracing-journald", ] -openreg = ["conduwuit-core/openreg"] +openreg = ["continuwuity-core/openreg"] # enable the tokio_console server ncompatible with release_max_log_level @@ -179,25 +178,25 @@ tokio_console = [ "tokio/tracing", ] url_preview = [ - "conduwuit-service/url_preview", + "continuwuity-service/url_preview", ] zstd_compression = [ - "conduwuit-api/zstd_compression", - "conduwuit-core/zstd_compression", - "conduwuit-database/zstd_compression", - "conduwuit-router/zstd_compression", - "conduwuit-service/zstd_compression", + "continuwuity-api/zstd_compression", + "continuwuity-core/zstd_compression", + "continuwuity-database/zstd_compression", + "continuwuity-router/zstd_compression", + "continuwuity-service/zstd_compression", ] -conduwuit_mods = [ - "conduwuit-core/conduwuit_mods", +continuwuity_mods = [ + "continuwuity-core/continuwuity_mods", ] bindgen-static = [ # "bindgen/static" # "clang-sys/static" - "conduwuit-database/bindgen-static" + "continuwuity-database/bindgen-static" ] bindgen-runtime = [ - "conduwuit-database/bindgen-runtime" + "continuwuity-database/bindgen-runtime" ] [build-dependencies] @@ -205,14 +204,14 @@ bindgen-runtime = [ # clang-sys = {version = "1", default-features = false} [dependencies] -conduwuit-admin.workspace = true -conduwuit-api.workspace = true -conduwuit-core.workspace = true -conduwuit-database.workspace = true -conduwuit-router.workspace = true -conduwuit-service.workspace = true -conduwuit-build-metadata.workspace = true -conduwuit-macros.workspace = true +continuwuity-admin.workspace = true +continuwuity-api.workspace = true +continuwuity-core.workspace = true +continuwuity-database.workspace = true +continuwuity-router.workspace = true +continuwuity-service.workspace = true +continuwuity-build-metadata.workspace = true +continuwuity-macros.workspace = true clap.workspace = true ctor.workspace = true @@ -257,5 +256,5 @@ hardened_malloc-rs.optional = true workspace = true [[bin]] -name = "conduwuit" +name = "continuwuity" path = "main.rs" diff --git a/src/main/clap.rs b/src/main/clap.rs index b47993d68..7c660a7b4 100644 --- a/src/main/clap.rs +++ b/src/main/clap.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use clap::{ArgAction, Parser}; -use conduwuit_core::{ +use continuwuity_core::{ Err, Result, config::{Figment, FigmentValue}, err, toml, @@ -15,8 +15,8 @@ use conduwuit_core::{ #[clap( about, long_about = None, - name = conduwuit_core::BRANDING, - version = conduwuit_core::version(), + name = continuwuity_core::BRANDING, + version = continuwuity_core::version(), )] pub struct Args { #[arg(short, long)] diff --git a/src/main/logging.rs b/src/main/logging.rs index 58c8ccfc6..f7647f827 100644 --- a/src/main/logging.rs +++ b/src/main/logging.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit_core::{ +use continuwuity_core::{ Result, config::Config, debug_warn, err, @@ -110,7 +110,7 @@ pub(crate) fn init( .with_batch_exporter(exporter) .build(); - let tracer = provider.tracer(conduwuit_core::BRANDING); + let tracer = provider.tracer(continuwuity_core::BRANDING); let telemetry = tracing_opentelemetry::layer().with_tracer(tracer); diff --git a/src/main/main.rs b/src/main/main.rs index ac363aa16..982e67816 100644 --- a/src/main/main.rs +++ b/src/main/main.rs @@ -1,3 +1,3 @@ -use conduwuit::Result; +use continuwuity::Result; -fn main() -> Result<()> { conduwuit::run() } +fn main() -> Result<()> { continuwuity::run() } diff --git a/src/main/mod.rs b/src/main/mod.rs index f141b26c1..5c24c4d97 100644 --- a/src/main/mod.rs +++ b/src/main/mod.rs @@ -2,9 +2,9 @@ use std::sync::{Arc, atomic::Ordering}; -use conduwuit_core::{debug_info, error}; +use continuwuity_core::{debug_info, error}; -conduwuit_macros::introspect_crate! {} +continuwuity_macros::introspect_crate! {} mod clap; mod deadlock; @@ -17,7 +17,7 @@ mod sentry; mod server; mod signal; -pub use conduwuit_core::{Error, Result}; +pub use continuwuity_core::{Error, Result}; use server::Server; pub use crate::clap::Args; @@ -63,7 +63,7 @@ pub fn run_with_args(args: &Args) -> Result<()> { /// Operate the server normally in release-mode static builds. This will start, /// run and stop the server within the asynchronous runtime. -#[cfg(any(not(conduwuit_mods), not(feature = "conduwuit_mods")))] +#[cfg(any(not(continuwuity_mods), not(feature = "continuwuity_mods")))] #[tracing::instrument( name = "main", parent = None, @@ -71,7 +71,7 @@ pub fn run_with_args(args: &Args) -> Result<()> { level = "info" )] async fn async_main(server: &Arc) -> Result<(), Error> { - extern crate conduwuit_router as router; + extern crate continuwuity_router as router; match router::start(&server.server).await { | Ok(services) => server.services.lock().await.insert(services), @@ -116,7 +116,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(all(conduwuit_mods, feature = "conduwuit_mods"))] +#[cfg(all(continuwuity_mods, feature = "continuwuity_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 6140cc6e3..fcf22fc60 100644 --- a/src/main/mods.rs +++ b/src/main/mods.rs @@ -1,7 +1,7 @@ -#![cfg(all(conduwuit_mods, feature = "conduwuit_mods"))] +#![cfg(all(continuwuity_mods, feature = "continuwuity_mods"))] #[unsafe(no_link)] -extern crate conduwuit_service; +extern crate continuwuity_service; use std::{ future::Future, @@ -9,13 +9,13 @@ use std::{ sync::{Arc, atomic::Ordering}, }; -use conduwuit_core::{Error, Result, debug, error, mods}; -use conduwuit_service::Services; +use continuwuity_core::{Error, Result, debug, error, mods}; +use continuwuity_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 = "conduwuit_service"; +const RESTART_THRESH: &str = "continuwuity_service"; const MODULE_NAMES: &[&str] = &[ - //"conduwuit_core", - "conduwuit_database", - "conduwuit_service", - "conduwuit_api", - "conduwuit_admin", - "conduwuit_router", + //"continuwuity_core", + "continuwuity_database", + "continuwuity_service", + "continuwuity_api", + "continuwuity_admin", + "continuwuity_router", ]; #[cfg(panic_trap)] -conduwuit_core::mod_init! {{ - conduwuit_core::debug::set_panic_trap(); +continuwuity_core::mod_init! {{ + continuwuity_core::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 34aac284c..e6c38db13 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 conduwuit_core::{debug, info, utils}; +use continuwuity_core::{debug, info, utils}; #[cold] pub(super) fn restart() -> ! { diff --git a/src/main/runtime.rs b/src/main/runtime.rs index 9bfb453f8..2f6d48229 100644 --- a/src/main/runtime.rs +++ b/src/main/runtime.rs @@ -9,8 +9,8 @@ use std::{ }; #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))] -use conduwuit_core::result::LogDebugErr; -use conduwuit_core::{ +use continuwuity_core::result::LogDebugErr; +use continuwuity_core::{ Result, debug, is_true, utils::sys::compute::{nth_core_available, set_affinity}, }; @@ -18,7 +18,7 @@ use tokio::runtime::Builder; use crate::{clap::Args, server::Server}; -const WORKER_NAME: &str = "conduwuit:worker"; +const WORKER_NAME: &str = "continuwuity:worker"; const WORKER_MIN: usize = 2; const WORKER_KEEPALIVE: u64 = 36; const MAX_BLOCKING_THREADS: usize = 1024; @@ -87,7 +87,7 @@ fn enable_histogram(builder: &mut Builder, args: &Args) { #[cfg(tokio_unstable)] #[tracing::instrument(name = "stop", level = "info", skip_all)] pub(super) fn shutdown(server: &Arc, runtime: tokio::runtime::Runtime) { - use conduwuit_core::event; + use continuwuity_core::event; use tracing::Level; // The final metrics output is promoted to INFO when tokio_unstable is @@ -120,7 +120,7 @@ fn wait_shutdown(_server: &Arc, runtime: tokio::runtime::Runtime) { // Join any jemalloc threads so they don't appear in use at exit. #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))] - conduwuit_core::alloc::je::background_thread_enable(false) + continuwuity_core::alloc::je::background_thread_enable(false) .log_debug_err() .ok(); } @@ -166,7 +166,7 @@ fn set_worker_affinity() { #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))] fn set_worker_mallctl(id: usize) { - use conduwuit_core::alloc::je::{ + use continuwuity_core::alloc::je::{ is_affine_arena, this_thread::{set_arena, set_muzzy_decay}, }; @@ -180,7 +180,7 @@ fn set_worker_mallctl(id: usize) { .expect("GC_MUZZY initialized by runtime::new()"); let muzzy_auto_disable = - conduwuit_core::utils::available_parallelism() >= DISABLE_MUZZY_THRESHOLD; + continuwuity_core::utils::available_parallelism() >= DISABLE_MUZZY_THRESHOLD; if matches!(muzzy_option, Some(false) | None if muzzy_auto_disable) { set_muzzy_decay(-1).log_debug_err().ok(); } @@ -233,7 +233,7 @@ fn thread_park() { fn gc_on_park() { #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))] - conduwuit_core::alloc::je::this_thread::decay() + continuwuity_core::alloc::je::this_thread::decay() .log_debug_err() .ok(); } diff --git a/src/main/sentry.rs b/src/main/sentry.rs index 0a013fa66..8b340fc2d 100644 --- a/src/main/sentry.rs +++ b/src/main/sentry.rs @@ -6,8 +6,8 @@ use std::{ sync::{Arc, OnceLock}, }; -use conduwuit_build_metadata as build; -use conduwuit_core::{config::Config, debug, trace}; +use continuwuity_build_metadata as build; +use continuwuity_core::{config::Config, debug, trace}; use sentry::{ Breadcrumb, ClientOptions, Level, types::{ @@ -47,7 +47,7 @@ fn options(config: &Config) -> ClientOptions { traces_sample_rate: config.sentry_traces_sample_rate, debug: cfg!(debug_assertions), release: release_name(), - user_agent: conduwuit_core::user_agent().into(), + user_agent: continuwuity_core::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 4c1abc25a..bf7f53c8d 100644 --- a/src/main/server.rs +++ b/src/main/server.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit_core::{ +use continuwuity_core::{ Error, Result, config::Config, info, @@ -17,18 +17,18 @@ use crate::{ /// 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(all(conduwuit_mods, feature = "conduwuit_mods"))] + #[cfg(all(continuwuity_mods, feature = "continuwuity_mods"))] // Module instances; TODO: move to mods::loaded mgmt vector - pub(crate) mods: tokio::sync::RwLock>, + pub(crate) mods: tokio::sync::RwLock>, } impl Server { @@ -64,11 +64,11 @@ impl Server { database_path = ?config.database_path, log_levels = %config.log, "{}", - conduwuit_core::version(), + continuwuity_core::version(), ); Ok(Arc::new(Self { - server: Arc::new(conduwuit_core::Server::new(config, runtime.cloned(), Log { + server: Arc::new(continuwuity_core::Server::new(config, runtime.cloned(), Log { reload: tracing_reload_handle, capture, })), @@ -80,7 +80,7 @@ impl Server { #[cfg(feature = "sentry_telemetry")] _sentry_guard: sentry_guard, - #[cfg(all(conduwuit_mods, feature = "conduwuit_mods"))] + #[cfg(all(continuwuity_mods, feature = "continuwuity_mods"))] mods: tokio::sync::RwLock::new(Vec::new()), })) } diff --git a/src/main/signal.rs b/src/main/signal.rs index 42cade135..303b5fe88 100644 --- a/src/main/signal.rs +++ b/src/main/signal.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit_core::{debug_error, trace, warn}; +use continuwuity_core::{debug_error, trace, warn}; use tokio::signal; use super::server::Server; @@ -12,7 +12,8 @@ pub(super) async fn signal(server: Arc) { use unix::SignalKind; const CONSOLE: bool = cfg!(feature = "console"); - const RELOADING: bool = cfg!(all(conduwuit_mods, feature = "conduwuit_mods", not(CONSOLE))); + const RELOADING: bool = + cfg!(all(continuwuity_mods, feature = "continuwuity_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 473da24d5..586862366 100644 --- a/src/router/Cargo.toml +++ b/src/router/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_router" +name = "continuwuity_router" description.workspace = true edition.workspace = true homepage.workspace = true @@ -17,10 +17,10 @@ crate-type = [ [features] brotli_compression = [ - "conduwuit-admin/brotli_compression", - "conduwuit-api/brotli_compression", - "conduwuit-core/brotli_compression", - "conduwuit-service/brotli_compression", + "continuwuity-admin/brotli_compression", + "continuwuity-api/brotli_compression", + "continuwuity-core/brotli_compression", + "continuwuity-service/brotli_compression", "tower-http/compression-br", ] direct_tls = [ @@ -29,53 +29,53 @@ direct_tls = [ "dep:axum-server-dual-protocol", ] gzip_compression = [ - "conduwuit-admin/gzip_compression", - "conduwuit-api/gzip_compression", - "conduwuit-core/gzip_compression", - "conduwuit-service/gzip_compression", + "continuwuity-admin/gzip_compression", + "continuwuity-api/gzip_compression", + "continuwuity-core/gzip_compression", + "continuwuity-service/gzip_compression", "tower-http/compression-gzip", ] io_uring = [ - "conduwuit-admin/io_uring", - "conduwuit-api/io_uring", - "conduwuit-service/io_uring", + "continuwuity-admin/io_uring", + "continuwuity-api/io_uring", + "continuwuity-service/io_uring", ] jemalloc = [ - "conduwuit-admin/jemalloc", - "conduwuit-api/jemalloc", - "conduwuit-core/jemalloc", - "conduwuit-service/jemalloc", + "continuwuity-admin/jemalloc", + "continuwuity-api/jemalloc", + "continuwuity-core/jemalloc", + "continuwuity-service/jemalloc", ] jemalloc_conf = [ - "conduwuit-admin/jemalloc_conf", - "conduwuit-api/jemalloc_conf", - "conduwuit-core/jemalloc_conf", - "conduwuit-service/jemalloc_conf", + "continuwuity-admin/jemalloc_conf", + "continuwuity-api/jemalloc_conf", + "continuwuity-core/jemalloc_conf", + "continuwuity-service/jemalloc_conf", ] jemalloc_prof = [ - "conduwuit-admin/jemalloc_prof", - "conduwuit-api/jemalloc_prof", - "conduwuit-core/jemalloc_prof", - "conduwuit-service/jemalloc_prof", + "continuwuity-admin/jemalloc_prof", + "continuwuity-api/jemalloc_prof", + "continuwuity-core/jemalloc_prof", + "continuwuity-service/jemalloc_prof", ] jemalloc_stats = [ - "conduwuit-admin/jemalloc_stats", - "conduwuit-api/jemalloc_stats", - "conduwuit-core/jemalloc_stats", - "conduwuit-service/jemalloc_stats", + "continuwuity-admin/jemalloc_stats", + "continuwuity-api/jemalloc_stats", + "continuwuity-core/jemalloc_stats", + "continuwuity-service/jemalloc_stats", ] release_max_log_level = [ - "conduwuit-admin/release_max_log_level", - "conduwuit-api/release_max_log_level", - "conduwuit-core/release_max_log_level", - "conduwuit-service/release_max_log_level", + "continuwuity-admin/release_max_log_level", + "continuwuity-api/release_max_log_level", + "continuwuity-core/release_max_log_level", + "continuwuity-service/release_max_log_level", "tracing/max_level_trace", "tracing/release_max_level_info", "log/max_level_trace", "log/release_max_level_info", ] sentry_telemetry = [ - "conduwuit-core/sentry_telemetry", + "continuwuity-core/sentry_telemetry", "dep:sentry", "dep:sentry-tracing", "dep:sentry-tower", @@ -84,9 +84,9 @@ systemd = [ "dep:sd-notify", ] zstd_compression = [ - "conduwuit-api/zstd_compression", - "conduwuit-core/zstd_compression", - "conduwuit-service/zstd_compression", + "continuwuity-api/zstd_compression", + "continuwuity-core/zstd_compression", + "continuwuity-service/zstd_compression", "tower-http/compression-zstd", ] @@ -96,12 +96,12 @@ axum-server-dual-protocol.optional = true axum-server.workspace = true axum.workspace = true bytes.workspace = true -conduwuit-admin.workspace = true -conduwuit-api.workspace = true -conduwuit-core.workspace = true -conduwuit-macros.workspace = true -conduwuit-service.workspace = true -conduwuit-web.workspace = true +continuwuity-admin.workspace = true +continuwuity-api.workspace = true +continuwuity-core.workspace = true +continuwuity-macros.workspace = true +continuwuity-service.workspace = true +continuwuity-web.workspace = true const-str.workspace = true ctor.workspace = true dtor.workspace = true diff --git a/src/router/layers.rs b/src/router/layers.rs index aeec5e84c..f970deb87 100644 --- a/src/router/layers.rs +++ b/src/router/layers.rs @@ -4,9 +4,9 @@ use axum::{ Router, extract::{self, DefaultBodyLimit, FromRequestParts, MatchedPath, State}, }; -use conduwuit::{Result, Server, debug, error}; -use conduwuit_api::client_ip::ClientIp; -use conduwuit_service::{Services, state::Guard}; +use continuwuity::{Result, Server, debug, error}; +use continuwuity_api::client_ip::ClientIp; +use continuwuity_service::{Services, state::Guard}; use http::{ HeaderValue, Method, StatusCode, header::{self, HeaderName}, @@ -23,7 +23,7 @@ use tower_http::{ use crate::{request, router}; -const CONDUWUIT_CSP: &[&str; 5] = &[ +const DEFAULT_CSP: &[&str; 5] = &[ "default-src 'none'", "frame-ancestors 'none'", "form-action 'none'", @@ -31,7 +31,7 @@ const CONDUWUIT_CSP: &[&str; 5] = &[ "sandbox", ]; -const CONDUWUIT_PERMISSIONS_POLICY: &[&str; 2] = &["interest-cohort=()", "browsing-topics=()"]; +const DEFAULT_PERMISSIONS_POLICY: &[&str; 2] = &["interest-cohort=()", "browsing-topics=()"]; pub(crate) fn build(services: &Arc) -> Result<(Router, Guard)> { let server = &services.server; @@ -87,11 +87,11 @@ pub(crate) fn build(services: &Arc) -> Result<(Router, Guard)> { )) .layer(SetResponseHeaderLayer::if_not_present( HeaderName::from_static("permissions-policy"), - HeaderValue::from_str(&CONDUWUIT_PERMISSIONS_POLICY.join(","))?, + HeaderValue::from_str(&DEFAULT_PERMISSIONS_POLICY.join(","))?, )) .layer(SetResponseHeaderLayer::if_not_present( header::CONTENT_SECURITY_POLICY, - HeaderValue::from_str(&CONDUWUIT_CSP.join(";"))?, + HeaderValue::from_str(&DEFAULT_CSP.join(";"))?, )) .layer(cors_layer(server)) .layer(body_limit_layer(server)) diff --git a/src/router/mod.rs b/src/router/mod.rs index c6f909d36..5df079ab1 100644 --- a/src/router/mod.rs +++ b/src/router/mod.rs @@ -6,18 +6,18 @@ mod router; mod run; mod serve; -extern crate conduwuit_core as conduwuit; +extern crate continuwuity_core as continuwuity; -conduwuit_macros::introspect_crate! {} +continuwuity_macros::introspect_crate! {} use std::{panic::AssertUnwindSafe, pin::Pin, sync::Arc}; -use conduwuit::{Error, Result, Server}; -use conduwuit_service::Services; +use continuwuity::{Error, Result, Server}; +use continuwuity_service::Services; use futures::{Future, FutureExt, TryFutureExt}; -conduwuit::mod_ctor! {} -conduwuit::mod_dtor! {} +continuwuity::mod_ctor! {} +continuwuity::mod_dtor! {} #[unsafe(no_mangle)] pub extern "Rust" fn start( diff --git a/src/router/request.rs b/src/router/request.rs index 2f7151b1c..0d0f22771 100644 --- a/src/router/request.rs +++ b/src/router/request.rs @@ -8,8 +8,8 @@ use axum::{ extract::State, response::{IntoResponse, Response}, }; -use conduwuit::{Result, debug, debug_error, debug_warn, err, error, trace}; -use conduwuit_service::Services; +use continuwuity::{Result, debug, debug_error, debug_warn, err, error, trace}; +use continuwuity_service::Services; use futures::FutureExt; use http::{Method, StatusCode, Uri}; use tokio::time::sleep; @@ -82,7 +82,7 @@ async fn execute( parent: &Span, ) -> Response { #[cfg(debug_assertions)] - conduwuit::defer! {{ + continuwuity::defer! {{ _ = services.server .metrics .requests_handle_finished diff --git a/src/router/router.rs b/src/router/router.rs index c482bfb79..0f559c188 100644 --- a/src/router/router.rs +++ b/src/router/router.rs @@ -1,16 +1,16 @@ use std::sync::Arc; use axum::{Router, response::IntoResponse}; -use conduwuit::Error; -use conduwuit_service::{Services, state, state::Guard}; +use continuwuity::Error; +use continuwuity_service::{Services, state, state::Guard}; use http::{StatusCode, Uri}; use ruma::api::error::ErrorKind; pub(crate) fn build(services: &Arc) -> (Router, Guard) { let router = Router::::new(); let (state, guard) = state::create(services.clone()); - let router = conduwuit_api::router::build(router, state) - .merge(conduwuit_web::build(services)) + let router = continuwuity_api::router::build(router, state) + .merge(continuwuity_web::build(services)) .fallback(not_found) .with_state(state); diff --git a/src/router/run.rs b/src/router/run.rs index bff30367a..5f26001d3 100644 --- a/src/router/run.rs +++ b/src/router/run.rs @@ -1,6 +1,6 @@ -extern crate conduwuit_admin as admin; -extern crate conduwuit_core as conduwuit; -extern crate conduwuit_service as service; +extern crate continuwuity_admin as admin; +extern crate continuwuity_core as continuwuity; +extern crate continuwuity_service as service; use std::{ sync::{Arc, Weak, atomic::Ordering}, @@ -8,7 +8,7 @@ use std::{ }; use axum_server::{Address, Handle as ServerHandle}; -use conduwuit::{Error, Result, Server, debug, debug_error, debug_info, error, info}; +use continuwuity::{Error, Result, Server, debug, debug_error, debug_info, error, info}; use futures::FutureExt; use service::Services; use tokio::{ diff --git a/src/router/serve/mod.rs b/src/router/serve/mod.rs index 0e86af8f7..482802ef5 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 conduwuit::{Result, err}; -use conduwuit_service::Services; +use continuwuity::{Result, err}; +use continuwuity_service::Services; use tokio::sync::broadcast; use super::layers; @@ -36,9 +36,9 @@ pub(super) async fn serve( return tls::serve(server, app, handle, addrs).await; #[cfg(not(feature = "direct_tls"))] - return conduwuit::Err!(Config( + return continuwuity::Err!(Config( "tls", - "conduwuit was not built with direct TLS support (\"direct_tls\")" + "continuwuity was not built with direct TLS support (\"direct_tls\")" )); } else { plain::serve(server, app, handle, addrs).await diff --git a/src/router/serve/plain.rs b/src/router/serve/plain.rs index 2024c67c2..300b7540e 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::{Handle as ServerHandle, bind}; -use conduwuit::{Result, Server, debug_info, info}; +use continuwuity::{Result, Server, debug_info, info}; use tokio::task::JoinSet; pub(super) async fn serve( diff --git a/src/router/serve/tls.rs b/src/router/serve/tls.rs index 55d44a3b7..8e6a385c6 100644 --- a/src/router/serve/tls.rs +++ b/src/router/serve/tls.rs @@ -6,7 +6,7 @@ use axum_server_dual_protocol::{ ServerExt, axum_server::{bind_rustls, tls_rustls::RustlsConfig}, }; -use conduwuit::{Result, Server, err}; +use continuwuity::{Result, Server, err}; use tokio::task::JoinSet; use tracing::{debug, info, warn}; @@ -26,7 +26,7 @@ pub(super) async fn serve( .ok_or_else(|| err!(Config("tls.key", "Missing required value in tls config section")))?; info!( "Note: It is strongly recommended that you use a reverse proxy instead of running \ - conduwuit directly with TLS." + continuwuity directly with TLS." ); debug!("Using direct TLS. Certificate path {certs} and certificate private key path {key}",); let conf = RustlsConfig::from_pem_file(certs, key) diff --git a/src/router/serve/unix.rs b/src/router/serve/unix.rs index 9bb3dd6e0..a1a6e58b7 100644 --- a/src/router/serve/unix.rs +++ b/src/router/serve/unix.rs @@ -11,7 +11,7 @@ use axum::{ Router, extract::{Request, connect_info::IntoMakeServiceWithConnectInfo}, }; -use conduwuit::{ +use continuwuity::{ Err, Result, Server, debug, debug_error, info, result::UnwrapInfallible, trace, warn, }; use hyper::{body::Incoming, service::service_fn}; diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 60a362608..9691fb31e 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "conduwuit_service" +name = "continuwuity_service" description.workspace = true edition.workspace = true homepage.workspace = true @@ -17,7 +17,7 @@ crate-type = [ [features] brotli_compression = [ - "conduwuit-core/brotli_compression", + "continuwuity-core/brotli_compression", "reqwest/brotli", ] console = [ @@ -26,34 +26,34 @@ console = [ ] element_hacks = [] gzip_compression = [ - "conduwuit-core/gzip_compression", + "continuwuity-core/gzip_compression", "reqwest/gzip", ] io_uring = [ - "conduwuit-database/io_uring", + "continuwuity-database/io_uring", ] jemalloc = [ - "conduwuit-core/jemalloc", - "conduwuit-database/jemalloc", + "continuwuity-core/jemalloc", + "continuwuity-database/jemalloc", ] jemalloc_conf = [ - "conduwuit-core/jemalloc_conf", - "conduwuit-database/jemalloc_conf", + "continuwuity-core/jemalloc_conf", + "continuwuity-database/jemalloc_conf", ] jemalloc_prof = [ - "conduwuit-core/jemalloc_prof", - "conduwuit-database/jemalloc_prof", + "continuwuity-core/jemalloc_prof", + "continuwuity-database/jemalloc_prof", ] jemalloc_stats = [ - "conduwuit-core/jemalloc_stats", - "conduwuit-database/jemalloc_stats", + "continuwuity-core/jemalloc_stats", + "continuwuity-database/jemalloc_stats", ] media_thumbnail = [ "dep:image", ] release_max_log_level = [ - "conduwuit-core/release_max_log_level", - "conduwuit-database/release_max_log_level", + "continuwuity-core/release_max_log_level", + "continuwuity-database/release_max_log_level", "log/max_level_trace", "log/release_max_level_info", "tracing/max_level_trace", @@ -67,8 +67,8 @@ url_preview = [ "dep:webpage", ] zstd_compression = [ - "conduwuit-core/zstd_compression", - "conduwuit-database/zstd_compression", + "continuwuity-core/zstd_compression", + "continuwuity-database/zstd_compression", "reqwest/zstd", ] @@ -77,9 +77,9 @@ askama.workspace = true async-trait.workspace = true base64.workspace = true bytes.workspace = true -conduwuit-core.workspace = true -conduwuit-database.workspace = true -conduwuit-macros.workspace = true +continuwuity-core.workspace = true +continuwuity-database.workspace = true +continuwuity-macros.workspace = true const-str.workspace = true ctor.workspace = true dtor.workspace = true diff --git a/src/service/account_data/mod.rs b/src/service/account_data/mod.rs index 52e9cb9b2..d34a86b8d 100644 --- a/src/service/account_data/mod.rs +++ b/src/service/account_data/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{ +use continuwuity::{ Err, Result, err, utils::{ReadyExt, result::LogErr, stream::TryIgnore}, }; diff --git a/src/service/admin/console.rs b/src/service/admin/console.rs index 68c1cf0d6..e8fa9c3db 100644 --- a/src/service/admin/console.rs +++ b/src/service/admin/console.rs @@ -2,7 +2,7 @@ use std::{collections::VecDeque, sync::Arc}; -use conduwuit::{Server, SyncMutex, debug, defer, error, log, log::is_systemd_mode}; +use continuwuity::{Server, SyncMutex, debug, defer, error, log, log::is_systemd_mode}; use futures::future::{AbortHandle, Abortable}; use ruma::events::room::message::RoomMessageEventContent; use rustyline_async::{Readline, ReadlineError, ReadlineEvent}; @@ -93,8 +93,10 @@ impl Console { async fn worker(self: Arc) { debug!("session starting"); - self.output - .print_inline(&format!("**conduwuit {}** admin console\n", conduwuit::version())); + self.output.print_inline(&format!( + "**continuwuity {}** admin console\n", + continuwuity::version() + )); self.output .print_text("\"help\" for help, ^D to exit the console, ^\\ to stop the server\n"); diff --git a/src/service/admin/create.rs b/src/service/admin/create.rs index 2febccaa4..d4f2e8a82 100644 --- a/src/service/admin/create.rs +++ b/src/service/admin/create.rs @@ -1,4 +1,4 @@ -use conduwuit::{Result, info, pdu::PartialPdu}; +use continuwuity::{Result, info, pdu::PartialPdu}; use futures::FutureExt; use ruma::{ Int, RoomId, @@ -23,8 +23,8 @@ use crate::Services; /// Create the admin room. /// -/// Users in this room are considered admins by conduwuit, and the room can be -/// used to issue admin commands by talking to the server user inside it. +/// Users in this room are considered admins by continuwuity, and the room can +/// be used to issue admin commands by talking to the server user inside it. pub async fn create_admin_room(services: &Services) -> Result { let room_version = services.config.default_room_version.clone(); let room_version_rules = room_version diff --git a/src/service/admin/execute.rs b/src/service/admin/execute.rs index 3ab282740..eb58e309d 100644 --- a/src/service/admin/execute.rs +++ b/src/service/admin/execute.rs @@ -1,6 +1,6 @@ use std::io::IsTerminal; -use conduwuit::{Err, Result, debug, debug_info, error, info, warn}; +use continuwuity::{Err, Result, debug, debug_info, error, info, warn}; use ruma::events::room::message::RoomMessageEventContent; use tokio::time::{Duration, sleep}; diff --git a/src/service/admin/grant.rs b/src/service/admin/grant.rs index 47cd227b9..9054c854b 100644 --- a/src/service/admin/grant.rs +++ b/src/service/admin/grant.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use conduwuit::{Err, Result, debug_info, debug_warn, error, matrix::pdu::PartialPdu, warn}; +use continuwuity::{Err, Result, debug_info, debug_warn, error, matrix::pdu::PartialPdu, warn}; use ruma::{ Int, RoomId, UserId, events::{ @@ -15,7 +15,7 @@ use ruma::{ }; impl super::Service { - /// Invite the user to the conduwuit admin room. + /// Invite the user to the continuwuity admin room. /// /// This is equivalent to granting server admin privileges. pub async fn make_user_admin(&self, user_id: &UserId) -> Result { diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs index 15dc33d50..4d5bc4326 100644 --- a/src/service/admin/mod.rs +++ b/src/service/admin/mod.rs @@ -9,8 +9,8 @@ use std::{ }; use async_trait::async_trait; -use conduwuit::{Err, SyncRwLock, utils}; -use conduwuit_core::{ +use continuwuity::{Err, SyncRwLock, utils}; +use continuwuity_core::{ Error, Event, Result, Server, debug, err, error, error::default_log, pdu::PartialPdu, }; pub use create::create_admin_room; @@ -603,7 +603,7 @@ impl Service { // Escaped commands must be sent locally (via client API), not via // federation if !sent_locally { - conduwuit::warn!( + continuwuity::warn!( "Ignoring escaped admin command from {} that arrived via federation", event.sender() ); diff --git a/src/service/announcements/mod.rs b/src/service/announcements/mod.rs index 006176ac3..1269f5317 100644 --- a/src/service/announcements/mod.rs +++ b/src/service/announcements/mod.rs @@ -18,7 +18,7 @@ use std::{sync::Arc, time::Duration}; use async_trait::async_trait; -use conduwuit::{ +use continuwuity::{ Result, Server, debug, error, utils::{response::LimitReadExt, time::jitter}, warn, diff --git a/src/service/antispam/mod.rs b/src/service/antispam/mod.rs index 59b362fa1..d3f202ac5 100644 --- a/src/service/antispam/mod.rs +++ b/src/service/antispam/mod.rs @@ -1,7 +1,7 @@ use std::{fmt::Debug, sync::Arc}; use async_trait::async_trait; -use conduwuit::{Result, config::Antispam, debug}; +use continuwuity::{Result, config::Antispam, debug}; use ruma::{ OwnedRoomId, OwnedUserId, api::{auth_scheme::AppserviceToken, path_builder::VersionHistory}, diff --git a/src/service/appservice/mod.rs b/src/service/appservice/mod.rs index 9a4d6f772..f0e25f661 100644 --- a/src/service/appservice/mod.rs +++ b/src/service/appservice/mod.rs @@ -4,7 +4,7 @@ mod registration_info; use std::{collections::BTreeMap, iter::IntoIterator, sync::Arc}; use async_trait::async_trait; -use conduwuit::{Err, Result, err, utils::stream::IterStream}; +use continuwuity::{Err, Result, err, utils::stream::IterStream}; use database::Map; use futures::{Future, FutureExt, Stream, TryStreamExt}; use ruma::{RoomAliasId, RoomId, UserId, api::appservice::Registration}; @@ -73,7 +73,7 @@ impl crate::Service for Service { .find_from_token(®istration.as_token) .await { - conduwuit::warn!( + continuwuity::warn!( "Token collision detected during startup: Appservice '{}' token was also \ used by user '{}' device '{}'. Logging out the user device to resolve \ conflict.", diff --git a/src/service/appservice/namespace_regex.rs b/src/service/appservice/namespace_regex.rs index 76b754ae6..10b325160 100644 --- a/src/service/appservice/namespace_regex.rs +++ b/src/service/appservice/namespace_regex.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::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 a511f58d4..786a57ee4 100644 --- a/src/service/appservice/registration_info.rs +++ b/src/service/appservice/registration_info.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::Result; use ruma::{UserId, api::appservice::Registration}; use super::NamespaceRegex; diff --git a/src/service/client/mod.rs b/src/service/client/mod.rs index 5fe5c79de..5dd500aac 100644 --- a/src/service/client/mod.rs +++ b/src/service/client/mod.rs @@ -1,7 +1,7 @@ use std::{sync::Arc, time::Duration}; use async_trait::async_trait; -use conduwuit::{Config, Result, Server, err, trace, utils::response::LimitReadExt, warn}; +use continuwuity::{Config, Result, Server, err, trace, utils::response::LimitReadExt, warn}; use either::Either; use hickory_resolver::{ TokioResolver, config::ConnectionConfig, net::runtime::TokioRuntimeProvider, @@ -65,7 +65,7 @@ impl crate::Service for Service { let url_preview_user_agent = config .url_preview_user_agent .clone() - .unwrap_or_else(|| conduwuit::user_agent_media().to_owned()); + .unwrap_or_else(|| continuwuity::user_agent_media().to_owned()); Ok(Arc::new(Self { matrix_resolver, @@ -226,7 +226,7 @@ pub 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(conduwuit::user_agent()) + .user_agent(continuwuity::user_agent()) .redirect(redirect::Policy::limited(6)) .danger_accept_invalid_certs(config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure) .connection_verbose(cfg!(debug_assertions)); @@ -296,7 +296,7 @@ fn builder_interface( builder: reqwest::ClientBuilder, config: Option<&str>, ) -> Result { - use conduwuit::Err; + use continuwuity::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/config/mod.rs b/src/service/config/mod.rs index 429666f15..5be13b2b2 100644 --- a/src/service/config/mod.rs +++ b/src/service/config/mod.rs @@ -1,7 +1,7 @@ use std::{ops::Deref, path::PathBuf, sync::Arc}; use async_trait::async_trait; -use conduwuit::{ +use continuwuity::{ Result, Server, config::{Config, check}, error, diff --git a/src/service/emergency/mod.rs b/src/service/emergency/mod.rs index 520a629ce..d6c639f6f 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 conduwuit::{Result, error, warn}; +use continuwuity::{Result, error, warn}; use ruma::{ events::{ GlobalAccountDataEvent, GlobalAccountDataEventType, push_rules::PushRulesEventContent, diff --git a/src/service/federation/execute.rs b/src/service/federation/execute.rs index 52af916e5..dc486e07a 100644 --- a/src/service/federation/execute.rs +++ b/src/service/federation/execute.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, fmt::Debug, mem, time::Instant}; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, debug, debug_error, debug_info, debug_warn, err, trace, utils::response::LimitReadExt, }; diff --git a/src/service/federation/mod.rs b/src/service/federation/mod.rs index 446516772..ecf9f0b3b 100644 --- a/src/service/federation/mod.rs +++ b/src/service/federation/mod.rs @@ -8,7 +8,7 @@ use std::{ use assign::assign; use async_trait::async_trait; -use conduwuit::{Error, Result, Server, SyncRwLock, debug, utils::millis_since_unix_epoch}; +use continuwuity::{Error, Result, Server, SyncRwLock, debug, utils::millis_since_unix_epoch}; pub(crate) use execute::FederationPathBuilderInput; use http::StatusCode; use ruma::{ diff --git a/src/service/firstrun/mod.rs b/src/service/firstrun/mod.rs index 2c73480ae..e61948094 100644 --- a/src/service/firstrun/mod.rs +++ b/src/service/firstrun/mod.rs @@ -5,7 +5,7 @@ use std::{ use askama::Template; use async_trait::async_trait; -use conduwuit::{Result, info, utils::ReadyExt}; +use continuwuity::{Result, info, utils::ReadyExt}; use futures::StreamExt; use ruma::{UserId, events::room::message::RoomMessageEventContent}; @@ -186,7 +186,7 @@ impl Service { eprintln!( "Welcome to {} {}!", "Continuwuity".bold().bright_magenta(), - conduwuit::version().bold() + continuwuity::version().bold() ); eprintln!(); eprintln!( diff --git a/src/service/globals/data.rs b/src/service/globals/data.rs index 07f1de5c6..f5bf51d46 100644 --- a/src/service/globals/data.rs +++ b/src/service/globals/data.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{Result, SyncRwLock, utils}; +use continuwuity::{Result, SyncRwLock, utils}; use database::{Database, Deserialized, Map}; pub struct Data { diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs index 23c3f8db4..8e4d5916b 100644 --- a/src/service/globals/mod.rs +++ b/src/service/globals/mod.rs @@ -3,7 +3,7 @@ mod data; use std::{collections::HashMap, fmt::Write, sync::Arc, time::Instant}; use async_trait::async_trait; -use conduwuit::{Result, Server, SyncRwLock, error, utils::bytes::pretty}; +use continuwuity::{Result, Server, SyncRwLock, error, utils::bytes::pretty}; use data::Data; use regex::RegexSet; use ruma::{OwnedEventId, OwnedRoomAliasId, OwnedUserId, ServerName, UserId}; diff --git a/src/service/key_backups/mod.rs b/src/service/key_backups/mod.rs index f2f3ce813..d612a3081 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 conduwuit::{ +use continuwuity::{ Err, Result, err, utils::stream::{ReadyExt, TryIgnore}, }; diff --git a/src/service/mailer/mod.rs b/src/service/mailer/mod.rs index cefecfdcb..1f1eb2650 100644 --- a/src/service/mailer/mod.rs +++ b/src/service/mailer/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{Err, Result, err, info}; +use continuwuity::{Err, Result, err, info}; use lettre::{ AsyncSmtpTransport, AsyncTransport, Tokio1Executor, message::{Mailbox, MessageBuilder, header::ContentType}, diff --git a/src/service/manager.rs b/src/service/manager.rs index f0c2ccb0d..8716adfb7 100644 --- a/src/service/manager.rs +++ b/src/service/manager.rs @@ -1,6 +1,8 @@ use std::{panic::AssertUnwindSafe, sync::Arc, time::Duration}; -use conduwuit::{Err, Error, Result, Server, debug, debug_warn, error, trace, utils::time, warn}; +use continuwuity::{ + Err, Error, Result, Server, debug, debug_warn, error, trace, utils::time, warn, +}; use futures::{FutureExt, TryFutureExt}; use tokio::{ sync::{Mutex, MutexGuard}, diff --git a/src/service/media/data.rs b/src/service/media/data.rs index 7416464f8..b0e492274 100644 --- a/src/service/media/data.rs +++ b/src/service/media/data.rs @@ -1,6 +1,6 @@ use std::{sync::Arc, time::Duration}; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, debug_info, err, utils::{ReadyExt, str_from_bytes, stream::TryIgnore, string_from_bytes}, }; diff --git a/src/service/media/migrations.rs b/src/service/media/migrations.rs index 5fd628cd9..fbf24e4b2 100644 --- a/src/service/media/migrations.rs +++ b/src/service/media/migrations.rs @@ -7,7 +7,7 @@ use std::{ time::Instant, }; -use conduwuit::{ +use continuwuity::{ Config, Result, debug, debug_info, debug_warn, error, info, utils::{ReadyExt, stream::TryIgnore}, warn, diff --git a/src/service/media/mod.rs b/src/service/media/mod.rs index f7ab0ef78..5f7530e7e 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 as _, engine::general_purpose}; -use conduwuit::{ +use continuwuity::{ Err, Result, Server, debug, debug_error, debug_info, debug_warn, err, error, trace, utils::{ self, MutexMap, diff --git a/src/service/media/preview.rs b/src/service/media/preview.rs index ac10fa40c..c2b9b5fd6 100644 --- a/src/service/media/preview.rs +++ b/src/service/media/preview.rs @@ -8,8 +8,8 @@ use std::time::SystemTime; #[cfg(feature = "url_preview")] -use conduwuit::utils::response::LimitReadExt; -use conduwuit::{Err, Result, debug, err}; +use continuwuity::utils::response::LimitReadExt; +use continuwuity::{Err, Result, debug, err}; use ipaddress::IPAddress; #[cfg(feature = "url_preview")] use ruma::OwnedMxcUri; @@ -132,7 +132,7 @@ impl Service { url: &str, preview_data: Option, ) -> Result { - use conduwuit::utils::random_string; + use continuwuity::utils::random_string; use image::ImageReader; use crate::media::mxc::Mxc; @@ -217,7 +217,7 @@ impl Service { } pub async fn download_media(&self, url: &str) -> Result<(OwnedMxcUri, usize)> { - use conduwuit::utils::random_string; + use continuwuity::utils::random_string; use http::header::CONTENT_TYPE; let response = self.services.client.url_preview.get(url).send().await?; diff --git a/src/service/media/remote.rs b/src/service/media/remote.rs index 2be895a6e..de7cab13b 100644 --- a/src/service/media/remote.rs +++ b/src/service/media/remote.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, time::Duration}; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, debug_warn, err, utils::{content_disposition::make_content_disposition, response::LimitReadExt}, }; diff --git a/src/service/media/thumbnail.rs b/src/service/media/thumbnail.rs index 139516653..fd76ac32c 100644 --- a/src/service/media/thumbnail.rs +++ b/src/service/media/thumbnail.rs @@ -7,7 +7,7 @@ use std::{cmp, num::Saturating as Sat}; -use conduwuit::{Result, checked, err}; +use continuwuity::{Result, checked, err}; use ruma::{UInt, UserId, http_headers::ContentDisposition, media::Method}; use tokio::{ fs, diff --git a/src/service/migrations.rs b/src/service/migrations.rs index 8816448c3..ea13c5248 100644 --- a/src/service/migrations.rs +++ b/src/service/migrations.rs @@ -7,7 +7,7 @@ use std::{ time::Instant, }; -use conduwuit::{ +use continuwuity::{ Err, Error, Event, Pdu, Result, debug, debug_info, debug_warn, err, error, info, result::NotFound, trace, diff --git a/src/service/mod.rs b/src/service/mod.rs index 759e1fd8f..64930a3c6 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,10 +1,10 @@ #![type_length_limit = "8192"] #![allow(refining_impl_trait)] -extern crate conduwuit_core as conduwuit; -extern crate conduwuit_database as database; +extern crate continuwuity_core as continuwuity; +extern crate continuwuity_database as database; -conduwuit_macros::introspect_crate! {} +continuwuity_macros::introspect_crate! {} mod manager; mod migrations; @@ -45,12 +45,12 @@ pub(crate) use service::{Args, Dep, Service}; pub use crate::services::Services; -conduwuit::mod_ctor! {} -conduwuit::mod_dtor! {} +continuwuity::mod_ctor! {} +continuwuity::mod_dtor! {} use std::sync::LazyLock; -use conduwuit::matrix::versions::{unstable_features, versions}; +use continuwuity::matrix::versions::{unstable_features, versions}; use ruma::api::SupportedVersions; pub static SUPPORTED_VERSIONS: LazyLock = diff --git a/src/service/moderation.rs b/src/service/moderation.rs index 69c9bfbd2..9e89caef0 100644 --- a/src/service/moderation.rs +++ b/src/service/moderation.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::Result; +use continuwuity::Result; use ruma::ServerName; use crate::{Dep, config}; diff --git a/src/service/oauth/mod.rs b/src/service/oauth/mod.rs index b5e576f41..3b2f9e87f 100644 --- a/src/service/oauth/mod.rs +++ b/src/service/oauth/mod.rs @@ -5,7 +5,7 @@ use std::{ }; use base64::Engine; -use conduwuit::{ +use continuwuity::{ Result, info, utils::{self, hash::sha256}, }; @@ -345,7 +345,7 @@ impl Service { .services .config .get_client_domain() - .join(&format!("{}/oauth2/grant/device_code", conduwuit::ROUTE_PREFIX)) + .join(&format!("{}/oauth2/grant/device_code", continuwuity::ROUTE_PREFIX)) .unwrap(); let mut verification_uri_complete = verification_uri.clone(); diff --git a/src/service/oidc/mod.rs b/src/service/oidc/mod.rs index d0369cf5e..5c40aff91 100644 --- a/src/service/oidc/mod.rs +++ b/src/service/oidc/mod.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, str::FromStr, sync::Arc, time::Duration}; use async_trait::async_trait; -use conduwuit::{ +use continuwuity::{ Result, config::{OidcConfig, OidcProfileKeyImportMode}, debug, err, error, info, warn, @@ -168,7 +168,7 @@ impl crate::Service for Service { .timeout(Duration::from_secs(args.server.config.request_total_timeout)) .pool_idle_timeout(Duration::from_secs(args.server.config.request_idle_timeout)) .pool_max_idle_per_host(args.server.config.request_idle_per_host.into()) - .user_agent(conduwuit::user_agent()) + .user_agent(continuwuity::user_agent()) .redirect(reqwest::redirect::Policy::none()) .danger_accept_invalid_certs(args.server.config.allow_invalid_tls_certificates_yes_i_know_what_the_fuck_i_am_doing_with_this_and_i_know_this_is_insecure) .build() @@ -184,7 +184,7 @@ impl crate::Service for Service { .services .config .get_client_domain() - .join(&format!("{}/oidc/complete", conduwuit::ROUTE_PREFIX)) + .join(&format!("{}/oidc/complete", continuwuity::ROUTE_PREFIX)) .expect("redirect url should be valid"); let provider_metadata = CoreProviderMetadata::discover_async( diff --git a/src/service/presence/data.rs b/src/service/presence/data.rs index d7ef5175b..2d0eacaca 100644 --- a/src/service/presence/data.rs +++ b/src/service/presence/data.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{ +use continuwuity::{ Result, debug_warn, utils, utils::{ReadyExt, stream::TryIgnore}, }; diff --git a/src/service/presence/mod.rs b/src/service/presence/mod.rs index d84267057..1d8d2d963 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 conduwuit::{ +use continuwuity::{ Error, Result, Server, checked, debug, debug_warn, error, result::LogErr, trace, }; use database::Database; diff --git a/src/service/presence/presence.rs b/src/service/presence/presence.rs index db976adfa..3526ca583 100644 --- a/src/service/presence/presence.rs +++ b/src/service/presence/presence.rs @@ -1,4 +1,4 @@ -use conduwuit::{Error, Result, utils}; +use continuwuity::{Error, Result, utils}; use ruma::{ UInt, UserId, events::presence::{PresenceEvent, PresenceEventContent}, diff --git a/src/service/pusher/mod.rs b/src/service/pusher/mod.rs index df82d7bb4..bea40a273 100644 --- a/src/service/pusher/mod.rs +++ b/src/service/pusher/mod.rs @@ -3,13 +3,13 @@ mod webpush; use std::{fmt::Debug, mem, sync::Arc}; use bytes::BytesMut; -use conduwuit::utils::response::LimitReadExt; -use conduwuit_core::{ +use continuwuity::utils::response::LimitReadExt; +use continuwuity_core::{ Err, Event, Result, Server, debug_warn, err, trace, utils::{stream::TryIgnore, string_from_bytes}, warn, }; -use conduwuit_database::{Deserialized, Ignore, Interfix, Json, Map}; +use continuwuity_database::{Deserialized, Ignore, Interfix, Json, Map}; use futures::{Stream, StreamExt}; use ipaddress::IPAddress; use ruma::{ diff --git a/src/service/pusher/webpush/helpers.rs b/src/service/pusher/webpush/helpers.rs index 7ac455e3f..9a9192890 100644 --- a/src/service/pusher/webpush/helpers.rs +++ b/src/service/pusher/webpush/helpers.rs @@ -1,7 +1,7 @@ //! Web Push key validation, token comparison, and payload shaping helpers. use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD}; -use conduwuit_core::{Err, Result, err}; +use continuwuity_core::{Err, Result, err}; use ruma::{api::push_gateway::send_event_notification::v1::Notification, serde::JsonObject}; use serde_json::Value as JsonValue; use web_push_native::{Auth, p256::PublicKey}; diff --git a/src/service/pusher/webpush/mod.rs b/src/service/pusher/webpush/mod.rs index f09f65890..be2aaba25 100644 --- a/src/service/pusher/webpush/mod.rs +++ b/src/service/pusher/webpush/mod.rs @@ -3,8 +3,8 @@ mod vapid; use std::time::{Duration, SystemTime}; -use conduwuit_core::{Err, Result, debug, debug_warn, err, utils, warn}; -use conduwuit_database::{Deserialized, Json}; +use continuwuity_core::{Err, Result, debug, debug_warn, err, utils, warn}; +use continuwuity_database::{Deserialized, Json}; use futures::StreamExt; pub(super) use helpers::{decode_auth, decode_pushkey}; use http::StatusCode; diff --git a/src/service/pusher/webpush/vapid.rs b/src/service/pusher/webpush/vapid.rs index ad9a83cb7..5b72c30a5 100644 --- a/src/service/pusher/webpush/vapid.rs +++ b/src/service/pusher/webpush/vapid.rs @@ -3,8 +3,8 @@ use std::{collections::HashMap, sync::Arc}; use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD}; -use conduwuit_core::{Result, SyncRwLock, debug_info, err, utils}; -use conduwuit_database::Database; +use continuwuity_core::{Result, SyncRwLock, debug_info, err, utils}; +use continuwuity_database::Database; use p256::{ SecretKey, ecdsa::{Signature, SigningKey, signature::Signer}, diff --git a/src/service/registration_tokens/data.rs b/src/service/registration_tokens/data.rs index ee2aee437..1d3b93b68 100644 --- a/src/service/registration_tokens/data.rs +++ b/src/service/registration_tokens/data.rs @@ -1,6 +1,6 @@ use std::{sync::Arc, time::SystemTime}; -use conduwuit::utils::{ +use continuwuity::utils::{ self, stream::{ReadyExt, TryIgnore}, }; diff --git a/src/service/registration_tokens/mod.rs b/src/service/registration_tokens/mod.rs index 1b1fbf158..2f78b2b77 100644 --- a/src/service/registration_tokens/mod.rs +++ b/src/service/registration_tokens/mod.rs @@ -2,7 +2,7 @@ mod data; use std::{future::ready, pin::Pin, sync::Arc}; -use conduwuit::{Err, Result, err, utils}; +use continuwuity::{Err, Result, err, utils}; use data::Data; pub use data::{DatabaseTokenInfo, TokenExpires}; use futures::{ diff --git a/src/service/rooms/alias/mod.rs b/src/service/rooms/alias/mod.rs index 5056a02fc..acd19d5e4 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 conduwuit::{ +use continuwuity::{ Err, Result, err, utils::{ReadyExt, stream::TryIgnore}, }; diff --git a/src/service/rooms/alias/remote.rs b/src/service/rooms/alias/remote.rs index 5ec464f7f..5373cc5cb 100644 --- a/src/service/rooms/alias/remote.rs +++ b/src/service/rooms/alias/remote.rs @@ -1,4 +1,4 @@ -use conduwuit::{Result, debug, error}; +use continuwuity::{Result, debug, error}; use federation::query::get_room_information::v1::Response; use ruma::{OwnedRoomId, OwnedServerName, RoomAliasId, ServerName, api::federation}; diff --git a/src/service/rooms/auth_chain/data.rs b/src/service/rooms/auth_chain/data.rs index ab8bbdc5d..eaf089207 100644 --- a/src/service/rooms/auth_chain/data.rs +++ b/src/service/rooms/auth_chain/data.rs @@ -1,6 +1,6 @@ use std::{mem::size_of, sync::Arc}; -use conduwuit::{Err, Result, SyncMutex, err, utils, utils::math::usize_from_f64}; +use continuwuity::{Err, Result, SyncMutex, err, utils, utils::math::usize_from_f64}; 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 fc68d2c9d..ab5c3f3fe 100644 --- a/src/service/rooms/auth_chain/mod.rs +++ b/src/service/rooms/auth_chain/mod.rs @@ -7,7 +7,7 @@ use std::{ time::Instant, }; -use conduwuit::{ +use continuwuity::{ Err, Result, at, debug, debug_error, trace, utils::{ IterStream, @@ -140,7 +140,7 @@ impl Service { let chunk_cache: Vec<_> = chunk .into_iter() - .try_stream::() + .try_stream::() .broad_and_then(|(shortid, event_id)| async move { if let Ok(cached) = self.get_cached_eventid_authchain(&[shortid]).await { return Ok(cached.to_vec()); diff --git a/src/service/rooms/directory/mod.rs b/src/service/rooms/directory/mod.rs index c1e7650c3..a69e38597 100644 --- a/src/service/rooms/directory/mod.rs +++ b/src/service/rooms/directory/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{Result, utils::stream::TryIgnore}; +use continuwuity::{Result, utils::stream::TryIgnore}; use database::Map; use futures::Stream; use ruma::{OwnedRoomId, RoomId, api::client::room::Visibility}; diff --git a/src/service/rooms/event_handler/acl_check.rs b/src/service/rooms/event_handler/acl_check.rs index 5492c9ba1..e8df7a509 100644 --- a/src/service/rooms/event_handler/acl_check.rs +++ b/src/service/rooms/event_handler/acl_check.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result, debug, debug_warn, trace}; +use continuwuity::{Err, Result, debug, debug_warn, trace}; use ruma::{ RoomId, ServerName, events::{StateEventType, room::server_acl::RoomServerAclEventContent}, 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 3fbe57c30..ea392a234 100644 --- a/src/service/rooms/event_handler/fetch_and_handle_outliers.rs +++ b/src/service/rooms/event_handler/fetch_and_handle_outliers.rs @@ -6,8 +6,8 @@ use std::{ use assign::assign; #[cfg(debug_assertions)] -use conduwuit::error; -use conduwuit::{ +use continuwuity::error; +use continuwuity::{ Err, Event, PduEvent, Result, debug, debug_info, debug_warn, err, result::FlatOk, state_res::lexicographical_topological_sort, diff --git a/src/service/rooms/event_handler/fetch_auth.rs b/src/service/rooms/event_handler/fetch_auth.rs index c807589dc..0c2165c5d 100644 --- a/src/service/rooms/event_handler/fetch_auth.rs +++ b/src/service/rooms/event_handler/fetch_auth.rs @@ -1,6 +1,6 @@ use std::collections::{HashMap, hash_map}; -use conduwuit::{Err, Event, EventTypeExt, PduEvent, Result, err, warn}; +use continuwuity::{Err, Event, EventTypeExt, PduEvent, Result, err, warn}; use ruma::{ OwnedEventId, ServerName, api::federation::authorization::get_event_authorization, room_version_rules::RoomVersionRules, diff --git a/src/service/rooms/event_handler/fetch_prev.rs b/src/service/rooms/event_handler/fetch_prev.rs index 70b12d88c..eb3e91f15 100644 --- a/src/service/rooms/event_handler/fetch_prev.rs +++ b/src/service/rooms/event_handler/fetch_prev.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, time::Instant}; -use conduwuit::{ +use continuwuity::{ Err, Event, PduEvent, debug, debug_info, debug_warn, trace, utils::{BoolExt, IterStream, stream::BroadbandExt}, }; @@ -19,7 +19,7 @@ impl super::Service { incoming_pdu: &PduEvent, origin: &ServerName, first_ts_in_room: MilliSecondsSinceUnixEpoch, - ) -> conduwuit::Result<()> { + ) -> continuwuity::Result<()> { let start = Instant::now(); let mut missing = incoming_pdu .prev_events() diff --git a/src/service/rooms/event_handler/fetch_state.rs b/src/service/rooms/event_handler/fetch_state.rs index 6d84f5736..81b84aa53 100644 --- a/src/service/rooms/event_handler/fetch_state.rs +++ b/src/service/rooms/event_handler/fetch_state.rs @@ -5,7 +5,7 @@ use std::{ time::{Duration, Instant}, }; -use conduwuit::{ +use continuwuity::{ Err, Event, PduEvent, Result, debug, debug_warn, err, info, trace, utils::{BoolExt, IterStream}, warn, @@ -16,7 +16,7 @@ use ruma::{ api::federation::event::{get_room_state, get_room_state_ids}, }; -use crate::{conduwuit::utils::stream::BroadbandExt, rooms::short::ShortStateKey}; +use crate::{continuwuity::utils::stream::BroadbandExt, rooms::short::ShortStateKey}; impl super::Service { /// Asks a remote server what the state at this event is. diff --git a/src/service/rooms/event_handler/handle_incoming_pdu.rs b/src/service/rooms/event_handler/handle_incoming_pdu.rs index ff2099b84..2ecdfa36e 100644 --- a/src/service/rooms/event_handler/handle_incoming_pdu.rs +++ b/src/service/rooms/event_handler/handle_incoming_pdu.rs @@ -3,7 +3,7 @@ use std::{ time::{Duration, Instant}, }; -use conduwuit::{ +use continuwuity::{ Err, Event, Result, debug, debug_error, debug_warn, defer, matrix::PartialPdu, trace, utils::time::jitter, }; diff --git a/src/service/rooms/event_handler/handle_outlier_pdu.rs b/src/service/rooms/event_handler/handle_outlier_pdu.rs index ee81a0c04..43f220f0a 100644 --- a/src/service/rooms/event_handler/handle_outlier_pdu.rs +++ b/src/service/rooms/event_handler/handle_outlier_pdu.rs @@ -1,6 +1,6 @@ use std::collections::{BTreeMap, HashMap, hash_map}; -use conduwuit::{ +use continuwuity::{ Err, Event, EventTypeExt, PduEvent, Result, debug, debug_warn, err, info, trace, }; use ruma::{CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, RoomId, ServerName}; diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs index f20eb3037..8f0152f41 100644 --- a/src/service/rooms/event_handler/mod.rs +++ b/src/service/rooms/event_handler/mod.rs @@ -22,7 +22,7 @@ use std::{ use assign::assign; use async_trait::async_trait; -use conduwuit::{Err, Error, Event, PduEvent, Result, Server, SyncRwLock, utils::MutexMap}; +use continuwuity::{Err, Error, Event, PduEvent, Result, Server, SyncRwLock, utils::MutexMap}; pub use fetch_and_handle_outliers::{ DagBuilderTree, GET_MISSING_EVENTS_MAX_BATCH_SIZE, build_local_dag, }; @@ -202,7 +202,7 @@ fn get_room_version_rules(create_event: &Pdu) -> Result Duration { +fn calc_next_retry(config: &continuwuity::Config, retries: u32) -> Duration { let min = Duration::from_secs(config.sender_retry_backoff_base); let max = Duration::from_secs(config.sender_retry_backoff_limit); min.saturating_mul(retries).min(max) diff --git a/src/service/rooms/event_handler/parse_incoming_pdu.rs b/src/service/rooms/event_handler/parse_incoming_pdu.rs index 3d9803440..ea4bd7c0e 100644 --- a/src/service/rooms/event_handler/parse_incoming_pdu.rs +++ b/src/service/rooms/event_handler/parse_incoming_pdu.rs @@ -1,6 +1,6 @@ use std::str::FromStr; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, err, matrix::event::{gen_event_id, gen_event_id_canonical_json}, }; diff --git a/src/service/rooms/event_handler/pdu_checks.rs b/src/service/rooms/event_handler/pdu_checks.rs index 458ff4f3b..22cba2c0a 100644 --- a/src/service/rooms/event_handler/pdu_checks.rs +++ b/src/service/rooms/event_handler/pdu_checks.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use base64::Engine; -use conduwuit::{ +use continuwuity::{ Err, Event, EventTypeExt, PduEvent, Result, debug, debug::DebugInspect, debug_error, debug_info, err, info, matrix::StateKey, state_res, trace, }; diff --git a/src/service/rooms/event_handler/pending_join_pdus.rs b/src/service/rooms/event_handler/pending_join_pdus.rs index 044aaf06e..d13abff08 100644 --- a/src/service/rooms/event_handler/pending_join_pdus.rs +++ b/src/service/rooms/event_handler/pending_join_pdus.rs @@ -1,4 +1,4 @@ -use conduwuit::{debug, debug_warn}; +use continuwuity::{debug, debug_warn}; use ruma::{CanonicalJsonObject, RoomId, ServerName}; use serde_json::value::RawValue as RawJsonValue; diff --git a/src/service/rooms/event_handler/policy_server.rs b/src/service/rooms/event_handler/policy_server.rs index 610811152..dbf9de03a 100644 --- a/src/service/rooms/event_handler/policy_server.rs +++ b/src/service/rooms/event_handler/policy_server.rs @@ -5,7 +5,7 @@ use std::{collections::BTreeMap, time::Duration}; -use conduwuit::{ +use continuwuity::{ Err, Error, Event, PduEvent, Result, debug, debug_error, debug_info, debug_warn, error, info, state_res::EventTypeExt, trace, utils::to_canonical_object, warn, }; diff --git a/src/service/rooms/event_handler/resolve_state.rs b/src/service/rooms/event_handler/resolve_state.rs index 4f35ceecb..c22989569 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 conduwuit::{ +use continuwuity::{ Error, Result, err, state_res::{self, StateMap}, trace, diff --git a/src/service/rooms/event_handler/state_at_incoming.rs b/src/service/rooms/event_handler/state_at_incoming.rs index e232df7bc..e1ba7a1fb 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::{ iter::Iterator, }; -use conduwuit::{ +use continuwuity::{ Result, debug, debug_error, err, error, matrix::{Event, StateMap}, trace, diff --git a/src/service/rooms/event_handler/upgrade_outlier_pdu.rs b/src/service/rooms/event_handler/upgrade_outlier_pdu.rs index af3d5b7de..41c534f49 100644 --- a/src/service/rooms/event_handler/upgrade_outlier_pdu.rs +++ b/src/service/rooms/event_handler/upgrade_outlier_pdu.rs @@ -1,6 +1,6 @@ use std::time::Instant; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, debug_info, debug_warn, is_true, matrix::{Event, PduEvent}, trace, diff --git a/src/service/rooms/lazy_loading/mod.rs b/src/service/rooms/lazy_loading/mod.rs index 60abdbdfe..64d2396f9 100644 --- a/src/service/rooms/lazy_loading/mod.rs +++ b/src/service/rooms/lazy_loading/mod.rs @@ -2,7 +2,7 @@ use std::{collections::HashSet, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Result, utils::{IterStream, ReadyExt, stream::TryIgnore}, }; diff --git a/src/service/rooms/membership/mod.rs b/src/service/rooms/membership/mod.rs index 0f8b816e5..26274fbd1 100644 --- a/src/service/rooms/membership/mod.rs +++ b/src/service/rooms/membership/mod.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Err, Event, Pdu, Result, Server, debug, debug_info, debug_warn, defer, err, error, info, is_true, matrix::{ diff --git a/src/service/rooms/metadata/mod.rs b/src/service/rooms/metadata/mod.rs index f80794e21..54e3be273 100644 --- a/src/service/rooms/metadata/mod.rs +++ b/src/service/rooms/metadata/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{Result, utils::stream::TryIgnore}; +use continuwuity::{Result, utils::stream::TryIgnore}; use database::{Deserialized, Map}; use futures::{Stream, StreamExt}; use ruma::{OwnedRoomId, RoomId, UInt, uint}; diff --git a/src/service/rooms/outlier/mod.rs b/src/service/rooms/outlier/mod.rs index afd671999..46b595f0b 100644 --- a/src/service/rooms/outlier/mod.rs +++ b/src/service/rooms/outlier/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{Result, matrix::PduEvent}; +use continuwuity::{Result, matrix::PduEvent}; use database::{Deserialized, Json, Map}; use ruma::{CanonicalJsonObject, EventId}; diff --git a/src/service/rooms/pdu_metadata/bundled_aggregations.rs b/src/service/rooms/pdu_metadata/bundled_aggregations.rs index b6b1cb930..b0fb35bc8 100644 --- a/src/service/rooms/pdu_metadata/bundled_aggregations.rs +++ b/src/service/rooms/pdu_metadata/bundled_aggregations.rs @@ -1,4 +1,4 @@ -use conduwuit::{Event, PduEvent, Result, err}; +use continuwuity::{Event, PduEvent, Result, err}; use ruma::{ UserId, api::Direction, @@ -31,7 +31,7 @@ impl super::Service { user_id, &pdu.room_id_or_hash(), pdu.event_id(), - conduwuit::PduCount::max(), + continuwuity::PduCount::max(), MAX_BUNDLED_RELATIONS, 0, Direction::Backward, @@ -270,7 +270,7 @@ enum RelationType<'a> { #[cfg(test)] mod tests { - use conduwuit_core::pdu::{EventHash, PduEvent}; + use continuwuity_core::pdu::{EventHash, PduEvent}; use ruma::{UInt, events::TimelineEventType, owned_event_id, owned_room_id, owned_user_id}; use serde_json::{Value as JsonValue, json, value::to_raw_value}; diff --git a/src/service/rooms/pdu_metadata/data.rs b/src/service/rooms/pdu_metadata/data.rs index db3973f06..33eaacde8 100644 --- a/src/service/rooms/pdu_metadata/data.rs +++ b/src/service/rooms/pdu_metadata/data.rs @@ -1,6 +1,6 @@ use std::{mem::size_of, sync::Arc}; -use conduwuit::{ +use continuwuity::{ arrayvec::ArrayVec, matrix::PduCount, result::LogErr, diff --git a/src/service/rooms/pdu_metadata/mod.rs b/src/service/rooms/pdu_metadata/mod.rs index 7c22f408b..dbd5dec1f 100644 --- a/src/service/rooms/pdu_metadata/mod.rs +++ b/src/service/rooms/pdu_metadata/mod.rs @@ -2,7 +2,7 @@ mod bundled_aggregations; mod data; use std::sync::Arc; -use conduwuit::{Result, matrix::PduCount}; +use continuwuity::{Result, matrix::PduCount}; use futures::{StreamExt, future::try_join}; use ruma::{EventId, RoomId, UserId, api::Direction}; diff --git a/src/service/rooms/read_receipt/data.rs b/src/service/rooms/read_receipt/data.rs index bcffd708c..3a2974f7a 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 conduwuit::{ +use continuwuity::{ Result, utils::{ReadyExt, stream::TryIgnore}, }; diff --git a/src/service/rooms/read_receipt/mod.rs b/src/service/rooms/read_receipt/mod.rs index 10301a66b..f303d336f 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 conduwuit::{ +use continuwuity::{ Result, debug, err, matrix::{ Event, @@ -168,7 +168,7 @@ where } let content = ReceiptEventContent::from_iter(json); - conduwuit::trace!(?content); + continuwuity::trace!(?content); Raw::from_json( serde_json::value::to_raw_value(&SyncEphemeralRoomEvent::new(content)) .expect("received valid json"), diff --git a/src/service/rooms/search/mod.rs b/src/service/rooms/search/mod.rs index b84d47c88..ffe5439ca 100644 --- a/src/service/rooms/search/mod.rs +++ b/src/service/rooms/search/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{ +use continuwuity::{ PduCount, PduEvent, Result, arrayvec::ArrayVec, debug_warn, diff --git a/src/service/rooms/short/mod.rs b/src/service/rooms/short/mod.rs index 53d70fe85..19ae78bbd 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 conduwuit::matrix::pdu::{ShortEventId, ShortId, ShortRoomId, ShortStateKey}; -use conduwuit::{ +pub use continuwuity::matrix::pdu::{ShortEventId, ShortId, ShortRoomId, ShortStateKey}; +use continuwuity::{ Result, err, matrix::StateKey, pair_of, diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state/mod.rs index 200e03f7f..51e369851 100644 --- a/src/service/rooms/state/mod.rs +++ b/src/service/rooms/state/mod.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, fmt::Write, sync::Arc}; use async_trait::async_trait; -use conduwuit::{debug, utils::stream::WidebandExt}; -use conduwuit_core::{ +use continuwuity::{debug, utils::stream::WidebandExt}; +use continuwuity_core::{ Event, PduEvent, Result, err, result::FlatOk, state_res::{self, StateMap}, @@ -12,7 +12,7 @@ use conduwuit_core::{ }, warn, }; -use conduwuit_database::{Deserialized, Ignore, Interfix, Map}; +use continuwuity_database::{Deserialized, Ignore, Interfix, Map}; use futures::{ FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt, future::join_all, pin_mut, }; diff --git a/src/service/rooms/state_accessor/mod.rs b/src/service/rooms/state_accessor/mod.rs index 8d2918302..9c2aabadb 100644 --- a/src/service/rooms/state_accessor/mod.rs +++ b/src/service/rooms/state_accessor/mod.rs @@ -6,7 +6,7 @@ mod user_can; use std::{collections::HashSet, sync::Arc}; use async_trait::async_trait; -use conduwuit::{Event, Pdu, Result, err}; +use continuwuity::{Event, Pdu, Result, err}; use database::Map; use ruma::{ EventEncryptionAlgorithm, JsOption, OwnedRoomAliasId, OwnedUserId, RoomId, UserId, diff --git a/src/service/rooms/state_accessor/room_state.rs b/src/service/rooms/state_accessor/room_state.rs index d1dfbbacc..1d3bb8898 100644 --- a/src/service/rooms/state_accessor/room_state.rs +++ b/src/service/rooms/state_accessor/room_state.rs @@ -1,6 +1,6 @@ use std::borrow::Borrow; -use conduwuit::{ +use continuwuity::{ Pdu, Result, err, matrix::{Event, StateKey}, }; diff --git a/src/service/rooms/state_accessor/server_can.rs b/src/service/rooms/state_accessor/server_can.rs index 26ea1a63a..e2215a564 100644 --- a/src/service/rooms/state_accessor/server_can.rs +++ b/src/service/rooms/state_accessor/server_can.rs @@ -1,4 +1,4 @@ -use conduwuit::{debug_warn, utils::stream::ReadyExt}; +use continuwuity::{debug_warn, utils::stream::ReadyExt}; use futures::StreamExt; use ruma::{ EventId, RoomId, ServerName, diff --git a/src/service/rooms/state_accessor/state.rs b/src/service/rooms/state_accessor/state.rs index 2ca26b3ce..1dd55db0b 100644 --- a/src/service/rooms/state_accessor/state.rs +++ b/src/service/rooms/state_accessor/state.rs @@ -1,6 +1,6 @@ use std::{borrow::Borrow, ops::Deref, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Pdu, Result, at, err, matrix::{Event, StateKey}, pair_of, diff --git a/src/service/rooms/state_accessor/user_can.rs b/src/service/rooms/state_accessor/user_can.rs index 4754935ee..e1191f1f6 100644 --- a/src/service/rooms/state_accessor/user_can.rs +++ b/src/service/rooms/state_accessor/user_can.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result, matrix::Event, pdu::PartialPdu, trace}; +use continuwuity::{Err, Result, matrix::Event, pdu::PartialPdu, trace}; use ruma::{ EventId, RoomId, UserId, events::{ diff --git a/src/service/rooms/state_cache/mod.rs b/src/service/rooms/state_cache/mod.rs index 5c64ce04c..af61622b0 100644 --- a/src/service/rooms/state_cache/mod.rs +++ b/src/service/rooms/state_cache/mod.rs @@ -3,7 +3,7 @@ mod via; use std::{collections::HashMap, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Pdu, Result, SyncRwLock, result::LogErr, utils::{ReadyExt, stream::TryIgnore}, @@ -205,7 +205,7 @@ impl Service { user_a: &'a UserId, user_b: &'a UserId, ) -> impl Stream + Send + 'a { - use conduwuit::utils::set; + use continuwuity::utils::set; let a = self.rooms_joined(user_a); let b = self.rooms_joined(user_b); diff --git a/src/service/rooms/state_cache/update.rs b/src/service/rooms/state_cache/update.rs index f7418b93a..48d561fe9 100644 --- a/src/service/rooms/state_cache/update.rs +++ b/src/service/rooms/state_cache/update.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use conduwuit::{Err, Event, Pdu, Result, is_not_empty, utils::ReadyExt}; +use continuwuity::{Err, Event, Pdu, Result, is_not_empty, utils::ReadyExt}; use database::{Json, serialize_key}; use futures::StreamExt; use ruma::{ diff --git a/src/service/rooms/state_cache/via.rs b/src/service/rooms/state_cache/via.rs index 7494a9123..85816f1fd 100644 --- a/src/service/rooms/state_cache/via.rs +++ b/src/service/rooms/state_cache/via.rs @@ -1,4 +1,4 @@ -use conduwuit::{ +use continuwuity::{ Result, utils::{StreamTools, stream::TryIgnore}, }; diff --git a/src/service/rooms/state_compressor/mod.rs b/src/service/rooms/state_compressor/mod.rs index ddd25eac1..e9bfc3eda 100644 --- a/src/service/rooms/state_compressor/mod.rs +++ b/src/service/rooms/state_compressor/mod.rs @@ -6,7 +6,7 @@ use std::{ }; use async_trait::async_trait; -use conduwuit::{ +use continuwuity::{ Result, SyncMutex, arrayvec::ArrayVec, at, checked, err, expected, utils, diff --git a/src/service/rooms/summary/mod.rs b/src/service/rooms/summary/mod.rs index f2d56eb52..96c2ce279 100644 --- a/src/service/rooms/summary/mod.rs +++ b/src/service/rooms/summary/mod.rs @@ -1,6 +1,6 @@ use std::{collections::HashSet, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Err, Event, Result, debug, info, utils::{IterStream, ReadyExt, TryFutureExtExt, stream::BroadbandExt}, warn, diff --git a/src/service/rooms/threads/mod.rs b/src/service/rooms/threads/mod.rs index a29ca5511..a2003b2f2 100644 --- a/src/service/rooms/threads/mod.rs +++ b/src/service/rooms/threads/mod.rs @@ -1,7 +1,7 @@ use std::{collections::BTreeMap, sync::Arc}; -use conduwuit::result::LogErr; -use conduwuit_core::{ +use continuwuity::result::LogErr; +use continuwuity_core::{ Event, Result, err, matrix::pdu::{PduCount, PduEvent, PduId, RawPduId}, utils::{ @@ -9,7 +9,7 @@ use conduwuit_core::{ stream::{TryIgnore, WidebandExt}, }, }; -use conduwuit_database::{Deserialized, Map}; +use continuwuity_database::{Deserialized, Map}; use futures::{Stream, StreamExt}; use ruma::{ CanonicalJsonValue, EventId, OwnedUserId, RoomId, UserId, diff --git a/src/service/rooms/timeline/append.rs b/src/service/rooms/timeline/append.rs index 9639e6733..d7cc52def 100644 --- a/src/service/rooms/timeline/append.rs +++ b/src/service/rooms/timeline/append.rs @@ -7,7 +7,7 @@ use std::{ time::Instant, }; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, debug_warn, matrix::{Event, PduEvent}, pdu::{Count, ShortRoomId}, @@ -19,7 +19,7 @@ use conduwuit::{ }, warn, }; -use conduwuit_core::{ +use continuwuity_core::{ err, error, matrix::pdu::{PduCount, PduId, RawPduId, sticky}, result::LogErr, diff --git a/src/service/rooms/timeline/backfill.rs b/src/service/rooms/timeline/backfill.rs index ece996f6e..33d694b37 100644 --- a/src/service/rooms/timeline/backfill.rs +++ b/src/service/rooms/timeline/backfill.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; -use conduwuit::{Err, PduEvent}; -use conduwuit_core::{ +use continuwuity::{Err, PduEvent}; +use continuwuity_core::{ Result, debug, debug_warn, err, info, matrix::{ event::Event, diff --git a/src/service/rooms/timeline/build.rs b/src/service/rooms/timeline/build.rs index 6e0a7282c..1cfd65887 100644 --- a/src/service/rooms/timeline/build.rs +++ b/src/service/rooms/timeline/build.rs @@ -1,7 +1,7 @@ use std::{collections::HashSet, iter::once}; -use conduwuit::trace; -use conduwuit_core::{ +use continuwuity::trace; +use continuwuity_core::{ Err, Result, matrix::{event::Event, pdu::PartialPdu}, utils::{IterStream, ReadyExt}, diff --git a/src/service/rooms/timeline/create.rs b/src/service/rooms/timeline/create.rs index 7d3ee9089..962328f1b 100644 --- a/src/service/rooms/timeline/create.rs +++ b/src/service/rooms/timeline/create.rs @@ -1,7 +1,7 @@ use std::{cmp, collections::HashMap}; -use conduwuit::{smallstr::SmallString, trace}; -use conduwuit_core::{ +use continuwuity::{smallstr::SmallString, trace}; +use continuwuity_core::{ Err, Error, Result, err, matrix::{ event::{Event, gen_event_id}, diff --git a/src/service/rooms/timeline/data.rs b/src/service/rooms/timeline/data.rs index 560bbae84..a244ffbc4 100644 --- a/src/service/rooms/timeline/data.rs +++ b/src/service/rooms/timeline/data.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{ +use continuwuity::{ Err, PduCount, PduEvent, Result, at, err, result::NotFound, utils::{self, stream::TryReadyExt}, diff --git a/src/service/rooms/timeline/helpers.rs b/src/service/rooms/timeline/helpers.rs index 170b35889..a17d7651a 100644 --- a/src/service/rooms/timeline/helpers.rs +++ b/src/service/rooms/timeline/helpers.rs @@ -1,6 +1,6 @@ //! Helpers for submitting events with the right checks performed -pub(crate) use conduwuit::{ +pub(crate) use continuwuity::{ Err, Event, Result, err, matrix::pdu::{PartialPdu, UnsignedContext, sticky}, trace, diff --git a/src/service/rooms/timeline/mod.rs b/src/service/rooms/timeline/mod.rs index 715d52855..66fef9932 100644 --- a/src/service/rooms/timeline/mod.rs +++ b/src/service/rooms/timeline/mod.rs @@ -9,8 +9,8 @@ mod redact; use std::{fmt::Write, sync::Arc}; use async_trait::async_trait; -pub use conduwuit_core::matrix::pdu::{PduId, RawPduId}; -use conduwuit_core::{ +pub use continuwuity_core::matrix::pdu::{PduId, RawPduId}; +use continuwuity_core::{ Result, Server, at, err, matrix::{ event::Event, diff --git a/src/service/rooms/timeline/redact.rs b/src/service/rooms/timeline/redact.rs index efa19dff5..1cbf1b323 100644 --- a/src/service/rooms/timeline/redact.rs +++ b/src/service/rooms/timeline/redact.rs @@ -1,4 +1,4 @@ -use conduwuit_core::{ +use continuwuity_core::{ Result, err, matrix::event::Event, utils::{self}, diff --git a/src/service/rooms/typing/mod.rs b/src/service/rooms/typing/mod.rs index 6a3562c2c..b8cd61050 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 conduwuit::{ +use continuwuity::{ Result, Server, debug_info, utils::{self, IterStream}, }; diff --git a/src/service/rooms/user/mod.rs b/src/service/rooms/user/mod.rs index a6c9a20e8..53799f7d3 100644 --- a/src/service/rooms/user/mod.rs +++ b/src/service/rooms/user/mod.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::Result; +use continuwuity::Result; use database::{Deserialized, Map}; use ruma::{RoomId, UserId}; diff --git a/src/service/sending/antispam.rs b/src/service/sending/antispam.rs index 5bb6463ea..38d8b3420 100644 --- a/src/service/sending/antispam.rs +++ b/src/service/sending/antispam.rs @@ -1,7 +1,7 @@ use std::{borrow::Cow, fmt::Debug, mem, time::Instant}; use bytes::BytesMut; -use conduwuit::{Err, Result, debug_info, err, utils::response::LimitReadExt}; +use continuwuity::{Err, Result, debug_info, err, utils::response::LimitReadExt}; use reqwest::Client; use ruma::api::{ IncomingResponseExt, OutgoingRequest, OutgoingRequestExt, diff --git a/src/service/sending/appservice.rs b/src/service/sending/appservice.rs index 5eb7b8058..feeca1afa 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 conduwuit::{ +use continuwuity::{ Err, Result, debug_error, err, trace, utils, utils::response::LimitReadExt, warn, }; use ruma::api::{ diff --git a/src/service/sending/data.rs b/src/service/sending/data.rs index 59f5c0647..79236eaeb 100644 --- a/src/service/sending/data.rs +++ b/src/service/sending/data.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Error, Result, at, utils, utils::{ReadyExt, stream::TryIgnore}, }; diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs index a6c971adf..1434aec65 100644 --- a/src/service/sending/mod.rs +++ b/src/service/sending/mod.rs @@ -12,7 +12,7 @@ use std::{ }; use async_trait::async_trait; -use conduwuit::{ +use continuwuity::{ Result, Server, debug, debug_warn, err, error, smallvec::SmallVec, utils::{ReadyExt, TryReadyExt, available_parallelism, math::usize_from_u64_truncated}, diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs index 383891d87..c0f1b4e01 100644 --- a/src/service/sending/sender.rs +++ b/src/service/sending/sender.rs @@ -9,8 +9,8 @@ use std::{ }; use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; -use conduwuit::{debug_info, debug_warn, info, trace}; -use conduwuit_core::{ +use continuwuity::{debug_info, debug_warn, info, trace}; +use continuwuity_core::{ Error, Event, Result, at, debug, err, error, matrix::pdu::sticky, result::LogErr, diff --git a/src/service/server_keys/get.rs b/src/service/server_keys/get.rs index 5011171c4..5efeeafeb 100644 --- a/src/service/server_keys/get.rs +++ b/src/service/server_keys/get.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use assign::assign; -use conduwuit::{Result, debug, debug_error, debug_info, debug_warn, err, info, trace}; +use continuwuity::{Result, debug, debug_error, debug_info, debug_warn, err, info, trace}; use futures::{StreamExt, stream::FuturesUnordered}; use ruma::{ CanonicalJsonObject, CanonicalJsonValue, MilliSecondsSinceUnixEpoch, ServerName, diff --git a/src/service/server_keys/keypair.rs b/src/service/server_keys/keypair.rs index 817d335cc..2495727d6 100644 --- a/src/service/server_keys/keypair.rs +++ b/src/service/server_keys/keypair.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use conduwuit::{Result, debug, debug_info, err, error, utils, utils::string_from_bytes}; +use continuwuity::{Result, debug, debug_info, err, error, utils, utils::string_from_bytes}; 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 ae1352d2b..29b304e9d 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}; -use conduwuit::{ +use continuwuity::{ Result, Server, utils::{IterStream, ReadyExt, stream::TryIgnore}, }; diff --git a/src/service/server_keys/request.rs b/src/service/server_keys/request.rs index 5a4ce6a10..22ffe05f5 100644 --- a/src/service/server_keys/request.rs +++ b/src/service/server_keys/request.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use conduwuit::{Err, Result, trace, utils::millis_since_unix_epoch, warn}; +use continuwuity::{Err, Result, trace, utils::millis_since_unix_epoch, warn}; use ruma::{ MilliSecondsSinceUnixEpoch, OwnedServerName, OwnedServerSigningKeyId, ServerName, UInt, api::federation::discovery::{ diff --git a/src/service/server_keys/sign.rs b/src/service/server_keys/sign.rs index 405c955e2..f88b99f3d 100644 --- a/src/service/server_keys/sign.rs +++ b/src/service/server_keys/sign.rs @@ -1,4 +1,4 @@ -use conduwuit::Result; +use continuwuity::Result; use ruma::{ CanonicalJsonObject, room_version_rules::RoomVersionRules, signatures::hash_and_sign_event, }; diff --git a/src/service/server_keys/verify.rs b/src/service/server_keys/verify.rs index a9c0c24e4..91b32efb4 100644 --- a/src/service/server_keys/verify.rs +++ b/src/service/server_keys/verify.rs @@ -1,4 +1,4 @@ -use conduwuit::{ +use continuwuity::{ Err, Result, matrix::event::gen_event_id_canonical_json, trace, utils::to_canonical_object, }; use ruma::{ diff --git a/src/service/service.rs b/src/service/service.rs index c093e850d..3ef855656 100644 --- a/src/service/service.rs +++ b/src/service/service.rs @@ -7,7 +7,7 @@ use std::{ }; use async_trait::async_trait; -use conduwuit::{ +use continuwuity::{ Err, Result, Server, SyncRwLock, err, error::inspect_log, utils::string::SplitInfallible, }; use database::Database; diff --git a/src/service/services.rs b/src/service/services.rs index 0d6c76676..d7cad3126 100644 --- a/src/service/services.rs +++ b/src/service/services.rs @@ -1,6 +1,6 @@ use std::{any::Any, collections::BTreeMap, sync::Arc}; -use conduwuit::{ +use continuwuity::{ Result, Server, SyncRwLock, debug, debug_info, error, info, trace, utils::stream::IterStream, }; use database::Database; diff --git a/src/service/sync/mod.rs b/src/service/sync/mod.rs index 5b50b38de..65282f140 100644 --- a/src/service/sync/mod.rs +++ b/src/service/sync/mod.rs @@ -3,7 +3,7 @@ use std::{ sync::Arc, }; -use conduwuit::{Result, SyncMutex, trace}; +use continuwuity::{Result, SyncMutex, trace}; use futures::StreamExt; use ruma::{ OwnedDeviceId, OwnedRoomId, OwnedUserId, RoomId, UserId, api::client::sync::sync_events::v5, diff --git a/src/service/threepid/mod.rs b/src/service/threepid/mod.rs index db0d08d9f..d8d4d53a0 100644 --- a/src/service/threepid/mod.rs +++ b/src/service/threepid/mod.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, collections::HashMap, sync::Arc}; -use conduwuit::{Err, Error, Result, config::OidcProfileKeyImportMode, result::FlatOk}; +use continuwuity::{Err, Error, Result, config::OidcProfileKeyImportMode, result::FlatOk}; use database::{Deserialized, Map}; use governor::{DefaultKeyedRateLimiter, Quota, RateLimiter}; use lettre::{Address, message::Mailbox}; diff --git a/src/service/threepid/session.rs b/src/service/threepid/session.rs index dfc7b8fd3..a6fa37e96 100644 --- a/src/service/threepid/session.rs +++ b/src/service/threepid/session.rs @@ -3,7 +3,7 @@ use std::{ time::{Duration, SystemTime}, }; -use conduwuit::utils; +use continuwuity::utils; use lettre::Address; use ruma::{ClientSecret, OwnedClientSecret, OwnedSessionId, SessionId}; diff --git a/src/service/transactions/mod.rs b/src/service/transactions/mod.rs index 094317c8b..95a9e76c6 100644 --- a/src/service/transactions/mod.rs +++ b/src/service/transactions/mod.rs @@ -9,7 +9,7 @@ use std::{ }; use async_trait::async_trait; -use conduwuit::{Error, Result, SyncRwLock, debug_warn, warn}; +use continuwuity::{Error, Result, SyncRwLock, debug_warn, warn}; use database::{Handle, Map}; use ruma::{ DeviceId, OwnedServerName, OwnedTransactionId, TransactionId, UserId, diff --git a/src/service/uiaa/mod.rs b/src/service/uiaa/mod.rs index f78bbe923..fb628366f 100644 --- a/src/service/uiaa/mod.rs +++ b/src/service/uiaa/mod.rs @@ -4,7 +4,7 @@ use std::{ sync::Arc, }; -use conduwuit::{Err, Error, Result, utils}; +use continuwuity::{Err, Error, Result, utils}; use futures::StreamExt; use lettre::Address; use ruma::{ @@ -304,7 +304,7 @@ impl Service { .get_client_domain() .join(&format!( "{}{}", - conduwuit_core::ROUTE_PREFIX, + continuwuity_core::ROUTE_PREFIX, oauth_ticket.ticket_issue_path() )) .unwrap(); diff --git a/src/service/users/account.rs b/src/service/users/account.rs index 39cadab32..660c0d140 100644 --- a/src/service/users/account.rs +++ b/src/service/users/account.rs @@ -3,7 +3,7 @@ use std::{ time::{Duration, SystemTime}, }; -use conduwuit::{ +use continuwuity::{ Err, Result, debug, debug_error, debug_warn, err, error, info, trace, utils::{self, stream::TryIgnore}, warn, diff --git a/src/service/users/dehydrated_device.rs b/src/service/users/dehydrated_device.rs index 83ab1b343..18e0701c9 100644 --- a/src/service/users/dehydrated_device.rs +++ b/src/service/users/dehydrated_device.rs @@ -1,5 +1,5 @@ -use conduwuit::{Err, Result, trace}; -use conduwuit_database::{Deserialized, Json}; +use continuwuity::{Err, Result, trace}; +use continuwuity_database::{Deserialized, Json}; use ruma::{ DeviceId, OwnedDeviceId, UserId, api::client::dehydrated_device::{ diff --git a/src/service/users/device.rs b/src/service/users/device.rs index f5f40c57c..c72d92346 100644 --- a/src/service/users/device.rs +++ b/src/service/users/device.rs @@ -3,7 +3,7 @@ use std::{ time::{Duration, SystemTime}, }; -use conduwuit::{ +use continuwuity::{ Err, Result, utils::{self, ReadyExt, stream::TryIgnore}, }; diff --git a/src/service/users/filters.rs b/src/service/users/filters.rs index bbe7aff29..b924a2ddc 100644 --- a/src/service/users/filters.rs +++ b/src/service/users/filters.rs @@ -1,4 +1,4 @@ -use conduwuit::utils; +use continuwuity::utils; use database::{Deserialized, Json}; use ruma::{UserId, api::client::filter::FilterDefinition}; @@ -19,7 +19,7 @@ impl super::Service { &self, user_id: &UserId, filter_id: &str, - ) -> conduwuit::Result { + ) -> continuwuity::Result { let key = (user_id, filter_id); self.db.userfilterid_filter.qry(&key).await.deserialized() } diff --git a/src/service/users/keys.rs b/src/service/users/keys.rs index 2f0227d14..1c5d2279f 100644 --- a/src/service/users/keys.rs +++ b/src/service/users/keys.rs @@ -1,6 +1,6 @@ use std::collections::BTreeMap; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, err, utils::{ReadyExt, stream::TryIgnore, string::Unquoted}, }; diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs index 09ade8a97..aed1ff9fa 100644 --- a/src/service/users/mod.rs +++ b/src/service/users/mod.rs @@ -9,7 +9,7 @@ pub(super) mod remote; use std::{mem, sync::Arc}; pub use account::{AccessTokenStatus, AccountStatus}; -use conduwuit::{ +use continuwuity::{ Err, Error, Result, err, utils::{self}, }; diff --git a/src/service/users/profile.rs b/src/service/users/profile.rs index 954b0eac4..6c773892a 100644 --- a/src/service/users/profile.rs +++ b/src/service/users/profile.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, collections::BTreeMap}; -use conduwuit::{ +use continuwuity::{ Err, Result, pdu::PartialPdu, utils::{ReadyExt, stream::TryIgnore, to_canonical_object}, diff --git a/src/service/users/remote.rs b/src/service/users/remote.rs index c2c77967c..f070f4823 100644 --- a/src/service/users/remote.rs +++ b/src/service/users/remote.rs @@ -1,4 +1,4 @@ -use conduwuit::utils::stream::TryIgnore; +use continuwuity::utils::stream::TryIgnore; use futures::Stream; use ruma::{OwnedUserId, UserId}; diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index c40c461e6..d4733236d 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -3,7 +3,7 @@ description.workspace = true edition.workspace = true homepage.workspace = true license.workspace = true -name = "conduwuit_web" +name = "continuwuity_web" readme.workspace = true repository.workspace = true version.workspace = true @@ -22,11 +22,11 @@ path = "mod.rs" askama.workspace = true async-trait.workspace = true axum.workspace = true -conduwuit-api.workspace = true -conduwuit-build-metadata.workspace = true -conduwuit-core.workspace = true -conduwuit-database.workspace = true -conduwuit-service.workspace = true +continuwuity-api.workspace = true +continuwuity-build-metadata.workspace = true +continuwuity-core.workspace = true +continuwuity-database.workspace = true +continuwuity-service.workspace = true form_urlencoded = "1.2.2" futures.workspace = true lettre.workspace = true @@ -55,7 +55,7 @@ workspace = true [package.metadata.cargo-shear] ignored = [ - "conduwuit_build_metadata", + "continuwuity_build_metadata", "form_urlencoded", "reqwest_recaptcha", "serde_json", diff --git a/src/web/mod.rs b/src/web/mod.rs index ac881c26b..cec4ce1c0 100644 --- a/src/web/mod.rs +++ b/src/web/mod.rs @@ -8,7 +8,7 @@ use axum::{ middleware::from_fn_with_state, response::{Html, IntoResponse, Redirect, Response}, }; -use conduwuit_service::{Services, state}; +use continuwuity_service::{Services, state}; use tower_http::catch_panic::CatchPanicLayer; use tower_sec_fetch::SecFetchLayer; use tower_sessions::{ExpiredDeletion, SessionManagerLayer, cookie::SameSite}; @@ -27,7 +27,7 @@ type State = state::State; const CATASTROPHIC_FAILURE: &str = "cat-astrophic failure! we couldn't even render the error template. \ please contact the team @ https://continuwuity.org"; -const ROUTE_PREFIX: &str = conduwuit_core::ROUTE_PREFIX; +const ROUTE_PREFIX: &str = continuwuity_core::ROUTE_PREFIX; #[derive(Debug, thiserror::Error)] enum WebError { @@ -52,7 +52,7 @@ enum WebError { #[error("Failed to render template: {0}")] Render(#[from] askama::Error), #[error("{0}")] - InternalError(#[from] conduwuit_core::Error), + InternalError(#[from] continuwuity_core::Error), #[error("Request handler panicked! {0}")] Panic(String), } diff --git a/src/web/pages/about.rs b/src/web/pages/about.rs index 6b7e1caba..96c187c0a 100644 --- a/src/web/pages/about.rs +++ b/src/web/pages/about.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use axum::{Extension, Router, extract::State, routing::get}; -use conduwuit_core::config::TermsDocument; +use continuwuity_core::config::TermsDocument; use ruma::{ OwnedServerName, api::client::discovery::discover_support::{Contact, ContactRole}, diff --git a/src/web/pages/account/cross_signing_reset.rs b/src/web/pages/account/cross_signing_reset.rs index 412dfc768..3ac2e094d 100644 --- a/src/web/pages/account/cross_signing_reset.rs +++ b/src/web/pages/account/cross_signing_reset.rs @@ -1,5 +1,5 @@ use axum::{Extension, Router, extract::State, routing::on}; -use conduwuit_service::oauth::OAuthTicket; +use continuwuity_service::oauth::OAuthTicket; use crate::{ extract::PostForm, diff --git a/src/web/pages/account/deactivate.rs b/src/web/pages/account/deactivate.rs index dfaa5acbc..dbc082f67 100644 --- a/src/web/pages/account/deactivate.rs +++ b/src/web/pages/account/deactivate.rs @@ -1,5 +1,5 @@ use axum::{Extension, Router, extract::State, routing::on}; -use conduwuit_api::client::full_user_deactivate; +use continuwuity_api::client::full_user_deactivate; use futures::StreamExt; use ruma::{OwnedRoomId, OwnedUserId, UserId}; use tower_sessions::Session; diff --git a/src/web/pages/account/device.rs b/src/web/pages/account/device.rs index 05d602664..93c8673f6 100644 --- a/src/web/pages/account/device.rs +++ b/src/web/pages/account/device.rs @@ -3,7 +3,7 @@ use axum::{ extract::{Path, State}, routing::{get, on}, }; -use conduwuit_service::oauth::{SessionInfo, client_metadata::ClientMetadata}; +use continuwuity_service::oauth::{SessionInfo, client_metadata::ClientMetadata}; use futures::StreamExt; use ruma::OwnedDeviceId; use serde::{Deserialize, Serialize}; diff --git a/src/web/pages/account/email.rs b/src/web/pages/account/email.rs index 1d9ca64b2..0eecf43ee 100644 --- a/src/web/pages/account/email.rs +++ b/src/web/pages/account/email.rs @@ -3,8 +3,8 @@ use axum::{ extract::{Query, State}, routing::{get, on, post}, }; -use conduwuit_core::warn; -use conduwuit_service::{mailer::messages, threepid::session::ValidationSessions}; +use continuwuity_core::warn; +use continuwuity_service::{mailer::messages, threepid::session::ValidationSessions}; use lettre::{Address, message::Mailbox}; use ruma::{ClientSecret, OwnedClientSecret, OwnedSessionId}; use serde::{Deserialize, Serialize}; diff --git a/src/web/pages/account/login.rs b/src/web/pages/account/login.rs index 44f9592d2..329996a75 100644 --- a/src/web/pages/account/login.rs +++ b/src/web/pages/account/login.rs @@ -6,7 +6,7 @@ use axum::{ response::{IntoResponse, Redirect}, routing::{get, on}, }; -use conduwuit_api::client::handle_login; +use continuwuity_api::client::handle_login; use openidconnect::core::CoreAuthPrompt; use ruma::{ OwnedUserId, @@ -162,7 +162,8 @@ async fn route_login( let user_id = match login_result { | Ok(user_id) => user_id, | Err(err) => { - let error_message = if let conduwuit_core::Error::Request(_, message, _) = err { + let error_message = if let continuwuity_core::Error::Request(_, message, _) = err + { message.into_owned() } else { "Internal login error".to_owned() diff --git a/src/web/pages/account/mod.rs b/src/web/pages/account/mod.rs index ac294cb71..45394cd72 100644 --- a/src/web/pages/account/mod.rs +++ b/src/web/pages/account/mod.rs @@ -4,8 +4,8 @@ use axum::{ response::Redirect, routing::get, }; -use conduwuit_core::utils::{IterStream, ReadyExt, stream::TryExpect}; -use conduwuit_service::threepid::EmailRequirement; +use continuwuity_core::utils::{IterStream, ReadyExt, stream::TryExpect}; +use continuwuity_service::threepid::EmailRequirement; use futures::StreamExt; use ruma::{ OwnedClientSecret, OwnedDeviceId, OwnedSessionId, diff --git a/src/web/pages/account/password/change.rs b/src/web/pages/account/password/change.rs index 74a5a5f64..8e8428cb3 100644 --- a/src/web/pages/account/password/change.rs +++ b/src/web/pages/account/password/change.rs @@ -1,5 +1,5 @@ use axum::{Extension, Router, extract::State, routing::on}; -use conduwuit_service::users::HashedPassword; +use continuwuity_service::users::HashedPassword; use ruma::UserId; use validator::{Validate, ValidationError, ValidationErrors}; diff --git a/src/web/pages/account/password/reset.rs b/src/web/pages/account/password/reset.rs index 20b2732d9..264929e2d 100644 --- a/src/web/pages/account/password/reset.rs +++ b/src/web/pages/account/password/reset.rs @@ -3,8 +3,8 @@ use axum::{ extract::{Query, State}, routing::on, }; -use conduwuit_core::warn; -use conduwuit_service::{ +use continuwuity_core::warn; +use continuwuity_service::{ mailer::messages, threepid::session::ValidationSessions, users::HashedPassword, }; use lettre::{Address, message::Mailbox}; diff --git a/src/web/pages/account/register.rs b/src/web/pages/account/register.rs index 5abff481e..7ddb079d0 100644 --- a/src/web/pages/account/register.rs +++ b/src/web/pages/account/register.rs @@ -6,9 +6,9 @@ use axum::{ response::{Redirect, Response}, routing::{get, on}, }; -use conduwuit_api::client_ip::ClientIp; -use conduwuit_core::{config::TermsDocument, warn}; -use conduwuit_service::{ +use continuwuity_api::client_ip::ClientIp; +use continuwuity_core::{config::TermsDocument, warn}; +use continuwuity_service::{ mailer::messages, registration_tokens::ValidToken, uiaa::{FlowStatus, TrustedFlowStatus, UntrustedFlowStatus}, diff --git a/src/web/pages/components/mod.rs b/src/web/pages/components/mod.rs index 561f2b630..e5e92718e 100644 --- a/src/web/pages/components/mod.rs +++ b/src/web/pages/components/mod.rs @@ -1,8 +1,8 @@ use std::{collections::BTreeSet, time::SystemTime}; use askama::{Template, filters::HtmlSafe}; -use conduwuit_core::utils; -use conduwuit_service::{ +use continuwuity_core::utils; +use continuwuity_service::{ Services, oauth::{client_metadata::ClientMetadata, grant::Scope}, }; diff --git a/src/web/pages/debug.rs b/src/web/pages/debug.rs index 9522480a1..c5507d9ea 100644 --- a/src/web/pages/debug.rs +++ b/src/web/pages/debug.rs @@ -1,7 +1,7 @@ use std::convert::Infallible; use axum::{Router, routing::get}; -use conduwuit_core::Error; +use continuwuity_core::Error; use crate::WebError; diff --git a/src/web/pages/media.rs b/src/web/pages/media.rs index a8b2c03ef..172f0aee9 100644 --- a/src/web/pages/media.rs +++ b/src/web/pages/media.rs @@ -4,8 +4,8 @@ use axum::{ http::{self, HeaderMap}, routing::get, }; -use conduwuit_core::result::FlatOk; -use conduwuit_service::media::mxc::Mxc; +use continuwuity_core::result::FlatOk; +use continuwuity_service::media::mxc::Mxc; use ruma::{OwnedUserId, profile::ProfileFieldName}; use serde::{Deserialize, Serialize}; diff --git a/src/web/pages/mod.rs b/src/web/pages/mod.rs index a9c169810..28d602b38 100644 --- a/src/web/pages/mod.rs +++ b/src/web/pages/mod.rs @@ -7,7 +7,7 @@ use axum::{ response::Response, routing::MethodFilter, }; -use conduwuit_core::utils; +use continuwuity_core::utils; use crate::WebError; @@ -35,7 +35,7 @@ pub(crate) struct TemplateContext { const CSP_NONCE_LENGTH: usize = 32; pub(super) async fn template_context_middleware( - State(config): State>, + State(config): State>, mut request: Request, next: Next, ) -> Response { diff --git a/src/web/pages/oauth/grant.rs b/src/web/pages/oauth/grant.rs index 5fe7656f1..7f549be7d 100644 --- a/src/web/pages/oauth/grant.rs +++ b/src/web/pages/oauth/grant.rs @@ -4,7 +4,7 @@ use axum::{ response::Redirect, routing::on, }; -use conduwuit_service::oauth::{ +use continuwuity_service::oauth::{ client_metadata::ClientMetadata, grant::{AuthorizationCodeQuery, DeviceCodeVerifyQuery, Prompt}, }; diff --git a/src/web/pages/oidc/complete.rs b/src/web/pages/oidc/complete.rs index 32a0d342d..034791917 100644 --- a/src/web/pages/oidc/complete.rs +++ b/src/web/pages/oidc/complete.rs @@ -6,7 +6,7 @@ use axum::{ response::Redirect, routing::on, }; -use conduwuit_service::{ +use continuwuity_service::{ oauth::grant::AuthorizationCodeResponse, oidc::{ClaimedLocalUser, SessionCompletionStatus}, }; diff --git a/src/web/pages/oidc/mod.rs b/src/web/pages/oidc/mod.rs index 74e73e59b..297d6ee77 100644 --- a/src/web/pages/oidc/mod.rs +++ b/src/web/pages/oidc/mod.rs @@ -1,5 +1,5 @@ use axum::Router; -use conduwuit_service::oidc::{self, Claims}; +use continuwuity_service::oidc::{self, Claims}; use ruma::OwnedUserId; use serde::{Deserialize, Serialize}; diff --git a/src/web/pages/templates/about.html.j2 b/src/web/pages/templates/about.html.j2 index 4a51fb2b8..0208edcad 100644 --- a/src/web/pages/templates/about.html.j2 +++ b/src/web/pages/templates/about.html.j2 @@ -59,8 +59,8 @@ About server {% endif %}

Server version {{ env!("CARGO_PKG_VERSION") }} - {%~ if let Some(version_info) = conduwuit_build_metadata::version_tag() ~%} - {%~ if let Some(url) = conduwuit_build_metadata::GIT_REMOTE_COMMIT_URL.or(conduwuit_build_metadata::GIT_REMOTE_WEB_URL) ~%} + {%~ if let Some(version_info) = continuwuity_build_metadata::version_tag() ~%} + {%~ if let Some(url) = continuwuity_build_metadata::GIT_REMOTE_COMMIT_URL.or(continuwuity_build_metadata::GIT_REMOTE_WEB_URL) ~%} ({{ version_info }}) {%~ else ~%} ({{ version_info }}) diff --git a/src/web/session/mod.rs b/src/web/session/mod.rs index 54f1d5830..e6022e6fc 100644 --- a/src/web/session/mod.rs +++ b/src/web/session/mod.rs @@ -10,7 +10,7 @@ use axum::{ http::request::Parts, response::{IntoResponse, Redirect, Response}, }; -use conduwuit_service::oauth::grant::{AuthorizationCodeQuery, DeviceCodeVerifyQuery}; +use continuwuity_service::oauth::grant::{AuthorizationCodeQuery, DeviceCodeVerifyQuery}; use ruma::{OwnedUserId, UserId}; use serde::{Deserialize, Serialize}; use tower_sessions::Session; diff --git a/src/web/session/store.rs b/src/web/session/store.rs index a05adb6cd..aab6de835 100644 --- a/src/web/session/store.rs +++ b/src/web/session/store.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use conduwuit_core::utils::stream::TryIgnore; -use conduwuit_database::{Database, Deserialized, Json, Map}; +use continuwuity_core::utils::stream::TryIgnore; +use continuwuity_database::{Database, Deserialized, Json, Map}; use futures::StreamExt; use tower_sessions::{ ExpiredDeletion, SessionStore, diff --git a/tests/cargo_smoke.sh b/tests/cargo_smoke.sh index e8bb55125..7e290729d 100755 --- a/tests/cargo_smoke.sh +++ b/tests/cargo_smoke.sh @@ -18,7 +18,7 @@ run () { fi } -conduwuit () { +continuwuity () { UWU_OPTS=$@ rm -rf /tmp/uwu_smoketest.db echo -e "[global]\nserver_name = \"localhost\"\ndatabase_path = \"/tmp/uwu_smoketest.db\"" > /tmp/uwu_smoketest.toml @@ -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 conduwuit -- -V - run conduwuit "$TOOLCHAIN" run $ELEMENT_OPTS --bin conduwuit + run cargo "$TOOLCHAIN" run $ELEMENT_OPTS --bin continuwuity -- -V + run continuwuity "$TOOLCHAIN" run $ELEMENT_OPTS --bin continuwuity fi } diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index f11953fdc..37f9df54d 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -10,7 +10,7 @@ repository.workspace = true version.workspace = true [dependencies] -conduwuit-admin.workspace = true +continuwuity-admin.workspace = true clap.workspace = true askama = "0.16.0" diff --git a/xtask/src/tasks/generate_docs/admin_commands.rs b/xtask/src/tasks/generate_docs/admin_commands.rs index e0bc6383e..f7efc383e 100644 --- a/xtask/src/tasks/generate_docs/admin_commands.rs +++ b/xtask/src/tasks/generate_docs/admin_commands.rs @@ -7,7 +7,7 @@ use std::path::Path; use askama::Template; use clap::{Command, CommandFactory}; -use conduwuit_admin::AdminCommand; +use continuwuity_admin::AdminCommand; use crate::tasks::{TaskResult, generate_docs::FileOutput};