Add message delete route.
This commit is contained in:
@@ -71,7 +71,7 @@ impl Message {
|
|||||||
|
|
||||||
pub async fn publish_delete(self) -> Result<()> {
|
pub async fn publish_delete(self) -> Result<()> {
|
||||||
let channel = self.channel.clone();
|
let channel = self.channel.clone();
|
||||||
ClientboundNotification::MessageDelete(self.id)
|
ClientboundNotification::MessageDelete { id: self.id }
|
||||||
.publish(channel)
|
.publish(channel)
|
||||||
.await
|
.await
|
||||||
.ok();
|
.ok();
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use std::ops;
|
|||||||
pub enum ChannelPermission {
|
pub enum ChannelPermission {
|
||||||
View = 1,
|
View = 1,
|
||||||
SendMessage = 2,
|
SendMessage = 2,
|
||||||
|
ManageMessages = 4,
|
||||||
}
|
}
|
||||||
|
|
||||||
bitfield! {
|
bitfield! {
|
||||||
@@ -14,6 +15,7 @@ bitfield! {
|
|||||||
u32;
|
u32;
|
||||||
pub get_view, _: 31;
|
pub get_view, _: 31;
|
||||||
pub get_send_message, _: 30;
|
pub get_send_message, _: 30;
|
||||||
|
pub get_manage_messages, _: 29;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
|
impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
|
||||||
@@ -23,7 +25,9 @@ pub async fn calculate(user: &User, target: &Channel) -> ChannelPermissions<[u32
|
|||||||
match target {
|
match target {
|
||||||
Channel::SavedMessages { user: owner, .. } => {
|
Channel::SavedMessages { user: owner, .. } => {
|
||||||
if &user.id == owner {
|
if &user.id == owner {
|
||||||
ChannelPermissions([ChannelPermission::View + ChannelPermission::SendMessage])
|
ChannelPermissions([ChannelPermission::View
|
||||||
|
+ ChannelPermission::SendMessage
|
||||||
|
+ ChannelPermission::ManageMessages])
|
||||||
} else {
|
} else {
|
||||||
ChannelPermissions([0])
|
ChannelPermissions([0])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,9 @@ pub enum ClientboundNotification {
|
|||||||
|
|
||||||
Message(Message),
|
Message(Message),
|
||||||
MessageEdit(Message),
|
MessageEdit(Message),
|
||||||
MessageDelete(String),
|
MessageDelete {
|
||||||
|
id: String,
|
||||||
|
},
|
||||||
|
|
||||||
/*MessageCreate {
|
/*MessageCreate {
|
||||||
id: String,
|
id: String,
|
||||||
|
|||||||
39
src/routes/channels/message_delete.rs
Normal file
39
src/routes/channels/message_delete.rs
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
use crate::database::*;
|
||||||
|
use crate::util::result::{Error, Result};
|
||||||
|
|
||||||
|
use mongodb::bson::doc;
|
||||||
|
|
||||||
|
#[delete("/<target>/messages/<msg>")]
|
||||||
|
pub async fn req(user: User, target: Ref, msg: Ref) -> Result<()> {
|
||||||
|
let channel = target.fetch_channel().await?;
|
||||||
|
|
||||||
|
let perm = permissions::channel::calculate(&user, &channel).await;
|
||||||
|
if !perm.get_view() {
|
||||||
|
Err(Error::LabelMe)?
|
||||||
|
}
|
||||||
|
|
||||||
|
let message = msg.fetch_message().await?;
|
||||||
|
if message.author != user.id && !perm.get_manage_messages() {
|
||||||
|
match channel {
|
||||||
|
Channel::SavedMessages { .. } => unreachable!(),
|
||||||
|
_ => Err(Error::CannotEditMessage)?,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get_collection("messages")
|
||||||
|
.delete_one(
|
||||||
|
doc! {
|
||||||
|
"_id": &message.id
|
||||||
|
},
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.map_err(|_| Error::DatabaseError {
|
||||||
|
operation: "delete_one",
|
||||||
|
with: "message",
|
||||||
|
})?;
|
||||||
|
|
||||||
|
message.publish_delete().await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -2,7 +2,7 @@ use crate::database::*;
|
|||||||
use crate::util::result::{Error, Result};
|
use crate::util::result::{Error, Result};
|
||||||
|
|
||||||
use chrono::Utc;
|
use chrono::Utc;
|
||||||
use mongodb::bson::{Bson, DateTime, doc};
|
use mongodb::bson::{doc, Bson, DateTime};
|
||||||
use rocket_contrib::json::Json;
|
use rocket_contrib::json::Json;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use validator::Validate;
|
use validator::Validate;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ use rocket::Route;
|
|||||||
|
|
||||||
mod delete_channel;
|
mod delete_channel;
|
||||||
mod fetch_channel;
|
mod fetch_channel;
|
||||||
|
mod message_delete;
|
||||||
mod message_edit;
|
mod message_edit;
|
||||||
mod message_fetch;
|
mod message_fetch;
|
||||||
mod message_query;
|
mod message_query;
|
||||||
@@ -14,6 +15,7 @@ pub fn routes() -> Vec<Route> {
|
|||||||
message_send::req,
|
message_send::req,
|
||||||
message_query::req,
|
message_query::req,
|
||||||
message_fetch::req,
|
message_fetch::req,
|
||||||
message_edit::req
|
message_edit::req,
|
||||||
|
message_delete::req
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user