Made now it's own required parameter.

mbta · Sep 11, 2024 · e72b5af · e72b5af
1 parent 0dae7ca
commit e72b5af
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/lib/screens/v2/candidate_generator/bus_eink.ex b/lib/screens/v2/candidate_generator/bus_eink.ex
@@ -59,7 +59,7 @@ defmodule Screens.V2.CandidateGenerator.BusEink do
       ) do
     [
       fn -> header_instances(config, now, fetch_stop_name_fn) end,
-      fn -> departures_instances_fn.(config, now: now) end,
+      fn -> departures_instances_fn.(config, now) end,
       fn -> alert_instances_fn.(config) end,
       fn -> footer_instances(config) end,
       fn -> evergreen_content_instances_fn.(config) end,

diff --git a/lib/screens/v2/candidate_generator/bus_shelter.ex b/lib/screens/v2/candidate_generator/bus_shelter.ex
@@ -57,7 +57,7 @@ defmodule Screens.V2.CandidateGenerator.BusShelter do
       ) do
     [
       fn -> header_instances(config, now, fetch_stop_name_fn) end,
-      fn -> departures_instances_fn.(config, now: now) end,
+      fn -> departures_instances_fn.(config, now) end,
       fn -> alert_instances_fn.(config) end,
       fn -> footer_instances(config) end,
       fn -> subway_status_instances_fn.(config, now) end,

diff --git a/lib/screens/v2/candidate_generator/busway.ex b/lib/screens/v2/candidate_generator/busway.ex
@@ -35,7 +35,7 @@ defmodule Screens.V2.CandidateGenerator.Busway do
 
     [
       fn -> header_instances(config, now) end,
-      fn -> deps.departures_instances.(config, now: now) end,
+      fn -> deps.departures_instances.(config, now) end,
       fn -> placeholder_instances() end
     ]
     |> Task.async_stream(& &1.(), timeout: 15_000)

diff --git a/lib/screens/v2/candidate_generator/gl_eink.ex b/lib/screens/v2/candidate_generator/gl_eink.ex
@@ -89,7 +89,7 @@ defmodule Screens.V2.CandidateGenerator.GlEink do
     [
       fn -> header_instances(config, now, fetch_destination_fn) end,
       fn ->
-        departures_instances_fn.(config, post_process_fn: &departures_post_processing/2, now: now)
+        departures_instances_fn.(config, now, post_process_fn: &departures_post_processing/2)
       end,
       fn -> alert_instances_fn.(config) end,
       fn -> footer_instances(config) end,

diff --git a/lib/screens/v2/candidate_generator/solari_large.ex b/lib/screens/v2/candidate_generator/solari_large.ex
@@ -31,7 +31,7 @@ defmodule Screens.V2.CandidateGenerator.SolariLarge do
       ) do
     [
       fn -> header_instances(config, now) end,
-      fn -> departures_instances_fn.(config, now: now) end,
+      fn -> departures_instances_fn.(config, now) end,
       fn -> placeholder_instances() end
     ]
     |> Task.async_stream(& &1.(), timeout: 15_000)

diff --git a/lib/screens/v2/candidate_generator/widgets/departures.ex b/lib/screens/v2/candidate_generator/widgets/departures.ex
@@ -36,10 +36,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.Departures do
           | OvernightDepartures.t()
 
   @spec departures_instances(Screen.t(), options()) :: [widget()]
-  def departures_instances(
-        %Screen{app_params: %app{}} = config,
-        options
-      )
+  def departures_instances(%Screen{app_params: %app{}} = config, now, options \\ [])
       when app in [BusEink, BusShelter, Busway, GlEink, SolariLarge] do
     disabled_modes =
       Keyword.get(options, :disabled_modes_fn, &Screens.Config.Cache.disabled_modes/0).()
@@ -53,7 +50,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.Departures do
         Keyword.get(options, :departure_fetch_fn, &Departure.fetch/2),
         Keyword.get(options, :post_process_fn, fn results, _config -> results end),
         Keyword.get(options, :route_fetch_fn, &Route.fetch/1),
-        options[:now]
+        now
       )
     end
   end

diff --git a/test/screens/v2/candidate_generator/widgets/departures_test.exs b/test/screens/v2/candidate_generator/widgets/departures_test.exs
@@ -31,7 +31,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.DeparturesTest do
     }
   end
 
-  describe "departures_instances/1" do
+  describe "departures_instances/3" do
     defp build_config(section_route_ids) do
       %Screen{
         app_params: %BusShelter{
@@ -62,6 +62,7 @@ defmodule Screens.V2.CandidateGenerator.Widgets.DeparturesTest do
     defp departures_instances(config, options) do
       Departures.departures_instances(
         config,
+        nil,
         Keyword.merge(
           [
             departure_fetch_fn: fn _, _ -> :error end,