_/cri
1
0
Fork 0
Code Issues 16 Pull requests Projects Releases Packages Wiki Activity

Fix events in chat history being in the wrong order or missing

Browse source
This commit is contained in:
Sijmen 2023-11-29 01:07:31 +01:00
parent b0dcb6b170
commit 5b94e67f0d
Signed by: vijfhoek
GPG key ID: DAF7821E067D9C48
2 changed files with 122 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/cri.rs
View file

@ -115,12 +115,11 @@ impl Cri {
.borrow() .borrow()
.send(IrcCommand::JOIN(channel.clone(), tokens.next().map(String::from), None).into()) .send(IrcCommand::JOIN(channel.clone(), tokens.next().map(String::from), None).into())
.unwrap(); .unwrap();
self.message_log.set_active(Some(channel)); self.message_log.set_active(Some(&channel));
} }
fn handle_query_command(&mut self, mut tokens: std::str::SplitWhitespace<'_>) { fn handle_query_command(&mut self, mut tokens: std::str::SplitWhitespace<'_>) {
self.message_log self.message_log.set_active(Some(tokens.next().unwrap()));
.set_active(Some(tokens.next().unwrap().into()));
} }
fn handle_list_command(&self) { fn handle_list_command(&self) {
@ -137,11 +136,7 @@ impl Cri {
timestamp: DateTime<Local>, timestamp: DateTime<Local>,
message_id: Option<&str>, message_id: Option<&str>,
) { ) {
let already_joined = self.message_log.has_channel(dbg!(chanlist)); if !self.message_log.has_channel(chanlist)
self.message_log
.on_join(chanlist, source_nickname, &timestamp, message_id);
if !already_joined
&& source_nickname == &self.nickname && source_nickname == &self.nickname
&& self.capabilities.contains(&"draft/chathistory".into()) && self.capabilities.contains(&"draft/chathistory".into())
{ {
@ -160,6 +155,9 @@ impl Cri {
.into(), .into(),
) )
.unwrap(); .unwrap();
} else {
self.message_log
.on_join(chanlist, source_nickname, &timestamp, message_id);
} }
} }
} }
@ -214,6 +212,8 @@ impl Application for Cri {
let message_id = tags_map.get("msgid").cloned().flatten(); let message_id = tags_map.get("msgid").cloned().flatten();
let message_id = message_id.as_deref(); let message_id = message_id.as_deref();
let batch = tags_map.get("batch").cloned().flatten();
match &message.command { match &message.command {
IrcCommand::CAP(_, CapSubCommand::ACK, capability, _) => { IrcCommand::CAP(_, CapSubCommand::ACK, capability, _) => {
let capability = capability.as_ref().unwrap(); let capability = capability.as_ref().unwrap();
@ -245,6 +245,7 @@ impl Application for Cri {
comment.as_deref(), comment.as_deref(),
&timestamp, &timestamp,
message_id, message_id,
batch,
); );
} }
@ -300,8 +301,8 @@ impl Application for Cri {
self.input_value.clear(); self.input_value.clear();
} }
ui_message::UiMessage::HandleChannelPress(channel) => { ui_message::UiMessage::HandleChannelPress(channel_name) => {
self.message_log.set_active(channel) self.message_log.set_active(channel_name.as_deref())
} }
ui_message::UiMessage::None => (), ui_message::UiMessage::None => (),
} }

140
src/message_log.rs
View file

