diff --git a/mat-chalmers.cabal b/mat-chalmers.cabal index f60e142..f63c5e3 100644 --- a/mat-chalmers.cabal +++ b/mat-chalmers.cabal @@ -54,6 +54,7 @@ library , thyme >= 0.4 && <= 0.5 , word8 == 0.1.3 , extra >= 1.7.10 && <= 1.8 + , vector-space >= 0.16 && <0.18 executable mat-chalmers main-is: Main.hs diff --git a/src/Model.hs b/src/Model.hs index d9b5c9a..ea9d730 100644 --- a/src/Model.hs +++ b/src/Model.hs @@ -37,13 +37,12 @@ import Data.Text.Lazy ( fromStrict import Prettyprinter ( Doc , pretty ) +import Data.AffineSpace ( (.+^) ) import Data.Thyme ( _localDay , _localTimeOfDay , _todHour - , _ymdDay , _zonedTimeToLocalTime , getZonedTime - , gregorian ) import Lens.Micro.Platform ( (^.) , (&) @@ -93,8 +92,7 @@ update = do dateNow <- liftIO $ fmap (view _zonedTimeToLocalTime) getZonedTime let (textday, d) = if dateNow ^. _localTimeOfDay . _todHour >= nextDayHour - then - ("Tomorrow", dateNow & (_localDay . gregorian . _ymdDay) %~ (+ 1)) + then ("Tomorrow", dateNow & _localDay %~ (.+^ 1)) else ("Today", dateNow) let day' = d ^. _localDay let karenR = fetchAndCreateRestaurant day'