Merge pull request #1 from znvjder/master

Added buttons to discord-rpc

Author: Lpsd

include/discord_rpc.h

@@ -23,6 +23,11 @@
 extern "C" {
 #endif
 
+typedef struct DiscordButton {
+    const char* label; /* TODO: max 128 bytes? */
+    const char* url;   /* TODO: would be reasonable to expect it to be >=128 bytes? */
+} DiscordButton;
+
 typedef struct DiscordRichPresence {
     const char* state;   /* max 128 bytes */
     const char* details; /* max 128 bytes */
@@ -40,6 +45,7 @@ typedef struct DiscordRichPresence {
     const char* joinSecret;     /* max 128 bytes */
     const char* spectateSecret; /* max 128 bytes */
     int8_t instance;
+    const DiscordButton* buttons;
 } DiscordRichPresence;
 
 typedef struct DiscordUser {

src/serialization.cpp

@@ -149,17 +149,41 @@ size_t JsonWriteRichPresenceObj(char* dest,
                     }
                 }
 
-                if ((presence->matchSecret && presence->matchSecret[0]) ||
-                    (presence->joinSecret && presence->joinSecret[0]) ||
-                    (presence->spectateSecret && presence->spectateSecret[0])) {
-                    WriteObject secrets(writer, "secrets");
-                    WriteOptionalString(writer, "match", presence->matchSecret);
-                    WriteOptionalString(writer, "join", presence->joinSecret);
-                    WriteOptionalString(writer, "spectate", presence->spectateSecret);
+                // Send secrets only when buttons aren't set
+                if (!presence->buttons) {
+                    if ((presence->matchSecret && presence->matchSecret[0]) ||
+                        (presence->joinSecret && presence->joinSecret[0]) ||
+                        (presence->spectateSecret && presence->spectateSecret[0])) {
+                        WriteObject secrets(writer, "secrets");
+                        WriteOptionalString(writer, "match", presence->matchSecret);
+                        WriteOptionalString(writer, "join", presence->joinSecret);
+                        WriteOptionalString(writer, "spectate", presence->spectateSecret);
+                    }
                 }
 
                 writer.Key("instance");
                 writer.Bool(presence->instance != 0);
+
+                if (presence->buttons) {
+                    const auto btns = presence->buttons;
+                    WriteArray buttons(writer, "buttons");
+
+                    if (btns[0].label[0]) {
+                        WriteObject button0(writer);
+                        WriteKey(writer, "url");
+                        writer.String(btns[0].url);
+                        WriteKey(writer, "label");
+                        writer.String(btns[0].label);
+                    }
+
+                    if (btns[1].label[0]) {
+                        WriteObject button1(writer);
+                        WriteKey(writer, "url");
+                        writer.String(btns[1].url);
+                        WriteKey(writer, "label");
+                        writer.String(btns[1].label);
+                    }
+                }
             }
         }
     }