mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-24 17:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Adjust chat permisisons to allow deletion for channel admins

Browse source
This commit is contained in:
Mikayla 2023-10-17 02:16:17 -07:00
parent b168bded1d
commit 162f625716
No known key found for this signature in database
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/collab/src/db/queries/messages.rs
View file

@ -337,8 +337,22 @@ impl Database {
.filter(channel_message::Column::SenderId.eq(user_id)) .filter(channel_message::Column::SenderId.eq(user_id))
.exec(&*tx) .exec(&*tx)
.await?; .await?;
if result.rows_affected == 0 { if result.rows_affected == 0 {
Err(anyhow!("no such message"))?; if self
.check_user_is_channel_admin(channel_id, user_id, &*tx)
.await
.is_ok()
{
let result = channel_message::Entity::delete_by_id(message_id)
.exec(&*tx)
.await?;
if result.rows_affected == 0 {
Err(anyhow!("no such message"))?;
}
} else {
Err(anyhow!("operation could not be completed"))?;
}
} }
Ok(participant_connection_ids) Ok(participant_connection_ids)

20
crates/collab_ui/src/chat_panel.rs
View file

@ -355,8 +355,12 @@ impl ChatPanel {
} }
fn render_message(&mut self, ix: usize, cx: &mut ViewContext<Self>) -> AnyElement<Self> { fn render_message(&mut self, ix: usize, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
let (message, is_continuation, is_last) = { let (message, is_continuation, is_last, is_admin) = {
let active_chat = self.active_chat.as_ref().unwrap().0.read(cx); let active_chat = self.active_chat.as_ref().unwrap().0.read(cx);
let is_admin = self
.channel_store
.read(cx)
.is_user_admin(active_chat.channel().id);
let last_message = active_chat.message(ix.saturating_sub(1)); let last_message = active_chat.message(ix.saturating_sub(1));
let this_message = active_chat.message(ix); let this_message = active_chat.message(ix);
let is_continuation = last_message.id != this_message.id let is_continuation = last_message.id != this_message.id
@ -366,6 +370,7 @@ impl ChatPanel {
active_chat.message(ix).clone(), active_chat.message(ix).clone(),
is_continuation, is_continuation,
active_chat.message_count() == ix + 1, active_chat.message_count() == ix + 1,
is_admin,
) )
}; };
@ -386,12 +391,13 @@ impl ChatPanel {
}; };
let belongs_to_user = Some(message.sender.id) == self.client.user_id(); let belongs_to_user = Some(message.sender.id) == self.client.user_id();
let message_id_to_remove = let message_id_to_remove = if let (ChannelMessageId::Saved(id), true) =
if let (ChannelMessageId::Saved(id), true) = (message.id, belongs_to_user) { (message.id, belongs_to_user || is_admin)
Some(id) {
} else { Some(id)
None } else {
}; None
};
enum MessageBackgroundHighlight {} enum MessageBackgroundHighlight {}
MouseEventHandler::new::<MessageBackgroundHighlight, _>(ix, cx, |state, cx| { MouseEventHandler::new::<MessageBackgroundHighlight, _>(ix, cx, |state, cx| {