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

12
src/routes/servers/ban_create.rs
View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{ServerBan, User},
perms, Db, Error, Ref, Result, ServerPermission,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -28,17 +28,15 @@ pub async fn req(
let server = server.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_ban_members()
.can_ban_members()
{
return Err(Error::MissingPermission {
permission: ServerPermission::BanMembers as i32,
});
return Error::from_permission(Permission::BanMembers);
}
let member = target.as_member(db, &server.id).await?;
// ! FIXME: calculate permission against member
// ! FIXME_PERMISSIONS
let ban = ServerBan {
id: member.id,

10
src/routes/servers/ban_list.rs
View File

@@ -1,5 +1,5 @@
use revolt_quark::models::{File, ServerBan, User};
use revolt_quark::{perms, Db, Error, Ref, Result, ServerPermission};
use revolt_quark::{perms, Db, Error, Permission, Ref, Result};
use rocket::serde::json::Json;
use serde::{Deserialize, Serialize};
@@ -16,13 +16,11 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<ServerBan>
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_ban_members()
.can_ban_members()
{
return Err(Error::MissingPermission {
permission: ServerPermission::BanMembers as i32,
});
return Error::from_permission(Permission::BanMembers);
}
db.fetch_bans(&server.id).await.map(Json)

10
src/routes/servers/ban_remove.rs
View File

@@ -1,17 +1,15 @@
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Ref, Result, ServerPermission};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
#[delete("/<server>/bans/<target>")]
pub async fn req(db: &Db, user: User, server: Ref, target: Ref) -> Result<EmptyResponse> {
let server = server.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_ban_members()
.can_ban_members()
{
return Err(Error::MissingPermission {
permission: ServerPermission::BanMembers as i32,
});
return Error::from_permission(Permission::BanMembers);
}
let ban = target.as_ban(db, &server.id).await?;

10
src/routes/servers/channel_create.rs
View File

@@ -2,7 +2,7 @@ use std::collections::HashMap;
use revolt_quark::{
models::{server::PartialServer, Channel, User},
perms, Db, Error, Ref, Result, ServerPermission,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -43,13 +43,11 @@ pub async fn req(db: &Db, user: User, target: Ref, info: Json<Data>) -> Result<J
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_manage_channels()
.can_manage_channel()
{
return Err(Error::MissingPermission {
permission: ServerPermission::ManageChannels as i32,
});
return Error::from_permission(Permission::ManageChannel);
}
let id = Ulid::new().to_string();

10
src/routes/servers/invites_fetch.rs
View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Invite, User},
perms, Db, Error, Ref, Result, ServerPermission,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -19,13 +19,11 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<Invite>>>
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_manage_server()
.can_manage_server()
{
return Err(Error::MissingPermission {
permission: ServerPermission::ManageServer as i32,
});
return Error::from_permission(Permission::ManageServer);
}
db.fetch_invites_for_server(&server.id).await.map(Json)

4
src/routes/servers/member_edit.rs
View File

@@ -33,8 +33,8 @@ pub async fn req(
.map_err(|error| Error::FailedValidation { error })?;
let server = server.as_server(db).await?;
let permissions = perms(&user).server(&server).calc_server(db).await;
if !permissions.get_view() {
let permissions = perms(&user).server(&server).calc(db).await;
if !permissions.can_view_channel() {
return Err(Error::NotFound);
}

4
src/routes/servers/member_fetch.rs
View File

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

4
src/routes/servers/member_fetch_all.rs
View File

@@ -7,9 +7,9 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<Value> {
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_view()
.can_view_channel()
{
return Err(Error::NotFound);
}

12
src/routes/servers/member_remove.rs
View File

@@ -1,21 +1,19 @@
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Ref, Result, ServerPermission};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
#[delete("/<target>/members/<member>")]
pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_kick_members()
.can_kick_members()
{
return Err(Error::MissingPermission {
permission: ServerPermission::KickMembers as i32,
});
return Error::from_permission(Permission::KickMembers);
}
let member = member.as_member(db, &server.id).await?;
// ! FIXME: calculate permission against member
// ! FIXME_PERMISSIONS
member.delete(db).await.map(|_| EmptyResponse)
}

4
src/routes/servers/permissions_set.rs
View File

@@ -28,9 +28,9 @@ pub async fn req(
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_manage_roles()
.can_manage_permissions()
{
return Err(Error::NotFound);
}

4
src/routes/servers/permissions_set_default.rs
View File

@@ -24,9 +24,9 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_manage_roles()
.can_manage_permissions()
{
return Err(Error::NotFound);
}

11
src/routes/servers/roles_create.rs
View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{server::Role, User},
perms, Db, Error, Ref, Result, DEFAULT_PERMISSION_CHANNEL_SERVER, DEFAULT_SERVER_PERMISSION,
perms, Db, Error, Ref, Result,
};
use rocket::serde::json::{Json, Value};
@@ -22,19 +22,16 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<V
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_manage_roles()
.can_manage_roles()
{
return Err(Error::NotFound);
}
let role = Role {
name: data.name,
permissions: (
*DEFAULT_SERVER_PERMISSION as i32,
*DEFAULT_PERMISSION_CHANNEL_SERVER as i32,
),
permissions: (0_i32, 0_i32),
..Default::default()
};

6
src/routes/servers/roles_delete.rs
View File

@@ -5,14 +5,14 @@ pub async fn req(db: &Db, user: User, target: Ref, role_id: String) -> Result<Em
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_manage_roles()
.can_manage_roles()
{
return Err(Error::NotFound);
}
// ! FIXME: check perms against role
// ! FIXME_PERMISSIONS
if let Some(role) = server.roles.remove(&role_id) {
role.delete(db, &server.id, &role_id)

4
src/routes/servers/roles_edit.rs
View File

@@ -37,9 +37,9 @@ pub async fn req(
let mut server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc_server(db)
.calc(db)
.await
.get_manage_roles()
.can_manage_roles()
{
return Err(Error::NotFound);
}

4
src/routes/servers/server_ack.rs
View File

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

7
src/routes/servers/server_create.rs
View File

@@ -2,7 +2,7 @@ use std::collections::HashMap;
use revolt_quark::{
models::{server_member::MemberCompositeKey, Channel, Member, Server, User},
Db, Error, Result, DEFAULT_PERMISSION_CHANNEL_SERVER, DEFAULT_SERVER_PERMISSION,
Db, Error, Result,
};
use rocket::serde::json::Json;
@@ -66,10 +66,7 @@ pub async fn req(db: &Db, user: User, info: Json<Data>) -> Result<Json<Server>>
description,
channels: vec![channel_id],
nsfw: nsfw.unwrap_or(false),
default_permissions: (
*DEFAULT_SERVER_PERMISSION as i32,
*DEFAULT_PERMISSION_CHANNEL_SERVER as i32,
),
default_permissions: (0_i32, 0_i32),
..Default::default()
};

18
src/routes/servers/server_edit.rs
View File

@@ -3,7 +3,7 @@ use revolt_quark::{
server::{Category, FieldsServer, PartialServer, SystemMessageChannels},
File, Server, User,
},
perms, Db, Error, Ref, Result, ServerPermission,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -38,8 +38,8 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
.map_err(|error| Error::FailedValidation { error })?;
let mut server = target.as_server(db).await?;
let permissions = perms(&user).server(&server).calc_server(db).await;
if !permissions.get_view() {
let permissions = perms(&user).server(&server).calc(db).await;
if !permissions.can_view_channel() {
return Err(Error::NotFound);
}
@@ -63,15 +63,11 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
|| data.nsfw.is_some()
|| data.analytics.is_some()
|| data.remove.is_some())
&& !permissions.get_manage_server()
&& !permissions.can_manage_server()
{
return Err(Error::MissingPermission {
permission: ServerPermission::ManageServer as i32,
});
} else if (data.categories.is_some()) && !permissions.get_manage_channels() {
return Err(Error::MissingPermission {
permission: ServerPermission::ManageChannels as i32,
});
return Error::from_permission(Permission::ManageServer);
} else if (data.categories.is_some()) && !permissions.can_manage_channel() {
return Error::from_permission(Permission::ManageChannel);
}
let Data {

4
src/routes/servers/server_fetch.rs
View File

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