summaryrefslogtreecommitdiff
path: root/src/discord/objects.cpp
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2023-08-25 20:36:36 -0400
committerouwou <26526779+ouwou@users.noreply.github.com>2023-08-25 20:36:36 -0400
commitccabaa44d6954812e7a8582246d3aa14a749ccc9 (patch)
tree3ecc78516971b709419e93bc75f2709a544c3f40 /src/discord/objects.cpp
parent2bc709bf3ff54b0104fb0bd8e8d80ffd1ba84586 (diff)
parenteea5987f379cd76786ace382da09dd687ecca28a (diff)
downloadabaddon-portaudio-ccabaa44d6954812e7a8582246d3aa14a749ccc9.tar.gz
abaddon-portaudio-ccabaa44d6954812e7a8582246d3aa14a749ccc9.zip
Merge branch 'master' into rnnoise
Diffstat (limited to 'src/discord/objects.cpp')
-rw-r--r--src/discord/objects.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/discord/objects.cpp b/src/discord/objects.cpp
index cb0a685..4ad17c3 100644
--- a/src/discord/objects.cpp
+++ b/src/discord/objects.cpp
@@ -27,7 +27,7 @@ void from_json(const nlohmann::json &j, MessageDeleteBulkData &m) {
void from_json(const nlohmann::json &j, GuildMemberListUpdateMessage::GroupItem &m) {
m.Type = "group";
JS_D("id", m.ID);
- JS_D("count", m.Count);
+ JS_ON("count", m.Count);
}
GuildMember GuildMemberListUpdateMessage::MemberItem::GetAsMemberData() const {
@@ -54,16 +54,16 @@ void from_json(const nlohmann::json &j, GuildMemberListUpdateMessage::OpObject &
m.Items.emplace();
JS_D("range", m.Range);
for (const auto &ij : j.at("items")) {
- if (ij.contains("group"))
- m.Items->push_back(std::make_unique<GuildMemberListUpdateMessage::GroupItem>(ij.at("group")));
- else if (ij.contains("member"))
+ if (ij.contains("member")) {
m.Items->push_back(std::make_unique<GuildMemberListUpdateMessage::MemberItem>(ij.at("member")));
+ }
}
} else if (m.Op == "UPDATE") {
JS_D("index", m.Index);
const auto &ij = j.at("item");
- if (ij.contains("member"))
+ if (ij.contains("member")) {
m.OpItem = std::make_unique<GuildMemberListUpdateMessage::MemberItem>(ij.at("member"));
+ }
}
}