populate channel list from READY message and other shit

2 files changed, 431 insertions, 6 deletions

diff --git a/discord/discord.cpp b/discord/discord.cpp
index 42c6550..3523989 100644
--- a/discord/discord.cpp
+++ b/discord/discord.cpp
@@ -20,6 +20,7 @@ void DiscordClient::Start() {
 }
 
 void DiscordClient::Stop() {
+    std::scoped_lock<std::mutex> guard(m_mutex);
     if (!m_client_connected) return;
 
     m_heartbeat_waiter.kill();
@@ -32,6 +33,17 @@ bool DiscordClient::IsStarted() const {
     return m_client_connected;
 }
 
+const DiscordClient::Guilds_t &DiscordClient::GetGuilds() const {
+    std::scoped_lock<std::mutex> guard(m_mutex);
+    return m_guilds;
+}
+
+const UserSettingsData &DiscordClient::GetUserSettings() const {
+    std::scoped_lock<std::mutex> guard(m_mutex);
+    assert(m_ready_received);
+    return m_user_settings;
+}
+
 void DiscordClient::HandleGatewayMessage(nlohmann::json j) {
     GatewayMessage m;
     try {
@@ -70,7 +82,19 @@ void DiscordClient::HandleGatewayMessage(nlohmann::json j) {
 }
 
 void DiscordClient::HandleGatewayReady(const GatewayMessage &msg) {
+    m_ready_received = true;
+    ReadyEventData data = msg.Data;
+    for (const auto &g : data.Guilds) {
+        StoreGuild(g.ID, g);
+    }
+    m_abaddon->DiscordNotifyReady();
+    m_user_settings = data.UserSettings;
+    return;
+}
 
+void DiscordClient::StoreGuild(Snowflake id, const GuildData &g) {
+    assert(id.IsValid() && id == g.ID);
+    m_guilds[id] = g;
 }
 
 void DiscordClient::HeartbeatThread() {
@@ -106,16 +130,169 @@ void DiscordClient::LoadEventMap() {
     m_event_map["READY"] = GatewayEvent::READY;
 }
 
+#define JS_D(k, t)         \
+    do {                   \
+        j.at(k).get_to(t); \
+    } while (0)
+
+#define JS_O(k, t)                            \
+    do {                                      \
+        if (j.contains(k)) j.at(k).get_to(t); \
+    } while (0)
+
+#define JS_N(k, t)                                 \
+    do {                                           \
+        if (!j.at(k).is_null()) j.at(k).get_to(t); \
+    } while (0)
+
+#define JS_ON(k, t)                              \
+    do {                                         \
+        if (j.contains(k) && !j.at(k).is_null()) \
+            j.at(k).get_to(t);                   \
+    } while (0)
+
 void from_json(const nlohmann::json &j, GatewayMessage &m) {
-    j.at("op").get_to(m.Opcode);
+    JS_D("op", m.Opcode);
     m.Data = j.at("d");
 
-    if (j.contains("t") && !j.at("t").is_null())
-        j.at("t").get_to(m.Type);
+    JS_ON("t", m.Type);
 }
 
 void from_json(const nlohmann::json &j, HelloMessageData &m) {
-    j.at("heartbeat_interval").get_to(m.HeartbeatInterval);
+    JS_D("heartbeat_interval", m.HeartbeatInterval);
+}
+
+void from_json(const nlohmann::json &j, UserData &m) {
+    JS_D("id", m.ID);
+    JS_D("username", m.Username);
+    JS_D("discriminator", m.Discriminator);
+    JS_N("avatar", m.Avatar);
+    JS_O("bot", m.IsBot);
+    JS_O("system", m.IsSystem);
+    JS_O("mfa_enabled", m.IsMFAEnabled);
+    JS_O("locale", m.Locale);
+    JS_O("verified", m.IsVerified);
+    JS_O("email", m.Email);
+    JS_O("flags", m.Flags);
+    JS_O("premium_type", m.PremiumType);
+    JS_O("public_flags", m.PublicFlags);
+    JS_O("desktop", m.IsDesktop);
+    JS_O("mobile", m.IsMobile);
+    JS_ON("nsfw_allowed", m.IsNSFWAllowed);
+    JS_ON("phone", m.Phone);
+}
+
+void from_json(const nlohmann::json &j, GuildData &m) {
+    JS_D("id", m.ID);
+    JS_D("name", m.Name);
+    JS_N("icon", m.Icon);
+    JS_N("splash", m.Splash);
+    JS_N("discovery_splash", m.DiscoverySplash);
+    JS_O("owner", m.IsOwner);
+    JS_D("owner_id", m.OwnerID);
+    JS_O("permissions", m.Permissions);
+    JS_O("permissions_new", m.PermissionsNew);
+    JS_D("region", m.VoiceRegion);
+    JS_N("afk_channel_id", m.AFKChannelID);
+    JS_D("afk_timeout", m.AFKTimeout);
+    JS_O("embed_enabled", m.IsEmbedEnabled);
+    JS_ON("embed_channel_id", m.EmbedChannelID);
+    JS_D("verification_level", m.VerificationLevel);
+    JS_D("default_message_notifications", m.DefaultMessageNotifications);
+    JS_D("explicit_content_filter", m.ExplicitContentFilter);
+    // JS_D("roles", m.Roles);
+    // JS_D("emojis", m.Emojis);
+    JS_D("features", m.Features);
+    JS_D("mfa_level", m.MFALevel);
+    JS_N("application_id", m.ApplicationID);
+    JS_O("widget_enabled", m.IsWidgetEnabled);
+    JS_ON("widget_channel_id", m.WidgetChannelID);
+    JS_N("system_channel_id", m.SystemChannelID);
+    JS_D("system_channel_flags", m.SystemChannelFlags);
+    JS_N("rules_channel_id", m.RulesChannelID);
+    JS_O("joined_at", m.JoinedAt);
+    JS_O("large", m.IsLarge);
+    JS_O("unavailable", m.IsUnavailable);
+    JS_O("member_count", m.MemberCount);
+    // JS_O("voice_states", m.VoiceStates);
+    // JS_O("members", m.Members);
+    JS_O("channels", m.Channels);
+    // JS_O("presences", m.Presences);
+    JS_ON("max_presences", m.MaxPresences);
+    JS_O("max_members", m.MaxMembers);
+    JS_N("vanity_url_code", m.VanityURL);
+    JS_N("description", m.Description);
+    JS_N("banner", m.BannerHash);
+    JS_D("premium_tier", m.PremiumTier);
+    JS_O("premium_subscription_count", m.PremiumSubscriptionCount);
+    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);
+}
+
+void from_json(const nlohmann::json &j, ChannelData &m) {
+    JS_D("id", m.ID);
+    JS_D("type", m.Type);
+    JS_O("guild_id", m.GuildID);
+    JS_O("position", m.Position);
+    // JS_O("permission_overwrites", m.PermissionOverwrites);
+    JS_O("name", m.Name);
+    JS_ON("topic", m.Topic);
+    JS_O("nsfw", m.IsNSFW);
+    JS_ON("last_message_id", m.LastMessageID);
+    JS_O("bitrate", m.Bitrate);
+    JS_O("user_limit", m.UserLimit);
+    JS_O("rate_limit_per_user", m.RateLimitPerUser);
+    JS_O("recipients", m.Recipients);
+    JS_ON("icon", m.Icon);
+    JS_O("owner_id", m.OwnerID);
+    JS_O("application_id", m.ApplicationID);
+    JS_ON("parent_id", m.ParentID);
+    JS_ON("last_pin_timestamp", m.LastPinTimestamp);
+}
+
+void from_json(const nlohmann::json &j, ReadyEventData &m) {
+    JS_D("v", m.GatewayVersion);
+    JS_D("user", m.User);
+    JS_D("guilds", m.Guilds);
+    JS_D("session_id", m.SessionID);
+    JS_D("analytics_token", m.AnalyticsToken);
+    JS_D("friend_suggestion_count", m.FriendSuggestionCount);
+    JS_D("user_settings", m.UserSettings);
+}
+
+void from_json(const nlohmann::json &j, UserSettingsData &m) {
+    JS_D("timezone_offset", m.TimezoneOffset);
+    JS_D("theme", m.Theme);
+    JS_D("stream_notifications_enabled", m.AreStreamNotificationsEnabled);
+    JS_D("status", m.Status);
+    JS_D("show_current_game", m.ShouldShowCurrentGame);
+    // JS_D("restricted_guilds", m.RestrictedGuilds);
+    JS_D("render_reactions", m.ShouldRenderReactions);
+    JS_D("render_embeds", m.ShouldRenderEmbeds);
+    JS_D("native_phone_integration_enabled", m.IsNativePhoneIntegrationEnabled);
+    JS_D("message_display_compact", m.ShouldMessageDisplayCompact);
+    JS_D("locale", m.Locale);
+    JS_D("inline_embed_media", m.ShouldInlineEmbedMedia);
+    JS_D("inline_attachment_media", m.ShouldInlineAttachmentMedia);
+    JS_D("guild_positions", m.GuildPositions);
+    // JS_D("guild_folders", m.GuildFolders);
+    JS_D("gif_auto_play", m.ShouldGIFAutoplay);
+    // JS_D("friend_source_flags", m.FriendSourceFlags);
+    JS_D("explicit_content_filter", m.ExplicitContentFilter);
+    JS_D("enable_tts_command", m.IsTTSCommandEnabled);
+    JS_D("disable_games_tab", m.ShouldDisableGamesTab);
+    JS_D("developer_mode", m.DeveloperMode);
+    JS_D("detect_platform_accounts", m.ShouldDetectPlatformAccounts);
+    JS_D("default_guilds_restricted", m.AreDefaultGuildsRestricted);
+    // JS_N("custom_status", m.CustomStatus);
+    JS_D("convert_emoticons", m.ShouldConvertEmoticons);
+    JS_D("contact_sync_enabled", m.IsContactSyncEnabled);
+    JS_D("animate_emoji", m.ShouldAnimateEmojis);
+    JS_D("allow_accessibility_detection", m.IsAccessibilityDetectionAllowed);
+    JS_D("afk_timeout", m.AFKTimeout);
 }
 
 void to_json(nlohmann::json &j, const IdentifyProperties &m) {
@@ -141,3 +318,34 @@ void to_json(nlohmann::json &j, const HeartbeatMessage &m) {
     else
         j["d"] = m.Sequence;
 }
+
+Snowflake::Snowflake()
+    : m_num(Invalid) {}
+
+Snowflake::Snowflake(const Snowflake &s)
+    : m_num(s.m_num) {}
+
+Snowflake::Snowflake(uint64_t n)
+    : m_num(n) {}
+
+Snowflake::Snowflake(const std::string &str) {
+    if (str.size())
+        m_num = std::stoull(str);
+    else
+        m_num = Invalid;
+};
+
+bool Snowflake::IsValid() const {
+    return m_num != Invalid;
+}
+
+void from_json(const nlohmann::json &j, Snowflake &s) {
+    std::string tmp;
+    j.get_to(tmp);
+    s.m_num = std::stoull(tmp);
+}
+
+#undef JS_O
+#undef JS_D
+#undef JS_N
+#undef JS_ON
diff --git a/discord/discord.hpp b/discord/discord.hpp
index 5a2d256..3c27efe 100644
--- a/discord/discord.hpp
+++ b/discord/discord.hpp
@@ -3,6 +3,41 @@
 #include <nlohmann/json.hpp>
 #include <thread>
 #include <unordered_map>
+#include <mutex>
+
+struct Snowflake {
+    Snowflake();
+    Snowflake(const Snowflake &s);
+    Snowflake(uint64_t n);
+    Snowflake(const std::string &str);
+
+    bool IsValid() const;
+
+    bool operator==(const Snowflake &s) const noexcept {
+        return m_num == s.m_num;
+    }
+
+    bool operator<(const Snowflake &s) const noexcept {
+        return m_num < s.m_num;
+    }
+
+    const static int Invalid = -1;
+
+    friend void from_json(const nlohmann::json &j, Snowflake &s);
+
+private:
+    friend struct std::hash<Snowflake>;
+    unsigned long long m_num;
+};
+
+namespace std {
+template<>
+struct hash<Snowflake> {
+    std::size_t operator()(const Snowflake &k) const {
+        return k.m_num;
+    }
+};
+} // namespace std
 
 enum class GatewayOp : int {
     Event = 0,
@@ -30,9 +65,180 @@ struct HelloMessageData {
     friend void from_json(const nlohmann::json &j, HelloMessageData &m);
 };
 
+enum class ChannelType : int {
+    GUILD_TEXT = 0,
+    DM = 1,
+    GUILD_VOICE = 2,
+    GROUP_DM = 3,
+    GUILD_CATEGORY = 4,
+    GUILD_NEWS = 5,
+    GUILD_STORE = 6,
+};
+
+struct UserData {
+    Snowflake ID;              //
+    std::string Username;      //
+    std::string Discriminator; //
+    std::string Avatar;        // null
+    bool IsBot = false;        // opt
+    bool IsSystem = false;     // opt
+    bool IsMFAEnabled = false; // opt
+    std::string Locale;        // opt
+    bool IsVerified = false;   // opt
+    std::string Email;         // opt, null
+    int Flags = 0;             // opt
+    int PremiumType = 0;       // opt
+    int PublicFlags = 0;       // opt
+
+    // undocumented (opt)
+    bool IsDesktop = false;     //
+    bool IsMobile = false;      //
+    bool IsNSFWAllowed = false; // null
+    std::string Phone;          // null?
+
+    friend void from_json(const nlohmann::json &j, UserData &m);
+};
+
+struct ChannelData {
+    Snowflake ID;      //
+    ChannelType Type;  //
+    Snowflake GuildID; // opt
+    int Position = -1; // opt
+    // std::vector<PermissionOverwriteData> PermissionOverwrites; // opt
+    std::string Name;                 // opt
+    std::string Topic;                // opt, null
+    bool IsNSFW = false;              // opt
+    Snowflake LastMessageID;          // opt, null
+    int Bitrate = 0;                  // opt
+    int UserLimit = 0;                // opt
+    int RateLimitPerUser = 0;         // opt
+    std::vector<UserData> Recipients; // opt
+    std::string Icon;                 // opt, null
+    Snowflake OwnerID;                // opt
+    Snowflake ApplicationID;          // opt
+    Snowflake ParentID;               // opt, null
+    std::string LastPinTimestamp;     // opt, can be null even tho docs say otherwise
+
+    friend void from_json(const nlohmann::json &j, ChannelData &m);
+};
+
+// a bot is apparently only supposed to receive the `id` and `unavailable` as false
+// but user tokens seem to get the full objects (minus users)
+struct GuildData {
+    Snowflake ID;                    //
+    std::string Name;                //
+    std::string Icon;                // null
+    std::string Splash;              // null
+    std::string DiscoverySplash;     // null
+    bool IsOwner = false;            // opt
+    Snowflake OwnerID;               //
+    int Permissions = 0;             // opt
+    std::string PermissionsNew;      // opt
+    std::string VoiceRegion;         // opt
+    Snowflake AFKChannelID;          // null
+    int AFKTimeout;                  //
+    bool IsEmbedEnabled = false;     // opt, deprecated
+    Snowflake EmbedChannelID;        // opt, null, deprecated
+    int VerificationLevel;           //
+    int DefaultMessageNotifications; //
+    int ExplicitContentFilter;       //
+    // std::vector<RoleData> Roles; //
+    // std::vector<EmojiData> Emojis; //
+    std::vector<std::string> Features; //
+    int MFALevel;                      //
+    Snowflake ApplicationID;           // null
+    bool IsWidgetEnabled = false;      // opt
+    Snowflake WidgetChannelID;         // opt, null
+    Snowflake SystemChannelID;         // null
+    int SystemChannelFlags;            //
+    Snowflake RulesChannelID;          // null
+    std::string JoinedAt;              // opt*
+    bool IsLarge = false;              // opt*
+    bool IsUnavailable = false;        // opt*
+    int MemberCount = 0;               // opt*
+    // std::vector<VoiceStateData> VoiceStates; // opt*
+    // std::vector<MemberData> Members; // opt* - incomplete anyways
+    std::vector<ChannelData> Channels; // opt*
+    // std::vector<PresenceUpdateData> Presences; // opt*
+    int MaxPresences = 0;             // opt, null
+    int MaxMembers = 0;               // opt
+    std::string VanityURL;            // null
+    std::string Description;          // null
+    std::string BannerHash;           // null
+    int PremiumTier;                  //
+    int PremiumSubscriptionCount = 0; // opt
+    std::string PreferredLocale;      //
+    Snowflake PublicUpdatesChannelID; // null
+    int MaxVideoChannelUsers = 0;     // opt
+    int ApproximateMemberCount = 0;   // opt
+    int ApproximatePresenceCount = 0; // opt
+
+    // undocumented
+    // std::map<std::string, Unknown> GuildHashes;
+    bool IsLazy = false;
+
+    // * - documentation says only sent in GUILD_CREATE, but these can be sent anyways in the READY event
+
+    friend void from_json(const nlohmann::json &j, GuildData &m);
+};
+
+struct UserSettingsData {
+    int TimezoneOffset;                 //
+    std::string Theme;                  //
+    bool AreStreamNotificationsEnabled; //
+    std::string Status;                 //
+    bool ShouldShowCurrentGame;         //
+    // std::vector<Unknown> RestrictedGuilds; //
+    bool ShouldRenderReactions;            //
+    bool ShouldRenderEmbeds;               //
+    bool IsNativePhoneIntegrationEnabled;  //
+    bool ShouldMessageDisplayCompact;      //
+    std::string Locale;                    //
+    bool ShouldInlineEmbedMedia;           //
+    bool ShouldInlineAttachmentMedia;      //
+    std::vector<Snowflake> GuildPositions; //
+    // std::vector<GuildFolderEntryData> GuildFolders; //
+    bool ShouldGIFAutoplay; //
+    // Unknown FriendSourceFlags; //
+    int ExplicitContentFilter;         //
+    bool IsTTSCommandEnabled;          //
+    bool ShouldDisableGamesTab;        //
+    bool DeveloperMode;                //
+    bool ShouldDetectPlatformAccounts; //
+    bool AreDefaultGuildsRestricted;   //
+    // Unknown CustomStatus; // null
+    bool ShouldConvertEmoticons;          //
+    bool IsContactSyncEnabled;            //
+    bool ShouldAnimateEmojis;             //
+    bool IsAccessibilityDetectionAllowed; //
+    int AFKTimeout;
+
+    friend void from_json(const nlohmann::json &j, UserSettingsData &m);
+};
+
 struct ReadyEventData {
-    std::string AnalyticsToken; // opt
+    int GatewayVersion;            //
+    UserData User;                 //
+    std::vector<GuildData> Guilds; //
+    std::string SessionID;         //
+    // std::vector<ChannelData?/PrivateChannelData?> PrivateChannels;
 
+    // undocumented
+    std::string AnalyticsToken;    // opt
+    int FriendSuggestionCount;     // opt
+    UserSettingsData UserSettings; // opt
+    // std::vector<Unknown> ConnectedAccounts; // opt
+    // std::map<std::string, Unknown> Consents; // opt
+    // std::vector<Unknown> Experiments; // opt
+    // std::vector<Unknown> GuildExperiments; // opt
+    // std::map<Unknown, Unknown> Notes; // opt
+    // std::vector<PresenceData> Presences; // opt
+    // std::vector<ReadStateData> ReadStates; // opt
+    // std::vector<RelationshipData> Relationships; // opt
+    // Unknown Tutorial; // opt, null
+    // std::vector<GuildSettingData> UserGuildSettings; // opt
+
+    friend void from_json(const nlohmann::json &j, ReadyEventData &m);
 };
 
 struct IdentifyProperties {
@@ -92,6 +298,10 @@ public:
     void Stop();
     bool IsStarted() const;
 
+    using Guilds_t = std::unordered_map<Snowflake, GuildData>;
+    const Guilds_t &GetGuilds() const;
+    const UserSettingsData &GetUserSettings() const;
+
 private:
     void HandleGatewayMessage(nlohmann::json msg);
     void HandleGatewayReady(const GatewayMessage &msg);
@@ -99,9 +309,16 @@ private:
     void SendIdentify();
 
     Abaddon *m_abaddon = nullptr;
+    mutable std::mutex m_mutex;
+
+    void StoreGuild(Snowflake id, const GuildData &g);
+    Guilds_t m_guilds;
+
+    UserSettingsData m_user_settings;
 
     Websocket m_websocket;
-    bool m_client_connected = false;
+    std::atomic<bool> m_client_connected = false;
+    std::atomic<bool> m_ready_received = false;
     std::unordered_map<std::string, GatewayEvent> m_event_map;
     void LoadEventMap();