@ -10,13 +10,14 @@ use irc::proto::BatchSubCommand;
use regex::Regex; use regex::Regex;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
#[derive(Default)]
pub struct Channel { pub struct Channel {
pub channel_name: Option<String>,
pub messages: Vec<IrcMessage>, pub messages: Vec<IrcMessage>,
pub message_ids: HashSet<String>, pub message_ids: HashSet<String>,
pub names: Vec<String>, pub names: Vec<String>,
pub topic: Option<String>, pub topic: Option<String>,
pub unread_messages: i32, pub unread_messages: i32,
pub unread_highlights: i32, pub unread_highlights: i32,
pub unread_events: i32, pub unread_events: i32,
@ -28,6 +29,29 @@ pub struct Channel {
pub multiline_message_id: Option<String>, pub multiline_message_id: Option<String>,
} }
impl Channel {
fn new(channel_name: Option<&str>) -> Self {
Self {
channel_name: channel_name.map(String::from),
messages: Vec::new(),
message_ids: HashSet::new(),
names: Vec::new(),
topic: None,
unread_messages: 0,
unread_highlights: 0,
unread_events: 0,
is_multiline: false,
multiline_privmsgs: None,
multiline_timestamp: None,
multiline_nickname: None,
multiline_message_id: None,
}
}
}
pub struct MessageLog { pub struct MessageLog {
channels: HashMap<Option<String>, Channel>, channels: HashMap<Option<String>, Channel>,
pub active_channel: Option<String>, pub active_channel: Option<String>,
@ -39,7 +63,7 @@ pub struct MessageLog {
impl<'a> MessageLog { impl<'a> MessageLog {
pub fn new() -> Self { pub fn new() -> Self {
let mut channels = HashMap::new(); let mut channels = HashMap::new();
channels.insert(None, Default::default()); channels.insert(None, Channel::new(None));
Self { Self {
channels, channels,
active_channel: None, active_channel: None,
@ -61,8 +85,10 @@ impl<'a> MessageLog {
self.channels.get(channel) self.channels.get(channel)
} }
pub fn get_mut(&mut self, channel_name: Option<String>) -> &mut Channel { pub fn get_mut(&mut self, channel_name: Option<&str>) -> &mut Channel {
self.channels.entry(channel_name).or_default() self.channels
.entry(channel_name.map(String::from))
.or_insert_with(|| Channel::new(channel_name))
} }
pub fn on_join( pub fn on_join(
@ -73,7 +99,7 @@ impl<'a> MessageLog {
message_id: Option<&str>, message_id: Option<&str>,
) { ) {
let is_active = self.active_channel.as_deref() != Some(channel_name); let is_active = self.active_channel.as_deref() != Some(channel_name);
let channel = self.get_mut(Some(channel_name.into())); let channel = self.get_mut(Some(channel_name));
if message_id.is_some() && !channel.message_ids.insert(message_id.unwrap().into()) { if message_id.is_some() && !channel.message_ids.insert(message_id.unwrap().into()) {
return; return;
@ -101,7 +127,7 @@ impl<'a> MessageLog {
message_id: Option<&str>, message_id: Option<&str>,
) { ) {
let is_active = self.active_channel.as_deref() != Some(channel_name); let is_active = self.active_channel.as_deref() != Some(channel_name);
let channel = self.get_mut(Some(channel_name.into())); let channel = self.get_mut(Some(channel_name));
if message_id.is_some() && !channel.message_ids.insert(message_id.unwrap().into()) { if message_id.is_some() && !channel.message_ids.insert(message_id.unwrap().into()) {
return; return;
@ -152,22 +178,49 @@ impl<'a> MessageLog {
reason: Option<&str>, reason: Option<&str>,
timestamp: &DateTime<Local>, timestamp: &DateTime<Local>,
message_id: Option<&str>, message_id: Option<&str>,
batch: Option<String>,
) { ) {
// TODO increment event counter for each relevant channel if let Some(batch) = batch {
for channel in self.channels.values_mut() { let (subcommand, channel_name) = &self.batch_channels[&batch];
if subcommand == &BatchSubCommand::CUSTOM("CHATHISTORY".into()) {
if let Some(channel) = self.channels.get_mut(&Some(channel_name.to_owned())) {
if message_id.is_some()
&& !channel.message_ids.insert(message_id.unwrap().into())
{
return;
}
Self::add_quit(
channel,
self.active_channel.as_deref(),
nickname,
reason,
message_id,
timestamp,
);
return;
}
}
}
for (_, channel) in self.channels.iter_mut() {
if !channel.names.is_empty() && !channel.names.contains(&nickname.into()) {
continue;
}
if message_id.is_some() && !channel.message_ids.insert(message_id.unwrap().into()) { if message_id.is_some() && !channel.message_ids.insert(message_id.unwrap().into()) {
continue; continue;
} }
// TODO only show in relevant channels Self::add_quit(
channel.messages.push(IrcMessage { channel,
detail: MessageDetail::Quit { self.active_channel.as_deref(),
nickname: nickname.into(), nickname,
reason: reason.map(String::from), reason,
}, message_id,
message_id: message_id.map(String::from), timestamp,
timestamp: *timestamp, );
})
} }
} }
@ -187,8 +240,7 @@ impl<'a> MessageLog {
(subcommand.unwrap().clone(), channel_name.clone()), (subcommand.unwrap().clone(), channel_name.clone()),
); );
let channel = self.get_mut(Some(channel_name.clone())); let channel = self.get_mut(Some(channel_name));
channel.is_multiline = true; channel.is_multiline = true;
channel.multiline_privmsgs = Some(Vec::new()); channel.multiline_privmsgs = Some(Vec::new());
channel.multiline_timestamp = Some(*timestamp); channel.multiline_timestamp = Some(*timestamp);
@ -198,10 +250,15 @@ impl<'a> MessageLog {
tag.into(), tag.into(),
(subcommand.unwrap().clone(), channel_name.clone()), (subcommand.unwrap().clone(), channel_name.clone()),
); );
// TODO Collect messages into a separate list and update them
// at the end of the batch instead of just clearing the channel
let channel = self.get_mut(Some(channel_name));
channel.messages.clear();
} }
} else if let Some(tag) = tag.strip_prefix('-') { } else if let Some(tag) = tag.strip_prefix('-') {
if let Some((subcommand, channel_name)) = self.batch_channels.remove(tag) { if let Some((subcommand, channel_name)) = self.batch_channels.remove(tag) {
let channel = self.get_mut(Some(channel_name.clone())); let channel = self.get_mut(Some(&channel_name));
if subcommand == BatchSubCommand::CUSTOM("DRAFT/MULTILINE".into()) { if subcommand == BatchSubCommand::CUSTOM("DRAFT/MULTILINE".into()) {
channel.is_multiline = false; channel.is_multiline = false;
@ -219,7 +276,7 @@ impl<'a> MessageLog {
&timestamp, &timestamp,
); );
} else if subcommand == BatchSubCommand::CUSTOM("CHATHISTORY".into()) { } else if subcommand == BatchSubCommand::CUSTOM("CHATHISTORY".into()) {
channel.messages.sort_by_key(|m| m.timestamp); // TODO
} }
} }
} }
@ -235,7 +292,7 @@ impl<'a> MessageLog {
timestamp: &DateTime<Local>, timestamp: &DateTime<Local>,
) { ) {
let is_active = self.active_channel.as_deref() == Some(channel_name); let is_active = self.active_channel.as_deref() == Some(channel_name);
let channel = self.get_mut(Some(channel_name.into())); let channel = self.get_mut(Some(channel_name));
if channel.is_multiline { if channel.is_multiline {
channel.multiline_nickname = Some(nickname.into()); channel.multiline_nickname = Some(nickname.into());
@ -284,8 +341,8 @@ impl<'a> MessageLog {
}) })
} }
pub fn set_active(&mut self, channel_name: Option<String>) { pub fn set_active(&mut self, channel_name: Option<&str>) {
self.active_channel = channel_name.clone(); self.active_channel = channel_name.map(String::from);
let channel = self.get_mut(channel_name); let channel = self.get_mut(channel_name);
channel.unread_events = 0; channel.unread_events = 0;
channel.unread_messages = 0; channel.unread_messages = 0;
@ -462,12 +519,37 @@ impl<'a> MessageLog {
} }
pub fn on_topic(&mut self, channel: &str, topic: &str) { pub fn on_topic(&mut self, channel: &str, topic: &str) {
self.get_mut(Some(channel.into())).topic = Some(topic.into()); self.get_mut(Some(channel)).topic = Some(topic.into());
} }
pub fn on_names_reply(&mut self, channel: &str, names: Vec<&str>) { pub fn on_names_reply(&mut self, channel: &str, names: Vec<&str>) {
self.get_mut(Some(channel.into())) self.get_mut(Some(channel)).names.extend(
.names names
.extend(names.iter().map(|&n| String::from(n))); .iter()
.map(|&n| String::from(n.trim_matches(&['~', '&', '@', '%', '+'] as &[_]))),
);
}
fn add_quit(
channel: &mut Channel,
active_channel_name: Option<&str>,
nickname: &str,
reason: Option<&str>,
message_id: Option<&str>,
timestamp: &DateTime<Local>,
) {
let is_active = active_channel_name != Some(channel.channel_name.as_ref().unwrap());
if is_active {
channel.unread_events += 1;
}
channel.messages.push(IrcMessage {
detail: MessageDetail::Quit {
nickname: nickname.into(),
reason: reason.map(String::from),
},
message_id: message_id.map(String::from),
timestamp: *timestamp,
});
} }
} }