From 35efe39ea75ef203341957494fc154cc0578f7b6 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 10 Jun 2015 11:00:19 +0200 Subject: [PATCH 1/5] Made feedback reports send emails "from" their creator's address --- rpg-docs/Model/Meta/Reports.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/rpg-docs/Model/Meta/Reports.js b/rpg-docs/Model/Meta/Reports.js index 14505dce..b3e3fb68 100644 --- a/rpg-docs/Model/Meta/Reports.js +++ b/rpg-docs/Model/Meta/Reports.js @@ -45,12 +45,22 @@ Meteor.methods({ metaData: Object, }); report.owner = this.userId; - Reports.insert(report); + var id = Reports.insert(report); + var user = Meteor.users.findOne(this.userId); + var sender = user && + user.emails && + user.emails[0] && + user.emails[0].address || + "reports@dicecloud.com"; + var bodyText = "Report ID: " + id + + "\nSeverity: " + report.severity + + "\nType: " + report.type + + "\n\n" + report.description; Email.send({ - from: "reports@dicecloud.com", + from: sender, to: "stefan.zermatten@gmail.com", subject: "DiceCloud feedback - " + report.title, - text: JSON.stringify(_.omit(report, "metaData"), null, '\t'), + text: bodyText, }); }, deleteReport: function(id) { From efc79cb6e76ed7b933cd71d9e852a2b0ec4e8686 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 10 Jun 2015 11:00:42 +0200 Subject: [PATCH 2/5] Fixed net value calculation to avoid rounding errors --- rpg-docs/client/globalHelpers/valueString.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rpg-docs/client/globalHelpers/valueString.js b/rpg-docs/client/globalHelpers/valueString.js index c0060d2f..9321a37e 100644 --- a/rpg-docs/client/globalHelpers/valueString.js +++ b/rpg-docs/client/globalHelpers/valueString.js @@ -1,25 +1,27 @@ Template.registerHelper("valueString", function(value) { + var intValue = Math.round(value * 100); + var cp = intValue % 10; + intValue -= cp; + cp = Math.round(cp); + sp = intValue % 100; + intValue -= sp; + sp = Math.round(sp / 10) + gp = Math.floor(value); + var resultArray = []; - //sp - var gp = Math.floor(value); if (gp > 0) { resultArray.push(gp + "gp"); } - //sp - var sp = Math.floor(10 * (value % 1)); if (sp > 0) { resultArray.push(sp + "sp"); } - //cp - var cp = 10 * ((value * 10) % 1); - cp = Math.round(cp * 1000) / 1000; if (cp > 0) { resultArray.push(cp + "cp"); } //build string with correct spacing var result = ""; - for (var i = 0; i < resultArray.length; i++) { + for (var i = 0, l = resultArray.length; i < l; i++) { //add a space between values if (i !== 0) { result += " "; From a09bad2fed5d5502a9adede54ce1dcf42013b2c2 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 10 Jun 2015 11:13:58 +0200 Subject: [PATCH 3/5] Change logs --- rpg-docs/private/changeLogs/changeLogs.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rpg-docs/private/changeLogs/changeLogs.js b/rpg-docs/private/changeLogs/changeLogs.js index b68d652e..651430c5 100644 --- a/rpg-docs/private/changeLogs/changeLogs.js +++ b/rpg-docs/private/changeLogs/changeLogs.js @@ -135,7 +135,7 @@ ChangeLogs.insert({ }); ChangeLogs.insert({ - version: "0.5.2", + version: "0.5.3", changes: [ "Prevented a harmless error caused by effects which have no stat set", "Added the ability to hide the spells tab", @@ -144,3 +144,10 @@ ChangeLogs.insert({ "Overhauled how effects' stats are chosen", ], }); + +ChangeLogs.insert({ + version: "0.5.4", + changes: [ + "Fixed rounding error on net worth calculation", + ], +}); From 7b3cb549830c263537ad7e6b6792d1af73e87f0b Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Fri, 12 Jun 2015 08:02:33 +0200 Subject: [PATCH 4/5] Added gmail email address senders to the report emails --- rpg-docs/Model/Meta/Reports.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpg-docs/Model/Meta/Reports.js b/rpg-docs/Model/Meta/Reports.js index b3e3fb68..ac0679e3 100644 --- a/rpg-docs/Model/Meta/Reports.js +++ b/rpg-docs/Model/Meta/Reports.js @@ -51,6 +51,9 @@ Meteor.methods({ user.emails && user.emails[0] && user.emails[0].address || + user.services && + user.services.google && + user.services.google.email || "reports@dicecloud.com"; var bodyText = "Report ID: " + id + "\nSeverity: " + report.severity + From 9d2eb14c0c31d102cdd3829898472dc20cccfca0 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Fri, 12 Jun 2015 08:03:46 +0200 Subject: [PATCH 5/5] Change logs --- rpg-docs/private/changeLogs/changeLogs.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rpg-docs/private/changeLogs/changeLogs.js b/rpg-docs/private/changeLogs/changeLogs.js index 651430c5..c57f03f1 100644 --- a/rpg-docs/private/changeLogs/changeLogs.js +++ b/rpg-docs/private/changeLogs/changeLogs.js @@ -151,3 +151,10 @@ ChangeLogs.insert({ "Fixed rounding error on net worth calculation", ], }); + +ChangeLogs.insert({ + version: "0.5.5", + changes: [ + "Fixed reports from google users not correctly storing the reply-to email address", + ], +});