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

fix: switch to new permissions enum

Browse Source
This commit is contained in:
Paul Makles
2022-02-22 20:34:23 +00:00
parent aab85fa143
commit 7befd77c5b
37 changed files with 128 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/channels/channel_ack.rs
View File

@@ -5,9 +5,9 @@ pub async fn req(db: &Db, user: User, target: Ref, message: Ref) -> Result<Empty
let channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_view()
.can_view_channel()
{
return Err(Error::NotFound);
}

12
src/routes/channels/channel_delete.rs
View File

@@ -1,14 +1,14 @@
use revolt_quark::{
models::{channel::PartialChannel, Channel, User},
perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result,
perms, Db, EmptyResponse, Error, Permission, Ref, Result,
};
#[delete("/<target>")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
let perm = perms(&user).channel(&channel).calc_channel(db).await;
let perm = perms(&user).channel(&channel).calc(db).await;
if !perm.get_view() {
if !perm.can_view_channel() {
return Err(Error::NotFound);
}
@@ -30,12 +30,10 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
.await
.map(|_| EmptyResponse),
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
if perm.get_manage_channel() {
if perm.can_manage_channel() {
channel.delete(db).await.map(|_| EmptyResponse)
} else {
Err(Error::MissingPermission {
permission: ChannelPermission::ManageChannel as i32,
})
Error::from_permission(Permission::ManageChannel)
}
}
}

10
src/routes/channels/channel_edit.rs
View File

