HMC/handmade-revolt-backend
6
0
Fork 0
forked from jmug/stoatchat
Code Pull Requests Actions Packages Releases 2 Activity

refactor(core): use core crates for sending messages

Browse Source
This commit is contained in:
Paul Makles
2023-09-03 16:31:39 +01:00
parent 279d9ef1b5
commit 9929f7499a
7 changed files with 100 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/core/config/Revolt.toml
View File

@@ -52,6 +52,7 @@ message_length = 2000
message_embeds = 5
message_replies = 5
message_attachments = 5
message_reactions = 20
servers = 100
server_emoji = 100
server_roles = 200

1
crates/core/config/src/lib.rs
View File

@@ -101,6 +101,7 @@ pub struct FeaturesLimits {
pub message_replies: usize,
pub message_attachments: usize,
pub message_embeds: usize,
pub message_reactions: usize,
pub servers: usize,
pub server_emoji: usize,
pub server_roles: usize,

26
crates/core/database/src/models/messages/model.rs
View File

@@ -7,6 +7,7 @@ use revolt_models::v0::{
self, DataMessageSend, Embed, MessageAuthor, MessageSort, MessageWebhook, PushNotification,
ReplyIntent, SendableEmbed, RE_MENTION,
};
use revolt_permissions::{ChannelPermission, PermissionValue};
use revolt_result::Result;
use ulid::Ulid;
@@ -14,7 +15,7 @@ use crate::{
events::client::EventV1,
tasks::{self, ack::AckEvent},
util::idempotency::IdempotencyKey,
Channel, Database, File,
Channel, Database, Emoji, File,
};
auto_derived_partial!(
@@ -353,7 +354,9 @@ impl Message {
// Pass-through nonce value for clients
message.nonce = Some(idempotency.into_key());
// Send the message
message.send(db, author, &channel, generate_embeds).await?;
Ok(message)
}
@@ -528,6 +531,27 @@ impl SystemMessage {
}
impl Interactions {
/// Validate interactions info is correct
pub async fn validate(&self, db: &Database, permissions: &PermissionValue) -> Result<()> {
let config = config().await;
if let Some(reactions) = &self.reactions {
permissions.throw_if_lacking_channel_permission(ChannelPermission::React)?;
if reactions.len() > config.features.limits.default.message_reactions {
return Err(create_error!(InvalidOperation));
}
for reaction in reactions {
if !Emoji::can_use(db, reaction).await? {
return Err(create_error!(InvalidOperation));
}
}
}
Ok(())
}
/// Check if we can use a given emoji to react
pub fn can_use(&self, emoji: &str) -> bool {
if self.restrict_reactions {

26
crates/core/database/src/util/bridge/v0.rs
View File

@@ -626,18 +626,26 @@ impl From<crate::FieldsRole> for FieldsRole {
}
impl crate::User {
pub async fn into<P>(self, perspective: P) -> User
pub async fn into<'a, P>(self, perspective: P) -> User
where
P: Into<Option<crate::User>>,
P: Into<Option<&'a crate::User>>,
{
let relationship = if let Some(perspective) = perspective.into() {
perspective
.relations
.unwrap_or_default()
.into_iter()
.find(|relationship| relationship.id == self.id)
.map(|relationship| relationship.status.into())
.unwrap_or_default()
if perspective.id == self.id {
RelationshipStatus::User
} else {
perspective
.relations
.as_ref()
.map(|relations| {
relations
.iter()
.find(|relationship| relationship.id == self.id)
.map(|relationship| relationship.status.clone().into())
.unwrap_or_default()
})
.unwrap_or_default()
}
} else {
RelationshipStatus::None
};

9
crates/core/permissions/src/models/mod.rs
View File

@@ -39,20 +39,17 @@ impl PermissionValue {
}
/// Check whether certain a permission has been granted
pub fn has(&mut self, v: u64) -> bool {
pub fn has(&self, v: u64) -> bool {
(self.0 & v) == v
}
/// Check whether certain a channel permission has been granted
pub fn has_channel_permission(&mut self, permission: ChannelPermission) -> bool {
pub fn has_channel_permission(&self, permission: ChannelPermission) -> bool {
self.has(permission as u64)
}
/// Throw if missing channel permission
pub fn throw_if_lacking_channel_permission(
&mut self,
permission: ChannelPermission,
) -> Result<()> {
pub fn throw_if_lacking_channel_permission(&self, permission: ChannelPermission) -> Result<()> {
if self.has_channel_permission(permission) {
Ok(())
} else {

74
crates/delta/src/routes/channels/message_send.rs
View File

@@ -1,12 +1,13 @@
use revolt_database::util::idempotency::IdempotencyKey;
use revolt_quark::{
models::{message::DataMessageSend, Message, User},
perms,
types::push::MessageAuthor,
Db, Error, Permission, Ref, Result,
use revolt_database::util::permissions::DatabasePermissionQuery;
use revolt_database::{
util::idempotency::IdempotencyKey, util::reference::Reference, Database, User,
};
use revolt_database::{Interactions, Message};
use revolt_models::v0;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result};
use rocket::serde::json::Json;
use rocket::State;
use validator::Validate;
/// # Send Message
@@ -15,68 +16,63 @@ use validator::Validate;
#[openapi(tag = "Messaging")]
#[post("/<target>/messages", data = "<data>")]
pub async fn message_send(
db: &Db,
db: &State<Database>,
user: User,
target: Ref,
data: Json<DataMessageSend>,
target: Reference,
data: Json<v0::DataMessageSend>,
idempotency: IdempotencyKey,
) -> Result<Json<Message>> {
) -> Result<Json<v0::Message>> {
let data = data.into_inner();
data.validate()
.map_err(|error| Error::FailedValidation { error })?;
data.validate().map_err(|error| {
create_error!(FailedValidation {
error: error.to_string()
})
})?;
// Ensure we have permissions to send a message
let channel = target.as_channel(db).await?;
let mut permissions = perms(&user).channel(&channel);
permissions
.throw_permission_and_view_channel(db, Permission::SendMessage)
.await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
let permissions = calculate_channel_permissions(&mut query).await;
permissions.throw_if_lacking_channel_permission(ChannelPermission::SendMessage)?;
// Verify permissions for masquerade
if let Some(masq) = &data.masquerade {
permissions
.throw_permission(db, Permission::Masquerade)
.await?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::Masquerade)?;
if masq.colour.is_some() {
permissions
.throw_permission(db, Permission::ManageRole)
.await?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::ManageRole)?;
}
}
// Check permissions for embeds
if data.embeds.as_ref().is_some_and(|v| !v.is_empty()) {
permissions
.throw_permission(db, Permission::SendEmbeds)
.await?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::SendEmbeds)?;
}
// Check permissions for files
if data.attachments.as_ref().is_some_and(|v| !v.is_empty()) {
permissions
.throw_permission(db, Permission::UploadFiles)
.await?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::UploadFiles)?;
}
// Ensure interactions information is correct
if let Some(interactions) = &data.interactions {
interactions.validate(db, &mut permissions).await?;
let interactions: Interactions = interactions.clone().into();
interactions.validate(db, &permissions).await?;
}
// Create the message
let message = channel
.send_message(
let author: v0::User = user.clone().into(Some(&user)).await;
Ok(Json(
Message::create_from_api(
db,
channel,
data,
MessageAuthor::User(&user),
v0::MessageAuthor::User(&author),
idempotency,
permissions
.has_permission(db, Permission::SendEmbeds)
.await?,
true,
)
.await?;
Ok(Json(message))
.await?
.into(),
))
}

34
crates/delta/src/routes/webhooks/webhook_execute.rs
View File

@@ -31,35 +31,37 @@ pub async fn webhook_execute(
let webhook = webhook_id.as_webhook(db).await?;
webhook.assert_token(&token)?;
let mut value: PermissionValue = webhook.permissions.into();
value.throw_if_lacking_channel_permission(ChannelPermission::SendMessage)?;
let permissions: PermissionValue = webhook.permissions.into();
permissions.throw_if_lacking_channel_permission(ChannelPermission::SendMessage)?;
if data.attachments.as_ref().map_or(false, |v| !v.is_empty()) {
value.throw_if_lacking_channel_permission(ChannelPermission::UploadFiles)?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::UploadFiles)?;
}
if data.embeds.as_ref().map_or(false, |v| !v.is_empty()) {
value.throw_if_lacking_channel_permission(ChannelPermission::SendEmbeds)?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::SendEmbeds)?;
}
if data.masquerade.is_some() {
value.throw_if_lacking_channel_permission(ChannelPermission::Masquerade)?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::Masquerade)?;
}
if data.interactions.is_some() {
value.throw_if_lacking_channel_permission(ChannelPermission::React)?;
permissions.throw_if_lacking_channel_permission(ChannelPermission::React)?;
}
let channel = db.fetch_channel(&webhook.channel_id).await?;
let message = Message::create_from_api(
db,
channel,
data,
v0::MessageAuthor::Webhook(&webhook.into()),
idempotency,
true,
)
.await?;
Ok(Json(message.into()))
Ok(Json(
Message::create_from_api(
db,
channel,
data,
v0::MessageAuthor::Webhook(&webhook.into()),
idempotency,
true,
)
.await?
.into(),
))
}