celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-19 20:11:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve build process, add github actions

Browse Source
This commit is contained in:
ouwou
2021-01-07 02:41:49 -05:00
parent 2d6c4cd50d
commit 8cf95fce0c
56 changed files with 1210 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
discord/activity.cpp
View File

@@ -60,7 +60,7 @@ void to_json(nlohmann::json &j, const ActivitySecrets &m) {
JS_IF("match", m.Match);
}
void from_json(const nlohmann::json &j, Activity &m) {
void from_json(const nlohmann::json &j, ActivityData &m) {
JS_D("name", m.Name);
JS_D("type", m.Type);
JS_ON("url", m.URL);
@@ -77,7 +77,7 @@ void from_json(const nlohmann::json &j, Activity &m) {
JS_O("flags", m.Flags);
}
void to_json(nlohmann::json &j, const Activity &m) {
void to_json(nlohmann::json &j, const ActivityData &m) {
if (m.Type == ActivityType::Custom) {
j["name"] = "Custom Status";
j["state"] = m.Name;
@@ -100,7 +100,7 @@ void to_json(nlohmann::json &j, const Activity &m) {
JS_IF("flags", m.Flags);
}
void to_json(nlohmann::json &j, const Presence &m) {
void to_json(nlohmann::json &j, const PresenceData &m) {
j["activities"] = m.Activities;
j["status"] = m.Status;
j["afk"] = m.IsAFK;