From f9463c3af293dfa11ede06b77e748e9f881cf634 Mon Sep 17 00:00:00 2001
From: Owen <owenrees82@gmail.com>
Date: Fri, 20 Dec 2024 21:58:20 +0100
Subject: [PATCH] fix relase environments

---
 config/dev.exs                           |  2 ++
 config/prod.exs                          |  2 ++
 config/test.exs                          |  2 ++
 lib/plantid_discord_bot/cogs/plantnet.ex | 32 ++++++++++++++++--------
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/config/dev.exs b/config/dev.exs
index dd743bd..7e66272 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -3,6 +3,8 @@ import Config
 config :plantid_discord_bot,
   api: Nostrum.Api
 
+config :plantid_discord_bot, :environment, :dev
+
 config :logger, :console,
   format: "$time $metadata[$level] $message\n",
   level: :debug
diff --git a/config/prod.exs b/config/prod.exs
index 2ebce33..e0c36da 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -3,6 +3,8 @@ import Config
 config :plantid_discord_bot,
   api: Nostrum.Api
 
+config :plantid_discord_bot, :environment, :prod
+
 config :logger,
   backends: [{PlantIdDiscordBot.DiscordLogger, :discord_logger}]
 
diff --git a/config/test.exs b/config/test.exs
index aa3c3ea..c9087be 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -3,6 +3,8 @@ import Config
 config :plantid_discord_bot,
   api: PlantIdDiscordBotTest.Mocks.Nostrum.Api
 
+config :plantid_discord_bot, :environment, :test
+
 config :logger, :console,
   format: "$time $metadata[$level] $message\n",
   level: :debug
diff --git a/lib/plantid_discord_bot/cogs/plantnet.ex b/lib/plantid_discord_bot/cogs/plantnet.ex
index 0fd1b46..387647d 100644
--- a/lib/plantid_discord_bot/cogs/plantnet.ex
+++ b/lib/plantid_discord_bot/cogs/plantnet.ex
@@ -39,17 +39,14 @@ defmodule PlantIdDiscordBot.Cog.PlantNet do
       }
     })
 
+    attachment_urls = get_attachment_urls(interaction)
+    original_images = get_original_images(attachment_urls)
+    saved_images = File.download_and_save_files!(attachment_urls)
+
     try do
-      attachment_urls = get_attachment_urls(interaction)
-      original_images = get_original_images(attachment_urls)
-
-      saved_images = File.download_and_save_files!(attachment_urls)
-
       prepare_images(saved_images)
       |> build_query_uri()
       |> get_response(interaction, original_images)
-
-      cleanup_saved_images(saved_images)
     rescue
       e ->
         Logger.error(Exception.format(:error, e, __STACKTRACE__))
@@ -57,6 +54,8 @@ defmodule PlantIdDiscordBot.Cog.PlantNet do
         Api.create_followup_message(interaction.application_id, interaction.token, %{
           content: "An error occurred. This error has been logged."
         })
+    after
+      cleanup_saved_images(saved_images)
     end
   end
 
@@ -70,11 +69,22 @@ defmodule PlantIdDiscordBot.Cog.PlantNet do
   defp get_original_images(attachment_urls), do: Enum.join(attachment_urls, "\n")
 
   defp prepare_images(saved_images) do
-    if Mix.env() in [:test, :dev] do
-      PlantIdDiscordBotTest.Mocks.PlantNet.Images.images()
-    else
-      Enum.map(saved_images, fn {:ok, filename} -> "#{@fileserver_url}/#{filename}" end)
+    case Application.get_env(:plantid_discord_bot, :environment) do
+      :test ->
+        PlantIdDiscordBotTest.Mocks.PlantNet.Images.images()
+
+      :dev ->
+        PlantIdDiscordBotTest.Mocks.PlantNet.Images.images()
+
+      _ ->
+        Enum.map(saved_images, fn {:ok, filename} -> "#{@fileserver_url}/#{filename}" end)
     end
+
+    # if Mix.env() in [:test, :dev] do
+    #   PlantIdDiscordBotTest.Mocks.PlantNet.Images.images()
+    # else
+    #   Enum.map(saved_images, fn {:ok, filename} -> "#{@fileserver_url}/#{filename}" end)
+    # end
   end
 
   @spec build_query_uri([String.t()]) :: String.t()