From f0ac7ed933d4b256192a7d904a37333653883cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Tue, 20 Jul 2021 15:24:18 +0200
Subject: [PATCH] chore: update ruma again
---
Cargo.lock | 36 +++++++++++++++++-----------------
Cargo.toml | 4 ++--
src/client_server/account.rs | 13 ++++++------
src/client_server/directory.rs | 2 +-
src/client_server/room.rs | 14 +++----------
src/database/pusher.rs | 5 ++++-
6 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index a6b87c9d..808ba4ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2015,7 +2015,7 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.2.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"assign",
"js_int",
@@ -2036,7 +2036,7 @@ dependencies = [
[[package]]
name = "ruma-api"
version = "0.17.1"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"bytes",
"http",
@@ -2052,7 +2052,7 @@ dependencies = [
[[package]]
name = "ruma-api-macros"
version = "0.17.1"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2063,7 +2063,7 @@ dependencies = [
[[package]]
name = "ruma-appservice-api"
version = "0.3.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"ruma-api",
"ruma-common",
@@ -2077,7 +2077,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.11.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"assign",
"bytes",
@@ -2097,7 +2097,7 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.5.4"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"indexmap",
"js_int",
@@ -2112,7 +2112,7 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.23.2"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"indoc",
"js_int",
@@ -2128,7 +2128,7 @@ dependencies = [
[[package]]
name = "ruma-events-macros"
version = "0.23.2"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2139,7 +2139,7 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.2.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"js_int",
"ruma-api",
@@ -2154,7 +2154,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers"
version = "0.19.4"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"paste",
"rand 0.8.4",
@@ -2168,7 +2168,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-macros"
version = "0.19.4"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"quote",
"ruma-identifiers-validation",
@@ -2178,12 +2178,12 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.4.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
[[package]]
name = "ruma-identity-service-api"
version = "0.2.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"js_int",
"ruma-api",
@@ -2196,7 +2196,7 @@ dependencies = [
[[package]]
name = "ruma-push-gateway-api"
version = "0.2.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"js_int",
"ruma-api",
@@ -2211,7 +2211,7 @@ dependencies = [
[[package]]
name = "ruma-serde"
version = "0.4.1"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"bytes",
"form_urlencoded",
@@ -2225,7 +2225,7 @@ dependencies = [
[[package]]
name = "ruma-serde-macros"
version = "0.4.1"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2236,7 +2236,7 @@ dependencies = [
[[package]]
name = "ruma-signatures"
version = "0.8.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"base64 0.13.0",
"ed25519-dalek",
@@ -2253,7 +2253,7 @@ dependencies = [
[[package]]
name = "ruma-state-res"
version = "0.2.0"
-source = "git+https://github.com/timokoesters/ruma?rev=74cf83c4ca937fa5e2709fb71e9d11848e72e487#74cf83c4ca937fa5e2709fb71e9d11848e72e487"
+source = "git+https://github.com/ruma/ruma?rev=eb19b0e08a901b87d11b3be0890ec788cc760492#eb19b0e08a901b87d11b3be0890ec788cc760492"
dependencies = [
"itertools 0.10.1",
"js_int",
diff --git a/Cargo.toml b/Cargo.toml
index c62ff821..2ce4b037 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,8 +18,8 @@ edition = "2018"
rocket = { version = "0.5.0-rc.1", features = ["tls"] } # Used to handle requests
# Used for matrix spec type definitions and helpers
-#ruma = { git = "https://github.com/ruma/ruma", rev = "c29c2b16ec114fa655e2b70bdd53c82e35859005", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
-ruma = { git = "https://github.com/timokoesters/ruma", rev = "74cf83c4ca937fa5e2709fb71e9d11848e72e487", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+ruma = { git = "https://github.com/ruma/ruma", rev = "eb19b0e08a901b87d11b3be0890ec788cc760492", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
+#ruma = { git = "https://github.com/timokoesters/ruma", rev = "74cf83c4ca937fa5e2709fb71e9d11848e72e487", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
#ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
# Used for long polling and federation sender, should be the same as rocket::tokio
diff --git a/src/client_server/account.rs b/src/client_server/account.rs
index ebaf7b17..ddb44d6e 100644
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -20,12 +20,12 @@ use ruma::{
},
events::{
room::{
- canonical_alias, guest_access, history_visibility, join_rules, member, message,
- name::{self, RoomName},
+ canonical_alias, guest_access, history_visibility, join_rules, member, message, name,
topic,
},
EventType,
},
+ identifiers::RoomName,
push, RoomAliasId, RoomId, RoomVersionId, UserId,
};
@@ -378,13 +378,14 @@ pub async fn register_route(
)?;
// 6. Events implied by name and topic
+ let room_name =
+ Box::<RoomName>::try_from(format!("{} Admin Room", db.globals.server_name()))
+ .expect("Room name is valid");
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomName,
- content: serde_json::to_value(name::NameEventContent::new(Some(
- RoomName::try_from("Admin Room".to_owned()).expect("Room name is valid"),
- )))
- .expect("event is valid, we just created it"),
+ content: serde_json::to_value(name::NameEventContent::new(Some(room_name)))
+ .expect("event is valid, we just created it"),
unsigned: None,
state_key: Some("".to_owned()),
redacts: None,
diff --git a/src/client_server/directory.rs b/src/client_server/directory.rs
index 64375f00..d7388865 100644
--- a/src/client_server/directory.rs
+++ b/src/client_server/directory.rs
@@ -316,7 +316,7 @@ pub async fn get_public_rooms_filtered_helper(
.map(|q| q.to_lowercase())
{
if let Some(name) = &chunk.name {
- if name.to_lowercase().contains(&query) {
+ if name.as_str().to_lowercase().contains(&query) {
return true;
}
}
diff --git a/src/client_server/room.rs b/src/client_server/room.rs
index c9b93c35..6e271308 100644
--- a/src/client_server/room.rs
+++ b/src/client_server/room.rs
@@ -9,11 +9,7 @@ use ruma::{
r0::room::{self, create_room, get_room_event, upgrade_room},
},
events::{
- room::{
- guest_access, history_visibility, join_rules, member,
- name::{self, RoomName},
- topic,
- },
+ room::{guest_access, history_visibility, join_rules, member, name, topic},
EventType,
},
serde::Raw,
@@ -256,12 +252,8 @@ pub async fn create_room_route(
db.rooms.build_and_append_pdu(
PduBuilder {
event_type: EventType::RoomName,
- content: serde_json::to_value(name::NameEventContent::new(Some(
- RoomName::try_from(name.clone()).map_err(|_| {
- Error::BadRequest(ErrorKind::InvalidParam, "Name is invalid.")
- })?,
- )))
- .expect("event is valid, we just created it"),
+ content: serde_json::to_value(name::NameEventContent::new(Some(name.clone())))
+ .expect("event is valid, we just created it"),
unsigned: None,
state_key: Some("".to_owned()),
redacts: None,
diff --git a/src/database/pusher.rs b/src/database/pusher.rs
index 3210cb18..348f4dcb 100644
--- a/src/database/pusher.rs
+++ b/src/database/pusher.rs
@@ -11,6 +11,7 @@ use ruma::{
IncomingResponse, OutgoingRequest, SendAccessToken,
},
events::{room::power_levels::PowerLevelsEventContent, EventType},
+ identifiers::RoomName,
push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak},
uint, UInt, UserId,
};
@@ -299,7 +300,9 @@ async fn send_notice(
.rooms
.room_state_get(&event.room_id, &EventType::RoomName, "")?
.map(|pdu| match pdu.content.get("name") {
- Some(serde_json::Value::String(s)) => Some(s.to_string()),
+ Some(serde_json::Value::String(s)) => {
+ Some(Box::<RoomName>::try_from(&**s).expect("room name is valid"))
+ }
_ => None,
})
.flatten();