Release 4.6.3

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.6.2
+ENV RC_VERSION 4.6.3
 
 MAINTAINER buildmaster@rocket.chat
 

.github/history.json

@@ -73236,6 +73236,29 @@
           ]
         }
       ]
+    },
+    "4.6.3": {
+      "node_version": "14.18.3",
+      "npm_version": "6.14.15",
+      "apps_engine_version": "1.31.0",
+      "mongo_versions": [
+        "3.6",
+        "4.0",
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "25220",
+          "title": "[FIX] Desktop notification on multi-instance environments",
+          "userLogin": "sampaiodiego",
+          "milestone": "4.6.3",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }

.snapcraft/resources/prepareRocketChat

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/4.6.2/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/4.6.3/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 

.snapcraft/snap/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 4.6.2
+version: 4.6.3
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

HISTORY.md

@@ -1,4 +1,22 @@
 
+# 4.6.3
+`2022-04-19  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.18.3`
+- NPM: `6.14.15`
+- MongoDB: `3.6, 4.0, 4.2, 4.4, 5.0`
+- Apps-Engine: `1.31.0`
+
+### 🐛 Bug fixes
+
+
+- Desktop notification on multi-instance environments ([#25220](https://github.com/RocketChat/Rocket.Chat/pull/25220))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 4.6.2
 `2022-04-14  ·  2 🐛  ·  2 👩‍💻👨‍💻`
 

app/notifications/server/lib/Notifications.ts

@@ -3,6 +3,7 @@ import { DDPCommon } from 'meteor/ddp-common';
 
 import { NotificationsModule } from '../../../../server/modules/notifications/notifications.module';
 import { Streamer } from '../../../../server/modules/streamer/streamer.module';
+import { api } from '../../../../server/sdk/api';
 import {
 	Subscriptions as SubscriptionsRaw,
 	Rooms as RoomsRaw,
@@ -41,4 +42,8 @@ notifications.configure({
 	Settings: SettingsRaw,
 });
 
+notifications.streamLocal.on('broadcast', ({ eventName, args }) => {
+	api.broadcastLocal(eventName, ...args);
+});
+
 export default notifications;

app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "4.6.2"
+	"version": "4.6.3"
 }

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "4.6.2",
+	"version": "4.6.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

server/modules/notifications/notifications.module.ts

@@ -51,6 +51,8 @@ export class NotificationsModule {
 
 	public readonly streamRoomData: IStreamer;
 
+	public readonly streamLocal: IStreamer;
+
 	public readonly streamPresence: IStreamer;
 
 	constructor(private Streamer: IStreamerConstructor) {
@@ -93,6 +95,7 @@ export class NotificationsModule {
 		});
 
 		this.streamUser = new this.Streamer('notify-user');
+		this.streamLocal = new this.Streamer('local');
 	}
 
 	async configure({ Rooms, Subscriptions, Users, Settings }: IModelsParam): Promise<void> {
@@ -448,6 +451,11 @@ export class NotificationsModule {
 			}
 		});
 
+		this.streamLocal.serverOnly = true;
+		this.streamLocal.allowRead('none');
+		this.streamLocal.allowEmit('all');
+		this.streamLocal.allowWrite('none');
+
 		this.streamPresence.allowRead('logged');
 		this.streamPresence.allowWrite('none');
 	}