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

Add caching for members, rewrite part of perms.

Browse Source
This commit is contained in:
Paul Makles
2020-08-10 18:53:24 +02:00
parent aba0db268a
commit 8956400e44
6 changed files with 155 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/channel.rs
View File

@@ -179,8 +179,8 @@ pub fn process_event(event: &Notification) {
owner: None,
guild: Some(ev.id.clone()),
name: Some(ev.name.clone()),
description: Some(ev.description.clone())
}
description: Some(ev.description.clone()),
},
);
}
Notification::guild_channel_delete(ev) => {

118
src/database/guild.rs
View File

@@ -48,9 +48,14 @@ pub struct Guild {
pub default_permissions: u32,
}
#[derive(Hash, Eq, PartialEq)]
pub struct MemberKey(pub String, pub String);
lazy_static! {
static ref CACHE: Arc<Mutex<LruCache<String, Guild>>> =
Arc::new(Mutex::new(LruCache::new(4_000_000)));
static ref MEMBER_CACHE: Arc<Mutex<LruCache<MemberKey, Member>>> =
Arc::new(Mutex::new(LruCache::new(4_000_000)));
}
pub fn fetch_guild(id: &str) -> Result<Option<Guild>, String> {
@@ -85,6 +90,44 @@ pub fn fetch_guild(id: &str) -> Result<Option<Guild>, String> {
}
}
pub fn fetch_member(key: MemberKey) -> Result<Option<Member>, String> {
{
if let Ok(mut cache) = MEMBER_CACHE.lock() {
let existing = cache.get(&key);
if let Some(member) = existing {
return Ok(Some((*member).clone()));
}
} else {
return Err("Failed to lock cache.".to_string());
}
}
let col = get_collection("members");
if let Ok(result) = col.find_one(
doc! {
"_id.guild": &key.0,
"_id.user": &key.1,
},
None,
) {
if let Some(doc) = result {
if let Ok(member) = from_bson(Bson::Document(doc)) as Result<Member, _> {
let mut cache = MEMBER_CACHE.lock().unwrap();
cache.put(key, member.clone());
Ok(Some(member))
} else {
Err("Failed to deserialize member!".to_string())
}
} else {
Ok(None)
}
} else {
Err("Failed to fetch member from database.".to_string())
}
}
impl<'r> FromParam<'r> for Guild {
type Error = &'r RawStr;
@@ -101,24 +144,6 @@ impl<'r> FromParam<'r> for Guild {
}
}
pub fn get_member(guild_id: &String, member: &String) -> Option<Member> {
if let Ok(result) = get_collection("members").find_one(
doc! {
"_id.guild": &guild_id,
"_id.user": &member,
},
None,
) {
if let Some(doc) = result {
Some(from_bson(Bson::Document(doc)).expect("Failed to unwrap member."))
} else {
None
}
} else {
None
}
}
pub fn get_invite<U: Into<Option<String>>>(
code: &String,
user: U,
@@ -176,3 +201,60 @@ pub fn get_invite<U: Into<Option<String>>>(
None
}
}
use crate::notifications::events::Notification;
pub fn process_event(event: &Notification) {
match event {
Notification::guild_channel_create(ev) => {} // ? for later use
Notification::guild_channel_create(ev) => {} // ? for later use
Notification::guild_delete(ev) => {}
Notification::guild_user_join(ev) => {}
Notification::guild_user_leave(ev) => {}
/*Notification::group_user_join(ev) => {
let mut cache = CACHE.lock().unwrap();
let entry = cache.pop(&ev.id);
if entry.is_some() {
let mut channel = entry.unwrap();
channel.recipients.as_mut().unwrap().push(ev.user.clone());
cache.put(ev.id.clone(), channel);
}
}
Notification::group_user_leave(ev) => {
let mut cache = CACHE.lock().unwrap();
let entry = cache.pop(&ev.id);
if entry.is_some() {
let mut channel = entry.unwrap();
let recipients = channel.recipients.as_mut().unwrap();
if let Some(pos) = recipients.iter().position(|x| *x == ev.user) {
recipients.remove(pos);
}
cache.put(ev.id.clone(), channel);
}
}
Notification::guild_channel_create(ev) => {
let mut cache = CACHE.lock().unwrap();
cache.put(
ev.id.clone(),
Channel {
id: ev.channel.clone(),
channel_type: 2,
active: None,
last_message: None,
recipients: None,
owner: None,
guild: Some(ev.id.clone()),
name: Some(ev.name.clone()),
description: Some(ev.description.clone())
}
);
}
Notification::guild_channel_delete(ev) => {
let mut cache = CACHE.lock().unwrap();
cache.pop(&ev.channel);
}*/
_ => {}
}
}

46
src/database/permissions.rs
View File

@@ -1,6 +1,6 @@
use super::mutual::has_mutual_connection;
use crate::database::channel::Channel;
use crate::database::guild::{fetch_guild, get_member, Guild, Member};
use crate::database::guild::{fetch_guild, fetch_member, Guild, Member, MemberKey};
use crate::database::user::UserRelationship;
use crate::guards::auth::UserRef;
@@ -140,7 +140,9 @@ impl PermissionCalculator {
};
if let Some(guild) = &guild {
self.member = get_member(&guild.id, &self.user.id);
if let Ok(result) = fetch_member(MemberKey(guild.id.clone(), self.user.id.clone())) {
self.member = result;
}
}
self.guild = guild;
@@ -164,32 +166,32 @@ impl PermissionCalculator {
match channel.channel_type {
0 => {
if let Some(arr) = &channel.recipients {
let mut other_user = "";
let mut other_user = None;
for item in arr {
if item != &self.user.id {
other_user = item;
other_user = Some(item);
}
}
// ? In this case, it is a "self DM".
if other_user == "" {
return 1024 + 128 + 32 + 16 + 1;
}
let relationships = self.user.fetch_relationships();
let relationship =
get_relationship_internal(&self.user.id, &other_user, &relationships);
if relationship == Relationship::Friend {
permissions = 1024 + 128 + 32 + 16 + 1;
} else if relationship == Relationship::Blocked
|| relationship == Relationship::BlockedOther
{
permissions = 1;
} else if has_mutual_connection(&self.user.id, other_user, true) {
permissions = 1024 + 128 + 32 + 16 + 1;
if let Some(other) = other_user {
let relationships = self.user.fetch_relationships();
let relationship =
get_relationship_internal(&self.user.id, &other, &relationships);
if relationship == Relationship::Friend {
permissions = 1024 + 128 + 32 + 16 + 1;
} else if relationship == Relationship::Blocked
|| relationship == Relationship::BlockedOther
{
permissions = 1;
} else if has_mutual_connection(&self.user.id, other, true) {
permissions = 1024 + 128 + 32 + 16 + 1;
} else {
permissions = 1;
}
} else {
permissions = 1;
// ? In this case, it is a "self DM".
return 1024 + 128 + 32 + 16 + 1;
}
}
}