From 8a3db49489ca0a2e4c5fe91ef5a8575e216921c8 Mon Sep 17 00:00:00 2001
From: Sean Edmunds <smedmunds226@gmail.com>
Date: Fri, 30 Dec 2022 16:42:25 -0600
Subject: [PATCH] Merging

---
 api/server.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/api/server.js b/api/server.js
index bbe9397c..2a99b375 100644
--- a/api/server.js
+++ b/api/server.js
@@ -17,10 +17,9 @@ function getData(table) {
     con.connect();
     con.query((sql + table), (error, results, fields) => {
         if (error) throw error;
-        console.log(results);
+        return results;
       });
     con.end();
-    return results;
 }
 
 //Read bookmarks
@@ -72,9 +71,7 @@ if (fs.existsSync('../src/apps.json')) {
 //Read everything else
 const providers = require('../src/providers.json');
 const themes = require('../src/themes.json');
-const messages = require('../src/messages.json');
-
-var testmessages = getData('messages');
+const messages = getData('messages');
 
 // initializing app
 const app = express();
@@ -110,7 +107,7 @@ app.get("/sui/api/personaldata", (req, res) => {
 });
 
 app.get("/sui/api/messages", (req, res) => {
-    res.status(200).send(messages.messages);
+    res.status(200).send(messages);
 });
 
 app.post("/sui/api/appUpdate", jsonParser, (req, res) => {