robin/tf-log-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/tf-log-parser.git synced 2026-06-03 18:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

handle chat from mallformed players

Browse source
This commit is contained in:
Robin Appelman 2023-03-26 19:28:26 +02:00
commit dc98cb9816
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/module/chat.rs
View file

@ -23,20 +23,18 @@ pub struct ChatMessage {
} }
impl ChatMessage { impl ChatMessage {
fn from_bare(bare: BareChatMessage, subjects: &SubjectMap) -> Self { fn from_bare(bare: BareChatMessage, subjects: &SubjectMap) -> Option<Self> {
let (name, steam_id) = match &subjects[bare.subject] { let (name, steam_id) = match &subjects[bare.subject] {
(SubjectData::Player { name, steam_id, .. }, _) => (name.clone(), *steam_id), (SubjectData::Player { name, steam_id, .. }, _) => (name.clone(), *steam_id),
_ => { _ => return None,
unreachable!("only player messages are added");
}
}; };
ChatMessage { Some(ChatMessage {
time: bare.time, time: bare.time,
name, name,
steam_id, steam_id,
message: bare.message, message: bare.message,
chat_type: bare.chat_type, chat_type: bare.chat_type,
} })
} }
} }
@ -81,7 +79,7 @@ impl GlobalData for ChatMessages {
fn finish(self, subjects: &SubjectMap) -> Self::Output { fn finish(self, subjects: &SubjectMap) -> Self::Output {
self.0 self.0
.into_iter() .into_iter()
.map(|bare| ChatMessage::from_bare(bare, subjects)) .filter_map(|bare| ChatMessage::from_bare(bare, subjects))
.collect() .collect()
} }
} }