suyu/discord-rpc
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make these use my helper functions

Browse source
This commit is contained in:
Chris Marsh 2017-07-31 15:40:31 -07:00
parent d5e6c4c11a
commit 120fe1b069
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/rpc_connection.cpp
View file

@ -36,16 +36,9 @@ void RpcConnection::Open()
if (state == State::SentHandshake) { if (state == State::SentHandshake) {
JsonDocument message; JsonDocument message;
if (Read(message)) { if (Read(message)) {
auto cmd = message.FindMember("cmd"); auto cmd = GetStrMember(&message, "cmd");
if (cmd == message.MemberEnd() || !cmd->value.IsString()) { auto evt = GetStrMember(&message, "evt");
return; if (cmd && evt && !strcmp(cmd, "DISPATCH") && !strcmp(evt, "READY")) {
}
auto evt = message.FindMember("evt");
if (evt == message.MemberEnd() || !evt->value.IsString()) {
return;
}
if (!strcmp(cmd->value.GetString(), "DISPATCH") &&
!strcmp(evt->value.GetString(), "READY")) {
state = State::Connected; state = State::Connected;
if (onConnect) { if (onConnect) {
onConnect(); onConnect();