diff --git a/src/api/conversations.js b/src/api/conversations.js index 8b0af2d5..7aac3493 100644 --- a/src/api/conversations.js +++ b/src/api/conversations.js @@ -16,6 +16,7 @@ export function getConversations(options) { order_by: _.get(options, 'order_by', 'timestamp'), order_by_direction: 'desc', no_count: true, + tz: 'UTC', page: _.get(options, 'page', 1), rows: _.get(options, 'rows', 25) }; diff --git a/src/filters/date.js b/src/filters/date.js index 5787dd42..95d54c6e 100644 --- a/src/filters/date.js +++ b/src/filters/date.js @@ -9,31 +9,31 @@ export default function(value) { return `${formatDate(timeStamp, 'MMMM D, YYYY')} at ${formatDate(timeStamp, 'h:mm a')}`; } -export function smartTime($date, $today) { +export function smartTime($date) { - let today = $today || new Date(); - let date = moment($date, 'YYYY-MM-DD HH:mm:SS').toDate(); + let today = new Date(); + let date = moment.utc($date, 'YYYY-MM-DD HH:mm:SS').toDate(); let diffSeconds = Math.floor((today.getTime() - date.getTime()) / 1000); let diffMinutes = Math.floor(diffSeconds / 60); let momentDate = moment(date); let seconds = 'second'; - if(diffSeconds > 1) { + if (diffSeconds > 1) { seconds = seconds + "s"; } let minutes = 'minute'; - if(diffSeconds > 120) { + if (diffSeconds > 120) { minutes = minutes + "s"; } - if(diffSeconds < 60) { + if (diffSeconds < 60) { return diffSeconds + ' ' + seconds + ' ago'; } else if (diffSeconds < 3600) { return diffMinutes + ' ' + minutes + ' ago'; } - else if(isToday(date)) { + else if (isToday(date)) { return 'Today, ' + momentDate.format('HH:mm'); } else if (isYesterday(date)) { diff --git a/src/helpers/date-helper.js b/src/helpers/date-helper.js index 1596176c..81b56af2 100644 --- a/src/helpers/date-helper.js +++ b/src/helpers/date-helper.js @@ -24,18 +24,6 @@ export function addDay(date) { return newDate; } -export function addMonth(date) { - let newDate = new Date(); - newDate.setUTCMonth(date.getUTCMonth() + 1); - return newDate; -} - -export function addYear(date) { - let newDate = new Date(); - newDate.setUTCFullYear(date.getUTCFullYear() + 1); - return newDate; -} - export function isToday(date, $today) { let today = $today || new Date(); let todayStart = new Date(today.getTime());