summaryrefslogtreecommitdiff
path: root/discord/objects.cpp
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2021-05-08 23:37:52 -0400
committerouwou <26526779+ouwou@users.noreply.github.com>2021-05-08 23:37:52 -0400
commitabd2b9c71e98f3d9feab8d5b4d288b246015ee0d (patch)
treeaecc28fd04f15fd44cf88326739f140fb5421e48 /discord/objects.cpp
parent78d3c5b679597dfa82910a6ea1e266349fa23a39 (diff)
parent469053a14468f08dc694a1ef8d98f0265a72dd07 (diff)
downloadabaddon-portaudio-abd2b9c71e98f3d9feab8d5b4d288b246015ee0d.tar.gz
abaddon-portaudio-abd2b9c71e98f3d9feab8d5b4d288b246015ee0d.zip
Merge branch 'master' into friends
Diffstat (limited to 'discord/objects.cpp')
-rw-r--r--discord/objects.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/discord/objects.cpp b/discord/objects.cpp
index d2a3f4c..9db6cf8 100644
--- a/discord/objects.cpp
+++ b/discord/objects.cpp
@@ -452,3 +452,8 @@ void from_json(const nlohmann::json &j, RateLimitedResponse &m) {
JS_O("message", m.Message);
JS_D("retry_after", m.RetryAfter);
}
+
+void from_json(const nlohmann::json &j, RelationshipRemoveData &m) {
+ JS_D("id", m.ID);
+ JS_D("type", m.Type);
+}