summaryrefslogtreecommitdiff
path: root/discord/usersettings.cpp
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2020-10-13 23:54:50 -0400
committerouwou <26526779+ouwou@users.noreply.github.com>2020-10-13 23:54:50 -0400
commitae85d7e4419a1dc6ab78cad9124f0febe1ff3259 (patch)
tree1a7efe6dfc917eb212d8bfe5346c8646fb9894a7 /discord/usersettings.cpp
parent00770e4bcbd8fdcefc80daf56a707c5ee4ae5bfd (diff)
downloadabaddon-portaudio-ae85d7e4419a1dc6ab78cad9124f0febe1ff3259.tar.gz
abaddon-portaudio-ae85d7e4419a1dc6ab78cad9124f0febe1ff3259.zip
fix guild positioning
Diffstat (limited to 'discord/usersettings.cpp')
-rw-r--r--discord/usersettings.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/discord/usersettings.cpp b/discord/usersettings.cpp
index 4cbf29c..2e5b7f5 100644
--- a/discord/usersettings.cpp
+++ b/discord/usersettings.cpp
@@ -1,5 +1,13 @@
#include "usersettings.hpp"
+void from_json(const nlohmann::json &j, UserSettingsGuildFoldersEntry &m) {
+ JS_N("color", m.Color);
+ JS_D("guild_ids", m.GuildIDs);
+ JS_N("id", m.ID);
+ JS_N("name", m.Name);
+
+}
+
void from_json(const nlohmann::json &j, UserSettings &m) {
JS_D("timezone_offset", m.TimezoneOffset);
JS_D("theme", m.Theme);
@@ -15,7 +23,7 @@ void from_json(const nlohmann::json &j, UserSettings &m) {
JS_D("inline_embed_media", m.ShouldInlineEmbedMedia);
JS_D("inline_attachment_media", m.ShouldInlineAttachmentMedia);
JS_D("guild_positions", m.GuildPositions);
- // JS_D("guild_folders", m.GuildFolders);
+ JS_D("guild_folders", m.GuildFolders);
JS_D("gif_auto_play", m.ShouldGIFAutoplay);
// JS_D("friend_source_flags", m.FriendSourceFlags);
JS_D("explicit_content_filter", m.ExplicitContentFilter);