HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

merge: remote-tracking branch 'origin/master' into refactor/split-project-into-core-crates

Browse Source
This commit is contained in:
Paul Makles
2023-04-22 21:09:51 +01:00
parent 63f56aec0c
commit 22bfd720b5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -2634,7 +2634,7 @@ dependencies = [
[[package]] [[package]]
name = "redis" name = "redis"
version = "0.22.3" version = "0.22.3"
source = "git+https://github.com/insertish/redis-rs?rev=6575a6b1c09eb8c9cc7f0082d95fe6b8f903c4d7#6575a6b1c09eb8c9cc7f0082d95fe6b8f903c4d7" source = "git+https://github.com/insertish/redis-rs?rev=1a41faf356fd21aebba71cea7eb7eb2653e5f0ef#1a41faf356fd21aebba71cea7eb7eb2653e5f0ef"
dependencies = [ dependencies = [
"async-std", "async-std",
"async-trait", "async-trait",

2
Cargo.toml
View File

@@ -3,4 +3,4 @@ members = ["crates/delta", "crates/bonfire", "crates/quark", "crates/core/*"]
[patch.crates-io] [patch.crates-io]
# mobc-redis = { git = "https://github.com/insertish/mobc", rev = "8b880bb59f2ba80b4c7bc40c649c113d8857a186" } # mobc-redis = { git = "https://github.com/insertish/mobc", rev = "8b880bb59f2ba80b4c7bc40c649c113d8857a186" }
redis = { git = "https://github.com/insertish/redis-rs", rev = "6575a6b1c09eb8c9cc7f0082d95fe6b8f903c4d7" } redis = { git = "https://github.com/insertish/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }

2
crates/core/presence/src/lib.rs
View File

@@ -121,7 +121,7 @@ pub async fn filter_online(user_ids: &'_ [String]) -> HashSet<String> {
// Ok so, if this breaks, that means we've lost the Redis patch which adds SMISMEMBER // Ok so, if this breaks, that means we've lost the Redis patch which adds SMISMEMBER
// Currently it's patched in through a forked repository, investigate what happen to it // Currently it's patched in through a forked repository, investigate what happen to it
let data: Vec<bool> = conn let data: Vec<bool> = conn
.sismember("online", user_ids) .smismember("online", user_ids)
.await .await
.expect("this shouldn't happen, please read this code! presence/mod.rs"); .expect("this shouldn't happen, please read this code! presence/mod.rs");
if data.is_empty() { if data.is_empty() {