fix: channel edit endpoint would fail due to expecting user
This commit is contained in:
@@ -1,7 +1,5 @@
|
|||||||
use rocket::serde::json::Json;
|
use rocket::serde::json::Json;
|
||||||
use crate::routes::admin::util::{
|
use crate::routes::admin::util::{create_audit_action, flatten_authorized_user, user_has_permission};
|
||||||
create_audit_action, flatten_authorized_user, user_has_permission,
|
|
||||||
};
|
|
||||||
use revolt_database::{util::reference::Reference, AdminAuthorization, Channel, Database, File, PartialChannel, SystemMessage, User, AMQP};
|
use revolt_database::{util::reference::Reference, AdminAuthorization, Channel, Database, File, PartialChannel, SystemMessage, User, AMQP};
|
||||||
use revolt_models::v0;
|
use revolt_models::v0;
|
||||||
use revolt_result::{create_error, Result};
|
use revolt_result::{create_error, Result};
|
||||||
@@ -17,7 +15,6 @@ pub async fn admin_channel_edit(
|
|||||||
voice_client: &State<VoiceClient>,
|
voice_client: &State<VoiceClient>,
|
||||||
amqp: &State<AMQP>,
|
amqp: &State<AMQP>,
|
||||||
channel_id: Reference<'_>,
|
channel_id: Reference<'_>,
|
||||||
user: User,
|
|
||||||
data: Json<v0::DataEditChannel>,
|
data: Json<v0::DataEditChannel>,
|
||||||
case: Option<&str>
|
case: Option<&str>
|
||||||
) -> Result<Json<v0::Channel>> {
|
) -> Result<Json<v0::Channel>> {
|
||||||
@@ -35,6 +32,8 @@ pub async fn admin_channel_edit(
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let user = db.fetch_user(&admin.platform_user_id).await?;
|
||||||
|
|
||||||
let mut channel = channel_id.as_channel(db).await?;
|
let mut channel = channel_id.as_channel(db).await?;
|
||||||
|
|
||||||
if data.name.is_none()
|
if data.name.is_none()
|
||||||
@@ -270,7 +269,7 @@ pub async fn admin_channel_edit(
|
|||||||
|
|
||||||
create_audit_action(
|
create_audit_action(
|
||||||
&db,
|
&db,
|
||||||
&user.id,
|
&admin.id,
|
||||||
v0::AdminAuditItemActions::EditChannel,
|
v0::AdminAuditItemActions::EditChannel,
|
||||||
case,
|
case,
|
||||||
Some(channel_id.id),
|
Some(channel_id.id),
|
||||||
|
|||||||
Reference in New Issue
Block a user