Type the updater API and the Tauri global. [skip build]
This commit is contained in:
@@ -8,6 +8,7 @@ import {
|
||||
MatrixEvent,
|
||||
Room,
|
||||
IPushRules,
|
||||
IPushRule,
|
||||
SyncState,
|
||||
} from 'matrix-js-sdk';
|
||||
import { useAtomValue } from 'jotai';
|
||||
@@ -113,8 +114,8 @@ export function TitleBar({ mx, children }: TitleBarProps) {
|
||||
const pushRules = pushRulesEvt?.getContent<IPushRules>() ?? { global: {} };
|
||||
const content = pushRules.global.content ?? [];
|
||||
const keywordPatterns = content
|
||||
.filter((rule: any) => rule.default === false && typeof rule.pattern === 'string')
|
||||
.map((rule: any) => rule.pattern as string);
|
||||
.filter((rule: IPushRule) => rule.default === false && typeof rule.pattern === 'string')
|
||||
.map((rule: IPushRule) => rule.pattern as string);
|
||||
|
||||
// Get notification preferences
|
||||
const global = pushRules?.global;
|
||||
@@ -128,21 +129,21 @@ export function TitleBar({ mx, children }: TitleBarProps) {
|
||||
};
|
||||
|
||||
// Check override rules for muted rooms
|
||||
override.forEach((rule: any) => {
|
||||
override.forEach((rule: IPushRule) => {
|
||||
if (isRoomId(rule.rule_id) && getNotificationMode(rule.actions) === NotificationMode.OFF) {
|
||||
preferences.mute.add(rule.rule_id);
|
||||
}
|
||||
});
|
||||
|
||||
// Check room rules for special messages (OFF mode = mentions only)
|
||||
room.forEach((rule: any) => {
|
||||
room.forEach((rule: IPushRule) => {
|
||||
if (getNotificationMode(rule.actions) === NotificationMode.OFF) {
|
||||
preferences.specialMessages.add(rule.rule_id);
|
||||
}
|
||||
});
|
||||
|
||||
// Check room rules for all messages (Notify or NotifyLoud mode)
|
||||
room.forEach((rule: any) => {
|
||||
room.forEach((rule: IPushRule) => {
|
||||
if (getNotificationMode(rule.actions) !== NotificationMode.OFF) {
|
||||
preferences.allMessages.add(rule.rule_id);
|
||||
}
|
||||
@@ -483,7 +484,7 @@ export function TitleBar({ mx, children }: TitleBarProps) {
|
||||
|
||||
const content = event.getContent();
|
||||
const isMyReceipt = Object.keys(content).find((eventId) =>
|
||||
(Object.keys(content[eventId]) as any[]).find(
|
||||
Object.keys(content[eventId]).find(
|
||||
(receiptType) => content[eventId][receiptType][myUserId],
|
||||
),
|
||||
);
|
||||
@@ -631,7 +632,7 @@ export function TitleBar({ mx, children }: TitleBarProps) {
|
||||
};
|
||||
|
||||
// Only render on desktop (when Tauri is available)
|
||||
if (typeof (window as any).__TAURI__ === 'undefined') {
|
||||
if (typeof window.__TAURI__ === 'undefined') {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,20 +1,7 @@
|
||||
import React, { useState, useEffect, useCallback } from 'react';
|
||||
import { Box, Text } from 'folds';
|
||||
import * as css from './UpdateNotification.css';
|
||||
|
||||
interface UpdateInfo {
|
||||
version: string;
|
||||
releaseNotes?: string;
|
||||
releaseDate?: string;
|
||||
mock?: boolean;
|
||||
}
|
||||
|
||||
interface DownloadProgress {
|
||||
percent: number;
|
||||
transferred: number;
|
||||
total: number;
|
||||
mock?: boolean;
|
||||
}
|
||||
import type { DownloadProgress, UpdateInfo } from '../../../ext';
|
||||
|
||||
type UpdaterPhase = 'idle' | 'checking' | 'available' | 'downloading' | 'ready';
|
||||
|
||||
@@ -26,7 +13,7 @@ export function UpdateNotification() {
|
||||
const [hovered, setHovered] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
const { electron } = window as any;
|
||||
const { electron } = window;
|
||||
if (!electron?.updater) return undefined;
|
||||
|
||||
const { updater } = electron;
|
||||
@@ -72,7 +59,7 @@ export function UpdateNotification() {
|
||||
const handleCheck = useCallback(async () => {
|
||||
setPhase('checking');
|
||||
try {
|
||||
const result = await (window as any).electron.updater.checkForUpdates();
|
||||
const result = await window.electron?.updater?.checkForUpdates();
|
||||
if (!result?.success) {
|
||||
setPhase('idle');
|
||||
}
|
||||
@@ -89,7 +76,7 @@ export function UpdateNotification() {
|
||||
setPhase('downloading');
|
||||
setDownloadProgress(0);
|
||||
try {
|
||||
await (window as any).electron.updater.downloadUpdate();
|
||||
await window.electron?.updater?.downloadUpdate();
|
||||
} catch {
|
||||
setPhase('available');
|
||||
}
|
||||
@@ -97,7 +84,7 @@ export function UpdateNotification() {
|
||||
|
||||
const handleInstall = useCallback(async () => {
|
||||
try {
|
||||
await (window as any).electron.updater.installUpdate();
|
||||
await window.electron?.updater?.installUpdate();
|
||||
if (isMock) {
|
||||
setPhase('idle');
|
||||
setUpdateInfo(null);
|
||||
@@ -114,7 +101,7 @@ export function UpdateNotification() {
|
||||
setDownloadProgress(0);
|
||||
}, []);
|
||||
|
||||
if (typeof window === 'undefined' || !(window as any).electron?.updater) {
|
||||
if (typeof window === 'undefined' || !window.electron?.updater) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
|
||||
);
|
||||
const powerLevelTags = powerLevelTagsEvent?.getContent();
|
||||
|
||||
const info: any = {
|
||||
const info = {
|
||||
roomId: room.roomId,
|
||||
name: room.name,
|
||||
canonicalAlias: room.canonicalAlias,
|
||||
@@ -103,8 +103,8 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
|
||||
timelineSetSize: room.getTimelineSets().length,
|
||||
},
|
||||
encryption: room.hasEncryptionStateEvent(),
|
||||
state: {} as any,
|
||||
accountData: {} as any,
|
||||
state: {} as Record<string, Record<string, unknown>>,
|
||||
accountData: {} as Record<string, unknown>,
|
||||
};
|
||||
|
||||
// Add all state events
|
||||
|
||||
@@ -151,7 +151,7 @@ export const MessageAllReactionItem = as<
|
||||
return (
|
||||
<>
|
||||
<Overlay
|
||||
onContextMenu={(evt: any) => {
|
||||
onContextMenu={(evt) => {
|
||||
evt.stopPropagation();
|
||||
}}
|
||||
open={open}
|
||||
@@ -974,7 +974,7 @@ export const Message = as<'div', MessageProps>(
|
||||
|
||||
const handleContextMenu: MouseEventHandler<HTMLDivElement> = (evt) => {
|
||||
if (evt.altKey || !window.getSelection()?.isCollapsed || edit) return;
|
||||
const tag = (evt.target as any).tagName;
|
||||
const tag = (evt.target as HTMLElement).tagName;
|
||||
if (typeof tag === 'string' && (tag.toLowerCase() === 'a' || tag.toLowerCase() === 'img'))
|
||||
return;
|
||||
evt.preventDefault();
|
||||
@@ -1187,7 +1187,7 @@ export const Message = as<'div', MessageProps>(
|
||||
after={<Icon size="100" src={Icons.ReplyArrow} />}
|
||||
radii="300"
|
||||
data-event-id={mEvent.getId()}
|
||||
onClick={(evt: any) => {
|
||||
onClick={(evt) => {
|
||||
onReplyClick(evt);
|
||||
closeMenu();
|
||||
}}
|
||||
@@ -1207,7 +1207,7 @@ export const Message = as<'div', MessageProps>(
|
||||
after={<Icon src={Icons.ThreadPlus} size="100" />}
|
||||
radii="300"
|
||||
data-event-id={mEvent.getId()}
|
||||
onClick={(evt: any) => {
|
||||
onClick={(evt) => {
|
||||
onReplyClick(evt, true);
|
||||
closeMenu();
|
||||
}}
|
||||
@@ -1359,7 +1359,7 @@ export const Event = as<'div', EventProps>(
|
||||
|
||||
const handleContextMenu: MouseEventHandler<HTMLDivElement> = (evt) => {
|
||||
if (evt.altKey || !window.getSelection()?.isCollapsed) return;
|
||||
const tag = (evt.target as any).tagName;
|
||||
const tag = (evt.target as HTMLElement).tagName;
|
||||
if (typeof tag === 'string' && (tag.toLowerCase() === 'a' || tag.toLowerCase() === 'img'))
|
||||
return;
|
||||
evt.preventDefault();
|
||||
|
||||
@@ -15,7 +15,7 @@ interface PluginLoaderProps {
|
||||
* Reads and evaluates a plugin's JS module from the Electron filesystem.
|
||||
* Supports both CommonJS and ESM-style exports.
|
||||
*/
|
||||
async function loadPluginModule(pluginId: string): Promise<any> {
|
||||
async function loadPluginModule(pluginId: string): Promise<Record<string, unknown>> {
|
||||
if (!window.electron?.plugins) {
|
||||
throw new Error('Plugins are only supported in the desktop app');
|
||||
}
|
||||
@@ -25,7 +25,7 @@ async function loadPluginModule(pluginId: string): Promise<any> {
|
||||
throw new Error(response.error ?? 'Failed to read plugin code');
|
||||
}
|
||||
|
||||
const pluginExports: any = {};
|
||||
const pluginExports: Record<string, unknown> = {};
|
||||
const mod = { exports: pluginExports };
|
||||
|
||||
try {
|
||||
@@ -134,7 +134,7 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
|
||||
const context = createPluginContext(
|
||||
{
|
||||
pluginId: installedPlugin.id,
|
||||
eventClient: matrixClient as any,
|
||||
eventClient: matrixClient,
|
||||
onNotify: async (opts) => {
|
||||
await sendNotification({
|
||||
title: opts.title,
|
||||
@@ -146,13 +146,13 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
|
||||
pluginRegistry,
|
||||
);
|
||||
|
||||
const compatContext = Object.assign(context as Record<string, unknown>, {
|
||||
const compatContext = Object.assign(context, {
|
||||
matrixClient,
|
||||
matrix: {
|
||||
on: (eventType: string, handler: (...args: unknown[]) => void) =>
|
||||
matrixClient.on(eventType as any, handler as any),
|
||||
matrixClient.on(eventType as any, handler),
|
||||
off: (eventType: string, handler: (...args: unknown[]) => void) =>
|
||||
matrixClient.off(eventType as any, handler as any),
|
||||
matrixClient.off(eventType as any, handler),
|
||||
},
|
||||
React,
|
||||
lucide,
|
||||
@@ -163,7 +163,7 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
|
||||
console.log('[PluginLoader] About to register plugin and call onLoad...');
|
||||
|
||||
pluginRegistry.registerPlugin(installedPlugin.id, plugin, context);
|
||||
await plugin.onLoad(compatContext as any);
|
||||
await plugin.onLoad(compatContext);
|
||||
console.log(`[PluginLoader] Successfully loaded plugin: ${installedPlugin.id}`);
|
||||
dispatchPluginButtonsChanged();
|
||||
}
|
||||
|
||||
@@ -185,8 +185,8 @@ export const renderMatrixMention = (
|
||||
|
||||
export const factoryRenderLinkifyWithMention = (
|
||||
mentionRender: (href: string) => React.JSX.Element | undefined,
|
||||
): OptFn<(ir: IntermediateRepresentation) => any> => {
|
||||
const render: OptFn<(ir: IntermediateRepresentation) => any> = ({
|
||||
): OptFn<(ir: IntermediateRepresentation) => React.JSX.Element | undefined> => {
|
||||
const render: OptFn<(ir: IntermediateRepresentation) => React.JSX.Element | undefined> = ({
|
||||
tagName,
|
||||
attributes,
|
||||
content,
|
||||
@@ -502,7 +502,7 @@ export function InlineCode({
|
||||
}: {
|
||||
children: ChildNode[];
|
||||
opts: HTMLReactParserOptions;
|
||||
props: any;
|
||||
props: ReturnType<typeof attributesToProps>;
|
||||
}) {
|
||||
const [copied, setCopied] = useTimeoutToggle();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user