summaryrefslogtreecommitdiff
path: root/discord/activity.hpp
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2021-01-07 02:41:49 -0500
committerouwou <26526779+ouwou@users.noreply.github.com>2021-01-07 02:41:49 -0500
commit8cf95fce0cb233125334482149c2c9f4219da52b (patch)
treec0c2e267385363e0f87ad4c80d299c08d33a33a9 /discord/activity.hpp
parent2d6c4cd50d0075c064641150dcf65e6b58d5bf36 (diff)
downloadabaddon-portaudio-8cf95fce0cb233125334482149c2c9f4219da52b.tar.gz
abaddon-portaudio-8cf95fce0cb233125334482149c2c9f4219da52b.zip
improve build process, add github actions
Diffstat (limited to 'discord/activity.hpp')
-rw-r--r--discord/activity.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/discord/activity.hpp b/discord/activity.hpp
index d889b22..1e323e3 100644
--- a/discord/activity.hpp
+++ b/discord/activity.hpp
@@ -71,7 +71,7 @@ struct ActivitySecrets {
friend void to_json(nlohmann::json &j, const ActivitySecrets &m);
};
-struct Activity {
+struct ActivityData {
std::string Name; //
ActivityType Type; //
std::optional<std::string> URL; // null
@@ -87,15 +87,15 @@ struct Activity {
std::optional<bool> IsInstance; //
std::optional<ActivityFlags> Flags; //
- friend void from_json(const nlohmann::json &j, Activity &m);
- friend void to_json(nlohmann::json &j, const Activity &m);
+ friend void from_json(const nlohmann::json &j, ActivityData &m);
+ friend void to_json(nlohmann::json &j, const ActivityData &m);
};
-struct Presence {
- std::vector<Activity> Activities; // null (but never sent as such)
+struct PresenceData {
+ std::vector<ActivityData> Activities; // null (but never sent as such)
std::string Status;
bool IsAFK;
int Since = 0;
- friend void to_json(nlohmann::json &j, const Presence &m);
+ friend void to_json(nlohmann::json &j, const PresenceData &m);
};