From 7397873db355d5449e9de3e6ca39b47b4cb34813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 27 Mar 2023 22:16:41 -0400
Subject: [PATCH] fix: fire action:user.online on user login

---
 src/controllers/authentication.js | 2 +-
 src/user/online.js                | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js
index 82dc6b1660..bb6e6bf49f 100644
--- a/src/controllers/authentication.js
+++ b/src/controllers/authentication.js
@@ -383,7 +383,7 @@ authenticationController.onSuccessfulLogin = async function (req, uid) {
 			}),
 			user.auth.addSession(uid, req.sessionID),
 			user.updateLastOnlineTime(uid),
-			user.updateOnlineUsers(uid),
+			user.onUserOnline(uid, Date.now()),
 			analytics.increment('logins'),
 			db.incrObjectFieldBy('global', 'loginCount', 1),
 		]);
diff --git a/src/user/online.js b/src/user/online.js
index ffba4c9a94..b7c6b9d45a 100644
--- a/src/user/online.js
+++ b/src/user/online.js
@@ -27,9 +27,13 @@ module.exports = function (User) {
 		if (now - parseInt(userOnlineTime, 10) < 300000) {
 			return;
 		}
-		await db.sortedSetAdd('users:online', now, uid);
+		await User.onUserOnline(uid, now);
 		topics.pushUnreadCount(uid);
-		plugins.hooks.fire('action:user.online', { uid: uid, timestamp: now });
+	};
+
+	User.onUserOnline = async (uid, timestamp) => {
+		await db.sortedSetAdd('users:online', timestamp, uid);
+		plugins.hooks.fire('action:user.online', { uid, timestamp });
 	};
 
 	User.isOnline = async function (uid) {