newthuhole/hole-backend-rust
2
1
Fork 0
Code Issues 7 Pull Requests Projects Releases 4 Wiki Activity

fix some warnings

Browse Source
This commit is contained in:
hole-thu
2026-03-24 03:18:41 +08:00
parent 8e386d98d0
commit 0487427342
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/comment.rs
View File

@@ -33,8 +33,8 @@ pub struct CommentOutput {
blocked: bool, blocked: bool,
} }
pub async fn c2output<'r>( pub async fn c2output(
p: &'r Post, p: &Post,
cs: &[Comment], cs: &[Comment],
user: &CurrentUser, user: &CurrentUser,
cached_block_dict: &HashMap<String, bool>, cached_block_dict: &HashMap<String, bool>,

6
src/api/post.rs
View File

@@ -87,7 +87,11 @@ async fn p2output(p: &Post, user: &CurrentUser, db: &Db, rconn: &RdsConn) -> Api
Ok(PostOutput { Ok(PostOutput {
pid: p.id, pid: p.id,
room_id: p.room_id, room_id: p.room_id,
text: can_view.then_some(p.content.clone()).unwrap_or_default(), text: if can_view {
p.content.clone()
} else {
Default::default()
},
cw: (!p.cw.is_empty()).then_some(p.cw.clone()), cw: (!p.cw.is_empty()).then_some(p.cw.clone()),
n_attentions: p.n_attentions, n_attentions: p.n_attentions,
n_comments: p.n_comments, n_comments: p.n_comments,

2
src/cache.rs
View File

@@ -180,7 +180,7 @@ impl PostListCache {
let list_ref = post_list_cache() let list_ref = post_list_cache()
.try_get_with(self.key.clone(), async { .try_get_with(self.key.clone(), async {
let mut items: Vec<(i64, i32)> = let mut items: Vec<(i64, i32)> =
query_posts.await?.iter().map(|p| self.p2pair(&p)).collect(); query_posts.await?.iter().map(|p| self.p2pair(p)).collect();
items.sort_by(|a, b| a.0.cmp(&b.0)); items.sort_by(|a, b| a.0.cmp(&b.0));
Ok(Arc::new(RwLock::new(items))) Ok(Arc::new(RwLock::new(items)))
}) })

4
src/models.rs
View File

@@ -389,7 +389,7 @@ impl User {
} }
pub async fn get_by_token(db: &Db, token: &str) -> Option<Self> { pub async fn get_by_token(db: &Db, token: &str) -> Option<Self> {
let mut cacher = UserCache::init(token); let cacher = UserCache::init(token);
if let Some(u) = cacher.get().await { if let Some(u) = cacher.get().await {
return Some(u); return Some(u);
} }
@@ -406,7 +406,7 @@ impl User {
_ => token, _ => token,
}; };
// dbg!(token); // dbg!(token);
let mut cacher = UserCache::init(token); let cacher = UserCache::init(token);
if let Some(u) = cacher.get().await { if let Some(u) = cacher.get().await {
Some(u) Some(u)
} else { } else {

21
src/rds_models.rs
View File

@@ -176,7 +176,9 @@ impl Systemlog {
pub async fn create(&self, rconn: &RdsConn) -> RedisResult<()> { pub async fn create(&self, rconn: &RdsConn) -> RedisResult<()> {
let mut rconn = rconn.clone(); let mut rconn = rconn.clone();
if rconn.llen::<&str, isize>(KEY_SYSTEMLOG).await? > SYSTEMLOG_MAX_LEN { if rconn.llen::<&str, isize>(KEY_SYSTEMLOG).await? > SYSTEMLOG_MAX_LEN {
rconn.ltrim(KEY_SYSTEMLOG, 0, SYSTEMLOG_MAX_LEN - 1).await?; rconn
.ltrim::<_, ()>(KEY_SYSTEMLOG, 0, SYSTEMLOG_MAX_LEN - 1)
.await?;
} }
rconn rconn
.lpush(KEY_SYSTEMLOG, serde_json::to_string(&self).unwrap()) .lpush(KEY_SYSTEMLOG, serde_json::to_string(&self).unwrap())
@@ -258,9 +260,9 @@ pub struct CustomTitle;
impl CustomTitle { impl CustomTitle {
async fn gen_and_set_secret(rconn: &RdsConn, title: &str) -> RedisResult<String> { async fn gen_and_set_secret(rconn: &RdsConn, title: &str) -> RedisResult<String> {
let secret = random_string(8); let secret = random_string(8);
rconn () = rconn
.clone() .clone()
.set_ex(KEY_TITLE_SECRET!(&title), &secret, CUSTOM_TITLE_KEEP_TIME) .set_ex::<_, _, ()>(KEY_TITLE_SECRET!(&title), &secret, CUSTOM_TITLE_KEEP_TIME)
.await?; .await?;
Ok(secret) Ok(secret)
} }
@@ -283,8 +285,8 @@ impl CustomTitle {
if let Some(t) = old_title { if let Some(t) = old_title {
clear_title_from_admins(&rconn, &t).await?; clear_title_from_admins(&rconn, &t).await?;
} }
rconn.hset(KEY_CUSTOM_TITLE, namehash, title).await?; () = rconn.hset(KEY_CUSTOM_TITLE, namehash, title).await?;
rconn.hset(KEY_CUSTOM_TITLE, title, namehash).await?; () = rconn.hset(KEY_CUSTOM_TITLE, title, namehash).await?;
Ok(Self::gen_and_set_secret(&rconn, title).await?) Ok(Self::gen_and_set_secret(&rconn, title).await?)
} }
} }
@@ -297,7 +299,7 @@ impl CustomTitle {
Ok(if let Some(title) = t { Ok(if let Some(title) = t {
let s: Option<String> = rconn.clone().get(KEY_TITLE_SECRET!(title)).await?; let s: Option<String> = rconn.clone().get(KEY_TITLE_SECRET!(title)).await?;
let secret = if let Some(ss) = s { let secret = if let Some(ss) = s {
rconn () = rconn
.clone() .clone()
.expire(KEY_TITLE_SECRET!(title), CUSTOM_TITLE_KEEP_TIME as i64) .expire(KEY_TITLE_SECRET!(title), CUSTOM_TITLE_KEEP_TIME as i64)
.await?; .await?;
@@ -345,7 +347,7 @@ impl PollOption {
init!(i32, "hole_thu:poll_opts:{}"); init!(i32, "hole_thu:poll_opts:{}");
pub async fn set_list(&mut self, v: &Vec<String>) -> RedisResult<()> { pub async fn set_list(&mut self, v: &Vec<String>) -> RedisResult<()> {
self.rconn.del(&self.key).await?; () = self.rconn.del(&self.key).await?;
self.rconn.rpush(&self.key, v).await self.rconn.rpush(&self.key, v).await
} }
@@ -409,9 +411,8 @@ pub async fn get_candidate_list(rconn: &RdsConn) -> RedisResult<Vec<String>> {
pub async fn clear_title_from_admins(rconn: &RdsConn, title: &str) -> RedisResult<()> { pub async fn clear_title_from_admins(rconn: &RdsConn, title: &str) -> RedisResult<()> {
let mut rconn = rconn.clone(); let mut rconn = rconn.clone();
rconn.srem(KEY_CANDIDATE, title).await?; () = rconn.srem(KEY_CANDIDATE, title).await?;
rconn.srem(KEY_ADMIN, title).await?; rconn.srem(KEY_ADMIN, title).await
Ok(())
} }
pub(crate) use clear_all; pub(crate) use clear_all;