From 617b64eae24009769f32e59d95ae8c441e7ac118 Mon Sep 17 00:00:00 2001
From: Owen <owenrees82@gmail.com>
Date: Wed, 15 Jan 2025 16:07:18 +0100
Subject: [PATCH] reworked aliases

---
 lib/plantid_discord_bot.ex                       | 5 ++---
 lib/plantid_discord_bot/cogs/plantnet_message.ex | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/plantid_discord_bot.ex b/lib/plantid_discord_bot.ex
index 1c747f1..2acfd90 100644
--- a/lib/plantid_discord_bot.ex
+++ b/lib/plantid_discord_bot.ex
@@ -4,10 +4,9 @@ defmodule PlantIdDiscordBot.Consumer do
   """
   use Nostrum.Consumer
   alias Nostrum.Api
-  alias PlantIdDiscordBot.Cog
-  alias PlantIdDiscordBot.Consumer.Commands
+  alias PlantIdDiscordBot.{Cog, Consumer}
 
-  @global_application_commands Commands.global_application_commands()
+  @global_application_commands Consumer.Commands.global_application_commands()
 
   def handle_event({:READY, _data, _ws_state}) do
     Api.create_global_application_command(@global_application_commands)
diff --git a/lib/plantid_discord_bot/cogs/plantnet_message.ex b/lib/plantid_discord_bot/cogs/plantnet_message.ex
index 144a031..e2a95a5 100644
--- a/lib/plantid_discord_bot/cogs/plantnet_message.ex
+++ b/lib/plantid_discord_bot/cogs/plantnet_message.ex
@@ -9,6 +9,7 @@ defmodule PlantIdDiscordBot.Cog.PlantNetMessage do
   alias Nostrum.Cache.GuildCache
   alias PlantIdDiscordBot.Metrics
 
+  # TODO reintroduce mocks
   # @api Application.compile_env(:plantid_discord_bot, :api)
   @plantnet_api_base_url Application.compile_env(:plantid_discord_bot, :plantnet_api_base_url)
   @max_results Application.compile_env(:plantid_discord_bot, :max_results)
@@ -34,11 +35,14 @@ defmodule PlantIdDiscordBot.Cog.PlantNetMessage do
         |> Enum.map(fn attachment -> attachment.url end)
         |> File.download_and_save_files!()
       rescue
+        # TODO add guild id and name into error
+        # TODO test by raising error
         e in ArgumentError ->
           Api.create_message(message.channel_id, content: e.message)
           nil
       end
 
+    # TODO improve composition
     if saved_images do
       try do
         prepare_images(saved_images)
@@ -72,6 +76,8 @@ defmodule PlantIdDiscordBot.Cog.PlantNetMessage do
 
   defp get_response(query_uri, message) do
     guild_id = message.guild_id
+
+    # TODO move into its own function
     {:ok, %{name: guild_name}} = GuildCache.get(guild_id)
 
     case HTTPoison.get(query_uri) do