@@ -3,7 +3,7 @@ use revolt_quark::{
channel::{Channel, FieldsChannel, PartialChannel},
File, User,
},
perms, ChannelPermission, Database, Error, Ref, Result,
perms, Database, Error, Permission, Ref, Result,
};
use rocket::{serde::json::Json, State};
@@ -40,13 +40,11 @@ pub async fn req(
let mut channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_manage_channel()
.can_manage_channel()
{
return Err(Error::MissingPermission {
permission: ChannelPermission::ManageChannel as i32,
});
return Error::from_permission(Permission::ManageChannel);
}
if data.name.is_none()

10
src/routes/channels/channel_fetch.rs
View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Channel, User},
perms, ChannelPermission, Database, Error, Ref, Result,
perms, Database, Error, Permission, Ref, Result,
};
use rocket::{serde::json::Json, State};
@@ -11,14 +11,12 @@ pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<C
if perms(&user)
.channel(&target)
.calc_channel(db)
.calc(db)
.await
.get_view()
.can_view_channel()
{
Ok(Json(target))
} else {
Err(Error::MissingPermission {
permission: ChannelPermission::View as i32,
})
Error::from_permission(Permission::ViewChannel)
}
}

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

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Channel, User},
perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result,
perms, Db, EmptyResponse, Error, Permission, Ref, Result,
};
#[put("/<target>/recipients/<member>")]
@@ -8,13 +8,11 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
let channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_invite_others()
.can_invite_others()
{
return Err(Error::MissingPermission {
permission: ChannelPermission::InviteOthers as i32,
});
return Error::from_permission(Permission::InviteOthers);
}
match &channel {

4
src/routes/channels/group_remove_member.rs
View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Channel, User},
Db, EmptyResponse, Error, Ref, Result,
Db, EmptyResponse, Error, Permission, Ref, Result,
};
#[delete("/<target>/recipients/<member>")]
@@ -12,7 +12,7 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
owner, recipients, ..
} => {
if &user.id != owner {
return Err(Error::MissingPermission { permission: 0 });
return Error::from_permission(Permission::ManageChannel);
}
let member = member.as_user(db).await?;

10
src/routes/channels/invite_create.rs
View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Invite, User},
perms, ChannelPermission, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -11,13 +11,11 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Invite>> {
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_invite_others()
.can_invite_others()
{
return Err(Error::MissingPermission {
permission: ChannelPermission::InviteOthers as i32,
});
return Error::from_permission(Permission::InviteOthers);
}
Invite::create(db, &user, &channel).await.map(Json)

4
src/routes/channels/members_fetch.rs
View File

@@ -10,9 +10,9 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<User>>> {
let channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_view()
.can_view_channel()
{
return Err(Error::NotFound);
}

10
src/routes/channels/message_delete.rs
View File

@@ -1,4 +1,4 @@
use revolt_quark::{models::User, perms, ChannelPermission, Db, EmptyResponse, Error, Ref, Result};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
#[delete("/<target>/messages/<msg>")]
pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResponse> {
@@ -11,14 +11,12 @@ pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResp
|| !{
perms(&user)
.channel(&target.as_channel(db).await?)
.calc_channel(db)
.calc(db)
.await
.get_manage_messages()
.can_manage_messages()
}
{
return Err(Error::MissingPermission {
permission: ChannelPermission::ManageMessages as i32,
});
return Error::from_permission(Permission::ManageMessages);
}
message.delete(db).await.map(|_| EmptyResponse)

4
src/routes/channels/message_fetch.rs
View File

@@ -10,9 +10,9 @@ pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<Json<Mess
let channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_view()
.can_view_channel()
{
return Err(Error::NotFound);
}

4
src/routes/channels/message_query.rs
View File

@@ -44,9 +44,9 @@ pub async fn req(
let channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_view()
.can_view_channel()
{
return Err(Error::NotFound);
}

4
src/routes/channels/message_search.rs
View File

@@ -41,9 +41,9 @@ pub async fn req(
let channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_view()
.can_view_channel()
{
return Err(Error::NotFound);
}

22
src/routes/channels/message_send.rs
View File

@@ -5,7 +5,7 @@ use revolt_quark::{
message::{Content, Masquerade, Reply, SendableEmbed},
Message, User,
},
perms, ChannelPermission, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use regex::Regex;
@@ -51,12 +51,10 @@ pub async fn message_send(
idempotency.consume_nonce(data.nonce).await?;
let channel = target.as_channel(db).await?;
let permissions = perms(&user).channel(&channel).calc_channel(db).await;
let permissions = perms(&user).channel(&channel).calc(db).await;
if !permissions.get_send_message() {
return Err(Error::MissingPermission {
permission: ChannelPermission::SendMessage as i32,
});
if !permissions.can_send_message() {
return Error::from_permission(Permission::SendMessage);
}
if data.content.is_empty()
@@ -82,10 +80,8 @@ pub async fn message_send(
}
// 2. Verify permissions for masquerade.
if data.masquerade.is_some() && !permissions.get_masquerade() {
return Err(Error::MissingPermission {
permission: ChannelPermission::Masquerade as i32,
});
if data.masquerade.is_some() && !permissions.can_masquerade() {
return Error::from_permission(Permission::Masquerade);
}
// 3. Verify replies are valid.
@@ -121,10 +117,8 @@ pub async fn message_send(
// 4. Add attachments to message.
let mut attachments = vec![];
if let Some(ids) = &data.attachments {
if !ids.is_empty() && !permissions.get_upload_files() {
return Err(Error::MissingPermission {
permission: ChannelPermission::UploadFiles as i32,
});
if !ids.is_empty() && !permissions.can_upload_files() {
return Error::from_permission(Permission::UploadFiles);
}
// ! FIXME: move this to app config

12
src/routes/channels/permissions_set.rs
View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{Channel, User},
perms, ChannelPermission, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -22,15 +22,15 @@ pub async fn req(
let mut channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_manage_channel()
.can_manage_permissions()
{
return Err(Error::MissingPermission {
permission: ChannelPermission::ManageChannel as i32,
});
return Error::from_permission(Permission::ManageChannel);
}
// ! FIXME_PERMISSIONS
channel
.set_role_permission(db, &role, data.permissions)
.await?;

12
src/routes/channels/permissions_set_default.rs
View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{channel::PartialChannel, Channel, User},
perms, ChannelPermission, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -16,13 +16,11 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
let mut channel = target.as_channel(db).await?;
if !perms(&user)
.channel(&channel)
.calc_channel(db)
.calc(db)
.await
.get_manage_channel()
.can_manage_permissions()
{
return Err(Error::MissingPermission {
permission: ChannelPermission::ManageChannel as i32,
});
return Error::from_permission(Permission::ManagePermissions);
}
match &channel {
@@ -39,6 +37,8 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
.await?;
}
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
// ! FIXME_PERMISSIONS
channel
.update(
db,