From 18262a62e0e25664a494147d9ea34e9be65efd2b Mon Sep 17 00:00:00 2001 From: hole-thu Date: Sun, 21 Aug 2022 17:00:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=86=92=E6=97=A7=E7=89=88=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=88=86=E5=8C=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/post.rs | 11 ++++++++++- src/cors.rs | 2 ++ src/main.rs | 2 +- src/models.rs | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/api/post.rs b/src/api/post.rs index 2ece348..2cc7e77 100644 --- a/src/api/post.rs +++ b/src/api/post.rs @@ -186,10 +186,19 @@ pub async fn publish_post( db: Db, rconn: RdsConn, ) -> JsonApi { + let text = if poi.room_id.is_none() { + format!( + "{}\n\n---\n\n\\* 无效分区或来自旧版前端,已默认归档到0区。分区管理说明见 #100426,建议尽快更新前端(点击ⓘ ,点击“立即更新”)。", + &poi.text + ) + } else { + poi.text.to_string() + }; + let p = Post::create( &db, NewPost { - content: poi.text.to_string(), + content: text, cw: poi.cw.to_string(), author_hash: user.namehash.to_string(), author_title: poi.use_title.map(|_| user.custom_title).unwrap_or_default(), diff --git a/src/cors.rs b/src/cors.rs index bf4761f..96a35e4 100644 --- a/src/cors.rs +++ b/src/cors.rs @@ -1,3 +1,5 @@ +#![allow(clippy::let_unit_value)] + use rocket::fairing::{Fairing, Info, Kind}; use rocket::http::Header; use rocket::{Request, Response}; diff --git a/src/main.rs b/src/main.rs index 686115b..26b4590 100644 --- a/src/main.rs +++ b/src/main.rs @@ -54,7 +54,7 @@ async fn main() -> Result<(), rocket::Error> { let rconn = RdsConn(rmc.clone()); tokio::spawn(async move { loop { - for room_id in [None, Some(0), Some(1), Some(42)] { + for room_id in (0..5).map(Some).chain([None, Some(42)]) { cache::PostListCache::init(room_id, 3, &rconn).clear().await; } sleep(Duration::from_secs(5 * 60)).await; diff --git a/src/models.rs b/src/models.rs index 9913929..1e4d8b2 100644 --- a/src/models.rs +++ b/src/models.rs @@ -365,7 +365,7 @@ impl Post { .unwrap(); PostCache::init(&rconn).clear_all().await; - for room_id in [None, Some(0), Some(1), Some(42)] { + for room_id in (0..5).map(Some).chain([None, Some(42)]) { PostListCache::init(room_id, 2, rconn).clear().await; } }