mirror of
https://github.com/zulip/zulip-desktop.git
synced 2025-11-14 10:57:44 +00:00
Avoid deprecated ipcRenderer.sendTo.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
@@ -1,7 +1,14 @@
|
|||||||
import type {Event} from "electron/common";
|
import type {Event} from "electron/common";
|
||||||
import {clipboard} from "electron/common";
|
import {clipboard} from "electron/common";
|
||||||
import type {IpcMainEvent, WebContents} from "electron/main";
|
import type {IpcMainEvent, WebContents} from "electron/main";
|
||||||
import {BrowserWindow, app, dialog, powerMonitor, session} from "electron/main";
|
import {
|
||||||
|
BrowserWindow,
|
||||||
|
app,
|
||||||
|
dialog,
|
||||||
|
powerMonitor,
|
||||||
|
session,
|
||||||
|
webContents,
|
||||||
|
} from "electron/main";
|
||||||
import {Buffer} from "node:buffer";
|
import {Buffer} from "node:buffer";
|
||||||
import crypto from "node:crypto";
|
import crypto from "node:crypto";
|
||||||
import path from "node:path";
|
import path from "node:path";
|
||||||
@@ -389,6 +396,21 @@ ${error}`,
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
ipcMain.on(
|
||||||
|
"forward-to",
|
||||||
|
<Channel extends keyof RendererMessage>(
|
||||||
|
_event: IpcMainEvent,
|
||||||
|
webContentsId: number,
|
||||||
|
listener: Channel,
|
||||||
|
...parameters: Parameters<RendererMessage[Channel]>
|
||||||
|
) => {
|
||||||
|
const contents = webContents.fromId(webContentsId);
|
||||||
|
if (contents !== undefined) {
|
||||||
|
send(contents, listener, ...parameters);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
ipcMain.on("update-menu", (_event, props: MenuProps) => {
|
ipcMain.on("update-menu", (_event, props: MenuProps) => {
|
||||||
AppMenu.setMenu(props);
|
AppMenu.setMenu(props);
|
||||||
if (props.activeTabIndex !== undefined) {
|
if (props.activeTabIndex !== undefined) {
|
||||||
|
|||||||
@@ -33,6 +33,15 @@ export const ipcMain: {
|
|||||||
...args: Parameters<RendererMessage[Channel]>
|
...args: Parameters<RendererMessage[Channel]>
|
||||||
) => void,
|
) => void,
|
||||||
): void;
|
): void;
|
||||||
|
on(
|
||||||
|
channel: "forward-to",
|
||||||
|
listener: <Channel extends keyof RendererMessage>(
|
||||||
|
event: IpcMainEvent,
|
||||||
|
webContentsId: number,
|
||||||
|
channel: Channel,
|
||||||
|
...args: Parameters<RendererMessage[Channel]>
|
||||||
|
) => void,
|
||||||
|
): void;
|
||||||
on<Channel extends keyof MainMessage>(
|
on<Channel extends keyof MainMessage>(
|
||||||
channel: Channel,
|
channel: Channel,
|
||||||
listener: MainListener<Channel>,
|
listener: MainListener<Channel>,
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ export default class WebView {
|
|||||||
channel: Channel,
|
channel: Channel,
|
||||||
...args: Parameters<RendererMessage[Channel]>
|
...args: Parameters<RendererMessage[Channel]>
|
||||||
): void {
|
): void {
|
||||||
ipcRenderer.sendTo(this.webContentsId, channel, ...args);
|
ipcRenderer.send("forward-to", this.webContentsId, channel, ...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
private registerListeners(): void {
|
private registerListeners(): void {
|
||||||
|
|||||||
@@ -356,7 +356,8 @@ export function initGeneralSection({$root}: GeneralSectionProps): void {
|
|||||||
const newValue = !ConfigUtil.getConfigItem("silent", true);
|
const newValue = !ConfigUtil.getConfigItem("silent", true);
|
||||||
ConfigUtil.setConfigItem("silent", newValue);
|
ConfigUtil.setConfigItem("silent", newValue);
|
||||||
updateSilentOption();
|
updateSilentOption();
|
||||||
ipcRenderer.sendTo(
|
ipcRenderer.send(
|
||||||
|
"forward-to",
|
||||||
currentBrowserWindow.webContents.id,
|
currentBrowserWindow.webContents.id,
|
||||||
"toggle-silent",
|
"toggle-silent",
|
||||||
newValue,
|
newValue,
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ function sendAction<Channel extends keyof RendererMessage>(
|
|||||||
win.restore();
|
win.restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
ipcRenderer.sendTo(win.webContents.id, channel, ...args);
|
ipcRenderer.send("forward-to", win.webContents.id, channel, ...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
const createTray = function (): void {
|
const createTray = function (): void {
|
||||||
|
|||||||
@@ -37,6 +37,12 @@ export const ipcRenderer: {
|
|||||||
rendererChannel: Channel,
|
rendererChannel: Channel,
|
||||||
...args: Parameters<RendererMessage[Channel]>
|
...args: Parameters<RendererMessage[Channel]>
|
||||||
): void;
|
): void;
|
||||||
|
send<Channel extends keyof RendererMessage>(
|
||||||
|
channel: "forward-to",
|
||||||
|
webContentsId: number,
|
||||||
|
rendererChannel: Channel,
|
||||||
|
...args: Parameters<RendererMessage[Channel]>
|
||||||
|
): void;
|
||||||
send<Channel extends keyof MainMessage>(
|
send<Channel extends keyof MainMessage>(
|
||||||
channel: Channel,
|
channel: Channel,
|
||||||
...args: Parameters<MainMessage[Channel]>
|
...args: Parameters<MainMessage[Channel]>
|
||||||
@@ -56,11 +62,6 @@ export const ipcRenderer: {
|
|||||||
: never,
|
: never,
|
||||||
transfer?: MessagePort[],
|
transfer?: MessagePort[],
|
||||||
): void;
|
): void;
|
||||||
sendTo<Channel extends keyof RendererMessage>(
|
|
||||||
webContentsId: number,
|
|
||||||
channel: Channel,
|
|
||||||
...args: Parameters<RendererMessage[Channel]>
|
|
||||||
): void;
|
|
||||||
sendToHost<Channel extends keyof RendererMessage>(
|
sendToHost<Channel extends keyof RendererMessage>(
|
||||||
channel: Channel,
|
channel: Channel,
|
||||||
...args: Parameters<RendererMessage[Channel]>
|
...args: Parameters<RendererMessage[Channel]>
|
||||||
|
|||||||
Reference in New Issue
Block a user