From 22bfd720b5362105372e48b989eaec8948c5fe30 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Sat, 22 Apr 2023 21:09:51 +0100
Subject: [PATCH] merge: remote-tracking branch 'origin/master' into
 refactor/split-project-into-core-crates

---
 Cargo.lock                      | 2 +-
 Cargo.toml                      | 2 +-
 crates/core/presence/src/lib.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e1b7cd1d..5129b4cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2634,7 +2634,7 @@ dependencies = [
 [[package]]
 name = "redis"
 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 = [
  "async-std",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 89be2f2a..a5a13117 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,4 +3,4 @@ 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 = "6575a6b1c09eb8c9cc7f0082d95fe6b8f903c4d7" }
+redis = { git = "https://github.com/insertish/redis-rs", rev = "1a41faf356fd21aebba71cea7eb7eb2653e5f0ef" }
diff --git a/crates/core/presence/src/lib.rs b/crates/core/presence/src/lib.rs
index 67c0722e..72418734 100644
--- a/crates/core/presence/src/lib.rs
+++ b/crates/core/presence/src/lib.rs
@@ -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
         // Currently it's patched in through a forked repository, investigate what happen to it
         let data: Vec<bool> = conn
-            .sismember("online", user_ids)
+            .smismember("online", user_ids)
             .await
             .expect("this shouldn't happen, please read this code! presence/mod.rs");
         if data.is_empty() {