From 827c056602a3b6e6a248abd1d5f241dd33f9ef83 Mon Sep 17 00:00:00 2001
From: Chris Marsh <chris@discordapp.com>
Date: Thu, 20 Jul 2017 15:08:34 -0700
Subject: [PATCH] I like this better over here.

---
 src/discord-rpc.cpp   | 6 +-----
 src/serialization.cpp | 9 ++++++---
 src/serialization.h   | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/discord-rpc.cpp b/src/discord-rpc.cpp
index 580bce5..a71e4b1 100644
--- a/src/discord-rpc.cpp
+++ b/src/discord-rpc.cpp
@@ -12,8 +12,6 @@
 #include <thread>
 #endif
 
-#include "rapidjson/internal/itoa.h"
-
 constexpr size_t MaxMessageSize = 16 * 1024;
 constexpr size_t MessageQueueSize = 8;
 
@@ -159,9 +157,7 @@ extern "C" void Discord_UpdatePresence(const DiscordRichPresence* presence)
 {
     auto qmessage = SendQueueGetNextAddMessage();
     if (qmessage) {
-        char nonce[32]{};
-        rapidjson::internal::i32toa(Nonce++, nonce);
-        qmessage->length = JsonWriteRichPresenceObj(qmessage->buffer, sizeof(qmessage->buffer), nonce, Pid, presence);
+        qmessage->length = JsonWriteRichPresenceObj(qmessage->buffer, sizeof(qmessage->buffer), Nonce++, Pid, presence);
         SendQueueCommitMessage();
         SignalIOActivity();
     }
diff --git a/src/serialization.cpp b/src/serialization.cpp
index 50bb3a2..c4c740a 100644
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -3,6 +3,7 @@
 
 #include "rapidjson/writer.h"
 #include "rapidjson/stringbuffer.h"
+#include "rapidjson/internal/itoa.h"
 
 // I want to use as few allocations as I can get away with, and to do that with RapidJson, you need to supply some of
 // your own allocators for stuff rather than use the defaults
@@ -93,12 +94,14 @@ void WriteOptionalString(JsonWriter& w, T& k, const char* value) {
     }
 }
 
-void JsonWriteCommandStart(JsonWriter& writer, const char* nonce, const char* cmd)
+void JsonWriteCommandStart(JsonWriter& writer, int nonce, const char* cmd)
 {
     writer.StartObject();
 
     WriteKey(writer, "nonce");
-    writer.String(nonce);
+    char nonceBuffer[32]{};
+    rapidjson::internal::i32toa(nonce, nonceBuffer);
+    writer.String(nonceBuffer);
 
     WriteKey(writer, "cmd");
     writer.String(cmd);
@@ -113,7 +116,7 @@ void JsonWriteCommandEnd(JsonWriter& writer)
     writer.EndObject(); // top level
 }
 
-size_t JsonWriteRichPresenceObj(char* dest, size_t maxLen, char* nonce, int pid, const DiscordRichPresence* presence)
+size_t JsonWriteRichPresenceObj(char* dest, size_t maxLen, int nonce, int pid, const DiscordRichPresence* presence)
 {
     DirectStringBuffer sb(dest, maxLen);
     WriterAllocator wa;
diff --git a/src/serialization.h b/src/serialization.h
index 59ce11b..b736a1a 100644
--- a/src/serialization.h
+++ b/src/serialization.h
@@ -20,5 +20,5 @@ inline size_t StringCopy(char (&dest)[Len], const char* src) {
 size_t JsonWriteHandshakeObj(char* dest, size_t maxLen, int version, const char* applicationId);
 
 struct DiscordRichPresence;
-size_t JsonWriteRichPresenceObj(char* dest, size_t maxLen, char* nonce, int pid, const DiscordRichPresence* presence);
+size_t JsonWriteRichPresenceObj(char* dest, size_t maxLen, int nonce, int pid, const DiscordRichPresence* presence);