jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #399 from StupidRepo/main

Browse Source 
fix: allow message pinning and unpinning for DM-like channels
This commit is contained in:
Paul Makles
2025-04-02 12:04:44 +01:00
committed by GitHub
parent 00bd56b687 7bee609b84
commit e3e1cab02e
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/delta/src/routes/channels/message_pin.rs
View File

@@ -1,7 +1,4 @@
use revolt_database::{ use revolt_database::{util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, PartialMessage, SystemMessage, User, AMQP};
util::{permissions::DatabasePermissionQuery, reference::Reference},
Database, PartialMessage, SystemMessage, User, AMQP,
};
use revolt_models::v0::MessageAuthor; use revolt_models::v0::MessageAuthor;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission}; use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result}; use revolt_result::{create_error, Result};
@@ -22,10 +19,12 @@ pub async fn message_pin(
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel); if !matches!(channel, Channel::DirectMessage { .. }) {
calculate_channel_permissions(&mut query) let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
.await calculate_channel_permissions(&mut query)
.throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?; .await
.throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
}
let mut message = msg.as_message_in_channel(db, channel.id()).await?; let mut message = msg.as_message_in_channel(db, channel.id()).await?;

15
crates/delta/src/routes/channels/message_unpin.rs
View File

@@ -1,7 +1,4 @@
use revolt_database::{ use revolt_database::{util::{permissions::DatabasePermissionQuery, reference::Reference}, Channel, Database, FieldsMessage, PartialMessage, SystemMessage, User, AMQP};
util::{permissions::DatabasePermissionQuery, reference::Reference},
Database, FieldsMessage, PartialMessage, SystemMessage, User, AMQP,
};
use revolt_models::v0::MessageAuthor; use revolt_models::v0::MessageAuthor;
use revolt_permissions::{calculate_channel_permissions, ChannelPermission}; use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
use revolt_result::{create_error, Result}; use revolt_result::{create_error, Result};
@@ -22,10 +19,12 @@ pub async fn message_unpin(
) -> Result<EmptyResponse> { ) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?; let channel = target.as_channel(db).await?;
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel); if !matches!(channel, Channel::DirectMessage { .. }) {
calculate_channel_permissions(&mut query) let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
.await calculate_channel_permissions(&mut query)
.throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?; .await
.throw_if_lacking_channel_permission(ChannelPermission::ManageMessages)?;
}
let mut message = msg.as_message_in_channel(db, channel.id()).await?; let mut message = msg.as_message_in_channel(db, channel.id()).await?;