summaryrefslogtreecommitdiff
path: root/discord/objects.cpp
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2021-01-23 18:23:14 -0500
committerouwou <26526779+ouwou@users.noreply.github.com>2021-01-23 18:23:14 -0500
commitfd72d91ceef0bba92fe886719b6e30e81f9ec838 (patch)
tree01ad325aeaf4b6b8f5443227cd94b8bfa7636819 /discord/objects.cpp
parent04734e7e55366e3138f7d818f5267e76fbfa1041 (diff)
downloadabaddon-portaudio-fd72d91ceef0bba92fe886719b6e30e81f9ec838.tar.gz
abaddon-portaudio-fd72d91ceef0bba92fe886719b6e30e81f9ec838.zip
handle merged_members in ready object
this way you dont have to load a channel to make the client aware of your permissions
Diffstat (limited to 'discord/objects.cpp')
-rw-r--r--discord/objects.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/discord/objects.cpp b/discord/objects.cpp
index bcc7b04..4cc03e0 100644
--- a/discord/objects.cpp
+++ b/discord/objects.cpp
@@ -98,6 +98,7 @@ void from_json(const nlohmann::json &j, ReadyEventData &m) {
JS_D("user_settings", m.Settings);
JS_D("private_channels", m.PrivateChannels);
JS_O("users", m.Users);
+ JS_ON("merged_members", m.MergedMembers);
}
void to_json(nlohmann::json &j, const IdentifyProperties &m) {