* TZUTC/TZUTCINFO handling should work properly

* Don't bork message timestamp when we write to the DB
* Fix read byte len which could prevent message imports!
This commit is contained in:
Bryan Ashby 2020-11-17 19:06:54 -07:00
parent b377d91155
commit 8b2be6769c
No known key found for this signature in database
GPG key ID: B49EB437951D2542
2 changed files with 24 additions and 8 deletions

View file

@ -134,7 +134,7 @@ module.exports = class Message {
modTimestamp = moment(modTimestamp);
}
this.modTimestamp = modTimestamp;
this.modTimestamp = modTimestamp || moment();
this.meta = {};
_.defaultsDeep(this.meta, { System : {} }, meta);
@ -695,11 +695,10 @@ module.exports = class Message {
},
function storeMessage(trans, callback) {
// generate a UUID for this message if required (general case)
const msgTimestamp = moment();
if(!self.messageUuid) {
self.messageUuid = Message.createMessageUUID(
self.areaTag,
msgTimestamp,
self.modTimestamp,
self.subject,
self.message
);
@ -710,7 +709,7 @@ module.exports = class Message {
VALUES (?, ?, ?, ?, ?, ?, ?, ?);`,
[
self.areaTag, self.messageUuid, self.replyToMsgId, self.toUserName,
self.fromUserName, self.subject, self.message, getISOTimestampString(msgTimestamp)
self.fromUserName, self.subject, self.message, getISOTimestampString(self.modTimestamp)
],
function inserted(err) { // use non-arrow function for 'this' scope
if(!err) {