jmug/stoatchat
1
0
Fork 1
mirror of https://github.com/stoatchat/stoatchat.git synced 2026-07-14 13:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include DM users in payload; fix permission query. + cargo fmt

Browse Source
This commit is contained in:
Paul Makles
2021-02-09 16:41:08 +00:00
parent 4c99d079e0
commit b0d07ec58f
6 changed files with 37 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/database/permissions/channel.rs
View File

@@ -25,46 +25,6 @@ bitfield! {
impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
impl_op_ex_commutative!(+ |a: &u32, b: &ChannelPermission| -> u32 { *a | *b as u32 });
/*pub async fn calculate(user: &User, target: &Channel) -> Result<u32> {
match target {
Channel::SavedMessages { user: owner, .. } => {
if &user.id == owner {
Ok(ChannelPermission::View
+ ChannelPermission::SendMessage
+ ChannelPermission::ManageMessages)
} else {
Ok(0)
}
}
Channel::DirectMessage { recipients, .. } => {
if recipients.iter().find(|x| *x == &user.id).is_some() {
if let Some(recipient) = recipients.iter().find(|x| *x != &user.id) {
let perms = super::user::get(&user, recipient).await?;
if perms.get_send_message() {
return Ok(ChannelPermission::View + ChannelPermission::SendMessage);
}
return Ok(ChannelPermission::View as u32);
}
}
Ok(0)
}
Channel::Group { recipients, .. } => {
if recipients.iter().find(|x| *x == &user.id).is_some() {
Ok(ChannelPermission::View + ChannelPermission::SendMessage)
} else {
Ok(0)
}
}
}
}
pub async fn get(user: &User, target: &Channel) -> Result<ChannelPermissions<[u32; 1]>> {
Ok(ChannelPermissions([calculate(&user, &target).await?]))
}*/
impl<'a> PermissionCalculator<'a> {
pub async fn calculate_channel(self) -> Result<u32> {
let channel = if let Some(channel) = self.channel {

8
src/database/permissions/user.rs
View File

@@ -72,10 +72,10 @@ impl<'a> PermissionCalculator<'a> {
{ "type": "Group" },
{ "type": "DirectMessage" },
],
"$and": {
"recipients": &self.perspective.id,
"recipients": target
}
"$and": [
{ "recipients": &self.perspective.id },
{ "recipients": target }
]
},
None,
)