From a57a4edcb648d025254ede4d18d267b887ad0b8b Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sun, 5 Sep 2021 15:14:28 +0530 Subject: Remove dependency on 'require' of 'electron' and 'electron/remote' modules. Instead, use the exposed content from the recipe model in main ferdi. --- recipes/discord/package.json | 2 +- recipes/discord/webview.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'recipes/discord') diff --git a/recipes/discord/package.json b/recipes/discord/package.json index 7a2ec50..73a859c 100644 --- a/recipes/discord/package.json +++ b/recipes/discord/package.json @@ -1,7 +1,7 @@ { "id": "discord", "name": "Discord", - "version": "1.3.1", + "version": "1.4.0", "license": "MIT", "config": { "serviceURL": "https://discordapp.com/login", diff --git a/recipes/discord/webview.js b/recipes/discord/webview.js index 0559612..480329d 100644 --- a/recipes/discord/webview.js +++ b/recipes/discord/webview.js @@ -1,7 +1,5 @@ // TODO: Some/most of this is already present in https://github.com/getferdi/ferdi/blob/develop/src/webview/screenshare.js#L5 -const { desktopCapturer, remote: { BrowserWindow } } = require('electron'); - const _path = _interopRequireDefault(require('path')); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -9,7 +7,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de window.navigator.mediaDevices.getDisplayMedia = () => { return new Promise(async (resolve, reject) => { try { - const sources = await desktopCapturer.getSources({ types: ['screen', 'window'] }); + const sources = await Ferdi.desktopCapturer.getSources({ types: ['screen', 'window'] }); const selectionElem = document.createElement('div'); selectionElem.classList = 'desktop-capturer-selection'; @@ -99,7 +97,7 @@ module.exports = (Ferdi, settings) => { event.stopPropagation(); if (url.includes('views/imgpsh_fullsize_anim')) { - let win = new BrowserWindow({ + let win = new Ferdi.BrowserWindow({ width: 800, height: window.innerHeight, minWidth: 600, -- cgit v1.2.3-70-g09d2