From 63e5d383d9668e183c788604a6f8021399f16d11 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 23 May 2019 12:23:01 -0400
Subject: [PATCH] fix: #7623, wait for lastonline to update on /users

---
 src/middleware/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/middleware/index.js b/src/middleware/index.js
index 316d5a2ea6..5d13b8eab0 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -60,11 +60,14 @@ middleware.pageView = function pageView(req, res, next) {
 	plugins.fireHook('action:middleware.pageView', { req: req });
 
 	if (req.loggedIn) {
-		user.updateLastOnlineTime(req.uid);
 		if (req.path.startsWith('/api/users') || req.path.startsWith('/users')) {
-			user.updateOnlineUsers(req.uid, next);
+			async.parallel([
+				async.apply(user.updateOnlineUsers, req.uid),
+				async.apply(user.updateLastOnlineTime, req.uid),
+			], next);
 		} else {
 			user.updateOnlineUsers(req.uid);
+			user.updateLastOnlineTime(req.uid);
 			setImmediate(next);
 		}
 	} else {