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

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;
}
}
}