From 2f4a2c978de560862ac55cea83f838428b754b52 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 13 Feb 2024 15:02:01 +0100 Subject: [PATCH] use a guild member list for the member cache if possible --- youmubot-prelude/src/member_cache.rs | 95 ++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/youmubot-prelude/src/member_cache.rs b/youmubot-prelude/src/member_cache.rs index e46a439..467a0ef 100644 --- a/youmubot-prelude/src/member_cache.rs +++ b/youmubot-prelude/src/member_cache.rs @@ -5,13 +5,40 @@ use serenity::model::{ id::{GuildId, UserId}, }; use serenity::{http::CacheHttp, prelude::*}; +use std::collections::HashMap as Map; use std::sync::Arc; +use crate::OkPrint; + const VALID_CACHE_SECONDS: i64 = 15 * 60; // 15 minutes /// MemberCache resolves `does User belong to Guild` requests, and store them in a cache. #[derive(Debug, Default)] -pub struct MemberCache(DashMap<(UserId, GuildId), (Option, DateTime)>); +pub struct MemberCache { + per_user: DashMap<(UserId, GuildId), Expiring>>, + per_guild: DashMap>>, + guild_counts: DashMap>, +} + +#[derive(Debug)] +struct Expiring { + pub value: T, + pub timeout: DateTime, +} + +impl Expiring { + fn new(value: T, timeout: DateTime) -> Self { + Self { value, timeout } + } +} + +impl std::ops::Deref for Expiring { + type Target = T; + + fn deref(&self) -> &Self::Target { + &self.value + } +} impl TypeMapKey for MemberCache { type Value = Arc; @@ -23,19 +50,75 @@ impl MemberCache { cache_http: impl CacheHttp, user_id: UserId, guild_id: GuildId, + ) -> Option { + let members_count = match self.guild_counts.get(&guild_id) { + Some(v) => v.clone(), + None => { + let res = guild_id + .to_partial_guild_with_counts(cache_http.http()) + .await + .ok() + .and_then(|v| v.approximate_member_count); + self.guild_counts.insert(guild_id, res); + res + } + }; + match members_count { + Some(g) if g <= 1000 => self.query_per_guild(cache_http, user_id, guild_id).await, + _ => self.query_per_user(cache_http, user_id, guild_id).await, + } + } + + async fn query_per_guild( + &self, + cache_http: impl CacheHttp, + user_id: UserId, + guild_id: GuildId, ) -> Option { let now = Utc::now(); // Check cache - if let Some(r) = self.0.get(&(user_id, guild_id)) { - if r.1 > now { - return r.0.clone(); + if let Some(r) = self.per_guild.get(&guild_id) { + if r.timeout > now { + return r.get(&user_id).cloned(); + } + } + // query + let members = guild_id + .members(cache_http.http(), None, None) + .await + .pls_ok()? + .into_iter() + .map(|m| (m.user.id, m)) + .collect::>(); + let result = members.get(&user_id).cloned(); + self.per_guild.insert( + guild_id, + Expiring::new( + members, + now + chrono::Duration::seconds(VALID_CACHE_SECONDS), + ), + ); + result + } + + async fn query_per_user( + &self, + cache_http: impl CacheHttp, + user_id: UserId, + guild_id: GuildId, + ) -> Option { + let now = Utc::now(); + // Check cache + if let Some(r) = self.per_user.get(&(user_id, guild_id)) { + if r.timeout > now { + return r.clone(); } } // Query let t = guild_id.member(&cache_http, user_id).await.ok(); - self.0.insert( + self.per_user.insert( (user_id, guild_id), - ( + Expiring::new( t.clone(), now + chrono::Duration::seconds(VALID_CACHE_SECONDS), ),