diff --git a/ticker-serve/src/index.rs b/ticker-serve/src/index.rs index faaa1fd..16a6920 100644 --- a/ticker-serve/src/index.rs +++ b/ticker-serve/src/index.rs @@ -9,7 +9,7 @@ use mime::TEXT_HTML; use typed_html::{html, text, dom::DOMTree, types::{Class, SpacedSet}}; use diesel::prelude::*; -use chrono::{offset::Local, Datelike, NaiveDate}; +use chrono::{offset::Local, Datelike, Duration, NaiveDate}; use libticker::{ schema::{self, events::dsl::events}, @@ -56,8 +56,11 @@ fn group_by_day(es: &[Event]) -> Vec { fn render_index(app_state: &AppState) -> String { let db = app_state.db.lock().unwrap(); let today = Local::today().naive_local().and_hms(0, 0, 0); + let limit = Local::today().naive_local().and_hms(0, 0, 0) + + Duration::weeks(2); let es = events .filter(schema::events::dtstart.ge(&today)) + .filter(schema::events::dtstart.lt(&limit)) .order_by(schema::events::dtstart.asc()) .then_order_by(schema::events::dtend.desc()) .load::(&*db)