diff --git a/src/app/components/title-bar/TitleBar.tsx b/src/app/components/title-bar/TitleBar.tsx index 01ddb7af..00fa33ae 100644 --- a/src/app/components/title-bar/TitleBar.tsx +++ b/src/app/components/title-bar/TitleBar.tsx @@ -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() ?? { 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; } diff --git a/src/app/components/update-notification/UpdateNotification.tsx b/src/app/components/update-notification/UpdateNotification.tsx index 82c8e988..b7b48a2c 100644 --- a/src/app/components/update-notification/UpdateNotification.tsx +++ b/src/app/components/update-notification/UpdateNotification.tsx @@ -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; } diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx index 59478f73..9b65065b 100644 --- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx +++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx @@ -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>, + accountData: {} as Record, }; // Add all state events diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index cb4dfdc5..1e2460cd 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -151,7 +151,7 @@ export const MessageAllReactionItem = as< return ( <> { + onContextMenu={(evt) => { evt.stopPropagation(); }} open={open} @@ -974,7 +974,7 @@ export const Message = as<'div', MessageProps>( const handleContextMenu: MouseEventHandler = (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={} 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={} 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 = (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(); diff --git a/src/app/features/settings/plugins/PluginLoader.tsx b/src/app/features/settings/plugins/PluginLoader.tsx index 6bf61ac9..31e16bcd 100644 --- a/src/app/features/settings/plugins/PluginLoader.tsx +++ b/src/app/features/settings/plugins/PluginLoader.tsx @@ -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 { +async function loadPluginModule(pluginId: string): Promise> { 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 { throw new Error(response.error ?? 'Failed to read plugin code'); } - const pluginExports: any = {}; + const pluginExports: Record = {}; 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, { + 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(); } diff --git a/src/app/plugins/react-custom-html-parser.tsx b/src/app/plugins/react-custom-html-parser.tsx index b81a9662..e172b42c 100644 --- a/src/app/plugins/react-custom-html-parser.tsx +++ b/src/app/plugins/react-custom-html-parser.tsx @@ -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; }) { const [copied, setCopied] = useTimeoutToggle(); diff --git a/src/ext.d.ts b/src/ext.d.ts index 01ba4c4d..9adc08d4 100644 --- a/src/ext.d.ts +++ b/src/ext.d.ts @@ -25,6 +25,20 @@ interface PluginAPI { ) => Promise<{ success: boolean; data?: string; error?: string }>; } +export interface UpdateInfo { + version: string; + releaseNotes?: string; + releaseDate?: string; + mock?: boolean; +} + +export interface DownloadProgress { + percent: number; + transferred: number; + total: number; + mock?: boolean; +} + interface ElectronAPI { platform?: string; arch?: string; @@ -91,9 +105,19 @@ interface ElectronAPI { }>; }; updater?: { - onUpdateDownloaded: ( - callback: (info: { version: string; releaseNotes?: unknown }) => void, - ) => void; + checkForUpdates: () => Promise<{ + success: boolean; + data?: { updateInfo?: UpdateInfo }; + error?: string; + }>; + downloadUpdate: () => Promise<{ success: boolean; error?: string }>; + installUpdate: () => Promise<{ success: boolean; error?: string }>; + downloadAndInstallUpdate: () => Promise<{ success: boolean; error?: string }>; + isMock: () => Promise<{ success: boolean; data?: { mock: boolean } }>; + onUpdateAvailable: (callback: (info: UpdateInfo) => void) => void; + onUpdateDownloadProgress: (callback: (progress: DownloadProgress) => void) => void; + onUpdateDownloaded: (callback: (info: UpdateInfo) => void) => void; + onUpdateNotAvailable: (callback: (info: UpdateInfo) => void) => void; }; discordCollectibles?: { fetchCatalog: (force?: boolean) => Promise<{ @@ -120,6 +144,10 @@ interface ElectronAPI { declare global { interface Window { electron?: ElectronAPI; + __TAURI__?: { + invoke: (command: string, args?: unknown) => Promise; + listen: (event: string, handler: (...args: unknown[]) => void) => () => void; + }; } }