From 8cf95fce0cb233125334482149c2c9f4219da52b Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Thu, 7 Jan 2021 02:41:49 -0500
Subject: improve build process, add github actions

---
 discord/activity.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'discord/activity.hpp')

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);
 };
-- 
cgit v1.2.3