diff options
author | ouwou <26526779+ouwou@users.noreply.github.com> | 2023-02-01 22:39:59 -0500 |
---|---|---|
committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2023-02-01 22:39:59 -0500 |
commit | ff812842e3f6943c248e57d464d4085b51abf343 (patch) | |
tree | 226e97aead191c4ebb7a72d8b475cff7763f7363 /src/discord/usersettings.hpp | |
parent | ff47134dc64ac2f0fa7bfee64313b2522709b9b9 (diff) | |
parent | b4d3fc44c5cc24dcbe4f6fdc0ffe73acdb95cda9 (diff) | |
download | abaddon-portaudio-ff812842e3f6943c248e57d464d4085b51abf343.tar.gz abaddon-portaudio-ff812842e3f6943c248e57d464d4085b51abf343.zip |
Merge branch 'folders'
Diffstat (limited to 'src/discord/usersettings.hpp')
-rw-r--r-- | src/discord/usersettings.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/discord/usersettings.hpp b/src/discord/usersettings.hpp index 2631c45..513390b 100644 --- a/src/discord/usersettings.hpp +++ b/src/discord/usersettings.hpp @@ -1,13 +1,14 @@ #pragma once #include "json.hpp" #include "snowflake.hpp" +#include <optional> #include <string> struct UserSettingsGuildFoldersEntry { - int Color = -1; // null + std::optional<int> Color; std::vector<Snowflake> GuildIDs; - Snowflake ID; // null (this can be a snowflake as a string or an int that isnt a snowflake lol) - std::string Name; // null + std::optional<Snowflake> ID; // (this can be a snowflake as a string or an int that isnt a snowflake lol) + std::optional<std::string> Name; friend void from_json(const nlohmann::json &j, UserSettingsGuildFoldersEntry &m); }; |