diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs index 5f256f2f29..c08b657187 100644 --- a/crates/channel/src/channel_chat.rs +++ b/crates/channel/src/channel_chat.rs @@ -242,6 +242,9 @@ impl ChannelChat { }) } + /// Load all of the chat messages since a certain message id. + /// + /// For now, we always maintain a suffix of the channel's messages. pub async fn load_history_since_message( chat: ModelHandle, message_id: u64, diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs index 7ff1dc7717..adb7ff50ff 100644 --- a/crates/collab/src/rpc.rs +++ b/crates/collab/src/rpc.rs @@ -2934,7 +2934,7 @@ fn send_notifications( for connection_id in connection_pool.user_connection_ids(user_id) { if let Err(error) = peer.send( connection_id, - proto::NewNotification { + proto::AddNotification { notification: Some(notification.clone()), }, ) { diff --git a/crates/notifications/src/notification_store.rs b/crates/notifications/src/notification_store.rs index 0ee4ad35f1..6aeb792e87 100644 --- a/crates/notifications/src/notification_store.rs +++ b/crates/notifications/src/notification_store.rs @@ -154,7 +154,7 @@ impl NotificationStore { async fn handle_new_notification( this: ModelHandle, - envelope: TypedEnvelope, + envelope: TypedEnvelope, _: Arc, cx: AsyncAppContext, ) -> Result<()> { diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto index 6eeb006f3a..854c3f0f9a 100644 --- a/crates/rpc/proto/zed.proto +++ b/crates/rpc/proto/zed.proto @@ -176,7 +176,7 @@ message Envelope { MoveChannel move_channel = 147; SetChannelVisibility set_channel_visibility = 148; - NewNotification new_notification = 149; + AddNotification add_notification = 149; GetNotifications get_notifications = 150; GetNotificationsResponse get_notifications_response = 151; DeleteNotification delete_notification = 152; @@ -1610,7 +1610,7 @@ message GetNotifications { optional uint64 before_id = 1; } -message NewNotification { +message AddNotification { Notification notification = 1; } diff --git a/crates/rpc/src/proto.rs b/crates/rpc/src/proto.rs index 1c46bbbb14..571fbec865 100644 --- a/crates/rpc/src/proto.rs +++ b/crates/rpc/src/proto.rs @@ -135,6 +135,7 @@ messages!( (Ack, Foreground), (AckBufferOperation, Background), (AckChannelMessage, Background), + (AddNotification, Foreground), (AddProjectCollaborator, Foreground), (ApplyCodeAction, Background), (ApplyCodeActionResponse, Background), @@ -212,7 +213,6 @@ messages!( (LinkChannel, Foreground), (MarkNotificationsRead, Foreground), (MoveChannel, Foreground), - (NewNotification, Foreground), (OnTypeFormatting, Background), (OnTypeFormattingResponse, Background), (OpenBufferById, Background),