-
-
Notifications
You must be signed in to change notification settings - Fork 883
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* generate sitemap.xml file * set up endpoint for sitemap * Update sitemap generation - remove sitemap generation from scheduled tasks - add posts query for sitemap - create sitemap module in API crate * remove priority and change freq from sitemap * add configuration option for number of posts for sitemap * fix default config * rate limit sitemap endpoint * update sitemap query * update sitemap generation - remove config value for query limit - adjust sitemap generation to query changes - tidy up error handling * refactor sitemap generation loop * remove `limit` argument * refactor `generate_urlset` and add unit test * change query to only fetch local posts of past 24h * fix outdated comment and log * cargo fmt
- Loading branch information
Showing
6 changed files
with
198 additions
and
0 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,142 @@ | ||
use actix_web::{ | ||
http::header::{self, CacheDirective}, | ||
web::Data, | ||
HttpResponse, | ||
}; | ||
use chrono::{DateTime, FixedOffset}; | ||
use lemmy_api_common::context::LemmyContext; | ||
use lemmy_db_schema::{newtypes::DbUrl, source::post::Post}; | ||
use lemmy_utils::error::LemmyResult; | ||
use sitemap_rs::{url::Url, url_set::UrlSet}; | ||
use tracing::info; | ||
|
||
async fn generate_urlset(posts: Vec<(DbUrl, chrono::NaiveDateTime)>) -> LemmyResult<UrlSet> { | ||
let urls = posts | ||
.into_iter() | ||
.map_while(|post| { | ||
Url::builder(post.0.to_string()) | ||
.last_modified(DateTime::from_utc( | ||
post.1, | ||
FixedOffset::east_opt(0).expect("Error setting timezone offset"), // TODO what is the proper timezone offset here? | ||
)) | ||
.build() | ||
.ok() | ||
}) | ||
.collect(); | ||
|
||
Ok(UrlSet::new(urls)?) | ||
} | ||
|
||
pub async fn get_sitemap(context: Data<LemmyContext>) -> LemmyResult<HttpResponse> { | ||
info!("Generating sitemap with posts from last {} hours...", 24); | ||
let posts = Post::list_for_sitemap(&mut context.pool()).await?; | ||
info!("Loaded latest {} posts", posts.len()); | ||
|
||
let mut buf = Vec::<u8>::new(); | ||
generate_urlset(posts).await?.write(&mut buf)?; | ||
|
||
Ok( | ||
HttpResponse::Ok() | ||
.content_type("application/xml") | ||
.insert_header(header::CacheControl(vec![CacheDirective::MaxAge(86_400)])) // 24 h | ||
.body(buf), | ||
) | ||
} | ||
|
||
#[cfg(test)] | ||
pub(crate) mod tests { | ||
#![allow(clippy::unwrap_used)] | ||
|
||
use crate::sitemap::generate_urlset; | ||
use chrono::{NaiveDate, NaiveDateTime}; | ||
use elementtree::Element; | ||
use lemmy_db_schema::newtypes::DbUrl; | ||
use url::Url; | ||
|
||
#[tokio::test] | ||
async fn test_generate_urlset() { | ||
let posts: Vec<(DbUrl, NaiveDateTime)> = vec![ | ||
( | ||
Url::parse("https://example.com").unwrap().into(), | ||
NaiveDate::from_ymd_opt(2022, 12, 1) | ||
.unwrap() | ||
.and_hms_opt(9, 10, 11) | ||
.unwrap(), | ||
), | ||
( | ||
Url::parse("https://lemmy.ml").unwrap().into(), | ||
NaiveDate::from_ymd_opt(2023, 1, 1) | ||
.unwrap() | ||
.and_hms_opt(1, 2, 3) | ||
.unwrap(), | ||
), | ||
]; | ||
|
||
let mut buf = Vec::<u8>::new(); | ||
generate_urlset(posts) | ||
.await | ||
.unwrap() | ||
.write(&mut buf) | ||
.unwrap(); | ||
let root = Element::from_reader(buf.as_slice()).unwrap(); | ||
|
||
assert_eq!(root.tag().name(), "urlset"); | ||
assert_eq!(root.child_count(), 2); | ||
|
||
assert!(root.children().all(|url| url.tag().name() == "url")); | ||
assert!(root.children().all(|url| url.child_count() == 2)); | ||
assert!(root.children().all(|url| url | ||
.children() | ||
.next() | ||
.is_some_and(|element| element.tag().name() == "loc"))); | ||
assert!(root.children().all(|url| url | ||
.children() | ||
.nth(1) | ||
.is_some_and(|element| element.tag().name() == "lastmod"))); | ||
|
||
assert_eq!( | ||
root | ||
.children() | ||
.next() | ||
.unwrap() | ||
.children() | ||
.find(|element| element.tag().name() == "loc") | ||
.unwrap() | ||
.text(), | ||
"https://example.com/" | ||
); | ||
assert_eq!( | ||
root | ||
.children() | ||
.next() | ||
.unwrap() | ||
.children() | ||
.find(|element| element.tag().name() == "lastmod") | ||
.unwrap() | ||
.text(), | ||
"2022-12-01T09:10:11+00:00" | ||
); | ||
assert_eq!( | ||
root | ||
.children() | ||
.nth(1) | ||
.unwrap() | ||
.children() | ||
.find(|element| element.tag().name() == "loc") | ||
.unwrap() | ||
.text(), | ||
"https://lemmy.ml/" | ||
); | ||
assert_eq!( | ||
root | ||
.children() | ||
.nth(1) | ||
.unwrap() | ||
.children() | ||
.find(|element| element.tag().name() == "lastmod") | ||
.unwrap() | ||
.text(), | ||
"2023-01-01T01:02:03+00:00" | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters