mirrors/discord-rpc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Thanks, paranoia

Browse source
This commit is contained in:
Chris Marsh 2017-11-17 09:12:48 -08:00
parent 6a963456ed
commit c834a2e6d9
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/discord-rpc.cpp
View file

@ -35,13 +35,15 @@ struct QueuedMessage {
struct JoinRequest { struct JoinRequest {
// snowflake (64bit int), turned into a ascii decimal string, at most 20 chars +1 null // snowflake (64bit int), turned into a ascii decimal string, at most 20 chars +1 null
// terminator = 21 // terminator = 21
char userId[22]; char userId[32];
// 32 unicode glyphs is max name size => 4 bytes per glyph in the worst case, +1 for null // 32 unicode glyphs is max name size => 4 bytes per glyph in the worst case, +1 for null
// terminator = 129 // terminator = 129
char username[130]; char username[344];
// 4 decimal digits + 1 null terminator = 5
char discriminator[8];
// optional 'a_' + md5 hex digest (32 bytes) + null terminator = 35 // optional 'a_' + md5 hex digest (32 bytes) + null terminator = 35
char avatar[36]; char avatar[128];
// +1 on each because: it's even / I'm paranoid // Rounded way up because I'm paranoid about games breaking from future changes in these sizes
}; };
static RpcConnection* Connection{nullptr}; static RpcConnection* Connection{nullptr};
@ -127,8 +129,9 @@ static void Discord_UpdateConnection(void)
continue; continue;
} }
auto data = GetObjMember(&message, "data");
if (strcmp(evtName, "ACTIVITY_JOIN") == 0) { if (strcmp(evtName, "ACTIVITY_JOIN") == 0) {
auto data = GetObjMember(&message, "data");
auto secret = GetStrMember(data, "secret"); auto secret = GetStrMember(data, "secret");
if (secret) { if (secret) {
StringCopy(JoinGameSecret, secret); StringCopy(JoinGameSecret, secret);
@ -136,7 +139,6 @@ static void Discord_UpdateConnection(void)
} }
} }
else if (strcmp(evtName, "ACTIVITY_SPECTATE") == 0) { else if (strcmp(evtName, "ACTIVITY_SPECTATE") == 0) {
auto data = GetObjMember(&message, "data");
auto secret = GetStrMember(data, "secret"); auto secret = GetStrMember(data, "secret");
if (secret) { if (secret) {
StringCopy(SpectateGameSecret, secret); StringCopy(SpectateGameSecret, secret);
@ -144,7 +146,6 @@ static void Discord_UpdateConnection(void)
} }
} }
else if (strcmp(evtName, "ACTIVITY_JOIN_REQUEST") == 0) { else if (strcmp(evtName, "ACTIVITY_JOIN_REQUEST") == 0) {
auto data = GetObjMember(&message, "data");
auto user = GetObjMember(data, "user"); auto user = GetObjMember(data, "user");
auto userId = GetStrMember(user, "id"); auto userId = GetStrMember(user, "id");
auto username = GetStrMember(user, "username"); auto username = GetStrMember(user, "username");