diff --git a/config/config.exs b/config/config.exs index b561153..20c2860 100644 --- a/config/config.exs +++ b/config/config.exs @@ -1,15 +1,16 @@ import Config config :plantid_discord_bot, - image_path: "priv/static", + max_results: 5, + score_threshold: 0.3, plantnet_api_key: System.get_env("PLANTNET_API_KEY"), plantnet_api_base_url: "https://my-api.plantnet.org/v2", - score_threshold: 0.3, - max_results: 5 - -config :plantid_discord_bot, PlantIdDiscordBot.Scheduler, - jobs: [ - {"@daily", {PlantIdDiscordBot.RateLimiter, :reset_counters, []}} - ] + port: 4321, + guild_request_limit_per_day: 20, + image_path: "priv/static", + fileserver_url: "http://localhost:4321", + source: "https://github.com/TheRealOwenRees/plantid-discord-bot", + invite: + "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot" import_config "#{config_env()}.exs" diff --git a/config/dev.exs b/config/dev.exs index a2d534d..dd743bd 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -1,15 +1,6 @@ import Config config :plantid_discord_bot, - guild_request_limit_per_day: 20, - guild_ids: [1_002_507_312_159_797_318], - plantnet_api_key: System.get_env("PLANTNET_API_KEY"), - plantnet_api_base_url: "https://my-api.plantnet.org/v2", - fileserver_url: "http://localhost:4321", - port: 4321, - source: "https://github.com/TheRealOwenRees/plantid-discord-bot", - invite: - "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot", api: Nostrum.Api config :logger, :console, diff --git a/config/prod.exs b/config/prod.exs index 882c454..2ebce33 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -1,14 +1,6 @@ import Config config :plantid_discord_bot, - guild_request_limit_per_day: 20, - guild_ids: [], - plantnet_api_key: System.get_env("PLANTNET_API_KEY"), - fileserver_url: "http://localhost:4321", - port: 4321, - source: "https://github.com/TheRealOwenRees/plantid-discord-bot", - invite: - "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot", api: Nostrum.Api config :logger, diff --git a/config/runtime.exs b/config/runtime.exs index 733b8b6..3bb89b1 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -3,13 +3,23 @@ import Config config :plantid_discord_bot, start_time: DateTime.utc_now(), guild_ids: [1_002_507_312_159_797_318], + api: Nostrum.Api, + max_results: 5, + score_threshold: 0.3, plantnet_api_key: System.get_env("PLANTNET_API_KEY"), - fileserver_url: "http://localhost:4321", + plantnet_api_base_url: "https://my-api.plantnet.org/v2", port: 4321, + guild_request_limit_per_day: 20, + image_path: "priv/static", + fileserver_url: "http://localhost:4321", source: "https://github.com/TheRealOwenRees/plantid-discord-bot", invite: - "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot", - api: Nostrum.Api + "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot" + +config :plantid_discord_bot, PlantIdDiscordBot.Scheduler, + jobs: [ + {"@daily", {PlantIdDiscordBot.RateLimiter, :reset_counters, []}} + ] config :nostrum, token: System.get_env("DISCORD_TOKEN"), diff --git a/config/test.exs b/config/test.exs index b322956..aa3c3ea 100644 --- a/config/test.exs +++ b/config/test.exs @@ -1,14 +1,6 @@ import Config config :plantid_discord_bot, - guild_request_limit_per_day: 20, - guild_ids: [1_002_507_312_159_797_318], - plantnet_api_key: System.get_env("PLANTNET_API_KEY"), - fileserver_url: "http://localhost:4321", - port: 4321, - source: "https://github.com/TheRealOwenRees/plantid-discord-bot", - invite: - "https://discord.com/api/oauth2/authorize?client_id=948227126094598204&permissions=19520&scope=bot", api: PlantIdDiscordBotTest.Mocks.Nostrum.Api config :logger, :console, diff --git a/lib/plantid_discord_bot/cogs/plantnet.ex b/lib/plantid_discord_bot/cogs/plantnet.ex index bbfb7c2..0fd1b46 100644 --- a/lib/plantid_discord_bot/cogs/plantnet.ex +++ b/lib/plantid_discord_bot/cogs/plantnet.ex @@ -52,8 +52,10 @@ defmodule PlantIdDiscordBot.Cog.PlantNet do cleanup_saved_images(saved_images) rescue e -> + Logger.error(Exception.format(:error, e, __STACKTRACE__)) + Api.create_followup_message(interaction.application_id, interaction.token, %{ - content: e.message + content: "An error occurred. This error has been logged." }) end end diff --git a/mix.exs b/mix.exs index 2f5d011..f0303ac 100644 --- a/mix.exs +++ b/mix.exs @@ -13,8 +13,10 @@ defmodule PlantidDiscordBot.MixProject do # Run "mix help compile.app" to learn about applications. def application do + dev_apps = if Mix.env() == :dev, do: [:observer, :wx], else: [] + [ - extra_applications: [:logger, :observer, :wx, :runtime_tools], + extra_applications: [:logger, :runtime_tools] ++ dev_apps, mod: {PlantIdDiscordBot.Application, []} ] end