merge master

1 files changed, 11 insertions, 0 deletions

diff --git a/src/discord/permissions.cpp b/src/discord/permissions.cpp
new file mode 100644
index 0000000..63eeb9f
--- /dev/null
+++ b/src/discord/permissions.cpp
@@ -0,0 +1,11 @@
+#include "permissions.hpp"
+
+void from_json(const nlohmann::json &j, PermissionOverwrite &m) {
+    JS_D("id", m.ID);
+    std::string tmp;
+    m.Type = j.at("type").get<int>() == 0 ? PermissionOverwrite::ROLE : PermissionOverwrite::MEMBER;
+    JS_D("allow", tmp);
+    m.Allow = static_cast<Permission>(std::stoull(tmp));
+    JS_D("deny", tmp);
+    m.Deny = static_cast<Permission>(std::stoull(tmp));
+}