[FIX] Preload scripts compatibility (#1140)

* Update copyright string * Make preload scripts support all Rocket.Chat versions up to 1.0.x
RocketChat · Mar 13, 2019 · cf524f0 · cf524f0
1 parent f422780
commit cf524f0
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.",
   "version": "2.16.0-develop",
   "author": "Rocket.Chat Support <[email protected]>",
-  "copyright": "© 2018, Rocket.Chat",
+  "copyright": "© 2019, Rocket.Chat",
   "homepage": "https://rocket.chat",
   "license": "MIT",
   "main": "app/background.js",

diff --git a/src/preload/jitsi.js b/src/preload/jitsi.js
@@ -1,6 +1,7 @@
 import { desktopCapturer, remote } from 'electron';
 import url from 'url';
 import util from 'util';
+import { getSettings } from './rocketChat';
 const { app } = remote;
 
 
@@ -15,12 +16,6 @@ const JitsiMeetElectron = {
 	},
 };
 
-
-const getSettings = () => (
-	(window.RocketChat && window.RocketChat.settings) ||
-		(window.require && window.require('/app/settings').settings)
-);
-
 const wrapWindowOpen = (defaultWindowOpen) => (href, frameName, features) => {
 	const settings = getSettings();
 

diff --git a/src/preload/links.js b/src/preload/links.js
@@ -1,11 +1,7 @@
 import { shell, remote } from 'electron';
+import { getSettings } from './rocketChat';
 
 
-const getSettings = () => (
-	(window.RocketChat && window.RocketChat.settings) ||
-		(window.require && window.require('/app/settings').settings)
-);
-
 const handleAnchorClick = (event) => {
 	const a = event.target.closest('a');
 

diff --git a/src/preload/rocketChat.js b/src/preload/rocketChat.js
@@ -0,0 +1,72 @@
+export function getMeteor() {
+	if (!window.require) {
+		return window.Meteor;
+	}
+
+	try {
+		return window.require('meteor/meteor').Meteor;
+	} catch (error) {
+		console.error(error);
+		return null;
+	}
+}
+
+export function getTracker() {
+	if (!window.require) {
+		return window.Tracker;
+	}
+
+	try {
+		return window.require('meteor/tracker').Tracker;
+	} catch (error) {
+		console.error(error);
+		return null;
+	}
+}
+
+export function getUserPresence() {
+	if (!window.require) {
+		return window.UserPresence;
+	}
+
+	try {
+		return window.require('meteor/konecty:user-presence').UserPresence;
+	} catch (error) {
+		console.error(error);
+		return null;
+	}
+}
+
+export function getSettings() {
+	if (!window.require) {
+		return window.RocketChat && window.RocketChat.settings;
+	}
+
+	try {
+		return window.require('/app/settings').settings;
+	} catch (_) {
+		try {
+			return window.require('meteor/rocketchat:settings').settings;
+		} catch (error) {
+			console.error(error);
+			return null;
+		}
+	}
+}
+
+export function getGetUserPreference() {
+	if (!window.require) {
+		return window.RocketChat && window.RocketChat.getUserPreference;
+	}
+
+	try {
+		return window.require('/app/utils').getUserPreference;
+	} catch (_) {
+		try {
+			return window.require('meteor/rocketchat:utils').getUserPreference;
+		} catch (error) {
+			console.error(error);
+			return null;
+		}
+	}
+}
diff --git a/src/preload/titleChange.js b/src/preload/titleChange.js
@@ -1,13 +1,7 @@
 import { ipcRenderer } from 'electron';
+import { getMeteor, getTracker, getSettings } from './rocketChat';
 
 
-const getMeteor = () => window.Meteor || (window.require && window.require('meteor/meteor').Meteor);
-const getTracker = () => window.Tracker || (window.require && window.require('meteor/tracker').Tracker);
-const getSettings = () => (
-	(window.RocketChat && window.RocketChat.settings) ||
-		(window.require && window.require('/app/settings').settings)
-);
-
 function handleTitleChange() {
 	const Meteor = getMeteor();
 	const Tracker = getTracker();

diff --git a/src/preload/userPresence.js b/src/preload/userPresence.js
@@ -1,20 +1,10 @@
 import { ipcRenderer } from 'electron';
+import { getMeteor, getTracker, getGetUserPreference, getUserPresence } from './rocketChat';
 
 
 let maximumIdleTime = 10 * 1000;
 const idleDetectionInterval = 1 * 1000;
 
-const getMeteor = () => window.Meteor || (window.require && window.require('meteor/meteor').Meteor);
-const getTracker = () => window.Tracker || (window.require && window.require('meteor/tracker').Tracker);
-const getGetUserPreference = () => (
-	(window.RocketChat && window.RocketChat.getUserPreference) ||
-	(window.require && window.require('/app/utils').getUserPreference)
-);
-const getUserPresence = () => (
-	window.UserPresence ||
-	(window.require && window.require('meteor/konecty:user-presence').UserPresence)
-);
-
 function onChangeUserPresence(isUserPresent) {
 	const UserPresence = getUserPresence();