diff --git a/src/models.rs b/src/models.rs index 4bb15f4..015bcd7 100644 --- a/src/models.rs +++ b/src/models.rs @@ -177,8 +177,7 @@ impl Post { let pat; let mut query = base_query!(posts) .distinct() - .left_join(comments::table) - .filter(comments::is_deleted.eq(false)); + .left_join(comments::table); // 先用搜索+缓存,性能有问题了再真的做tag表 query = match search_mode { 0 => { @@ -187,7 +186,7 @@ impl Post { .filter(posts::cw.eq(&search_text)) .or_filter(posts::cw.eq(format!("#{}", &search_text))) .or_filter(posts::content.like(&pat)) - .or_filter(comments::content.like(&pat)) + .or_filter(comments::content.like(&pat).and(comments::is_deleted.eq(false))) } 1 => { pat = format!("%{}%", search_text2.replace(" ", "%")); diff --git a/src/rds_models.rs b/src/rds_models.rs index c8edf1d..e8615c0 100644 --- a/src/rds_models.rs +++ b/src/rds_models.rs @@ -65,7 +65,7 @@ impl PostCache { pub async fn get(&mut self) -> Option { let rds_result = self.rconn.get::<&String, String>(&self.key).await; if let Ok(s) = rds_result { - debug!("hint post cache: {}", &s); + debug!("hint post cache"); self.rconn .expire::<&String, bool>(&self.key, INSTANCE_EXPIRE_TIME) .await