From c089f20b87976121f6e6e3275e8905a07572ded4 Mon Sep 17 00:00:00 2001
From: insects <mail@liv.nrw>
Date: Tue, 4 Feb 2025 22:17:06 +0100
Subject: [PATCH] include previous weather in calculation

---
 src/data.rs     | 21 +++++++++++++++++++--
 src/forecast.rs | 20 ++++++++++++++++++--
 src/main.rs     |  2 +-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index 433a15e..aba5924 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -48,6 +48,7 @@ pub struct FishEntry {
     pub fish_eyes: bool,
     pub big_fish: bool,
     pub weather_set: Vec<u32>,
+    pub previous_weather_set: Vec<u32>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -127,11 +128,27 @@ impl<'a> CombinedFish<'a> {
         if self.entry.weather_set.is_empty() {
             return true;
         }
+        // Check if the current weather is right!
         let cur_weather = forecast.weather_now();
-        self.entry
+        let is_current = self
+            .entry
             .weather_set
             .iter()
-            .any(|ws| ws == &cur_weather.weather_id)
+            .any(|ws| ws == &cur_weather.weather_id);
+
+        // Check if the fish depends on a previous weather, and if so, if that weather is
+        // right as well.
+        let is_past = if self.entry.previous_weather_set.is_empty() {
+            true
+        } else {
+            let prev_weather = forecast.nth_weather(-1);
+            self.entry
+                .previous_weather_set
+                .iter()
+                .any(|ws| ws == &prev_weather.weather_id)
+        };
+
+        is_current && is_past
     }
 
     pub fn is_up(&self, data: &Data) -> bool {
diff --git a/src/forecast.rs b/src/forecast.rs
index 7aeddd0..70a6343 100644
--- a/src/forecast.rs
+++ b/src/forecast.rs
@@ -1,6 +1,8 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, f32::consts::PI};
 
-use chrono::{DateTime, Timelike, Utc};
+use chrono::{DateTime, Duration, Timelike, Utc};
+
+use crate::clock;
 
 /// A forecast is used to divine specific weather patterns for a zone.
 #[derive(Debug)]
@@ -35,6 +37,20 @@ impl Forecast {
         let target = calculate_target(utc);
         self.weather_for_target(target)
     }
+
+    /// Returns the weather `n` cycles before or after the current weather.
+    pub fn nth_weather(&self, n: i32) -> &Rate {
+        let last_weather_time = round_to_last_weather_time(&clock::get_current_eorzea_date());
+        let hours = n * 8;
+        let td = Duration::hours(hours.abs() as i64);
+        let new_date = if hours > 0 {
+            last_weather_time.checked_add_signed(td).unwrap()
+        } else {
+            last_weather_time.checked_sub_signed(td).unwrap()
+        };
+        let target = calculate_target(new_date);
+        self.weather_for_target(target)
+    }
 }
 
 /// Rounds to the last weather "start". These happen three times a day, at 0:00,
diff --git a/src/main.rs b/src/main.rs
index 8bd422e..116ef03 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,7 +47,7 @@ async fn main_handler(state: State<Arc<AppState>>) -> Result<Markup, AppError> {
             }
         })
         .collect();
-    values.sort_by(|(afish, aup), (bfish, bup)| bup.cmp(aup));
+    values.sort_by(|(_, aup), (_, bup)| bup.cmp(aup));
     Ok(html! {
         h1 { "Hello! Current ET " (clock::get_current_eorzea_date().format("%H:%M")) }
         @for (fish, is_up) in values {