celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-13 20:18:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/uowuo/abaddon into voice

Browse Source
This commit is contained in:
ouwou
2023-04-13 16:29:56 -04:00
parent 7b5dc8a865 44ab35dfd5
commit c084230767
29 changed files with 721 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/discord/objects.cpp
View File

@@ -199,10 +199,26 @@ void to_json(nlohmann::json &j, const UserGuildSettingsEntry &m) {
j["version"] = m.Version;
}
std::optional<UserGuildSettingsChannelOverride> UserGuildSettingsEntry::GetOverride(Snowflake channel_id) const {
for (const auto &override : ChannelOverrides) {
if (override.ChannelID == channel_id) return override;
}
return std::nullopt;
}
void from_json(const nlohmann::json &j, UserGuildSettingsData &m) {
JS_D("version", m.Version);
JS_D("partial", m.IsPartial);
JS_D("entries", m.Entries);
{
std::vector<UserGuildSettingsEntry> entries;
JS_D("entries", entries);
for (const auto &entry : entries) {
m.Entries[entry.GuildID] = entry;
}
}
}
void from_json(const nlohmann::json &j, ReadyEventData &m) {