chore: cut new release with redis patches and debug profile

Cargo.lock

@@ -2712,7 +2712,7 @@ dependencies = [
 [[package]]
 name = "redis"
 version = "0.22.3"
-source = "git+https://github.com/insertish/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
+source = "git+https://github.com/revoltchat/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2731,9 +2731,8 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.23.0"
+version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/revoltchat/redis-rs?rev=f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9#f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9"
-checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2759,7 +2758,7 @@ dependencies = [
  "lazy_static",
  "mobc",
  "mobc-redis",
- "redis 0.23.0",
+ "redis 0.23.1",
  "rmp-serde",
  "serde",
  "serde_json",
@@ -2877,7 +2876,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "async-std",
  "async-tungstenite",
@@ -2888,13 +2887,14 @@ dependencies = [
  "revolt-presence",
  "revolt-quark",
  "rmp-serde",
+ "sentry",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "revolt-database"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "async-recursion",
  "async-std",
@@ -2926,7 +2926,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "async-channel",
  "async-std",
@@ -2967,7 +2967,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-models"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "indexmap",
  "iso8601-timestamp 0.2.11",
@@ -2980,7 +2980,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-permissions"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2994,7 +2994,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-presence"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "async-std",
  "log",
@@ -3005,7 +3005,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-quark"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "async-lock",
  "async-recursion",
@@ -3058,7 +3058,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-result"
-version = "0.6.6"
+version = "0.6.7"
 dependencies = [
  "revolt_okapi",
  "revolt_rocket_okapi",

Cargo.toml

@@ -3,4 +3,8 @@ members = ["crates/delta", "crates/bonfire", "crates/quark", "crates/core/*"]
 
 [patch.crates-io]
 # mobc-redis = { git = "https://github.com/insertish/mobc", rev = "8b880bb59f2ba80b4c7bc40c649c113d8857a186" }
-redis = { git = "https://github.com/insertish/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }
+redis22 = { package = "redis", version = "0.22.3", git = "https://github.com/revoltchat/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }
+redis23 = { package = "redis", version = "0.23.1", git = "https://github.com/revoltchat/redis-rs", rev = "f8ca28ab85da59d2ccde526b4d2fb390eff5a5f9" }
+
+[profile.release]
+debug = true

crates/bonfire/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.6.6"
+version = "0.6.7"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 
@@ -33,3 +33,4 @@ async-std = { version = "1.8.0", features = [
 
 # core
 revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
+sentry = "0.31.5"

crates/bonfire/src/websocket.rs

@@ -136,13 +136,13 @@ pub fn spawn_client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
                                             );*/
 
                                             // Handle incoming events.
-                                            match conn.on_message().next().await.map(|item| {
+                                            match conn.on_message().next().await.map(|res| {
-                                                (
+                                                res.map(|item|(
                                                     item.get_channel_name().to_string(),
                                                     redis_kiss::decode_payload::<EventV1>(&item),
-                                                )
+                                                ))
                                             }) {
-                                                Some((channel, item)) => {
+                                                Some(Ok((channel, item))) => {
                                                     if let Ok(mut event) = item {
                                                         if state
                                                             .handle_incoming_event_v1(
@@ -160,6 +160,11 @@ pub fn spawn_client(db: &'static Database, stream: TcpStream, addr: SocketAddr)
                                                         warn!("Failed to deserialise an event for {channel}!");
                                                     }
                                                 }
+                                                Some(Err(e)) => {
+                                                    info!("Error while consuming pub/sub messages: {e:?}");
+                                                    sentry::capture_error(&e);
+                                                    break
+                                                }
                                                 // No more data, assume we disconnected or otherwise
                                                 // something bad occurred, so disconnect user.
                                                 None => break,

crates/core/database/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.6.6"
+version = "0.6.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -22,10 +22,10 @@ default = ["mongodb", "async-std-runtime"]
 
 [dependencies]
 # Core
-revolt-result = { version = "0.6.6", path = "../result" }
+revolt-result = { version = "0.6.7", path = "../result" }
-revolt-models = { version = "0.6.6", path = "../models" }
+revolt-models = { version = "0.6.7", path = "../models" }
-revolt-presence = { version = "0.6.6", path = "../presence" }
+revolt-presence = { version = "0.6.7", path = "../presence" }
-revolt-permissions = { version = "0.6.6", path = "../permissions", features = [
+revolt-permissions = { version = "0.6.7", path = "../permissions", features = [
     "serde",
     "bson",
 ] }

crates/core/models/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.6.6"
+version = "0.6.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
@@ -18,7 +18,7 @@ default = ["serde", "partials"]
 
 [dependencies]
 # Core
-revolt-permissions = { version = "0.6.6", path = "../permissions" }
+revolt-permissions = { version = "0.6.7", path = "../permissions" }
 
 # Serialisation
 indexmap = "1.9.3"

crates/core/permissions/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.6.6"
+version = "0.6.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/presence/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.6.6"
+version = "0.6.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/result/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.6.6"
+version = "0.6.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/delta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.6.6"
+version = "0.6.7"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"

crates/delta/src/routes/users/find_mutual.rs

@@ -24,10 +24,6 @@ pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<M
         return Err(Error::InvalidOperation);
     }
 
-    if user.bot.is_some() {
-        return Err(Error::IsBot);
-    }
-
     let target = target.as_user(db).await?;
 
     if perms(&user)

crates/quark/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-quark"
-version = "0.6.6"
+version = "0.6.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"