jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix: add additional checks to group members

Browse Source
This commit is contained in:
Paul Makles
2023-03-18 22:32:15 +00:00
parent 59832e6ba2
commit b7b70346b4
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -2792,7 +2792,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-bonfire" name = "revolt-bonfire"
version = "0.5.16" version = "0.5.17"
dependencies = [ dependencies = [
"async-std", "async-std",
"async-tungstenite", "async-tungstenite",
@@ -2808,7 +2808,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-delta" name = "revolt-delta"
version = "0.5.16" version = "0.5.17"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-std", "async-std",
@@ -2847,7 +2847,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-quark" name = "revolt-quark"
version = "0.5.16" version = "0.5.17"
dependencies = [ dependencies = [
"async-lock", "async-lock",
"async-recursion", "async-recursion",

2
crates/bonfire/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-bonfire" name = "revolt-bonfire"
version = "0.5.16" version = "0.5.17"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
edition = "2021" edition = "2021"

2
crates/delta/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-delta" name = "revolt-delta"
version = "0.5.16" version = "0.5.17"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
authors = ["Paul Makles <paulmakles@gmail.com>"] authors = ["Paul Makles <paulmakles@gmail.com>"]
edition = "2018" edition = "2018"

10
crates/delta/src/routes/channels/group_add_member.rs
View File

@@ -1,5 +1,6 @@
use revolt_quark::{ use revolt_quark::{
models::{Channel, User}, get_relationship,
models::{user::RelationshipStatus, Channel, User},
perms, Db, EmptyResponse, Error, Permission, Ref, Result, perms, Db, EmptyResponse, Error, Permission, Ref, Result,
}; };
@@ -22,6 +23,13 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
match &channel { match &channel {
Channel::Group { .. } => { Channel::Group { .. } => {
let member = member.as_user(db).await?; let member = member.as_user(db).await?;
if !matches!(
get_relationship(&user, &member.id),
RelationshipStatus::Friend
) {
return Err(Error::NotFriends);
}
channel channel
.add_user_to_group(db, &member.id, &user.id) .add_user_to_group(db, &member.id, &user.id)
.await .await

2
crates/quark/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-quark" name = "revolt-quark"
version = "0.5.16" version = "0.5.17"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
edition = "2021" edition = "2021"