From 803a26de8c728ba1ef82a0eb09f9cadc56ea8d14 Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Fri, 22 Dec 2023 21:24:33 +0000
Subject: [PATCH] Revert "Make all API returns JSON format"

This reverts commit e1503906d4a20a141845c3cdcf4cb12aa30fcc23.
---
 API.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/API.py b/API.py
index 2f5d1e9..1a6114f 100644
--- a/API.py
+++ b/API.py
@@ -76,7 +76,7 @@ class FD_API(ServiceBase):
     #return API version
     @rpc(Unicode, _returns=Decimal())
     def version(ctx, sessionid):
-        return({result: 'OK', version: FD_API._version})
+        return(FD_API._version)
 
     @rpc()
     def dummy(ctx):
@@ -90,7 +90,6 @@ class FD_API(ServiceBase):
         system = ctx.udc.validateKey(int(dmrid),key)
         if system:
             ctx.udc.reset(system)
-            return({result: 'OK'})
         else:
             raise error.InvalidCredentialsError()
 
@@ -99,7 +98,6 @@ class FD_API(ServiceBase):
         system = ctx.udc.validateKey(int(dmrid),key)
         if system:
             ctx.udc.options(system,options)
-            return({result: 'OK'})
         else:
             raise error.InvalidCredentialsError()
 
@@ -107,7 +105,7 @@ class FD_API(ServiceBase):
     def getoptions(ctx,dmrid,key):
         system = ctx.udc.validateKey(int(dmrid),key)
         if system:
-            return {result: 'OK', options: ctx.udc.getoptions(system)}
+            return ctx.udc.getoptions(system)
         else:
             raise error.InvalidCredentialsError()
 
@@ -117,22 +115,21 @@ class FD_API(ServiceBase):
     @rpc(Unicode)
     def killserver(ctx,systemkey):
         if ctx.udc.validateSystemKey(systemkey):
-            ctx.udc.killserver()
-            return {result: 'OK'}
+            return ctx.udc.killserver()
         else:
             raise error.InvalidCredentialsError()
 
     @rpc(Unicode,_returns=Unicode())
     def getconfig(ctx,systemkey):
         if ctx.udc.validateSystemKey(systemkey):
-            return {result: 'OK', config: ctx.udc.getconfig()}
+            return ctx.udc.getconfig()
         else:
             raise error.InvalidCredentialsError()
 
     @rpc(Unicode,_returns=Unicode())
     def getbridges(ctx,systemkey):
         if ctx.udc.validateSystemKey(systemkey):
-            return {result: 'OK', bridges: ctx.udc.getbridges()}
+            return ctx.udc.getbridges()
         else:
             raise error.InvalidCredentialsError()