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

use textviews in channel list + parse emojis

Browse Source
This commit is contained in:
ouwou
2020-11-10 01:38:44 -05:00
parent 823e1786e0
commit eb0feef511
8 changed files with 151 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
discord/guild.cpp
View File

@@ -14,10 +14,10 @@ void from_json(const nlohmann::json &j, Guild &m) {
JS_ON("discovery_splash", m.DiscoverySplash);
JS_O("owner", m.IsOwner);
JS_D("owner_id", m.OwnerID);
std::string tmp;
std::optional<std::string> tmp;
JS_O("permissions", tmp);
if (tmp != "")
m.Permissions = std::stoull(tmp);
if (tmp.has_value())
m.Permissions = std::stoull(*tmp);
JS_D("region", m.VoiceRegion);
JS_N("afk_channel_id", m.AFKChannelID);
JS_D("afk_timeout", m.AFKTimeout);
@@ -54,8 +54,12 @@ void from_json(const nlohmann::json &j, Guild &m) {
JS_D("preferred_locale", m.PreferredLocale);
JS_N("public_updates_channel_id", m.PublicUpdatesChannelID);
JS_O("max_video_channel_users", m.MaxVideoChannelUsers);
JS_O("approximate_member_count", m.ApproximateMemberCount);
JS_O("approximate_presence_count", m.ApproximatePresenceCount);
JS_O("approximate_member_count", tmp);
if (tmp.has_value())
m.ApproximateMemberCount = std::stoull(*tmp);
JS_O("approximate_presence_count", tmp);
if (tmp.has_value())
m.ApproximatePresenceCount = std::stoull(*tmp);
}
void Guild::update_from_json(const nlohmann::json &j) {