Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 11:39:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: replaced momentjs had timestamp issue

Browse source
This commit is contained in:
djmaze 2020-08-07 17:37:14 +02:00
parent ecbe543b15
commit b57b555bed
3 changed files with 19 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

33
dev/Common/Momentor.js
View file

@ -3,39 +3,24 @@ import $ from '$';
import { i18n } from 'Common/Translator';
let _moment = null;
let _momentNow = 0;
var d, du;
const updateMomentNow = ()=>{
// leading debounce
if (!d) {
d = setTimeout(()=>d=0, 500);
_moment = new Date();
}
};
const updateMomentNowUnix = ()=>{
// leading debounce
if (!du) {
du = setTimeout(()=>du=0, 500);
_momentNow = new Date().getTime();
}
};
let d;
/**
* @returns {moment}
*/
export function momentNow() {
updateMomentNow();
return _moment || new Date();
function momentNow() {
if (!d) {
d = setTimeout(()=>d=0, 500);
_moment = new Date();
}
return _moment;
}
/**
* @returns {number}
*/
export function momentNowUnix() {
updateMomentNowUnix();
return _momentNow || 0;
return momentNow().getTime() / 1000;
}
/**
@ -46,7 +31,7 @@ function formatCustomShortDate(m) {
const now = momentNow();
if (m && now) {
switch (true) {
case 4 >= (now.getTime() - m.getTime()) / 3600:
case 4 >= (now.getTime() - m.getTime()) / 3600000:
return m.fromNow();
case now.format('L') === m.format('L'):
return i18n('MESSAGE_LIST/TODAY_AT', {

3
dev/Stores/User/Message.js
View file

@ -745,14 +745,13 @@ class MessageUserStore {
unreadCountChange = false;
const list = [],
utc = momentNowUnix(),
iCount = pInt(data.Result.MessageResultCount),
iOffset = pInt(data.Result.Offset);
const folder = getFolderFromCacheList(isNormal(data.Result.Folder) ? data.Result.Folder : '');
if (folder && !cached) {
folder.interval = utc;
folder.interval = momentNowUnix();
setFolderHash(data.Result.Folder, data.Result.FolderHash);