Compare commits

..

6 Commits

Author SHA1 Message Date
timedout c940706762 style: Use contains to check for row presence 2026-01-07 12:32:34 -05:00
timedout 93f30642dd perf: Store empty value (row only needs to exist) 2026-01-07 12:32:34 -05:00
timedout 743f6a101b fix: Await future 2026-01-07 12:32:34 -05:00
timedout 3a4b94005d fix: Correctly return M_USER_LOCKED during login 2026-01-07 12:32:34 -05:00
timedout 0a24b0bfec chore: Add news fragment 2026-01-07 12:32:34 -05:00
timedout dd4d4173d9 feat: Allow admins to disable the login capability of an account 2026-01-07 12:32:34 -05:00
17 changed files with 46 additions and 10 deletions
+11 -4
View File
@@ -1,17 +1,26 @@
#cargo-features = ["profile-rustflags"]
[workspace]
resolver = "2"
members = ["src/*", "xtask/*"]
default-members = ["src/*"]
[workspace.package]
authors = ["Continuwuity Team and contributors <team@continuwuity.org>"]
description = "A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver."
authors = [
"June Clementine Strawberry <june@girlboss.ceo>",
"strawberry <strawberry@puppygock.gay>", # woof
"Jason Volk <jason@zemos.net>",
]
categories = ["network-programming"]
description = "a very cool Matrix chat homeserver written in Rust"
edition = "2024"
homepage = "https://continuwuity.org/"
keywords = ["chat", "matrix", "networking", "server", "uwu"]
license = "Apache-2.0"
# See also `rust-toolchain.toml`
readme = "README.md"
repository = "https://forgejo.ellis.link/continuwuation/continuwuity"
rust-version = "1.86.0"
version = "0.5.1"
[workspace.metadata.crane]
@@ -839,8 +848,6 @@ unknown_lints = "allow"
###################
cargo = { level = "warn", priority = -1 }
# Nobody except for us should be consuming these crates, they don't need metadata
cargo_common_metadata = { level = "allow"}
## some sadness
multiple_crate_versions = { level = "allow", priority = 1 }
+1 -1
View File
@@ -8,7 +8,7 @@ # Command-Line Help for `continuwuity`
## `continuwuity`
A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver.
a very cool Matrix chat homeserver written in Rust
**Usage:** `continuwuity [OPTIONS]`
+2 -2
View File
@@ -4,7 +4,7 @@
Name: continuwuity
Version: {{{ git_repo_version }}}
Release: 1%{?dist}
Summary: A Matrix homeserver written in Rust.
Summary: Very cool Matrix chat homeserver written in Rust
License: Apache-2.0 AND MIT
@@ -23,7 +23,7 @@ Requires: glibc
Requires: libstdc++
%global _description %{expand:
A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver.}
A cool hard fork of Conduit, a Matrix homeserver written in Rust}
%description %{_description}
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_admin"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+1
View File
@@ -1101,4 +1101,5 @@ pub(super) async fn enable_login(&self, user_id: String) -> Result {
self.services.users.enable_login(&user_id);
self.write_str(&format!("{user_id} can now log in.")).await
.await
}
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_api"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_build_metadata"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_core"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_database"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+1 -1
View File
@@ -395,7 +395,7 @@ pub(super) fn open_list(db: &Arc<Engine>, maps: &[Descriptor]) -> Result<Maps> {
..descriptor::RANDOM_SMALL
},
Descriptor {
name: "userid_logindisabled",
name: "userid_login_disabled",
..descriptor::RANDOM_SMALL
},
Descriptor {
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_macros"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+6 -2
View File
@@ -2,12 +2,15 @@
name = "conduwuit"
default-run = "conduwuit"
authors.workspace = true
categories.workspace = true
description.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true
metadata.crane.workspace = true
@@ -20,13 +23,14 @@ crate-type = [
[package.metadata.deb]
name = "continuwuity"
maintainer = "Continuwuity Team and contributors <team@continuwuity.org>"
maintainer = "continuwuity developers <contact@continuwuity.org>"
copyright = "2024, continuwuity developers"
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."""
a cool hard fork of Conduit, a Matrix homeserver written in Rust"""
section = "net"
priority = "optional"
conf-files = ["/etc/conduwuit/conduwuit.toml"]
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_router"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_service"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
+2
View File
@@ -1,7 +1,9 @@
[package]
name = "conduwuit_web"
categories.workspace = true
description.workspace = true
edition.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
@@ -1,12 +1,15 @@
[package]
name = "xtask-generate-commands"
authors.workspace = true
categories.workspace = true
description.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true
[dependencies]
+3
View File
@@ -1,12 +1,15 @@
[package]
name = "xtask"
authors.workspace = true
categories.workspace = true
description.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true
[dependencies]