summaryrefslogtreecommitdiff
path: root/src/discord/usersettings.hpp
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2023-02-01 23:49:48 -0500
committerouwou <26526779+ouwou@users.noreply.github.com>2023-02-01 23:49:48 -0500
commitecc83036c1522a024e1f5a1efc6fe533b907daf1 (patch)
treeceb75059aec90e01a314e59851beefffa733cdb0 /src/discord/usersettings.hpp
parent5a6f8cac09770d315fe4a3258fa6116e65750f24 (diff)
parent3ed51eb155444859c3aa00119857b602066c9c10 (diff)
downloadabaddon-portaudio-ecc83036c1522a024e1f5a1efc6fe533b907daf1.tar.gz
abaddon-portaudio-ecc83036c1522a024e1f5a1efc6fe533b907daf1.zip
Merge branch 'master' into pch
Diffstat (limited to 'src/discord/usersettings.hpp')
-rw-r--r--src/discord/usersettings.hpp7
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);
};