diff --git a/Server/src/database/sermons.js b/Server/src/database/sermons.js index 7845543..93dea25 100644 --- a/Server/src/database/sermons.js +++ b/Server/src/database/sermons.js @@ -80,9 +80,8 @@ exports.insertSermon = function(dateOrSermonObject, titleOrCallbackFunction, aut insertSermonFromObject(dateOrSermonObject,titleOrCallbackFunction); return; } - //date string needs to be in the following format: yyyy-mm-dd-hh-mm - var str = dateOrSermonObject.split(/\D/); - dateOrSermonObject = new Date(str[0],--str[1],str[2],str[3],str[4]); + + dateOrSermonObject = new Date(dateOrSermonObject); connection.query("INSERT INTO Sermons (CreatedDate,ModifiedDate,Id,Date,Title,Author,Description,File) VALUES(?,CURRENT_TIMESTAMP,NULL,?,?,?,?,?)",[new Date,dateOrSermonObject,titleOrCallbackFunction,author,description,file],function(error,result){ if (error){ console.log(error); @@ -108,11 +107,7 @@ exports.updateSermon = function(sermonIdOrSermonObject, dateOrCallbackFunction, updateSermonFromObject(sermonIdOrSermonObject,callback); return; } - if (typeof dateOrCallbackFunction != 'date'){ - //date string needs to be in the following format: yyyy-mm-dd-hh-mm - var str = dateOrCallbackFunction.split(/\D/); - dateOrCallbackFunction = new Date(str[0],--str[1],str[2],str[3],str[4]); - } + dateOrCallbackFunction = new Date(dateOrCallbackFunction); connection.query("UPDATE Sermons SET ModifiedDate = CURRENT_TIMESTAMP, Date = ?, Title = ?, Author = ?, Description = ? WHERE Id = ?",[dateOrCallbackFunction,title,author,description,sermonIdOrSermonObject],function(error,result){ if (error){ console.log(error); diff --git a/Server/src/routes/api/share.js b/Server/src/routes/api/share.js index 48b8526..73f5677 100644 --- a/Server/src/routes/api/share.js +++ b/Server/src/routes/api/share.js @@ -102,6 +102,10 @@ function getEventMeta(req, res, id){ var monthNum = event.startDate.getMonth(); var monthName = MONTHS_FULL[monthNum]; var day = event.startDate.getDate(); + var year = event.startDate.getYear(); + var hour = event.startDate.getUTCHours(); + var minutes = event.startDate.getUTCMinutes(); + var port = req.socket.localPort; var imageUrl = req.protocol + "://" + req.hostname + calendarImageUrl + monthName + "/" + day; @@ -114,7 +118,7 @@ function getEventMeta(req, res, id){ Learn more: https://developers.facebook.com/docs/sharing/webmasters --> - +