Merge pull request #17583 from ankush/realtime_viewer

fix(realtime): "X is viewing" doc broken

.github/helper/install_dependencies.sh

@@ -9,8 +9,6 @@ install_wkhtmltopdf() {
 }
 install_wkhtmltopdf &
 
-curl -LsS -O https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
-sudo bash mariadb_repo_setup --mariadb-server-version=10.6
 
 sudo apt update
-sudo apt install libcups2-dev redis-server libmariadb3 libmariadb-dev mariadb-client
+sudo apt install libcups2-dev redis-server mariadb-client-10.3

socketio.js

@@ -292,21 +292,14 @@ function send_users(args, action) {
 
 	const room = action == 'view' ? open_doc_room: get_typing_room(args.socket, args.doctype, args.docname);
 
-	const socketio_room = io.sockets.adapter.rooms[room] || {};
-	// for compatibility with both v1.3.7 and 1.4.4
-	const clients_dict = ('sockets' in socketio_room) ? socketio_room.sockets : socketio_room;
-
-	// socket ids connected to this room
-	const clients = Object.keys(clients_dict || {});
+	const clients = Array.from(io.sockets.adapter.rooms.get(room) || []);
 
 	let users = [];
-	for (let i in io.sockets.sockets) {
-		const s = io.sockets.sockets[i];
-		if (clients.indexOf(s.id) !== -1) {
-			// this socket is connected to the room
-			users.push(s.user);
+	io.sockets.sockets.forEach((sock) => {
+		if (clients.includes(sock.id)) {
+			users.push(sock.user);
 		}
-	}
+	})
 
 	const emit_event = action == 'view' ? 'doc_viewers' : 'doc_typers';