# HG changeset patch
# User Lucas Thompson <dev@lucas.im>
# Date 1485902832 0
# Node ID 59c89b0e937507158e72fc6109ba233e02f803a2
# Parent  492970caa62b2398adf07b76c31fb04c046c3a39
Fix regression from old schema changes, regarding assessing whether a JSON response was successful

diff -r 492970caa62b -r 59c89b0e9375 vamp-json/VampJson.h
--- a/vamp-json/VampJson.h	Tue Jan 31 22:21:51 2017 +0000
+++ b/vamp-json/VampJson.h	Tue Jan 31 22:47:12 2017 +0000
@@ -1109,11 +1109,11 @@
 
     static bool
     successful(json11::Json j, std::string &err) {
-        if (!j["success"].is_bool()) {
-            err = "bool expected for success";
+        if (!j["result"].is_object()) {
+            err = "result object expected for success";
             return false;
         }
-        return j["success"].bool_value();
+        return true;
     }
 
     static void
diff -r 492970caa62b -r 59c89b0e9375 vamp-server/convert.cpp
--- a/vamp-server/convert.cpp	Tue Jan 31 22:21:51 2017 +0000
+++ b/vamp-server/convert.cpp	Tue Jan 31 22:47:12 2017 +0000
@@ -295,8 +295,10 @@
     VampJson::BufferSerialisation serialisation =
         VampJson::BufferSerialisation::Array;
 
-    rr.success = j["success"].bool_value();
-    rr.errorText = j["errorText"].string_value();
+    const bool isSuccess = j["result"].is_object();
+    const bool isError = j["error"].is_object();
+    rr.success = isSuccess;
+    rr.errorText = isError ? j["error"]["message"].string_value() : "";
 
     switch (rr.type) {