Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/app/mail.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ impl MailState {
self.msgs.iter().filter(|m| matches!(m.state, State::Held(_)) || (m.to == Party::You && m.state == State::Delivered))
}

/// Queued and Delivered addressed to that pane.
/// Addressed to that pane and not yet in its agent's hands: a hand-over sets `via`.
pub fn unread(&self, pane: PaneId) -> usize {
self.msgs.iter().filter(|m| m.to.pane() == Some(pane) && matches!(m.state, State::Queued | State::Delivered)).count()
self.msgs.iter().filter(|m| m.to.pane() == Some(pane) && (m.state == State::Queued || (m.state == State::Delivered && m.via.is_none()))).count()
}

/// Ends the `Wait`s whose message expired undelivered or whose time is up.
Expand Down Expand Up @@ -1243,6 +1243,18 @@ mod tests {
});
}

#[test]
fn a_message_the_agent_has_taken_is_not_unread() {
let mut mail = MailState::default();
let m = to(Some(2), "reader", State::Delivered);
mail.add(m.clone());
assert_eq!(mail.unread(2), 1, "handed over but not taken yet");
mail.set(&m.id, State::Delivered, Some(Via::Extension), None);
assert_eq!(mail.unread(2), 0);
mail.add(to(Some(2), "reader", State::Queued));
assert_eq!(mail.unread(2), 1);
}

#[test]
fn a_route_cycles_allow_ask_no_then_goes() {
with_policy("mail-cycle", || {
Expand Down
Loading