From 4128d83be66d20bdec56589775b46fb4cfaa3b17 Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 24 Apr 2024 15:24:26 -0400 Subject: [PATCH] bump ruma, adjust a couple lines of docs Signed-off-by: strawberry --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 4 ++-- README.md | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fe6fcb6..6e44505a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2513,7 +2513,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.9.4" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "assign", "js_int", @@ -2533,7 +2533,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "js_int", "ruma-common", @@ -2545,7 +2545,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.17.4" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "as_variant", "assign", @@ -2567,7 +2567,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.12.1" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "as_variant", "base64 0.21.7", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.27.11" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "as_variant", "indexmap", @@ -2619,7 +2619,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "js_int", "ruma-common", @@ -2631,7 +2631,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.3" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "js_int", "thiserror", @@ -2640,7 +2640,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "js_int", "ruma-common", @@ -2650,7 +2650,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.12.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "once_cell", "proc-macro-crate", @@ -2665,7 +2665,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "js_int", "ruma-common", @@ -2677,7 +2677,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.14.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "base64 0.21.7", "ed25519-dalek", @@ -2693,7 +2693,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.10.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#3d0308ca2f3d7c0254ce8097a28f36c313bed4fb" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#7136799881d0fcb18aad26c3dac18a34a1f892fc" dependencies = [ "itertools 0.11.0", "js_int", diff --git a/Cargo.toml b/Cargo.toml index 17592ce1..eb538402 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "conduit" -description = "a cool fork of Conduit, a Matrix homeserver written in Rust" +description = "a cool hard fork of Conduit, a Matrix homeserver written in Rust" license = "Apache-2.0" authors = [ "strawberry ", @@ -403,7 +403,7 @@ copyright = "2024, Timo Kösters " license-file = ["LICENSE", "3"] depends = "$auto, ca-certificates" extended-description = """\ -a cool fork of Conduit, a Matrix homeserver written in Rust""" +a cool hard fork of Conduit, a Matrix homeserver written in Rust""" section = "net" priority = "optional" assets = [ diff --git a/README.md b/README.md index 669c1cf8..51c4b6f8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![CI and Artifacts](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml) -### a well maintained fork of [Conduit](https://conduit.rs/) +### a well maintained hard fork of [Conduit](https://conduit.rs/) Visit the [Conduwuit documentation](https://conduwuit.puppyirl.gay/) for more information. @@ -29,11 +29,11 @@ An official conduwuit server ran by me is available at transfem.dev ([element.tr #### What is the current status? -conduwuit is a fork of Conduit which is in beta, meaning you can join and participate in most +conduwuit is a hard fork of Conduit which is in beta, meaning you can join and participate in most Matrix rooms, but not all features are supported and you might run into bugs from time to time. -#### Why does this fork exist? Why don't you contribute back upstream? +#### Why does this hard fork exist? Why don't you contribute back upstream? I now intend on contributing back as time and mental energy sees fit, but my fork still exists as a way to: - avoid unnecessary Matrix and general developer politics