Merge pull request #4415 from RocketChat/fix-jitsiTimeout

Fix jitsiTimeout errors

packages/rocketchat-videobridge/client/actionLink.js

@@ -4,7 +4,7 @@ RocketChat.actionLinks.register('joinJitsiCall', function(/*message, params*/) {
 
 		let room = RocketChat.models.Rooms.findOne({_id: rid});
 		let currentTime = new Date().getTime();
-		let jitsiTimeout = new Date(room.jitsiTimeout).getTime() || currentTime;
+		let jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
 
 		if (jitsiTimeout > currentTime) {
 			RocketChat.TabBar.setTemplate('videoFlexTab');

packages/rocketchat-videobridge/client/public/external_api.js

@@ -295,7 +295,7 @@ var JitsiMeetExternalAPI = (function()
         var message;
         try {
             message = JSON.parse(event.data);
-        } catch (e) {}
+        } catch (e) { return; }
 
         if(!message.type) {
             console.error("Message without type is received.");

packages/rocketchat-videobridge/client/tabBar.js

@@ -30,7 +30,7 @@ Meteor.startup(function() {
 
 				let room = RocketChat.models.Rooms.findOne({_id: rid});
 				let currentTime = new Date().getTime();
-				let jitsiTimeout = new Date(room.jitsiTimeout).getTime() || currentTime;
+				let jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
 
 				if (jitsiTimeout > currentTime) {
 					RocketChat.TabBar.updateButton('video', { class: 'attention' });

packages/rocketchat-videobridge/server/methods/jitsiSetTimeout.js

@@ -4,7 +4,7 @@ Meteor.methods({
 		let room = RocketChat.models.Rooms.findOne({_id: rid});
 		let currentTime = new Date().getTime();
 
-		let jitsiTimeout = new Date(room.jitsiTimeout || currentTime).getTime();
+		let jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
 
 		if (jitsiTimeout <= currentTime) {
 			RocketChat.models.Rooms.setJitsiTimeout(rid, new Date(currentTime + 35*1000));