From 51cf8fd2df3cf7a602d05540627a5ad8af6baa58 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Wed, 9 Sep 2020 23:17:26 -0400 Subject: rename and reorder a bunch of discord stuff --- discord/discord.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'discord/discord.hpp') diff --git a/discord/discord.hpp b/discord/discord.hpp index 953be69..f6e7241 100644 --- a/discord/discord.hpp +++ b/discord/discord.hpp @@ -61,8 +61,8 @@ public: using members_type = Store::members_type; const guilds_type &GetGuilds() const; - const UserData &GetUserData() const; - const UserSettingsData &GetUserSettings() const; + const User &GetUserData() const; + const UserSettings &GetUserSettings() const; std::vector GetUserSortedGuilds() const; std::set GetMessagesForChannel(Snowflake id) const; std::set GetPrivateChannels() const; @@ -71,10 +71,10 @@ public: void FetchMessagesInChannel(Snowflake id, std::function &)> cb); void FetchMessagesInChannelBefore(Snowflake channel_id, Snowflake before_id, std::function &)> cb); const MessageData *GetMessage(Snowflake id) const; - const ChannelData *GetChannel(Snowflake id) const; - const UserData *GetUser(Snowflake id) const; - const RoleData *GetRole(Snowflake id) const; - const GuildData *GetGuild(Snowflake id) const; + const Channel *GetChannel(Snowflake id) const; + const User *GetUser(Snowflake id) const; + const Role *GetRole(Snowflake id) const; + const Guild *GetGuild(Snowflake id) const; Snowflake GetMemberHoistedRole(Snowflake guild_id, Snowflake user_id, bool with_color = false) const; std::unordered_set GetUsersInGuild(Snowflake id) const; @@ -110,8 +110,8 @@ private: void AddUserToGuild(Snowflake user_id, Snowflake guild_id); std::unordered_map> m_guild_to_users; - UserData m_user_data; - UserSettingsData m_user_settings; + User m_user_data; + UserSettings m_user_settings; Store m_store; HTTPClient m_http; -- cgit v1.2.3