Skip to content

Simplified config loading & negative value check #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mr-DuctTape wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −39
Open

Simplified config loading & negative value check #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 18 additions & 39 deletions src/globals/globals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <cstdint>
#include <dpp/nlohmann/json.hpp>
#include <utility>

namespace
{
Expand All @@ -18,7 +19,7 @@ namespace
return true;
}

if (value.is_number_unsigned() || value.is_number_integer())
if (value.is_number_unsigned())
{
out = dpp::snowflake(value.get<uint64_t>());
return true;
Expand Down Expand Up @@ -55,46 +56,24 @@ namespace globals

bool loadFromConfig(const nlohmann::json& config, std::string& error)
{
if (!parseSnowflake(config, "emoji_yes_id", emoji::yes))
constexpr std::pair<const char*, dpp::snowflake&> configEntries[] =
{
error = "Missing or invalid config key: emoji_yes_id";
return false;
}

if (!parseSnowflake(config, "emoji_no_id", emoji::no))
{
error = "Missing or invalid config key: emoji_no_id";
return false;
}

if (!parseSnowflake(config, "channel_rules_id", channel::rulesId))
{
error = "Missing or invalid config key: channel_rules_id";
return false;
}

if (!parseSnowflake(config, "channel_jail_id", channel::jailId))
{
error = "Missing or invalid config key: channel_jail_id";
return false;
}

if (!parseSnowflake(config, "category_ticket_id", category::ticketId))
{
error = "Missing or invalid config key: category_ticket_id";
return false;
}

if (!parseSnowflake(config, "role_staff_id", role::staffId))
{
error = "Missing or invalid config key: role_staff_id";
return false;
}

if (!parseSnowflake(config, "role_jail_id", role::jailId))
{"emoji_yes_id", emoji::yes},
{"emoji_no_id", emoji::no},
{"channel_rules_id", channel::rulesId},
{"channel_jail_id", channel::jailId},
{"category_ticket_id", category::ticketId},
{"role_staff_id", role::staffId},
{"role_jail_id", role::jailId}
};

for (const auto& [name, id] : configEntries)
{
error = "Missing or invalid config key: role_jail_id";
return false;
if (!parseSnowFlake(config, name, id))
{
error = "Missing or invalid config key: " + std::string(name);
return false;
}
}

return true;
Expand Down