nichkara/iamb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle attachment file names more robustly (#494)

Browse Source
This commit is contained in:
vaw
2025-08-22 21:24:35 +00:00
committed by GitHub
parent ad10082c2f
commit e3090e537f
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/windows/room/chat.rs
View File

@@ -220,12 +220,10 @@ impl ChatState {
}; };
let (source, msg_filename) = match &ev.content.msgtype { let (source, msg_filename) = match &ev.content.msgtype {
MessageType::Audio(c) => (c.source.clone(), c.body.as_str()), MessageType::Audio(c) => (c.source.clone(), c.filename()),
MessageType::File(c) => { MessageType::File(c) => (c.source.clone(), c.filename()),
(c.source.clone(), c.filename.as_deref().unwrap_or(c.body.as_str())) MessageType::Image(c) => (c.source.clone(), c.filename()),
}, MessageType::Video(c) => (c.source.clone(), c.filename()),
MessageType::Image(c) => (c.source.clone(), c.body.as_str()),
MessageType::Video(c) => (c.source.clone(), c.body.as_str()),
_ => { _ => {
if !flags.contains(DownloadFlags::OPEN) { if !flags.contains(DownloadFlags::OPEN) {
return Err(IambError::NoAttachment.into()); return Err(IambError::NoAttachment.into());
@@ -263,7 +261,7 @@ impl ChatState {
}; };
if filename.is_dir() { if filename.is_dir() {
filename.push(msg_filename); filename.push(msg_filename.replace(std::path::MAIN_SEPARATOR_STR, "_"));
} }
if filename.exists() && !flags.contains(DownloadFlags::FORCE) { if filename.exists() && !flags.contains(DownloadFlags::FORCE) {