Merge pull request #982 from CatalysmsServerManager/development

CatalysmsServerManager · Dec 8, 2021 · d5e4bbc · d5e4bbc
2 parents 936f6a8 + e44462c
commit d5e4bbc
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 6 deletions.
diff --git a/api/controllers/SdtdServer/available-items.js b/api/controllers/SdtdServer/available-items.js
@@ -54,6 +54,14 @@ module.exports = {
       `listitems ${inputs.item}`
     );
 
-    return exits.success(response);
+    items = response.result
+      .split('\n')
+      .map(function(item) {
+        return item.trim();
+      }).filter(Boolean)
+      // Remove the last element, which is the total
+      .slice(0, -1);
+
+    return exits.success(items);
   }
 };
diff --git a/assets/js/sdtdServer/chat.js b/assets/js/sdtdServer/chat.js
@@ -7,7 +7,6 @@ class sdtdChat {
 
 
   start() {
-
     io.socket.on('chatMessage', (chatMessage) => {
       if (chatMessage.server.id === this.serverId) {
         this.addNewChatMessage(chatMessage);
@@ -55,12 +54,12 @@ class sdtdChat {
     chatMessage.playerName = _.escape(chatMessage.playerName);
 
     if (chatMessage.playerName === 'Server') {
-      $('.chat-window').append(`<li class=\"chat-message\">[${chatMessage.time}] ${chatMessage.messageText} </li>`);
-      addMessageToStorage(`[${chatMessage.time}] ${chatMessage.messageText}`, this.serverId);
+      $('.chat-window').append(`<li class=\"chat-message\">[${new Date().toLocaleTimeString()}] ${chatMessage.messageText} </li>`);
+      addMessageToStorage(`[${new Date().toLocaleTimeString()}] ${chatMessage.messageText}`, this.serverId);
 
     } else {
-      $('.chat-window').append(`<li class=\"chat-message\">[${chatMessage.time}] ${chatMessage.playerName}: ${chatMessage.messageText} </li>`);
-      addMessageToStorage(`[${chatMessage.time}] ${chatMessage.playerName}: ${chatMessage.messageText}`, this.serverId);
+      $('.chat-window').append(`<li class=\"chat-message\">[${new Date().toLocaleTimeString()}] ${chatMessage.playerName}: ${chatMessage.messageText} </li>`);
+      addMessageToStorage(`[${new Date().toLocaleTimeString()}] ${chatMessage.playerName}: ${chatMessage.messageText}`, this.serverId);
     }
     $('.chat-window').scrollTop($('.chat-window')[0].scrollHeight);
 

diff --git a/test/integration/controllers/available-items.test.js b/test/integration/controllers/available-items.test.js
@@ -0,0 +1,40 @@
+const supertest = require('supertest');
+const { expect } = require('chai');
+
+describe('GET Available items', function () {
+
+  it('Should return an array of items', async function () {
+    sandbox.stub(sails.helpers.sdtdApi,'executeConsoleCommand').resolves({'command':'listitems','parameters':'test','result':'    cntBruteStyleTrashCanEmpty\n    cntBruteStyleTrashCanFull\n    cntBruteStyleTrashCanRandomLootHelper\n    cntQuestTestLoot\n    TestCubeP\n    TestCubeA\n    TestCubeC\n    TestCubeY\n    TestCubeO\n    rampCornerCutoutTest\n    curve_3x3x1TEST\n    turret_3x3TEST\n    turret_4x4x6TEST\n    elevatorTest\n    rampGutterTest\n    rampGutterOutsideCornerTest\n    cube3mTest\n    qtest_nextTraderAdmin\n    resourceTestosteroneExtract\n    noteTestersDelightAdmin\n    noteTestersElectricityAdmin\n    bookPistolPeteSteadyHand\nListed 22 matching items.\n'});
+    const response = await supertest(sails.hooks.http.app).get(`/api/sdtdserver/availableitems?serverId=${sails.testServer.id}&item=*`);
+    expect(response.statusCode).to.equal(200);
+    expect(response.body).to.be.an('array');
+    expect(response.body).to.have.lengthOf(22);
+    expect(response.body).to.deep.equal([
+      'cntBruteStyleTrashCanEmpty',
+      'cntBruteStyleTrashCanFull',
+      'cntBruteStyleTrashCanRandomLootHelper',
+      'cntQuestTestLoot',
+      'TestCubeP',
+      'TestCubeA',
+      'TestCubeC',
+      'TestCubeY',
+      'TestCubeO',
+      'rampCornerCutoutTest',
+      'curve_3x3x1TEST',
+      'turret_3x3TEST',
+      'turret_4x4x6TEST',
+      'elevatorTest',
+      'rampGutterTest',
+      'rampGutterOutsideCornerTest',
+      'cube3mTest',
+      'qtest_nextTraderAdmin',
+      'resourceTestosteroneExtract',
+      'noteTestersDelightAdmin',
+      'noteTestersElectricityAdmin',
+      'bookPistolPeteSteadyHand',
+    ]);
+  });
+
+
+});
+