Skip to content
Snippets Groups Projects
Commit accd6d77 authored by insert's avatar insert
Browse files

Add edit message route.

parent ba08746e
Branches
No related merge requests found
...@@ -58,4 +58,24 @@ impl Message { ...@@ -58,4 +58,24 @@ impl Message {
Ok(()) Ok(())
} }
pub async fn publish_edit(self) -> Result<()> {
let channel = self.channel.clone();
ClientboundNotification::MessageEdit(self)
.publish(channel)
.await
.ok();
Ok(())
}
pub async fn publish_delete(self) -> Result<()> {
let channel = self.channel.clone();
ClientboundNotification::MessageDelete(self.id)
.publish(channel)
.await
.ok();
Ok(())
}
} }
use crate::database::*; use crate::database::*;
use crate::util::result::{Error, Result}; use crate::util::result::{Error, Result};
use mongodb::bson::{doc, from_bson, from_document, Bson}; use mongodb::bson::{doc, from_document};
use rocket::http::RawStr; use rocket::http::RawStr;
use rocket::request::FromParam; use rocket::request::FromParam;
use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde::{de::DeserializeOwned, Deserialize, Serialize};
......
use crate::database::*; use crate::database::*;
use mongodb::bson::{doc, from_bson, from_document, Bson}; use mongodb::bson::{doc, from_document};
use rauth::auth::Session; use rauth::auth::Session;
use rocket::http::Status; use rocket::http::Status;
use rocket::request::{self, FromRequest, Outcome, Request}; use rocket::request::{self, FromRequest, Outcome, Request};
......
...@@ -2,7 +2,7 @@ use super::super::{get_collection, get_db}; ...@@ -2,7 +2,7 @@ use super::super::{get_collection, get_db};
use crate::rocket::futures::StreamExt; use crate::rocket::futures::StreamExt;
use log::info; use log::info;
use mongodb::bson::{doc, from_bson, from_document, Bson}; use mongodb::bson::{doc, from_document};
use mongodb::options::FindOptions; use mongodb::options::FindOptions;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
......
...@@ -37,6 +37,8 @@ pub enum ClientboundNotification { ...@@ -37,6 +37,8 @@ pub enum ClientboundNotification {
}, },
Message(Message), Message(Message),
MessageEdit(Message),
MessageDelete(String),
/*MessageCreate { /*MessageCreate {
id: String, id: String,
......
...@@ -5,7 +5,7 @@ use crate::{ ...@@ -5,7 +5,7 @@ use crate::{
}; };
use futures::StreamExt; use futures::StreamExt;
use mongodb::{ use mongodb::{
bson::{doc, from_bson, from_document, Bson}, bson::{doc, from_document},
options::FindOptions, options::FindOptions,
}; };
......
use crate::database::*;
use crate::util::result::{Error, Result};
use chrono::Utc;
use mongodb::bson::{Bson, DateTime, doc};
use rocket_contrib::json::Json;
use serde::{Deserialize, Serialize};
use validator::Validate;
#[derive(Validate, Serialize, Deserialize)]
pub struct Data {
#[validate(length(min = 1, max = 2000))]
content: String,
}
#[patch("/<target>/messages/<msg>", data = "<edit>")]
pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<()> {
edit.validate()
.map_err(|error| Error::FailedValidation { error })?;
let channel = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &channel).await;
if !perm.get_view() {
Err(Error::LabelMe)?
}
let mut message = msg.fetch_message().await?;
if message.author != user.id {
Err(Error::CannotEditMessage)?
}
let edited = Utc::now();
get_collection("messages")
.update_one(
doc! {
"_id": &message.id
},
doc! {
"$set": {
"content": &edit.content,
"edited": Bson::DateTime(edited)
}
},
None,
)
.await
.map_err(|_| Error::DatabaseError {
operation: "update_one",
with: "message",
})?;
message.content = edit.content.clone();
message.edited = Some(DateTime(edited));
message.publish_edit().await?;
Ok(())
}
...@@ -2,6 +2,7 @@ use rocket::Route; ...@@ -2,6 +2,7 @@ use rocket::Route;
mod delete_channel; mod delete_channel;
mod fetch_channel; mod fetch_channel;
mod message_edit;
mod message_fetch; mod message_fetch;
mod message_query; mod message_query;
mod message_send; mod message_send;
...@@ -12,6 +13,7 @@ pub fn routes() -> Vec<Route> { ...@@ -12,6 +13,7 @@ pub fn routes() -> Vec<Route> {
delete_channel::req, delete_channel::req,
message_send::req, message_send::req,
message_query::req, message_query::req,
message_fetch::req message_fetch::req,
message_edit::req
] ]
} }
...@@ -34,6 +34,8 @@ pub enum Error { ...@@ -34,6 +34,8 @@ pub enum Error {
// ? Channel related errors. // ? Channel related errors.
#[snafu(display("Already sent a message with this nonce."))] #[snafu(display("Already sent a message with this nonce."))]
AlreadySentMessage, AlreadySentMessage,
#[snafu(display("Cannot edit someone else's message."))]
CannotEditMessage,
// ? General errors. // ? General errors.
#[snafu(display("Failed to validate fields."))] #[snafu(display("Failed to validate fields."))]
...@@ -67,6 +69,7 @@ impl<'r> Responder<'r, 'static> for Error { ...@@ -67,6 +69,7 @@ impl<'r> Responder<'r, 'static> for Error {
Error::BlockedByOther => Status::Forbidden, Error::BlockedByOther => Status::Forbidden,
Error::AlreadySentMessage => Status::Conflict, Error::AlreadySentMessage => Status::Conflict,
Error::CannotEditMessage => Status::Forbidden,
Error::FailedValidation { .. } => Status::UnprocessableEntity, Error::FailedValidation { .. } => Status::UnprocessableEntity,
Error::DatabaseError { .. } => Status::InternalServerError, Error::DatabaseError { .. } => Status::InternalServerError,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment