event instead of events

Author: tanneberger

src/events.rs renamed to src/event.rs

@@ -9,7 +9,7 @@ use time::{Date, OffsetDateTime};
 struct MyDate(Date);
 
 #[derive(Debug, Clone)]
-pub(crate) struct Events {
+pub(crate) struct EventHandler {
   events: Arc<Vec<Arc<Event>>>,
   short_event: Arc<Vec<Arc<SmallEvent>>>,
 }
@@ -60,7 +60,7 @@ pub(crate) struct SmallEvent {
   image: Option<String>,
 }
 
-impl Events {
+impl EventHandler {
   pub(crate) async fn load(directory: &Path) -> anyhow::Result<Self> {
     let mut events = Vec::new();
     let mut short_events = Vec::new();

src/main.rs

@@ -9,7 +9,7 @@ use tracing_subscriber::FmtSubscriber;
 use crate::args::Args;
 use crate::bird::Bird;
 use crate::documents::Documents;
-use crate::events::Events;
+use crate::event::EventHandler;
 use crate::lists::MailingLists;
 use crate::blog::Blog;
 use crate::peers::NetworkService;
@@ -23,7 +23,7 @@ mod args;
 mod bird;
 mod cache;
 mod documents;
-mod events;
+mod event;
 mod lang;
 mod lists;
 mod blog;
@@ -73,7 +73,7 @@ async fn main() -> anyhow::Result<()> {
     )
     .await?,
     bird: Bird::new(args.bird_html).await?,
-    events: Events::load(&args.content_directory.join("events")).await?,
+    events: EventHandler::load(&args.content_directory.join("event")).await?,
   };
 
   let cors = CorsLayer::new()

src/routes/events.rs renamed to src/routes/event.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::events::{Event, SmallEvent};
+use crate::event::{Event, SmallEvent};
 use axum::extract::{Path, State};
 use axum::Json;
 

src/routes/mod.rs

@@ -6,7 +6,7 @@ use axum::Router;
 use tower_http::services::ServeDir;
 
 use crate::routes::documents::list_documents;
-use crate::routes::events::{find_event, list_all_events, list_future_events};
+use crate::routes::event::{find_event, list_all_events, list_future_events};
 use crate::routes::lists::add_subscriber;
 use crate::routes::blog::{find_keywords, find_post, list_posts};
 use crate::routes::peers::get_peers_and_supporter;
@@ -18,7 +18,7 @@ use self::stats::{get_as112_stats, get_traffic_stats};
 
 mod bird;
 mod documents;
-mod events;
+mod event;
 mod lists;
 mod blog;
 mod peers;
@@ -39,9 +39,9 @@ pub(crate) fn route(content_paths: &ContentPaths) -> Router<FoundationState> {
     .route("/blog/:lang", get(list_posts))
     .route("/blog/:lang/:slug", get(find_post))
     .route("/blog/keywords", get(find_keywords))
-    .route("/events/:lang/all", get(list_all_events))
-    .route("/events/:lang/upcoming", get(list_future_events))
-    .route("/events/:lang/:slug", get(find_event))
+    .route("/event/:lang/all", get(list_all_events))
+    .route("/event/:lang/upcoming", get(list_future_events))
+    .route("/event/:lang/:slug", get(find_event))
     .route("/text-blocks/:lang/:slug", get(find_text_block))
     .nest_service(
       "/text-blocks/assets",

src/state.rs

@@ -1,6 +1,6 @@
 use crate::bird::Bird;
 use crate::documents::Documents;
-use crate::events::Events;
+use crate::event::EventHandler;
 use crate::lists::MailingLists;
 use crate::blog::Blog;
 use crate::peers::NetworkService;
@@ -18,5 +18,5 @@ pub(crate) struct FoundationState {
   pub(crate) stats: Stats,
   pub(crate) peers: NetworkService,
   pub(crate) bird: Bird,
-  pub(crate) events: Events,
+  pub(crate) events: EventHandler,
 }