Merge branch 'master' into attachments

2 files changed, 6 insertions, 7 deletions

diff --git a/README.md b/README.md
index 01534de..86df18d 100644
--- a/README.md
+++ b/README.md
@@ -59,18 +59,17 @@ the result of fundamental issues with Discord's thread implementation.
 
 #### Mac:
 
-1. `git clone https://github.com/uowuo/abaddon && cd abaddon`
+1. `git clone https://github.com/uowuo/abaddon --recurse-submodules="subprojects" && cd abaddon`
 2. `brew install gtkmm3 nlohmann-json`
-3. `git submodule update --init subprojects`
-4. `mkdir build && cd build`
-5. `cmake ..`
-6. `make`
+3. `mkdir build && cd build`
+4. `cmake ..`
+5. `make`
 
 #### Linux:
 
 1. Install dependencies: `libgtkmm-3.0-dev`, `libcurl4-gnutls-dev`,
    and [nlohmann-json](https://github.com/nlohmann/json)
-2. `git clone https://github.com/uowuo/abaddon && cd abaddon`
+2. `git clone https://github.com/uowuo/abaddon --recurse-submodules="subprojects" && cd abaddon`
 3. `mkdir build && cd build`
 4. `cmake ..`
 5. `make`
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);