Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 922527f

Browse files
aumetraaumetra
committedMar 10, 2024·
update
1 parent e4902a0 commit 922527f

File tree

17 files changed

+134
-146
lines changed

17 files changed

+134
-146
lines changed
 

‎Cargo.lock

+116-115
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ targets = [
111111
pr-run-mode = "plan"
112112

113113
[patch.crates-io]
114-
diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "017ebe2fb7a2709ab5db92148dea5ce812a35e09" }
114+
diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "1ef43d2a8a4080c1e9e5c34056f4d26cbb2a85cc" }

‎crates/kitsune-cache/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license.workspace = true
99
enum_dispatch = "0.3.12"
1010
moka = { version = "0.12.5", features = ["future"] }
1111
multiplex-pool = { path = "../../lib/multiplex-pool" }
12-
redis = { version = "0.24.0", default-features = false, features = [
12+
redis = { version = "0.25.0", default-features = false, features = [
1313
"connection-manager",
1414
"tokio-comp",
1515
] }

‎crates/kitsune-embed/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license.workspace = true
88
[dependencies]
99
diesel = "2.1.4"
1010
diesel-async = "0.4.1"
11-
embed-sdk = { git = "https://github.com/Lantern-chat/embed-service.git", rev = "0d43394bb2514f57edc402a83f69b171705c3650" }
11+
embed-sdk = { git = "https://github.com/Lantern-chat/embed-service.git", rev = "39f526e9674766596a6fc988623683c15d3564b9" }
1212
http = "1.1.0"
1313
iso8601-timestamp = "0.2.17"
1414
kitsune-db = { path = "../kitsune-db" }

‎crates/kitsune-messaging/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ derive_more = { version = "1.0.0-beta.6", features = ["from"] }
1111
futures-util = "0.3.30"
1212
just-retry = { path = "../../lib/just-retry" }
1313
pin-project-lite = "0.2.13"
14-
redis = { version = "0.24.0", features = ["connection-manager", "tokio-comp"] }
14+
redis = { version = "0.25.0", features = ["connection-manager", "tokio-comp"] }
1515
serde = "1.0.197"
1616
simd-json = "0.13.8"
1717
tokio = { version = "1.36.0", features = ["macros", "rt", "sync"] }

‎crates/kitsune-messaging/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ pub type BoxError = Box<dyn Error + Send + Sync>;
2323
/// Type alias for Result, defaulting to [`BoxError`] on the error branch
2424
pub type Result<T, E = BoxError> = std::result::Result<T, E>;
2525

26-
mod util;
27-
2826
pub mod redis;
2927
pub mod tokio_broadcast;
3028

‎crates/kitsune-messaging/src/redis.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! Redis implementation
33
//!
44
5-
use crate::{util::TransparentDebug, MessagingBackend, Result};
5+
use crate::{MessagingBackend, Result};
66
use ahash::AHashMap;
77
use futures_util::{future, Stream, StreamExt, TryStreamExt};
88
use just_retry::RetryExt;
@@ -82,14 +82,12 @@ impl MultiplexActor {
8282
let client = self.client.clone();
8383
async move {
8484
client
85-
.get_async_connection()
85+
.get_async_pubsub()
8686
.await
87-
.map(|conn| TransparentDebug(conn.into_pubsub()))
8887
}
8988
})
9089
.retry(just_retry::backoff_policy())
9190
.await
92-
.map(|conn| conn.0)
9391
.unwrap();
9492

9593
for key in self.mapping.keys() {
@@ -111,7 +109,7 @@ impl MultiplexActor {
111109

112110
let actor = Self {
113111
mapping: AHashMap::new(),
114-
conn: client.get_async_connection().await?.into_pubsub(),
112+
conn: client.get_async_pubsub().await?,
115113
client,
116114
registration_queue: receiver,
117115
};

‎crates/kitsune-messaging/src/util.rs

-9
This file was deleted.

‎crates/kitsune-oidc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ openidconnect = { version = "3.5.0", default-features = false, features = [
2020
"accept-rfc3339-timestamps",
2121
"accept-string-booleans",
2222
] }
23-
redis = { version = "0.24.0", default-features = false, features = [
23+
redis = { version = "0.25.0", default-features = false, features = [
2424
"connection-manager",
2525
"tokio-comp",
2626
] }

‎crates/kitsune-service/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ password-hash = { version = "0.5.0", features = ["std"] }
4848
pkcs8 = "0.10.2"
4949
post-process = { path = "../../lib/post-process" }
5050
rand = "0.8.5"
51-
redis = { version = "0.24.0", default-features = false, features = [
51+
redis = { version = "0.25.0", default-features = false, features = [
5252
"connection-manager",
5353
"tokio-comp",
5454
] }

‎crates/kitsune-test/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ kitsune-config = { path = "../kitsune-config" }
1717
kitsune-db = { path = "../kitsune-db" }
1818
multiplex-pool = { path = "../../lib/multiplex-pool" }
1919
pin-project-lite = "0.2.13"
20-
redis = { version = "0.24.0", default-features = false, features = [
20+
redis = { version = "0.25.0", default-features = false, features = [
2121
"connection-manager",
2222
"tokio-rustls-comp",
2323
] }

‎crates/kitsune-wasm-mrf/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ kitsune-type = { path = "../kitsune-type" }
1818
miette = "7.2.0"
1919
mrf-manifest = { path = "../../lib/mrf-manifest", features = ["parse"] }
2020
multiplex-pool = { path = "../../lib/multiplex-pool" }
21-
redis = { version = "0.24.0", default-features = false, features = [
21+
redis = { version = "0.25.0", default-features = false, features = [
2222
"connection-manager",
2323
"tokio-rustls-comp",
2424
] }

‎crates/kitsune-webfinger/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ kitsune-http-client = { path = "../kitsune-http-client" }
1616
kitsune-type = { path = "../kitsune-type" }
1717
kitsune-util = { path = "../kitsune-util" }
1818
multiplex-pool = { path = "../../lib/multiplex-pool" }
19-
redis = { version = "0.24.0", default-features = false, features = [
19+
redis = { version = "0.25.0", default-features = false, features = [
2020
"connection-manager",
2121
"tokio-comp",
2222
] }

‎kitsune-job-runner/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ kitsune-wasm-mrf = { path = "../crates/kitsune-wasm-mrf" }
2929
miette = { version = "7.2.0", features = ["fancy"] }
3030
mimalloc = "0.1.39"
3131
multiplex-pool = { path = "../lib/multiplex-pool" }
32-
redis = { version = "0.24.0", default-features = false, features = [
32+
redis = { version = "0.25.0", default-features = false, features = [
3333
"aio",
3434
"connection-manager",
3535
"tokio-rustls-comp",

‎kitsune/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ mime_guess = { version = "2.0.4", default-features = false }
7676
oxide-auth = "0.5.4"
7777
oxide-auth-async = "0.1.1"
7878
oxide-auth-axum = "0.4.0"
79-
redis = { version = "0.24.0", default-features = false, features = [
79+
redis = { version = "0.25.0", default-features = false, features = [
8080
"tokio-rustls-comp",
8181
] }
8282
rust-embed = { version = "8.3.0", features = ["include-exclude"] }
@@ -137,7 +137,7 @@ kitsune-http-client = { path = "../crates/kitsune-http-client" }
137137
kitsune-test = { path = "../crates/kitsune-test" }
138138
multiplex-pool = { path = "../lib/multiplex-pool" }
139139
pretty_assertions = "1.4.0"
140-
redis = { version = "0.24.0", default-features = false, features = [
140+
redis = { version = "0.25.0", default-features = false, features = [
141141
"connection-manager",
142142
"tokio-comp",
143143
] }

‎lib/athena/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ just-retry = { path = "../just-retry" }
1414
multiplex-pool = { path = "../multiplex-pool" }
1515
once_cell = "1.19.0"
1616
rand = "0.8.5"
17-
redis = { version = "0.24.0", default-features = false, features = [
17+
redis = { version = "0.25.0", default-features = false, features = [
1818
"ahash",
1919
"connection-manager",
2020
"script",
@@ -32,7 +32,7 @@ tracing = "0.1.40"
3232
typed-builder = "0.18.1"
3333

3434
[dev-dependencies]
35-
redis = { version = "0.24.0", features = ["connection-manager"] }
35+
redis = { version = "0.25.0", features = ["connection-manager"] }
3636
tracing-subscriber = "0.3.18"
3737

3838
[lints]

‎lib/speedy-uuid/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ diesel = { version = "2.1.4", features = [
1111
"postgres_backend",
1212
"uuid",
1313
], optional = true }
14-
redis = { version = "0.24.0", default-features = false, optional = true }
14+
redis = { version = "0.25.0", default-features = false, optional = true }
1515
serde = { version = "1.0.197", optional = true }
1616
thiserror = "1.0.57"
1717
uuid = { version = "1.7.0", features = ["fast-rng", "v7"] }

0 commit comments

Comments
 (0)
Please sign in to comment.