mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-02 07:31:03 +00:00
Merge branch 'main' into hide-removed-deleted-posts
This commit is contained in:
commit
5907006499
|
@ -20,7 +20,12 @@ use lemmy_db_views_actor::{
|
|||
person_mention_view::PersonMentionQuery,
|
||||
structs::{CommentReplyView, PersonMentionView},
|
||||
};
|
||||
use lemmy_utils::{claims::Claims, error::LemmyError, utils::markdown::markdown_to_html};
|
||||
use lemmy_utils::{
|
||||
cache_header::cache_1hour,
|
||||
claims::Claims,
|
||||
error::LemmyError,
|
||||
utils::markdown::markdown_to_html,
|
||||
};
|
||||
use once_cell::sync::Lazy;
|
||||
use rss::{
|
||||
extension::dublincore::DublinCoreExtensionBuilder,
|
||||
|
@ -65,10 +70,15 @@ enum RequestType {
|
|||
}
|
||||
|
||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||
cfg
|
||||
.route("/feeds/{type}/{name}.xml", web::get().to(get_feed))
|
||||
.route("/feeds/all.xml", web::get().to(get_all_feed))
|
||||
.route("/feeds/local.xml", web::get().to(get_local_feed));
|
||||
cfg.service(
|
||||
web::scope("/feeds")
|
||||
.route("/{type}/{name}.xml", web::get().to(get_feed))
|
||||
.route("/all.xml", web::get().to(get_all_feed).wrap(cache_1hour()))
|
||||
.route(
|
||||
"/local.xml",
|
||||
web::get().to(get_local_feed).wrap(cache_1hour()),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
static RSS_NAMESPACE: Lazy<BTreeMap<String, String>> = Lazy::new(|| {
|
||||
|
|
|
@ -3,14 +3,24 @@ use anyhow::anyhow;
|
|||
use lemmy_api_common::context::LemmyContext;
|
||||
use lemmy_db_schema::RegistrationMode;
|
||||
use lemmy_db_views::structs::SiteView;
|
||||
use lemmy_utils::{error::LemmyError, version};
|
||||
use lemmy_utils::{
|
||||
cache_header::{cache_1hour, cache_3days},
|
||||
error::LemmyError,
|
||||
version,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use url::Url;
|
||||
|
||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||
cfg
|
||||
.route("/nodeinfo/2.0.json", web::get().to(node_info))
|
||||
.route("/.well-known/nodeinfo", web::get().to(node_info_well_known));
|
||||
.route(
|
||||
"/nodeinfo/2.0.json",
|
||||
web::get().to(node_info).wrap(cache_1hour()),
|
||||
)
|
||||
.route(
|
||||
"/.well-known/nodeinfo",
|
||||
web::get().to(node_info_well_known).wrap(cache_3days()),
|
||||
);
|
||||
}
|
||||
|
||||
async fn node_info_well_known(
|
||||
|
|
|
@ -8,7 +8,7 @@ use lemmy_db_schema::{
|
|||
source::{community::Community, person::Person},
|
||||
traits::ApubActor,
|
||||
};
|
||||
use lemmy_utils::error::LemmyError;
|
||||
use lemmy_utils::{cache_header::cache_3days, error::LemmyError};
|
||||
use serde::Deserialize;
|
||||
use std::collections::HashMap;
|
||||
use url::Url;
|
||||
|
@ -21,7 +21,7 @@ struct Params {
|
|||
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||
cfg.route(
|
||||
".well-known/webfinger",
|
||||
web::get().to(get_webfinger_response),
|
||||
web::get().to(get_webfinger_response).wrap(cache_3days()),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
22
crates/utils/src/cache_header.rs
Normal file
22
crates/utils/src/cache_header.rs
Normal file
|
@ -0,0 +1,22 @@
|
|||
use actix_web::middleware::DefaultHeaders;
|
||||
|
||||
/// Adds a cache header to requests
|
||||
///
|
||||
/// Common cache amounts are:
|
||||
/// * 1 hour = 60s * 60m = `3600` seconds
|
||||
/// * 3 days = 60s * 60m * 24h * 3d = `259200` seconds
|
||||
///
|
||||
/// Mastodon & other activitypub server defaults to 3d
|
||||
pub fn cache_header(seconds: usize) -> DefaultHeaders {
|
||||
DefaultHeaders::new().add(("Cache-Control", format!("public, max-age={seconds}")))
|
||||
}
|
||||
|
||||
/// Set a 1 hour cache time
|
||||
pub fn cache_1hour() -> DefaultHeaders {
|
||||
cache_header(3600)
|
||||
}
|
||||
|
||||
/// Set a 3 day cache time
|
||||
pub fn cache_3days() -> DefaultHeaders {
|
||||
cache_header(259200)
|
||||
}
|
|
@ -4,6 +4,7 @@ extern crate strum_macros;
|
|||
extern crate smart_default;
|
||||
|
||||
pub mod apub;
|
||||
pub mod cache_header;
|
||||
pub mod email;
|
||||
pub mod rate_limit;
|
||||
pub mod settings;
|
||||
|
|
|
@ -49,30 +49,54 @@ pub fn setup(
|
|||
// Update active counts every hour
|
||||
let url = db_url.clone();
|
||||
scheduler.every(CTimeUnits::hour(1)).run(move || {
|
||||
let mut conn = PgConnection::establish(&url).expect("could not establish connection");
|
||||
active_counts(&mut conn);
|
||||
update_banned_when_expired(&mut conn);
|
||||
PgConnection::establish(&url)
|
||||
.map(|mut conn| {
|
||||
active_counts(&mut conn);
|
||||
update_banned_when_expired(&mut conn);
|
||||
})
|
||||
.map_err(|e| {
|
||||
error!("Failed to establish db connection for active counts update: {e}");
|
||||
})
|
||||
.ok();
|
||||
});
|
||||
|
||||
// Update hot ranks every 15 minutes
|
||||
let url = db_url.clone();
|
||||
scheduler.every(CTimeUnits::minutes(15)).run(move || {
|
||||
let mut conn = PgConnection::establish(&url).expect("could not establish connection");
|
||||
update_hot_ranks(&mut conn);
|
||||
PgConnection::establish(&url)
|
||||
.map(|mut conn| {
|
||||
update_hot_ranks(&mut conn);
|
||||
})
|
||||
.map_err(|e| {
|
||||
error!("Failed to establish db connection for hot ranks update: {e}");
|
||||
})
|
||||
.ok();
|
||||
});
|
||||
|
||||
// Delete any captcha answers older than ten minutes, every ten minutes
|
||||
let url = db_url.clone();
|
||||
scheduler.every(CTimeUnits::minutes(10)).run(move || {
|
||||
let mut conn = PgConnection::establish(&url).expect("could not establish connection");
|
||||
delete_expired_captcha_answers(&mut conn);
|
||||
PgConnection::establish(&url)
|
||||
.map(|mut conn| {
|
||||
delete_expired_captcha_answers(&mut conn);
|
||||
})
|
||||
.map_err(|e| {
|
||||
error!("Failed to establish db connection for captcha cleanup: {e}");
|
||||
})
|
||||
.ok();
|
||||
});
|
||||
|
||||
// Clear old activities every week
|
||||
let url = db_url.clone();
|
||||
scheduler.every(CTimeUnits::weeks(1)).run(move || {
|
||||
let mut conn = PgConnection::establish(&url).expect("could not establish connection");
|
||||
clear_old_activities(&mut conn);
|
||||
PgConnection::establish(&url)
|
||||
.map(|mut conn| {
|
||||
clear_old_activities(&mut conn);
|
||||
})
|
||||
.map_err(|e| {
|
||||
error!("Failed to establish db connection for activity cleanup: {e}");
|
||||
})
|
||||
.ok();
|
||||
});
|
||||
|
||||
// Remove old rate limit buckets after 1 to 2 hours of inactivity
|
||||
|
@ -84,15 +108,27 @@ pub fn setup(
|
|||
// Overwrite deleted & removed posts and comments every day
|
||||
let url = db_url.clone();
|
||||
scheduler.every(CTimeUnits::days(1)).run(move || {
|
||||
let mut conn = PgConnection::establish(&url).expect("could not establish connection");
|
||||
overwrite_deleted_posts_and_comments(&mut conn);
|
||||
PgConnection::establish(&db_url)
|
||||
.map(|mut conn| {
|
||||
overwrite_deleted_posts_and_comments(&mut conn);
|
||||
})
|
||||
.map_err(|e| {
|
||||
error!("Failed to establish db connection for deleted content cleanup: {e}");
|
||||
})
|
||||
.ok();
|
||||
});
|
||||
|
||||
// Update the Instance Software
|
||||
scheduler.every(CTimeUnits::days(1)).run(move || {
|
||||
let mut conn = PgConnection::establish(&db_url).expect("could not establish connection");
|
||||
update_instance_software(&mut conn, &user_agent)
|
||||
.map_err(|e| warn!("Failed to update instance software: {e}"))
|
||||
PgConnection::establish(&url)
|
||||
.map(|mut conn| {
|
||||
update_instance_software(&mut conn, &user_agent)
|
||||
.map_err(|e| warn!("Failed to update instance software: {e}"))
|
||||
.ok();
|
||||
})
|
||||
.map_err(|e| {
|
||||
error!("Failed to establish db connection for instance software update: {e}");
|
||||
})
|
||||
.ok();
|
||||
});
|
||||
|
||||
|
@ -203,18 +239,15 @@ fn process_hot_ranks_in_batches(
|
|||
}
|
||||
|
||||
fn delete_expired_captcha_answers(conn: &mut PgConnection) {
|
||||
match diesel::delete(
|
||||
diesel::delete(
|
||||
captcha_answer::table.filter(captcha_answer::published.lt(now - IntervalDsl::minutes(10))),
|
||||
)
|
||||
.execute(conn)
|
||||
{
|
||||
Ok(_) => {
|
||||
info!("Done.");
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to clear old captcha answers: {}", e)
|
||||
}
|
||||
}
|
||||
.map(|_| {
|
||||
info!("Done.");
|
||||
})
|
||||
.map_err(|e| error!("Failed to clear old captcha answers: {e}"))
|
||||
.ok();
|
||||
}
|
||||
|
||||
/// Clear old activities (this table gets very large)
|
||||
|
@ -222,21 +255,22 @@ fn clear_old_activities(conn: &mut PgConnection) {
|
|||
info!("Clearing old activities...");
|
||||
diesel::delete(sent_activity::table.filter(sent_activity::published.lt(now - 3.months())))
|
||||
.execute(conn)
|
||||
.map_err(|e| error!("Failed to clear old sent activities: {}", e))
|
||||
.map_err(|e| error!("Failed to clear old sent activities: {e}"))
|
||||
.ok();
|
||||
|
||||
diesel::delete(
|
||||
received_activity::table.filter(received_activity::published.lt(now - 3.months())),
|
||||
)
|
||||
.execute(conn)
|
||||
.map_err(|e| error!("Failed to clear old received activities: {}", e))
|
||||
.map(|_| info!("Done."))
|
||||
.map_err(|e| error!("Failed to clear old received activities: {e}"))
|
||||
.ok();
|
||||
}
|
||||
|
||||
/// overwrite posts and comments 30d after deletion
|
||||
fn overwrite_deleted_posts_and_comments(conn: &mut PgConnection) {
|
||||
info!("Overwriting deleted posts...");
|
||||
match diesel::update(
|
||||
diesel::update(
|
||||
post::table
|
||||
.filter(post::deleted.eq(true))
|
||||
.filter(post::updated.lt(now.nullable() - 1.months()))
|
||||
|
@ -247,17 +281,14 @@ fn overwrite_deleted_posts_and_comments(conn: &mut PgConnection) {
|
|||
post::name.eq(DELETED_REPLACEMENT_TEXT),
|
||||
))
|
||||
.execute(conn)
|
||||
{
|
||||
Ok(_) => {
|
||||
info!("Done.");
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to overwrite deleted posts: {}", e)
|
||||
}
|
||||
}
|
||||
.map(|_| {
|
||||
info!("Done.");
|
||||
})
|
||||
.map_err(|e| error!("Failed to overwrite deleted posts: {e}"))
|
||||
.ok();
|
||||
|
||||
info!("Overwriting deleted comments...");
|
||||
match diesel::update(
|
||||
diesel::update(
|
||||
comment::table
|
||||
.filter(comment::deleted.eq(true))
|
||||
.filter(comment::updated.lt(now.nullable() - 1.months()))
|
||||
|
@ -265,14 +296,11 @@ fn overwrite_deleted_posts_and_comments(conn: &mut PgConnection) {
|
|||
)
|
||||
.set(comment::content.eq(DELETED_REPLACEMENT_TEXT))
|
||||
.execute(conn)
|
||||
{
|
||||
Ok(_) => {
|
||||
info!("Done.");
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to overwrite deleted comments: {}", e)
|
||||
}
|
||||
}
|
||||
.map(|_| {
|
||||
info!("Done.");
|
||||
})
|
||||
.map_err(|e| error!("Failed to overwrite deleted comments: {e}"))
|
||||
.ok();
|
||||
}
|
||||
|
||||
/// Re-calculate the site and community active counts every 12 hours
|
||||
|
@ -291,20 +319,16 @@ fn active_counts(conn: &mut PgConnection) {
|
|||
"update site_aggregates set users_active_{} = (select * from site_aggregates_activity('{}')) where site_id = 1",
|
||||
i.1, i.0
|
||||
);
|
||||
match sql_query(update_site_stmt).execute(conn) {
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
error!("Failed to update site stats: {}", e)
|
||||
}
|
||||
}
|
||||
sql_query(update_site_stmt)
|
||||
.execute(conn)
|
||||
.map_err(|e| error!("Failed to update site stats: {e}"))
|
||||
.ok();
|
||||
|
||||
let update_community_stmt = format!("update community_aggregates ca set users_active_{} = mv.count_ from community_aggregates_activity('{}') mv where ca.community_id = mv.community_id_", i.1, i.0);
|
||||
match sql_query(update_community_stmt).execute(conn) {
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
error!("Failed to update community stats: {}", e)
|
||||
}
|
||||
}
|
||||
sql_query(update_community_stmt)
|
||||
.execute(conn)
|
||||
.map_err(|e| error!("Failed to update community stats: {e}"))
|
||||
.ok();
|
||||
}
|
||||
|
||||
info!("Done.");
|
||||
|
@ -314,27 +338,20 @@ fn active_counts(conn: &mut PgConnection) {
|
|||
fn update_banned_when_expired(conn: &mut PgConnection) {
|
||||
info!("Updating banned column if it expires ...");
|
||||
|
||||
match diesel::update(
|
||||
diesel::update(
|
||||
person::table
|
||||
.filter(person::banned.eq(true))
|
||||
.filter(person::ban_expires.lt(now)),
|
||||
)
|
||||
.set(person::banned.eq(false))
|
||||
.execute(conn)
|
||||
{
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
error!("Failed to update person.banned when expires: {}", e)
|
||||
}
|
||||
}
|
||||
match diesel::delete(community_person_ban::table.filter(community_person_ban::expires.lt(now)))
|
||||
.map_err(|e| error!("Failed to update person.banned when expires: {e}"))
|
||||
.ok();
|
||||
|
||||
diesel::delete(community_person_ban::table.filter(community_person_ban::expires.lt(now)))
|
||||
.execute(conn)
|
||||
{
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
error!("Failed to remove community_ban expired rows: {}", e)
|
||||
}
|
||||
}
|
||||
.map_err(|e| error!("Failed to remove community_ban expired rows: {e}"))
|
||||
.ok();
|
||||
}
|
||||
|
||||
/// Updates the instance software and version
|
||||
|
|
Loading…
Reference in a new issue