Merge remote-tracking branch 'upstream/main'

src/model/mod.rs

@@ -6,8 +6,8 @@ use waterlevel::WaterlevelDay;
 use crate::AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD;
 
 use self::{
-    event::{Event, EventWithUserAndTriptype},
-    trip::{Trip, TripWithUserAndType},
+    event::{Event, EventWithDetails},
+    trip::{Trip, TripWithDetails},
     waterlevel::Waterlevel,
     weather::Weather,
 };
@@ -28,8 +28,8 @@ pub mod weather;
 #[derive(Serialize, Debug)]
 pub struct Day {
     day: NaiveDate,
-    events: Vec<EventWithUserAndTriptype>,
-    trips: Vec<TripWithUserAndType>,
+    events: Vec<EventWithDetails>,
+    trips: Vec<TripWithDetails>,
     is_pinned: bool,
     regular_sees_this_day: bool,
     max_waterlevel: Option<WaterlevelDay>,