diff options
author | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-01-09 23:20:08 -0500 |
---|---|---|
committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-01-09 23:20:08 -0500 |
commit | 481685b3bbb2b0270870dec5de87e60fc2d84d15 (patch) | |
tree | 5eaa4abf4cb800812389ce95af954e120f633e54 /src/discord | |
parent | f31d431517b27a88a95f6972de8fcf3206df1da1 (diff) | |
download | abaddon-portaudio-481685b3bbb2b0270870dec5de87e60fc2d84d15.tar.gz abaddon-portaudio-481685b3bbb2b0270870dec5de87e60fc2d84d15.zip |
format all
Diffstat (limited to 'src/discord')
-rw-r--r-- | src/discord/activity.hpp | 2 | ||||
-rw-r--r-- | src/discord/ban.hpp | 2 | ||||
-rw-r--r-- | src/discord/interactions.hpp | 8 | ||||
-rw-r--r-- | src/discord/relationship.hpp | 16 | ||||
-rw-r--r-- | src/discord/snowflake.cpp | 2 | ||||
-rw-r--r-- | src/discord/store.cpp | 10 | ||||
-rw-r--r-- | src/discord/usersettings.hpp | 20 |
7 files changed, 30 insertions, 30 deletions
diff --git a/src/discord/activity.hpp b/src/discord/activity.hpp index 6b8e944..4382ac0 100644 --- a/src/discord/activity.hpp +++ b/src/discord/activity.hpp @@ -26,7 +26,7 @@ constexpr inline const char *GetPresenceString(PresenceStatus s) { return ""; } -constexpr inline const char* GetPresenceDisplayString(PresenceStatus s) { +constexpr inline const char *GetPresenceDisplayString(PresenceStatus s) { switch (s) { case PresenceStatus::Online: return "Online"; diff --git a/src/discord/ban.hpp b/src/discord/ban.hpp index d417ce3..7ab3d33 100644 --- a/src/discord/ban.hpp +++ b/src/discord/ban.hpp @@ -4,7 +4,7 @@ struct BanData { std::string Reason; // null - UserData User; // access id + UserData User; // access id friend void from_json(const nlohmann::json &j, BanData &m); }; diff --git a/src/discord/interactions.hpp b/src/discord/interactions.hpp index c076145..782c491 100644 --- a/src/discord/interactions.hpp +++ b/src/discord/interactions.hpp @@ -14,10 +14,10 @@ enum class InteractionType { }; struct MessageInteractionData { - Snowflake ID; // id of the interaction - InteractionType Type; // the type of interaction - std::string Name; // the name of the ApplicationCommand - UserData User; // the user who invoked the interaction + Snowflake ID; // id of the interaction + InteractionType Type; // the type of interaction + std::string Name; // the name of the ApplicationCommand + UserData User; // the user who invoked the interaction // undocumented??? std::optional<GuildMember> Member; // the member who invoked the interaction (in a guild) diff --git a/src/discord/relationship.hpp b/src/discord/relationship.hpp index d492bd3..1595502 100644 --- a/src/discord/relationship.hpp +++ b/src/discord/relationship.hpp @@ -3,19 +3,19 @@ #include "user.hpp" enum class RelationshipType { - None = 0, - Friend = 1, - Blocked = 2, - PendingIncoming = 3, - PendingOutgoing = 4, - Implicit = 5, + None = 0, + Friend = 1, + Blocked = 2, + PendingIncoming = 3, + PendingOutgoing = 4, + Implicit = 5, }; struct RelationshipData { // Snowflake UserID; this is the same as ID apparently but it looks new so i wont touch it RelationshipType Type; Snowflake ID; - // Unknown Nickname; // null + // Unknown Nickname; // null - friend void from_json(const nlohmann::json &j, RelationshipData &m); + friend void from_json(const nlohmann::json &j, RelationshipData &m); }; diff --git a/src/discord/snowflake.cpp b/src/discord/snowflake.cpp index efa327d..3624c01 100644 --- a/src/discord/snowflake.cpp +++ b/src/discord/snowflake.cpp @@ -2,8 +2,8 @@ #include "util.hpp" #include <chrono> #include <ctime> -#include <iomanip> #include <glibmm.h> +#include <iomanip> constexpr static uint64_t DiscordEpochSeconds = 1420070400; diff --git a/src/discord/store.cpp b/src/discord/store.cpp index e182c70..6a3d636 100644 --- a/src/discord/store.cpp +++ b/src/discord/store.cpp @@ -812,8 +812,8 @@ std::optional<GuildMember> Store::GetGuildMember(Snowflake guild_id, Snowflake u s->Get(2, r.Nickname); s->Get(3, r.JoinedAt); s->Get(4, r.PremiumSince); - //s->Get(5, r.IsDeafened); - //s->Get(6, r.IsMuted); + // s->Get(5, r.IsDeafened); + // s->Get(6, r.IsMuted); s->Get(7, r.Avatar); s->Get(8, r.IsPending); @@ -873,8 +873,8 @@ Message Store::GetMessageBound(std::unique_ptr<Statement> &s) const { s->Get(4, r.Content); s->Get(5, r.Timestamp); s->Get(6, r.EditedTimestamp); - //s->Get(7, r.IsTTS); - //s->Get(8, r.DoesMentionEveryone); + // s->Get(7, r.IsTTS); + // s->Get(8, r.DoesMentionEveryone); s->GetJSON(9, r.Embeds); s->Get(10, r.IsPinned); s->Get(11, r.WebhookID); @@ -999,7 +999,7 @@ RoleData Store::GetRoleBound(std::unique_ptr<Statement> &s) const { RoleData r; s->Get(0, r.ID); - //s->Get(1, guild id); + // s->Get(1, guild id); s->Get(2, r.Name); s->Get(3, r.Color); s->Get(4, r.IsHoisted); diff --git a/src/discord/usersettings.hpp b/src/discord/usersettings.hpp index 6d37b3c..2baf61e 100644 --- a/src/discord/usersettings.hpp +++ b/src/discord/usersettings.hpp @@ -6,7 +6,7 @@ struct UserSettingsGuildFoldersEntry { int Color = -1; // null std::vector<Snowflake> GuildIDs; - Snowflake ID; // null (this can be a snowflake as a string or an int that isnt a snowflake lol) + Snowflake ID; // null (this can be a snowflake as a string or an int that isnt a snowflake lol) std::string Name; // null friend void from_json(const nlohmann::json &j, UserSettingsGuildFoldersEntry &m); @@ -19,16 +19,16 @@ struct UserSettings { 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; // deprecated? + bool ShouldRenderReactions; // + bool ShouldRenderEmbeds; // + bool IsNativePhoneIntegrationEnabled; // + bool ShouldMessageDisplayCompact; // + std::string Locale; // + bool ShouldInlineEmbedMedia; // + bool ShouldInlineAttachmentMedia; // + std::vector<Snowflake> GuildPositions; // deprecated? std::vector<UserSettingsGuildFoldersEntry> GuildFolders; // - bool ShouldGIFAutoplay; // + bool ShouldGIFAutoplay; // // Unknown FriendSourceFlags; // int ExplicitContentFilter; // bool IsTTSCommandEnabled; // |