From d2cb86ac276e7a5566c5a3091cf57b94573f188a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 14 Oct 2020 11:33:25 +0200
Subject: [PATCH] Fixed broken logging for actions

---
 app/imports/api/creature/actions/applyAction.js |  5 +++--
 app/imports/api/creature/actions/applyAttack.js |  6 ++++--
 app/imports/api/creature/log/CreatureLogs.js    | 11 ++---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/imports/api/creature/actions/applyAction.js b/app/imports/api/creature/actions/applyAction.js
index 0126ab51..5685edf9 100644
--- a/app/imports/api/creature/actions/applyAction.js
+++ b/app/imports/api/creature/actions/applyAction.js
@@ -4,7 +4,8 @@ import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
 export default function applyAction({prop, creature}){
   spendResources(prop);
   insertCreatureLog.call({
-    log: prop.name,
-    creatureId: creature._id,
+    log: {
+      text: prop.name,
+      creatureId: creature._id},
   });
 }
diff --git a/app/imports/api/creature/actions/applyAttack.js b/app/imports/api/creature/actions/applyAttack.js
index 7b03cc21..a501085f 100644
--- a/app/imports/api/creature/actions/applyAttack.js
+++ b/app/imports/api/creature/actions/applyAttack.js
@@ -10,7 +10,9 @@ export default function applyAttack({
 }){
   let result = math.roll(1, 20) + prop.rollBonusResult;
   insertCreatureLog.call({
-    log: `${prop.name} attack. ${result} to hit`,
-    creatureId: creature._id,
+    log: {
+      text: `${prop.name} attack. ${result} to hit`,
+      creatureId: creature._id,
+    }
   });
 }
diff --git a/app/imports/api/creature/log/CreatureLogs.js b/app/imports/api/creature/log/CreatureLogs.js
index ba399f7c..c617052e 100644
--- a/app/imports/api/creature/log/CreatureLogs.js
+++ b/app/imports/api/creature/log/CreatureLogs.js
@@ -74,12 +74,9 @@ const insertCreatureLog = new ValidatedMethod({
   },
 	validate: new SimpleSchema({
 		log: CreatureLogSchema.omit('type', 'date'),
-		creatureId: {
-			type: String,
-			regEx: SimpleSchema.RegEx.Id,
-		},
 	}).validator(),
-  run({log, creatureId}){
+  run({log}){
+    const creatureId = log.creatureId;
     const creature = Creatures.findOne(creatureId, {fields: {
       readers: 1,
       writers: 1,
@@ -93,10 +90,6 @@ const insertCreatureLog = new ValidatedMethod({
     if (typeof log === 'string'){
       log = {text: log};
     }
-    if (Meteor.isServer){
-      Meteor._sleepForMs(5000);
-    }
-    log.creatureId = creatureId;
     log.date = new Date();
     // Insert it
     let id = CreatureLogs.insert(log);