Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement channel changes for messages

Browse source
This commit is contained in:
Mikayla 2023-10-01 22:21:27 -07:00
parent 51cf6a5ff3
commit 1d5b665f13
No known key found for this signature in database
12 changed files with 212 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/collab/src/db/queries/channels.rs
View file

@ -464,10 +464,14 @@ impl Database {
}
let mut channels_with_changed_notes = HashSet::default();
let mut channels_with_new_messages = HashSet::default();
for channel in graph.channels.iter() {
if self.has_note_changed(user_id, channel.id, tx).await? {
channels_with_changed_notes.insert(channel.id);
}
if self.has_new_message(channel.id, user_id, tx).await? {
channels_with_new_messages.insert(channel.id);
}
}
Ok(ChannelsForUser {
@ -475,6 +479,7 @@ impl Database {
channel_participants,
channels_with_admin_privileges,
channels_with_changed_notes,
channels_with_new_messages,
})
}

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

@ -97,7 +97,7 @@ impl Database {
let mut messages = Vec::new();
while let Some(row) = rows.next().await {
let row = row?;
dbg!(&max_id);
max_assign(&mut max_id, row.id);
let nonce = row.nonce.as_u64_pair();
@ -113,23 +113,18 @@ impl Database {
});
}
drop(rows);
dbg!(&max_id);
if let Some(max_id) = max_id {
let has_older_message = dbg!(
observed_channel_messages::Entity::find()
.filter(
observed_channel_messages::Column::UserId
.eq(user_id)
.and(observed_channel_messages::Column::ChannelId.eq(channel_id))
.and(
observed_channel_messages::Column::ChannelMessageId.lt(max_id)
),
)
.one(&*tx)
.await
)?
.is_some();
let has_older_message = observed_channel_messages::Entity::find()
.filter(
observed_channel_messages::Column::UserId
.eq(user_id)
.and(observed_channel_messages::Column::ChannelId.eq(channel_id))
.and(observed_channel_messages::Column::ChannelMessageId.lt(max_id)),
)
.one(&*tx)
.await?
.is_some();
if has_older_message {
observed_channel_messages::Entity::update(
@ -174,7 +169,7 @@ impl Database {
body: &str,
timestamp: OffsetDateTime,
nonce: u128,
) -> Result<(MessageId, Vec<ConnectionId>)> {
) -> Result<(MessageId, Vec<ConnectionId>, Vec<UserId>)> {
self.transaction(|tx| async move {
let mut rows = channel_chat_participant::Entity::find()
.filter(channel_chat_participant::Column::ChannelId.eq(channel_id))
@ -241,7 +236,14 @@ impl Database {
.exec(&*tx)
.await?;
Ok((message.last_insert_id, participant_connection_ids))
let mut channel_members = self.get_channel_members_internal(channel_id, &*tx).await?;
channel_members.retain(|member| !participant_user_ids.contains(member));
Ok((
message.last_insert_id,
participant_connection_ids,
channel_members,
))
})
.await
}
@ -290,7 +292,7 @@ impl Database {
.await?
.map(|model| model.channel_message_id);
Ok(dbg!(last_message_read) != dbg!(latest_message_id))
Ok(last_message_read != latest_message_id)
}
pub async fn remove_channel_message(