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

fix presence in identify and update build number

Browse Source
This commit is contained in:
ouwou
2020-12-18 23:55:28 -05:00
parent 712eba816e
commit 2ec60ce5ac
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
discord/activity.cpp
View File

@@ -99,3 +99,10 @@ void to_json(nlohmann::json &j, const Activity &m) {
JS_IF("instance", m.IsInstance);
JS_IF("flags", m.Flags);
}
void to_json(nlohmann::json &j, const Presence &m) {
j["activities"] = m.Activities;
j["status"] = m.Status;
j["afk"] = m.IsAFK;
j["since"] = m.Since;
}

9
discord/activity.hpp
View File

@@ -90,3 +90,12 @@ struct Activity {
friend void from_json(const nlohmann::json &j, Activity &m);
friend void to_json(nlohmann::json &j, const Activity &m);
};
struct Presence {
std::vector<Activity> 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);
};

8
discord/discord.cpp
View File

@@ -383,9 +383,9 @@ void DiscordClient::BanUser(Snowflake user_id, Snowflake guild_id) {
void DiscordClient::UpdateStatus(const std::string &status, bool is_afk, const Activity &obj) {
UpdateStatusMessage msg;
msg.Status = status;
msg.IsAFK = is_afk;
msg.Activities.push_back(obj);
msg.Presence.Status = status;
msg.Presence.IsAFK = is_afk;
msg.Presence.Activities.push_back(obj);
m_websocket.Send(nlohmann::json(msg));
}
@@ -985,7 +985,7 @@ void DiscordClient::SendIdentify() {
msg.Properties.ReferrerCurrent = "";
msg.Properties.ReferringDomainCurrent = "";
msg.Properties.ReleaseChannel = "stable";
msg.Properties.ClientBuildNumber = 73363;
msg.Properties.ClientBuildNumber = 73785;
msg.Properties.ClientEventSource = "";
msg.Presence.Status = "online";
msg.Presence.Since = 0;

6
discord/objects.cpp
View File

@@ -85,11 +85,7 @@ void to_json(nlohmann::json &j, const LazyLoadRequestMessage &m) {
void to_json(nlohmann::json &j, const UpdateStatusMessage &m) {
j["op"] = GatewayOp::UpdateStatus;
j["d"] = nlohmann::json::object();
j["d"]["activities"] = m.Activities;
j["d"]["status"] = m.Status;
j["d"]["afk"] = m.IsAFK;
j["d"]["since"] = nullptr;
j["d"] = m.Presence;
}
void from_json(const nlohmann::json &j, ReadyEventData &m) {

7
discord/objects.hpp
View File

@@ -145,10 +145,7 @@ struct LazyLoadRequestMessage {
};
struct UpdateStatusMessage {
std::vector<Activity> Activities; // null (but never sent as such)
std::string Status;
bool IsAFK;
int Since = 0;
Presence Presence;
friend void to_json(nlohmann::json &j, const UpdateStatusMessage &m);
};
@@ -209,7 +206,7 @@ struct ClientStateProperties {
struct IdentifyMessage : GatewayMessage {
std::string Token;
IdentifyProperties Properties;
UpdateStatusMessage Presence;
Presence Presence;
ClientStateProperties ClientState;
bool DoesSupportCompression = false;
int Capabilities;