github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-21 17:55:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent humanTime helper to generate future times

Browse Source 
Fixes #592.
This commit is contained in:
Franz Liedke 2016-03-29 22:23:11 +09:00
parent e00661125a
commit adcda98f30
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/js/admin/dist/app.js vendored
View File

@ -22447,6 +22447,14 @@ System.register('flarum/utils/formatNumber', [], function (_export, _context) {
System.register('flarum/utils/humanTime', [], function (_export, _context) {
function humanTime(time) {
var m = moment(time);
var now = moment();
// To prevent showing things like "in a few seconds" due to small offsets
// between client and server time, we always reset future dates to the
// current time. This will result in "just now" being shown instead.
if (m.isAfter(now)) {
m = now;
}
var day = 864e5;
var diff = m.diff(moment());

8
framework/core/js/forum/dist/app.js vendored
View File

@ -30555,6 +30555,14 @@ System.register('flarum/utils/History', [], function (_export, _context) {
System.register('flarum/utils/humanTime', [], function (_export, _context) {
function humanTime(time) {
var m = moment(time);
var now = moment();
// To prevent showing things like "in a few seconds" due to small offsets
// between client and server time, we always reset future dates to the
// current time. This will result in "just now" being shown instead.
if (m.isAfter(now)) {
m = now;
}
var day = 864e5;
var diff = m.diff(moment());

10
framework/core/js/lib/utils/humanTime.js
View File

@ -6,7 +6,15 @@
* @return {String}
*/
export default function humanTime(time) {
const m = moment(time);
let m = moment(time);
const now = moment();
// To prevent showing things like "in a few seconds" due to small offsets
// between client and server time, we always reset future dates to the
// current time. This will result in "just now" being shown instead.
if (m.isAfter(now)) {
m = now;
}
const day = 864e5;
const diff = m.diff(moment());