HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix (backend-rs): selected texts may be None in check_word_mute

Browse source 
Co-authored-by: naskya <m@naskya.net>
This commit is contained in:
sup39 2024-04-12 22:32:42 +09:00 committed by naskya
parent 603ec70b97
commit 99b8a40566
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
packages/backend-rs/src/misc/check_word_mute.rs
View file

@ -31,21 +31,27 @@ async fn all_texts(note: NoteLike) -> Result<Vec<String>, DbErr> {
.select_only()
.column(drive_file::Column::Comment)
.filter(drive_file::Column::Id.is_in(note.file_ids))
.into_tuple::<String>()
.into_tuple::<Option<String>>()
.all(db)
.await?,
.await?
.into_iter()
.flatten(),
);
if let Some(renote_id) = note.renote_id {
if let Some((text, cw)) = note::Entity::find_by_id(renote_id)
.select_only()
.columns([note::Column::Text, note::Column::Cw])
.into_tuple::<(String, String)>()
.into_tuple::<(Option<String>, Option<String>)>()
.one(db)
.await?
{
texts.push(text);
texts.push(cw);
if let Some(t) = text {
texts.push(t);
}
if let Some(c) = cw {
texts.push(c);
}
}
}
@ -53,12 +59,16 @@ async fn all_texts(note: NoteLike) -> Result<Vec<String>, DbErr> {
if let Some((text, cw)) = note::Entity::find_by_id(reply_id)
.select_only()
.columns([note::Column::Text, note::Column::Cw])
.into_tuple::<(String, String)>()
.into_tuple::<(Option<String>, Option<String>)>()
.one(db)
.await?
{
texts.push(text);
texts.push(cw);
if let Some(t) = text {
texts.push(t);
}
if let Some(c) = cw {
texts.push(c);
}
}
}