diff --git a/src/db.rs b/src/db.rs
index 4c68e5c..b07923e 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -1086,10 +1086,8 @@ impl Database {
         )?;
         let rows = stmt.query_map(params![account_id, limit], Self::row_to_chat_message)?;
         let mut msgs = Vec::new();
-        for row in rows {
-            if let Ok(m) = row {
-                msgs.push(m);
-            }
+        for m in rows.flatten() {
+            msgs.push(m);
         }
         Ok(msgs)
     }
diff --git a/src/models.rs b/src/models.rs
index 295d9a1..5f815a9 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -1754,8 +1754,8 @@ mod tests {
         j["unrelatedField"] = json!("ignored");
         let raw: RawNote = serde_json::from_value(j).unwrap();
         let note = raw.normalize("acc1", "misskey.io");
-        assert_eq!(*note.mode_flags.get("isNoteInYamiMode").unwrap(), true);
-        assert_eq!(*note.mode_flags.get("isNoteInSuperMode").unwrap(), false);
+        assert!(*note.mode_flags.get("isNoteInYamiMode").unwrap());
+        assert!(!*note.mode_flags.get("isNoteInSuperMode").unwrap());
         assert!(!note.mode_flags.contains_key("unrelatedField"));
     }