diff options
author | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-06-14 02:23:22 -0400 |
---|---|---|
committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-06-14 02:23:22 -0400 |
commit | caa551a4693c7c7ef475be515b31eb025bc7df96 (patch) | |
tree | 556ac98d2d2f88d29f192f9abba4dbaeb78edfec /src | |
parent | 5cf4d8e160dd5bb2a8681106c030ecee152c7366 (diff) | |
parent | ccf5afbba959068f34897b75afcd25c65c96d79c (diff) | |
download | abaddon-portaudio-caa551a4693c7c7ef475be515b31eb025bc7df96.tar.gz abaddon-portaudio-caa551a4693c7c7ef475be515b31eb025bc7df96.zip |
Merge branch 'master' into attachments
Diffstat (limited to 'src')
-rw-r--r-- | src/discord/objects.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/discord/objects.cpp b/src/discord/objects.cpp index 6deaca0..f796000 100644 --- a/src/discord/objects.cpp +++ b/src/discord/objects.cpp @@ -41,7 +41,7 @@ void from_json(const nlohmann::json &j, GuildMemberListUpdateMessage::MemberItem JS_D("mute", m.IsMuted); JS_D("joined_at", m.JoinedAt); JS_D("deaf", m.IsDefeaned); - JS_N("hoisted_role", m.HoistedRole); + JS_ON("hoisted_role", m.HoistedRole); JS_ON("premium_since", m.PremiumSince); JS_ON("nick", m.Nickname); JS_ON("presence", m.Presence); |