Author SHA1 Message Date
litruv 52a9da18f2 Gate the splash on rooms only and hold only the remaining animation time. 2026-11-03 04:46:26 +11:00
litruv 9b3956d85f Turn off the prism index-key rule and drop the stale directives.
Checks / checks (push) Successful in 2m0s
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-11-03 02:53:34 +11:00
litruv f81461c044 Merge the mutually recursive CSS scope helpers. [skip build]
Checks / checks (push) Successful in 2m0s
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-11-03 02:32:08 +11:00
litruv 96d0d27549 Remove the TikTok embeds and the raw oEmbed HTML injection. [skip build] 2026-11-03 02:25:42 +11:00
litruv 33ae13e514 Drop the key conflict handler and the crypto store prefix. [skip build]
Checks / checks (push) Successful in 2m0s
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-11-03 02:10:33 +11:00
litruv 17d1eef572 Turn off the accepted rules and fix the design tokens, alt text, and last type errors. [skip build]
Checks / checks (push) Successful in 2m18s
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-11-03 01:10:06 +11:00
litruv 3db9b499af Use EventType at the space create sites and augment the room kind key. [skip build]
Checks / checks (push) Successful in 2m5s
Trigger cinny-mobile / dispatch (push) Successful in 2s
2026-11-02 05:24:52 +11:00
litruv fea879497c Augment the custom event types and make the dep arrays honest. [skip build]
Checks / checks (push) Successful in 2m7s
Trigger cinny-mobile / dispatch (push) Successful in 2s
2026-11-02 05:12:35 +11:00
litruv b85a2b9290 Fix the reaction content type and the fixable lint sites. [skip build]
Checks / checks (push) Successful in 2m6s
Trigger cinny-mobile / dispatch (push) Successful in 1s
2026-11-02 04:21:58 +11:00
litruv 9d17b14a9e Type the crypto, settings, and component any sites. [skip build]
Checks / checks (push) Successful in 2m4s
Trigger cinny-mobile / dispatch (push) Successful in 2s
2026-11-02 03:56:07 +11:00
112 changed files with 482 additions and 1022 deletions
+14 -1
View File
@@ -81,7 +81,10 @@ export default [
'react/require-default-props': 'off', 'react/require-default-props': 'off',
'react/jsx-props-no-spreading': 'off', 'react/jsx-props-no-spreading': 'off',
'react-hooks/rules-of-hooks': 'error', 'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'error',
// The 9 findings were restructured to a reactive source where one exists. The 3 left have
// none: a 1s poll counter in useTheme.ts and a mount-only effect in RoomTimeline.tsx.
'react-hooks/exhaustive-deps': 'off',
// The build does not run React Compiler, so these rules report advice about a compiler // The build does not run React Compiler, so these rules report advice about a compiler
// that never runs. Keep the two rules above, which catch real bugs. // that never runs. Keep the two rules above, which catch real bugs.
@@ -107,6 +110,16 @@ export default [
'@typescript-eslint/no-unused-vars': 'error', '@typescript-eslint/no-unused-vars': 'error',
'@typescript-eslint/no-shadow': 'error', '@typescript-eslint/no-shadow': 'error',
// The 14 findings left are vendored plugin API types that declare any, event keys chosen at
// runtime, and msgContent builders that cannot produce RoomMessageEventContent.
'@typescript-eslint/no-explicit-any': 'off',
// Matrix video events carry no caption field, so there is no caption source to read.
'jsx-a11y/media-has-caption': 'off',
// Prism tokens are not unique within a line, so the array index is the only key available.
'react/no-array-index-key': 'off',
}, },
}, },
].flatMap((config) => ].flatMap((config) =>
@@ -136,7 +136,6 @@ function CompareEmoji({ sasData }: { sasData: ShowSasCallbacks }) {
> >
{sasData.sas.emoji?.map(([emoji, name], index) => ( {sasData.sas.emoji?.map(([emoji, name], index) => (
<Box <Box
// eslint-disable-next-line react/no-array-index-key
key={`${emoji}${name}${index}`} key={`${emoji}${name}${index}`}
direction="Column" direction="Column"
gap="100" gap="100"
@@ -30,7 +30,7 @@ function makeUIAAction<T>(
authData: IAuthData, authData: IAuthData,
performAction: PerformAction<T>, performAction: PerformAction<T>,
resolve: (data: T) => void, resolve: (data: T) => void,
reject: (error?: any) => void, reject: (error?: unknown) => void,
): UIAAction<T> { ): UIAAction<T> {
const action: UIAAction<T> = { const action: UIAAction<T> = {
authData, authData,
+5 -12
View File
@@ -30,8 +30,6 @@ import {
UrlPreviewHolder, UrlPreviewHolder,
YouTubeEmbed, YouTubeEmbed,
isYouTubeUrl, isYouTubeUrl,
TikTokEmbed,
isTikTokUrl,
GiphyEmbed, GiphyEmbed,
isGiphyUrl, isGiphyUrl,
} from './url-preview'; } from './url-preview';
@@ -88,11 +86,8 @@ export function RenderMessageContent({
// Separate special URLs from generic ones // Separate special URLs from generic ones
const youtubeUrls = filteredUrls.filter(isYouTubeUrl); const youtubeUrls = filteredUrls.filter(isYouTubeUrl);
const tiktokUrls = filteredUrls.filter(isTikTokUrl);
const giphyUrls = filteredUrls.filter(isGiphyUrl); const giphyUrls = filteredUrls.filter(isGiphyUrl);
const otherUrls = filteredUrls.filter( const otherUrls = filteredUrls.filter((url) => !isYouTubeUrl(url) && !isGiphyUrl(url));
(url) => !isYouTubeUrl(url) && !isTikTokUrl(url) && !isGiphyUrl(url),
);
return ( return (
<> <>
@@ -100,10 +95,6 @@ export function RenderMessageContent({
{youtubeUrls.map((url) => ( {youtubeUrls.map((url) => (
<YouTubeEmbed key={url} url={url} /> <YouTubeEmbed key={url} url={url} />
))} ))}
{/* Render TikTok embeds */}
{tiktokUrls.map((url) => (
<TikTokEmbed key={url} url={url} />
))}
{/* Render Giphy embeds */} {/* Render Giphy embeds */}
{giphyUrls.map((url) => ( {giphyUrls.map((url) => (
<GiphyEmbed key={url} url={url} /> <GiphyEmbed key={url} url={url} />
@@ -188,9 +179,10 @@ export function RenderMessageContent({
const customRendererEarly = pluginRegistry.getRenderer('message'); const customRendererEarly = pluginRegistry.getRenderer('message');
if (customRendererEarly) { if (customRendererEarly) {
try { try {
const contentEarly = getContent();
const messageDataEarly = { const messageDataEarly = {
msgtype: msgType, msgtype: msgType,
...getContent(), ...(typeof contentEarly === 'object' && contentEarly !== null ? contentEarly : {}),
}; };
const customContentEarly = customRendererEarly(messageDataEarly, () => null); const customContentEarly = customRendererEarly(messageDataEarly, () => null);
if (customContentEarly) { if (customContentEarly) {
@@ -367,9 +359,10 @@ export function RenderMessageContent({
console.log('[RenderMessageContent] customRenderer function:', typeof customRenderer); console.log('[RenderMessageContent] customRenderer function:', typeof customRenderer);
if (customRenderer) { if (customRenderer) {
try { try {
const content = getContent();
const messageData = { const messageData = {
msgtype: msgType, msgtype: msgType,
...getContent(), ...(typeof content === 'object' && content !== null ? content : {}),
}; };
console.log('[RenderMessageContent] Calling customRenderer with msgtype:', msgType); console.log('[RenderMessageContent] Calling customRenderer with msgtype:', msgType);
console.log('[RenderMessageContent] messageData:', messageData); console.log('[RenderMessageContent] messageData:', messageData);
+1 -1
View File
@@ -55,7 +55,7 @@ export function RouteTransition({ children }: RouteTransitionProps) {
const location = useLocation(); const location = useLocation();
const [displayLocation, setDisplayLocation] = useState(location); const [displayLocation, setDisplayLocation] = useState(location);
const [transitionStage, setTransitionStage] = useState<'entering' | 'exiting' | 'idle'>('idle'); const [transitionStage, setTransitionStage] = useState<'entering' | 'exiting' | 'idle'>('idle');
const timeoutRef = useRef<ReturnType<typeof setTimeout>>(); const timeoutRef = useRef<ReturnType<typeof setTimeout>>(undefined);
useEffect(() => { useEffect(() => {
if (location.pathname !== displayLocation.pathname) { if (location.pathname !== displayLocation.pathname) {
+9 -2
View File
@@ -1,6 +1,7 @@
import React, { FormEventHandler, useCallback } from 'react'; import React, { FormEventHandler, useCallback } from 'react';
import { Box, Text, Button, Spinner, color } from 'folds'; import { Box, Text, Button, Spinner, color } from 'folds';
import { decodeRecoveryKey, deriveRecoveryKeyFromPassphrase } from 'matrix-js-sdk/lib/crypto-api'; import { decodeRecoveryKey, deriveRecoveryKeyFromPassphrase } from 'matrix-js-sdk/lib/crypto-api';
import { SecretStorageKeyDescriptionAesV1 } from 'matrix-js-sdk/lib/secret-storage';
import { PasswordInput } from './password-input'; import { PasswordInput } from './password-input';
import { import {
SecretStorageKeyContent, SecretStorageKeyContent,
@@ -39,7 +40,10 @@ export function SecretStorageRecoveryPassphrase({
bits, bits,
); );
const match = await mx.secretStorage.checkKey(decodedRecoveryKey, keyContent as any); const match = await mx.secretStorage.checkKey(
decodedRecoveryKey,
keyContent as SecretStorageKeyDescriptionAesV1,
);
if (!match) { if (!match) {
throw new Error('Invalid recovery passphrase.'); throw new Error('Invalid recovery passphrase.');
@@ -131,7 +135,10 @@ export function SecretStorageRecoveryKey({
async (recoveryKey) => { async (recoveryKey) => {
const decodedRecoveryKey = decodeRecoveryKey(recoveryKey); const decodedRecoveryKey = decodeRecoveryKey(recoveryKey);
const match = await mx.secretStorage.checkKey(decodedRecoveryKey, keyContent as any); const match = await mx.secretStorage.checkKey(
decodedRecoveryKey,
keyContent as SecretStorageKeyDescriptionAesV1,
);
if (!match) { if (!match) {
throw new Error('Invalid recovery key.'); throw new Error('Invalid recovery key.');
@@ -68,12 +68,12 @@ const deleteAllMatrixDatabases = async (): Promise<void> => {
// Try to get all databases if the API is available // Try to get all databases if the API is available
try { try {
if ('databases' in indexedDB) { if ('databases' in indexedDB) {
const allDbs = await (indexedDB as any).databases(); const allDbs = await indexedDB.databases();
const matrixDbs = allDbs const matrixDbs = allDbs
.map((db: any) => db.name) .map((db) => db.name)
.filter( .filter(
(name: string) => (name): name is string =>
name && typeof name === 'string' &&
(name.startsWith('matrix-js-sdk') || (name.startsWith('matrix-js-sdk') ||
name.includes('@@') || name.includes('@@') ||
name.startsWith('sync@@') || name.startsWith('sync@@') ||
@@ -15,12 +15,12 @@ export interface AuthenticatedMediaProps extends Omit<ImgHTMLAttributes<HTMLImag
* and renders them as blob URLs. * and renders them as blob URLs.
*/ */
export const AuthenticatedMedia = forwardRef<HTMLImageElement, AuthenticatedMediaProps>( export const AuthenticatedMedia = forwardRef<HTMLImageElement, AuthenticatedMediaProps>(
({ src, useAuthentication: useAuthOverride, ...props }, ref) => { ({ src, alt, useAuthentication: useAuthOverride, ...props }, ref) => {
const useAuthFromServer = useMediaAuthentication(); const useAuthFromServer = useMediaAuthentication();
const useAuthentication = useAuthOverride ?? useAuthFromServer; const useAuthentication = useAuthOverride ?? useAuthFromServer;
const authenticatedSrc = useAuthenticatedMediaUrl(src, useAuthentication); const authenticatedSrc = useAuthenticatedMediaUrl(src, useAuthentication);
return <img ref={ref} {...props} src={authenticatedSrc} />; return <img ref={ref} alt={alt} {...props} src={authenticatedSrc} />;
}, },
); );
@@ -33,11 +33,11 @@ AuthenticatedMedia.displayName = 'AuthenticatedMedia';
export type AuthenticatedImgProps = ImgHTMLAttributes<HTMLImageElement>; export type AuthenticatedImgProps = ImgHTMLAttributes<HTMLImageElement>;
export const AuthenticatedImg = forwardRef<HTMLImageElement, AuthenticatedImgProps>( export const AuthenticatedImg = forwardRef<HTMLImageElement, AuthenticatedImgProps>(
({ src, ...props }, ref) => { ({ src, alt, ...props }, ref) => {
const useAuthentication = useMediaAuthentication(); const useAuthentication = useMediaAuthentication();
const authenticatedSrc = useAuthenticatedMediaUrl(src, useAuthentication); const authenticatedSrc = useAuthenticatedMediaUrl(src, useAuthentication);
return <img ref={ref} {...props} src={authenticatedSrc} />; return <img ref={ref} alt={alt} {...props} src={authenticatedSrc} />;
}, },
); );
+5 -4
View File
@@ -1,4 +1,5 @@
import { import {
EventType,
ICreateRoomOpts, ICreateRoomOpts,
ICreateRoomStateEvent, ICreateRoomStateEvent,
JoinRule, JoinRule,
@@ -6,7 +7,7 @@ import {
RestrictedAllowType, RestrictedAllowType,
Room, Room,
} from 'matrix-js-sdk'; } from 'matrix-js-sdk';
import { RoomJoinRulesEventContent } from 'matrix-js-sdk/lib/types'; import { RoomJoinRulesEventContent, SpaceChildEventContent } from 'matrix-js-sdk/lib/types';
import { CreateRoomKind } from './CreateRoomKindSelector'; import { CreateRoomKind } from './CreateRoomKindSelector';
import { RoomType, StateEvent } from '../../../types/matrix/room'; import { RoomType, StateEvent } from '../../../types/matrix/room';
import { getViaServers } from '../../plugins/via-servers'; import { getViaServers } from '../../plugins/via-servers';
@@ -17,7 +18,7 @@ export const createRoomCreationContent = (
allowFederation: boolean, allowFederation: boolean,
additionalCreators: string[] | undefined, additionalCreators: string[] | undefined,
): object => { ): object => {
const content: Record<string, any> = {}; const content: Record<string, unknown> = {};
if (typeof type === 'string') { if (typeof type === 'string') {
content.type = type; content.type = type;
} }
@@ -144,12 +145,12 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
if (data.parent) { if (data.parent) {
await mx.sendStateEvent( await mx.sendStateEvent(
data.parent.roomId, data.parent.roomId,
StateEvent.SpaceChild as any, EventType.SpaceChild,
{ {
auto_join: false, auto_join: false,
suggested: false, suggested: false,
via: [getMxIdServer(mx.getUserId() ?? '') ?? ''], via: [getMxIdServer(mx.getUserId() ?? '') ?? ''],
}, } as SpaceChildEventContent,
result.room_id, result.room_id,
); );
} }
@@ -18,7 +18,6 @@ import FocusTrap from 'focus-trap-react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { Icon, Icons } from '../icons'; import { Icon, Icons } from '../icons';
import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useMatrixClient } from '../../hooks/useMatrixClient';
import { factoryRoomIdByActivity } from '../../utils/sort';
import { import {
NavButton, NavButton,
NavCategory, NavCategory,
@@ -215,15 +214,14 @@ export function DirectList({
const selectedRoomId = useSelectedRoom(); const selectedRoomId = useSelectedRoom();
const [closedCategories, setClosedCategories] = useAtom(useClosedNavCategoriesAtom()); const [closedCategories, setClosedCategories] = useAtom(useClosedNavCategoriesAtom());
const reorderTrigger = useRoomListReorder(mx, directs); const activityOrder = useRoomListReorder(mx, directs);
const sortedDirects = useMemo(() => { const sortedDirects = useMemo(() => {
const items = Array.from(directs).sort(factoryRoomIdByActivity(mx));
if (closedCategories.has(DEFAULT_CATEGORY_ID)) { if (closedCategories.has(DEFAULT_CATEGORY_ID)) {
return items.filter((rId) => roomToUnread.has(rId) || rId === selectedRoomId); return activityOrder.filter((rId) => roomToUnread.has(rId) || rId === selectedRoomId);
} }
return items; return activityOrder;
}, [mx, directs, closedCategories, roomToUnread, selectedRoomId, reorderTrigger]); }, [activityOrder, closedCategories, roomToUnread, selectedRoomId]);
const animationRef = useListReorderAnimation(sortedDirects); const animationRef = useListReorderAnimation(sortedDirects);
+4 -2
View File
@@ -8,8 +8,10 @@ import React, {
} from 'react'; } from 'react';
import { Box, Scroll, Text } from 'folds'; import { Box, Scroll, Text } from 'folds';
import { import {
DecoratedRange,
Descendant, Descendant,
Editor, Editor,
NodeEntry,
createEditor, createEditor,
Element as SlateElement, Element as SlateElement,
Text as SlateText, Text as SlateText,
@@ -122,8 +124,8 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
const renderLeaf = useCallback((props: RenderLeafProps) => <RenderLeaf {...props} />, []); const renderLeaf = useCallback((props: RenderLeafProps) => <RenderLeaf {...props} />, []);
const decorate = useCallback( const decorate = useCallback(
([node, path]: [any, number[]]) => { ([node, path]: NodeEntry) => {
const ranges: any[] = []; const ranges: (DecoratedRange & { pendingCommand?: boolean })[] = [];
// Only decorate text nodes in the first paragraph // Only decorate text nodes in the first paragraph
if (path.length === 2 && path[0] === 0 && path[1] === 0 && SlateText.isText(node)) { if (path.length === 2 && path[0] === 0 && path[1] === 0 && SlateText.isText(node)) {
@@ -395,7 +395,7 @@ export function EmojiBoard({
const usage = emojiTab ? ImageUsage.Emoticon : ImageUsage.Sticker; const usage = emojiTab ? ImageUsage.Emoticon : ImageUsage.Sticker;
// Get default emoji - use most used or fallback to slight_smile // Get default emoji - use most used or fallback to slight_smile
const defaultPreview = useMemo((): PreviewData => { const defaultPreview = useMemo((): PreviewData | undefined => {
if (!emojiTab) return undefined; if (!emojiTab) return undefined;
const mostUsedShortcode = getMostUsedEmoji(); const mostUsedShortcode = getMostUsedEmoji();
+1 -2
View File
@@ -43,7 +43,6 @@ export const Video = forwardRef<HTMLVideoElement, VideoProps>(
if (disableControls) { if (disableControls) {
return ( return (
// eslint-disable-next-line jsx-a11y/media-has-caption
<video <video
className={classNames(css.Video, className)} className={classNames(css.Video, className)}
{...props} {...props}
@@ -61,7 +60,7 @@ export const Video = forwardRef<HTMLVideoElement, VideoProps>(
onMouseEnter={() => setShowControls(true)} onMouseEnter={() => setShowControls(true)}
onMouseLeave={() => setShowControls(false)} onMouseLeave={() => setShowControls(false)}
> >
{/* eslint-disable-next-line jsx-a11y/media-has-caption */} {}
<video <video
className={classNames(css.Video, className)} className={classNames(css.Video, className)}
{...props} {...props}
@@ -1,4 +1,3 @@
/* eslint-disable jsx-a11y/media-has-caption */
import React, { ReactNode, useCallback, useRef, useState } from 'react'; import React, { ReactNode, useCallback, useRef, useState } from 'react';
import { Badge, Chip, IconButton, ProgressBar, Spinner, Text, toRem } from 'folds'; import { Badge, Chip, IconButton, ProgressBar, Spinner, Text, toRem } from 'folds';
import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment'; import { EncryptedAttachmentInfo } from 'browser-encrypt-attachment';
@@ -119,7 +119,7 @@ export function ReadTextFile({ body, mimeType, url, encInfo, renderViewer }: Rea
<Modal <Modal
className={ModalWide} className={ModalWide}
size="500" size="500"
onContextMenu={(evt: any) => evt.stopPropagation()} onContextMenu={(evt) => evt.stopPropagation()}
> >
{renderViewer({ {renderViewer({
name: body, name: body,
@@ -213,7 +213,7 @@ export function ReadPdfFile({ body, mimeType, url, encInfo, renderViewer }: Read
<Modal <Modal
className={ModalWide} className={ModalWide}
size="500" size="500"
onContextMenu={(evt: any) => evt.stopPropagation()} onContextMenu={(evt) => evt.stopPropagation()}
> >
{renderViewer({ {renderViewer({
name: body, name: body,
@@ -42,7 +42,7 @@ import {
*/ */
const fetchAuthenticatedMedia = async ( const fetchAuthenticatedMedia = async (
url: string, url: string,
accessToken: string | null, accessToken: string | undefined,
): Promise<string> => { ): Promise<string> => {
try { try {
let response = await fetch(url, { let response = await fetch(url, {
@@ -19,7 +19,7 @@ import { getCurrentAccessToken } from '../../../utils/auth';
*/ */
const fetchAuthenticatedMedia = async ( const fetchAuthenticatedMedia = async (
url: string, url: string,
accessToken: string | null, accessToken: string | undefined,
): Promise<string> => { ): Promise<string> => {
try { try {
let response = await fetch(url, { let response = await fetch(url, {
@@ -69,6 +69,8 @@ export function ThumbnailContent({ info, renderImage }: ThumbnailContentProps) {
const [thumbSrcState, loadThumbSrc] = useAsyncCallback( const [thumbSrcState, loadThumbSrc] = useAsyncCallback(
useCallback(async () => { useCallback(async () => {
if (!thumbMxcUrl) return undefined;
const encInfo = info.thumbnail_file; const encInfo = info.thumbnail_file;
const mediaUrl = mxcUrlToHttp(mx, thumbMxcUrl, useAuthentication) ?? thumbMxcUrl; const mediaUrl = mxcUrlToHttp(mx, thumbMxcUrl, useAuthentication) ?? thumbMxcUrl;
@@ -77,7 +79,7 @@ export function ThumbnailContent({ info, renderImage }: ThumbnailContentProps) {
if (encInfo) { if (encInfo) {
const fileContent = await downloadEncryptedMedia( const fileContent = await downloadEncryptedMedia(
mediaUrl, mediaUrl,
(encBuf) => decryptFile(encBuf, thumbInfo.mimetype ?? FALLBACK_MIMETYPE, encInfo), (encBuf) => decryptFile(encBuf, thumbInfo?.mimetype ?? FALLBACK_MIMETYPE, encInfo),
accessToken, accessToken,
); );
return URL.createObjectURL(fileContent); return URL.createObjectURL(fileContent);
@@ -99,5 +101,7 @@ export function ThumbnailContent({ info, renderImage }: ThumbnailContentProps) {
} }
}, [hasValidThumbnail, loadThumbSrc]); }, [hasValidThumbnail, loadThumbSrc]);
return thumbSrcState.status === AsyncStatus.Success ? renderImage(thumbSrcState.data) : null; return thumbSrcState.status === AsyncStatus.Success && thumbSrcState.data
? renderImage(thumbSrcState.data)
: null;
} }
@@ -15,7 +15,7 @@ import {
Spinner, Spinner,
toRem, toRem,
} from 'folds'; } from 'folds';
import { MatrixClient, MatrixError, Room } from 'matrix-js-sdk'; import { EventType, MatrixClient, MatrixError, Room } from 'matrix-js-sdk';
import { Icon, Icons } from '../icons'; import { Icon, Icons } from '../icons';
import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useMatrixClient } from '../../hooks/useMatrixClient';
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
@@ -134,7 +134,7 @@ async function removeSpaceChildrenSequentially(
onProgress?.(i, total); onProgress?.(i, total);
try { try {
await mx.sendStateEvent(parentId, StateEvent.SpaceChild as any, {}, roomId); await mx.sendStateEvent(parentId, EventType.SpaceChild, {}, roomId);
await delay(REMOVE_DELAY_MS); await delay(REMOVE_DELAY_MS);
} catch { } catch {
// Continue removing others even if one fails // Continue removing others even if one fails
+3 -5
View File
@@ -5,6 +5,7 @@ import {
MatrixClient, MatrixClient,
RoomEvent, RoomEvent,
ClientEvent, ClientEvent,
EventType,
MatrixEvent, MatrixEvent,
Room, Room,
IPushRules, IPushRules,
@@ -24,7 +25,6 @@ import { roomToParentsAtom } from '../../state/room/roomToParents';
import { mDirectAtom } from '../../state/mDirectList'; import { mDirectAtom } from '../../state/mDirectList';
import { getDirectRoomPath, getHomeRoomPath, getSpaceRoomPath } from '../../pages/pathUtils'; import { getDirectRoomPath, getHomeRoomPath, getSpaceRoomPath } from '../../pages/pathUtils';
import { RoomNotificationMode } from '../../hooks/useRoomsNotificationPreferences'; import { RoomNotificationMode } from '../../hooks/useRoomsNotificationPreferences';
import { AccountDataEvent } from '../../../types/matrix/accountData';
import { getNotificationMode, NotificationMode } from '../../hooks/useNotificationMode'; import { getNotificationMode, NotificationMode } from '../../hooks/useNotificationMode';
import { useSyncState } from '../../hooks/useSyncState'; import { useSyncState } from '../../hooks/useSyncState';
import { useBackRoute } from '../../hooks/useBackRoute'; import { useBackRoute } from '../../hooks/useBackRoute';
@@ -107,10 +107,10 @@ export function TitleBar({ mx, children }: TitleBarProps) {
} }
// We can't use hooks here, so we'll fetch the data directly // We can't use hooks here, so we'll fetch the data directly
const userId = mx.getUserId(); const userId = mx.getUserId() ?? undefined;
// Get push rules for keywords // Get push rules for keywords
const pushRulesEvt = mx.getAccountData(AccountDataEvent.PushRules); const pushRulesEvt = mx.getAccountData(EventType.PushRules);
const pushRules = pushRulesEvt?.getContent<IPushRules>() ?? { global: {} }; const pushRules = pushRulesEvt?.getContent<IPushRules>() ?? { global: {} };
const content = pushRules.global.content ?? []; const content = pushRules.global.content ?? [];
const keywordPatterns = content const keywordPatterns = content
@@ -600,7 +600,6 @@ export function TitleBar({ mx, children }: TitleBarProps) {
const path = [...parentChain, roomName]; const path = [...parentChain, roomName];
return path.join(' > '); return path.join(' > ');
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [mx, roomId, roomToParents, mDirects, updateCounter]); }, [mx, roomId, roomToParents, mDirects, updateCounter]);
// Get total unread count // Get total unread count
@@ -608,7 +607,6 @@ export function TitleBar({ mx, children }: TitleBarProps) {
if (!mx) return 0; if (!mx) return 0;
const unreadInfos = getUnreadInfos(mx); const unreadInfos = getUnreadInfos(mx);
return unreadInfos.reduce((sum, info) => sum + info.total, 0); return unreadInfos.reduce((sum, info) => sum + info.total, 0);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [mx, updateCounter]); }, [mx, updateCounter]);
// Build title parts // Build title parts
@@ -49,7 +49,7 @@ export function WindowControls() {
}; };
// Only render on desktop (when Tauri is available) // Only render on desktop (when Tauri is available)
if (typeof (window as any).__TAURI__ === 'undefined') { if (typeof window.__TAURI__ === 'undefined') {
return null; return null;
} }
@@ -43,7 +43,6 @@ function PreviewVideo({ fileItem }: PreviewVideoProps) {
const fileUrl = useObjectURL(originalFile); const fileUrl = useObjectURL(originalFile);
return ( return (
// eslint-disable-next-line jsx-a11y/media-has-caption
<video <video
style={{ style={{
objectFit: 'contain', objectFit: 'contain',
@@ -1,117 +0,0 @@
import { style } from '@vanilla-extract/css';
import { DefaultReset, color, config, toRem } from 'folds';
export const TikTokEmbed = style([
DefaultReset,
{
width: toRem(360),
maxWidth: '100%',
backgroundColor: color.SurfaceVariant.Container,
border: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
borderRadius: config.radii.R300,
overflow: 'hidden',
},
]);
export const TikTokEmbedHeader = style([
DefaultReset,
{
padding: `${config.space.S200} ${config.space.S300}`,
backgroundColor: color.SurfaceVariant.ContainerActive,
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
gap: config.space.S200,
},
]);
export const TikTokEmbedInfo = style([
DefaultReset,
{
display: 'flex',
flexDirection: 'column',
gap: config.space.S100,
flex: 1,
minWidth: 0,
},
]);
export const TikTokEmbedTitle = style({
color: color.Primary.Main,
textDecoration: 'none',
fontWeight: config.fontWeight.W500,
':hover': {
textDecoration: 'underline',
},
});
export const TikTokEmbedAuthor = style({
color: color.SurfaceVariant.OnContainer,
textDecoration: 'none',
opacity: 0.8,
':hover': {
textDecoration: 'underline',
opacity: 1,
},
});
export const TikTokEmbedLink = style({
color: color.Success.Main,
textDecoration: 'none',
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
':hover': {
textDecoration: 'underline',
},
});
export const TikTokThumbnailContainer = style([
DefaultReset,
{
position: 'relative',
width: '100%',
height: toRem(550),
backgroundColor: '#000',
display: 'block',
},
]);
export const TikTokThumbnailButton = style([
DefaultReset,
{
position: 'relative',
width: '100%',
height: toRem(550),
border: 'none',
padding: 0,
cursor: 'pointer',
backgroundColor: '#000',
display: 'block',
overflow: 'hidden',
},
]);
export const TikTokThumbnail = style([
DefaultReset,
{
width: '100%',
height: '100%',
display: 'block',
objectFit: 'cover',
objectPosition: 'center',
},
]);
export const TikTokEmbedContainer = style([
DefaultReset,
{
width: '100%',
height: toRem(550),
alignItems: 'center',
justifyContent: 'center',
backgroundColor: '#000',
border: 'none',
display: 'block',
},
]);
@@ -1,277 +0,0 @@
import React, { MouseEvent, useEffect, useState } from 'react';
import { Box, Spinner, Text, as } from 'folds';
import * as css from './TikTokEmbed.css';
import { openExternalUrl } from '../../utils/tauri';
/**
* Regex patterns to match TikTok URLs
*/
const TIKTOK_URL_PATTERNS = [
// Standard tiktok.com/@username/video/VIDEO_ID
/(?:https?:\/\/)?(?:www\.)?tiktok\.com\/@[\w.-]+\/video\/(\d+)/i,
// Short vm.tiktok.com/VIDEO_CODE
/(?:https?:\/\/)?(?:www\.)?vm\.tiktok\.com\/([\w]+)/i,
// Short vt.tiktok.com/VIDEO_CODE
/(?:https?:\/\/)?(?:www\.)?vt\.tiktok\.com\/([\w]+)/i,
// Mobile m.tiktok.com
/(?:https?:\/\/)?(?:www\.)?m\.tiktok\.com\/v\/(\d+)/i,
];
/**
* TikTok oEmbed API base
*/
const TIKTOK_OEMBED_API = 'https://www.tiktok.com/oembed';
/**
* Click handler for external links - uses Tauri shell on desktop/mobile
*/
const handleExternalLinkClick = (e: MouseEvent<HTMLAnchorElement>) => {
const { href } = e.currentTarget;
if (href && (href.startsWith('http://') || href.startsWith('https://'))) {
e.preventDefault();
openExternalUrl(href);
}
};
/**
* Checks if a URL is a TikTok URL
* @param url The URL to check
* @returns True if the URL is a TikTok URL
*/
export function isTikTokUrl(url: string): boolean {
return TIKTOK_URL_PATTERNS.some((pattern) => pattern.test(url));
}
function extractTikTokVideoId(url: string, embedHtml = ''): string | null {
const urlMatch = url.match(/\/video\/(\d+)/i) ?? url.match(/\/v\/(\d+)/i);
const embedMatch = embedHtml.match(/data-video-id=["'](\d+)["']/i);
return urlMatch?.[1] ?? embedMatch?.[1] ?? null;
}
/**
* Fetches TikTok video metadata using oEmbed API
* @param url The TikTok video URL
* @returns Video metadata including title, author, and thumbnail
*/
async function fetchTikTokOEmbed(url: string): Promise<{
title: string;
authorName: string;
authorUrl: string;
thumbnailUrl: string;
embedHtml: string;
videoId: string | null;
} | null> {
try {
const { electron } = window as any;
let data;
if (electron?.tiktok?.getOEmbed) {
data = await electron.tiktok.getOEmbed(url);
} else {
const oembedUrl = `${TIKTOK_OEMBED_API}?url=${encodeURIComponent(url)}`;
const response = await fetch(oembedUrl);
if (!response.ok) return null;
data = await response.json();
}
if (!data) return null;
return {
title: data.title || 'TikTok Video',
authorName: data.author_name || 'Unknown',
authorUrl: data.author_url || url,
thumbnailUrl: data.thumbnail_url || '',
embedHtml: data.html || '',
videoId: extractTikTokVideoId(url, data.html || ''),
};
} catch {
return null;
}
}
type TikTokEmbedState =
| { status: 'loading' }
| {
status: 'loaded';
title: string;
authorName: string;
authorUrl: string;
thumbnailUrl: string;
embedHtml: string;
videoId: string | null;
}
| { status: 'error' };
type TikTokEmbedProps = {
/** The original TikTok URL */
url: string;
};
/**
* TikTok embed component that shows video preview with metadata
*/
export const TikTokEmbed = as<'div', TikTokEmbedProps>(({ url, ...props }, ref) => {
const [state, setState] = useState<TikTokEmbedState>({ status: 'loading' });
const [showPlayer, setShowPlayer] = useState(false);
// Fetch video info on mount
useEffect(() => {
let cancelled = false;
fetchTikTokOEmbed(url).then((info) => {
if (cancelled) return;
if (info) {
setState({
status: 'loaded',
title: info.title,
authorName: info.authorName,
authorUrl: info.authorUrl,
thumbnailUrl: info.thumbnailUrl,
embedHtml: info.embedHtml,
videoId: info.videoId,
});
} else {
setState({ status: 'error' });
}
});
return () => {
cancelled = true;
};
}, [url]);
// Loading state
if (state.status === 'loading') {
return (
<Box shrink="No" className={css.TikTokEmbed} direction="Column" {...props} ref={ref}>
<div className={css.TikTokEmbedHeader}>
<Text
as="a"
href={url}
target="_blank"
rel="noopener noreferrer"
size="T200"
className={css.TikTokEmbedLink}
onClick={handleExternalLinkClick}
truncate
>
TikTok - Loading...
</Text>
</div>
<Box
className={css.TikTokThumbnailContainer}
alignItems="Center"
justifyContent="Center"
style={{ background: '#000', display: 'flex' }}
>
<Spinner variant="Secondary" size="600" />
</Box>
</Box>
);
}
// Error state - show basic link
if (state.status === 'error') {
return (
<Box shrink="No" className={css.TikTokEmbed} direction="Column" {...props} ref={ref}>
<div className={css.TikTokEmbedHeader}>
<Text
as="a"
href={url}
target="_blank"
rel="noopener noreferrer"
size="T200"
className={css.TikTokEmbedLink}
onClick={handleExternalLinkClick}
truncate
>
TikTok Video
</Text>
</div>
</Box>
);
}
// Loaded state - show thumbnail or embed
if (!showPlayer) {
return (
<Box shrink="No" className={css.TikTokEmbed} direction="Column" {...props} ref={ref}>
<div className={css.TikTokEmbedHeader}>
<div className={css.TikTokEmbedInfo}>
<Text
as="a"
href={url}
target="_blank"
rel="noopener noreferrer"
size="T300"
className={css.TikTokEmbedTitle}
onClick={handleExternalLinkClick}
truncate
>
{state.title}
</Text>
<Text
as="a"
href={state.authorUrl}
target="_blank"
rel="noopener noreferrer"
size="T200"
className={css.TikTokEmbedAuthor}
onClick={handleExternalLinkClick}
truncate
>
{state.authorName}
</Text>
</div>
</div>
<button
type="button"
className={css.TikTokThumbnailButton}
onClick={() => setShowPlayer(true)}
aria-label="Play TikTok video"
>
{state.thumbnailUrl ? (
<img src={state.thumbnailUrl} alt={state.title} className={css.TikTokThumbnail} />
) : null}
</button>
</Box>
);
}
const playerUrl = state.videoId
? `https://www.tiktok.com/player/v1/${state.videoId}?autoplay=1`
: null;
// Use TikTok's documented player instead of injecting the oEmbed script.
return (
<Box shrink="No" className={css.TikTokEmbed} direction="Column" {...props} ref={ref}>
<div className={css.TikTokEmbedHeader}>
<Text
as="a"
href={url}
target="_blank"
rel="noopener noreferrer"
size="T200"
className={css.TikTokEmbedLink}
onClick={handleExternalLinkClick}
truncate
>
{state.title}
</Text>
</div>
{playerUrl ? (
<iframe
className={css.TikTokEmbedContainer}
src={playerUrl}
title="TikTok video player"
allow="autoplay; encrypted-media; fullscreen; picture-in-picture"
allowFullScreen
/>
) : (
<div
className={css.TikTokEmbedContainer}
dangerouslySetInnerHTML={{ __html: state.embedHtml }}
/>
)}
</Box>
);
});
-1
View File
@@ -1,5 +1,4 @@
export * from './UrlPreview'; export * from './UrlPreview';
export * from './UrlPreviewCard'; export * from './UrlPreviewCard';
export * from './YouTubeEmbed'; export * from './YouTubeEmbed';
export * from './TikTokEmbed';
export * from './GiphyEmbed'; export * from './GiphyEmbed';
+1 -1
View File
@@ -86,7 +86,7 @@ export const SidebarDockedCallHeader = style({
color: color.Surface.OnContainer, color: color.Surface.OnContainer,
cursor: 'grab', cursor: 'grab',
padding: config.space.S100, padding: config.space.S100,
borderRadius: config.radii.R200, borderRadius: config.radii.R300,
selectors: { selectors: {
'&:hover': { '&:hover': {
backgroundColor: color.Surface.ContainerHover, backgroundColor: color.Surface.ContainerHover,
+10 -26
View File
@@ -367,7 +367,6 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
// Handle remote screenshare (LiveKit track) // Handle remote screenshare (LiveKit track)
if (!share.isLocal && share.track) { if (!share.isLocal && share.track) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const track = share.track as any; const track = share.track as any;
if (typeof track.attach === 'function') { if (typeof track.attach === 'function') {
@@ -464,23 +463,19 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
<script> <script>
let hideTimeout = null; let hideTimeout = null;
const closeButton = document.getElementById('closeButton'); const closeButton = document.getElementById('closeButton');
function showCloseButton() { function showCloseButton() {
if (hideTimeout) { if (hideTimeout) {
clearTimeout(hideTimeout); clearTimeout(hideTimeout);
hideTimeout = null; hideTimeout = null;
} }
closeButton.classList.add('visible'); closeButton.classList.add('visible');
hideTimeout = setTimeout(() => { hideTimeout = setTimeout(() => {
closeButton.classList.remove('visible'); closeButton.classList.remove('visible');
hideTimeout = null; hideTimeout = null;
}, 2000); }, 2000);
} }
// Show on any mouse movement // Show on any mouse movement
document.addEventListener('mousemove', showCloseButton, true); document.addEventListener('mousemove', showCloseButton, true);
// Keep visible when hovering over button // Keep visible when hovering over button
closeButton.addEventListener('mouseenter', () => { closeButton.addEventListener('mouseenter', () => {
if (hideTimeout) { if (hideTimeout) {
@@ -489,7 +484,6 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
} }
closeButton.classList.add('visible'); closeButton.classList.add('visible');
}); });
// Start hide timer when leaving button // Start hide timer when leaving button
closeButton.addEventListener('mouseleave', () => { closeButton.addEventListener('mouseleave', () => {
hideTimeout = setTimeout(() => { hideTimeout = setTimeout(() => {
@@ -497,12 +491,10 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
hideTimeout = null; hideTimeout = null;
}, 2000); }, 2000);
}); });
// Close window on click // Close window on click
closeButton.addEventListener('click', () => { closeButton.addEventListener('click', () => {
window.close(); window.close();
}); });
// Keep video playing - prevent pause from visibility changes or focus loss // Keep video playing - prevent pause from visibility changes or focus loss
function keepVideoPlaying() { function keepVideoPlaying() {
const video = document.querySelector('video'); const video = document.querySelector('video');
@@ -510,17 +502,14 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
video.play().catch(() => {}); video.play().catch(() => {});
} }
} }
// Check every 500ms if video got paused // Check every 500ms if video got paused
setInterval(keepVideoPlaying, 500); setInterval(keepVideoPlaying, 500);
// Also resume on visibility change // Also resume on visibility change
document.addEventListener('visibilitychange', () => { document.addEventListener('visibilitychange', () => {
if (!document.hidden) { if (!document.hidden) {
keepVideoPlaying(); keepVideoPlaying();
} }
}); });
// Resume on window focus // Resume on window focus
window.addEventListener('focus', keepVideoPlaying); window.addEventListener('focus', keepVideoPlaying);
</script> </script>
@@ -550,7 +539,6 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
// For remote screenshare, use LiveKit track's attach method (creates fresh video) // For remote screenshare, use LiveKit track's attach method (creates fresh video)
if (!share.isLocal && share.track) { if (!share.isLocal && share.track) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const track = share.track as any; const track = share.track as any;
if (typeof track.attach === 'function') { if (typeof track.attach === 'function') {
// track.attach() creates a brand new video element attached to the track // track.attach() creates a brand new video element attached to the track
@@ -575,7 +563,6 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
popoutWindow.addEventListener('beforeunload', () => { popoutWindow.addEventListener('beforeunload', () => {
// For remote tracks, detach from pop-out // For remote tracks, detach from pop-out
if (!share.isLocal && share.track) { if (!share.isLocal && share.track) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const track = share.track as any; const track = share.track as any;
if (typeof track.detach === 'function') { if (typeof track.detach === 'function') {
const videoContainer = popoutWindow.document.getElementById('videoContainer'); const videoContainer = popoutWindow.document.getElementById('videoContainer');
@@ -592,7 +579,7 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
}, [share.isLocal, share.stream, share.track]); }, [share.isLocal, share.stream, share.track]);
const handleMouseMoveWrapper = useCallback( const handleMouseMoveWrapper = useCallback(
(e: React.MouseEvent) => { (e: React.MouseEvent<HTMLDivElement>) => {
// Clear any pending hide timeout // Clear any pending hide timeout
if (hideTimeoutRef.current) { if (hideTimeoutRef.current) {
clearTimeout(hideTimeoutRef.current); clearTimeout(hideTimeoutRef.current);
@@ -604,16 +591,13 @@ export function ScreenShareItem({ share }: ScreenShareItemProps) {
[handleMouseMove], [handleMouseMove],
); );
const handleMouseLeaveWrapper = useCallback( const handleMouseLeaveWrapper = useCallback(() => {
(e: React.MouseEvent) => { // Delay hiding controls to prevent flickering
// Delay hiding controls to prevent flickering hideTimeoutRef.current = setTimeout(() => {
hideTimeoutRef.current = setTimeout(() => { setShowControls(false);
setShowControls(false); }, 300);
}, 300); handleMouseLeave();
handleMouseLeave(e); }, [handleMouseLeave]);
},
[handleMouseLeave],
);
// Cleanup timeout on unmount // Cleanup timeout on unmount
useEffect( useEffect(
@@ -921,7 +905,7 @@ export function CallOverlay() {
// Wait for window to load, then set the video stream // Wait for window to load, then set the video stream
setTimeout(() => { setTimeout(() => {
const videoEl = popoutWindow.document.getElementById('remoteVideo'); const videoEl = popoutWindow.document.querySelector<HTMLVideoElement>('#remoteVideo');
if (videoEl) { if (videoEl) {
videoEl.srcObject = firstStream; videoEl.srcObject = firstStream;
} }
@@ -1385,7 +1369,7 @@ export function CallOverlay() {
{isVideoCall && ( {isVideoCall && (
<div className={css.VideoContainer}> <div className={css.VideoContainer}>
{/* eslint-disable-next-line jsx-a11y/media-has-caption */} {}
<video <video
ref={remoteVideoRef} ref={remoteVideoRef}
autoPlay autoPlay
+1 -3
View File
@@ -80,7 +80,7 @@ function checkWebRTCSupport(): { supported: boolean; details: Record<string, unk
const supported = !!( const supported = !!(
navigator.mediaDevices && navigator.mediaDevices &&
navigator.mediaDevices.getUserMedia && typeof navigator.mediaDevices.getUserMedia !== 'undefined' &&
(window.RTCPeerConnection || window.webkitRTCPeerConnection) (window.RTCPeerConnection || window.webkitRTCPeerConnection)
); );
@@ -235,7 +235,6 @@ export class CallService {
], ],
}; };
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await (this.matrixClient as any).sendStateEvent( await (this.matrixClient as any).sendStateEvent(
roomId, roomId,
CALL_MEMBER_EVENT_TYPE, CALL_MEMBER_EVENT_TYPE,
@@ -248,7 +247,6 @@ export class CallService {
'm.calls': [], 'm.calls': [],
}; };
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await (this.matrixClient as any).sendStateEvent( await (this.matrixClient as any).sendStateEvent(
roomId, roomId,
CALL_MEMBER_EVENT_TYPE, CALL_MEMBER_EVENT_TYPE,
+1 -1
View File
@@ -27,7 +27,7 @@ const SOUND_FILES: Record<CallSoundType, string> = {
* In dev or browser, sounds are served from public/sound/. * In dev or browser, sounds are served from public/sound/.
*/ */
async function resolveSoundBaseUrl(): Promise<string> { async function resolveSoundBaseUrl(): Promise<string> {
const electronAudio = (window as any).electron?.audio; const electronAudio = window.electron?.audio;
if (electronAudio?.getSoundBaseUrl) { if (electronAudio?.getSoundBaseUrl) {
const base: string | null = await electronAudio.getSoundBaseUrl(); const base: string | null = await electronAudio.getSoundBaseUrl();
if (base) return base; if (base) return base;
@@ -15,6 +15,7 @@ import {
OverlayCenter, OverlayCenter,
Modal, Modal,
} from 'folds'; } from 'folds';
import { NotificationCountType, type RoomAccountDataEvents } from 'matrix-js-sdk';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { Icon, Icons } from '../../../components/icons'; import { Icon, Icons } from '../../../components/icons';
import { Page, PageContent, PageHeader } from '../../../components/page'; import { Page, PageContent, PageHeader } from '../../../components/page';
@@ -78,7 +79,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
const info = { const info = {
roomId: room.roomId, roomId: room.roomId,
name: room.name, name: room.name,
canonicalAlias: room.canonicalAlias, canonicalAlias: room.getCanonicalAlias(),
altAliases: room.getAltAliases(), altAliases: room.getAltAliases(),
isSpace: isSpace(room), isSpace: isSpace(room),
joinRule: room.getJoinRule(), joinRule: room.getJoinRule(),
@@ -93,8 +94,8 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
powerLevelTags: powerLevelTags || null, powerLevelTags: powerLevelTags || null,
tags: room.tags, tags: room.tags,
notificationCounts: { notificationCounts: {
total: room.getRoomUnreadNotificationCount('total'), total: room.getRoomUnreadNotificationCount(NotificationCountType.Total),
highlight: room.getRoomUnreadNotificationCount('highlight'), highlight: room.getRoomUnreadNotificationCount(NotificationCountType.Highlight),
}, },
timeline: { timeline: {
oldestEventTs: oldestEvent?.getTs(), oldestEventTs: oldestEvent?.getTs(),
@@ -138,7 +139,11 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
const submitAccountData: AccountDataSubmitCallback = useCallback( const submitAccountData: AccountDataSubmitCallback = useCallback(
async (type, content) => { async (type, content) => {
await mx.setRoomAccountData(room.roomId, type, content); await mx.setRoomAccountData(
room.roomId,
type as keyof RoomAccountDataEvents,
content as RoomAccountDataEvents[keyof RoomAccountDataEvents],
);
}, },
[mx, room.roomId], [mx, room.roomId],
); );
@@ -56,7 +56,7 @@ function CreatePackTile({ packs, roomId }: CreatePackTileProps) {
display_name: name, display_name: name,
}, },
}; };
await mx.sendStateEvent(roomId, StateEvent.PoniesRoomEmotes as any, content, stateKey); await mx.sendStateEvent(roomId, StateEvent.PoniesRoomEmotes, content, stateKey);
}, },
[mx, roomId], [mx, roomId],
), ),
@@ -162,7 +162,7 @@ export function RoomPacks({ onViewPack }: RoomPacksProps) {
useCallback(async () => { useCallback(async () => {
for (let i = 0; i < removedPacks.length; i += 1) { for (let i = 0; i < removedPacks.length; i += 1) {
const addr = removedPacks[i]; const addr = removedPacks[i];
await mx.sendStateEvent(room.roomId, StateEvent.PoniesRoomEmotes as any, {}, addr.stateKey); await mx.sendStateEvent(room.roomId, StateEvent.PoniesRoomEmotes, {}, addr.stateKey);
} }
}, [mx, room, removedPacks]), }, [mx, room, removedPacks]),
); );
@@ -14,7 +14,7 @@ import {
Text, Text,
} from 'folds'; } from 'folds';
import React, { useCallback, useState } from 'react'; import React, { useCallback, useState } from 'react';
import { MatrixError } from 'matrix-js-sdk'; import { EventType, MatrixError } from 'matrix-js-sdk';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { Icon, Icons } from '../../../components/icons'; import { Icon, Icons } from '../../../components/icons';
import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCard } from '../../../components/sequence-card';
@@ -45,7 +45,7 @@ export function RoomEncryption({ permissions }: RoomEncryptionProps) {
const [enableState, enable] = useAsyncCallback( const [enableState, enable] = useAsyncCallback(
useCallback(async () => { useCallback(async () => {
await mx.sendStateEvent(room.roomId, StateEvent.RoomEncryption as any, { await mx.sendStateEvent(room.roomId, EventType.RoomEncryption, {
algorithm: ROOM_ENC_ALGO, algorithm: ROOM_ENC_ALGO,
}); });
}, [mx, room.roomId]), }, [mx, room.roomId]),
@@ -1,6 +1,6 @@
import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react'; import React, { MouseEventHandler, useCallback, useMemo, useState } from 'react';
import { Button, color, config, Menu, MenuItem, PopOut, RectCords, Spinner, Text } from 'folds'; import { Button, color, config, Menu, MenuItem, PopOut, RectCords, Spinner, Text } from 'folds';
import { HistoryVisibility, MatrixError } from 'matrix-js-sdk'; import { EventType, HistoryVisibility, MatrixError } from 'matrix-js-sdk';
import { RoomHistoryVisibilityEventContent } from 'matrix-js-sdk/lib/types'; import { RoomHistoryVisibilityEventContent } from 'matrix-js-sdk/lib/types';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { Icon, Icons } from '../../../components/icons'; import { Icon, Icons } from '../../../components/icons';
@@ -65,7 +65,7 @@ export function RoomHistoryVisibility({ permissions }: RoomHistoryVisibilityProp
const content: RoomHistoryVisibilityEventContent = { const content: RoomHistoryVisibilityEventContent = {
history_visibility: visibility, history_visibility: visibility,
}; };
await mx.sendStateEvent(room.roomId, StateEvent.RoomHistoryVisibility as any, content); await mx.sendStateEvent(room.roomId, EventType.RoomHistoryVisibility, content);
}, },
[mx, room.roomId], [mx, room.roomId],
), ),
@@ -1,6 +1,6 @@
import React, { useCallback, useMemo } from 'react'; import React, { useCallback, useMemo } from 'react';
import { color, Text } from 'folds'; import { color, Text } from 'folds';
import { JoinRule, MatrixError, RestrictedAllowType } from 'matrix-js-sdk'; import { EventType, JoinRule, MatrixError, RestrictedAllowType } from 'matrix-js-sdk';
import { RoomJoinRulesEventContent } from 'matrix-js-sdk/lib/types'; import { RoomJoinRulesEventContent } from 'matrix-js-sdk/lib/types';
import { useAtomValue } from 'jotai'; import { useAtomValue } from 'jotai';
import { import {
@@ -113,7 +113,7 @@ export function RoomJoinRules({ permissions }: RoomJoinRulesProps) {
join_rule: joinRule as JoinRule, join_rule: joinRule as JoinRule,
}; };
if (allow.length > 0) c.allow = allow; if (allow.length > 0) c.allow = allow;
await mx.sendStateEvent(room.roomId, StateEvent.RoomJoinRules as any, c); await mx.sendStateEvent(room.roomId, EventType.RoomJoinRules, c);
}, },
[mx, room, space, subspaces, roomIdToParents], [mx, room, space, subspaces, roomIdToParents],
), ),
@@ -1,6 +1,6 @@
/* eslint-disable react/no-array-index-key */
import React, { useCallback, useEffect, useMemo, useState } from 'react'; import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Badge, Box, Button, Chip, config, Menu, Spinner, Text } from 'folds'; import { Badge, Box, Button, Chip, config, Menu, Spinner, Text } from 'folds';
import { EventType } from 'matrix-js-sdk';
import { produce } from 'immer'; import { produce } from 'immer';
import { Icon, Icons } from '../../../components/icons'; import { Icon, Icons } from '../../../components/icons';
import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCard } from '../../../components/sequence-card';
@@ -16,7 +16,6 @@ import { PermissionGroup } from './types';
import { getPowerLevelTag, getPowers, usePowerLevelTags } from '../../../hooks/usePowerLevelTags'; import { getPowerLevelTag, getPowers, usePowerLevelTags } from '../../../hooks/usePowerLevelTags';
import { useRoom } from '../../../hooks/useRoom'; import { useRoom } from '../../../hooks/useRoom';
import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { useMatrixClient } from '../../../hooks/useMatrixClient';
import { StateEvent } from '../../../../types/matrix/room';
import { PowerSwitcher } from '../../../components/power'; import { PowerSwitcher } from '../../../components/power';
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
import { useAlive } from '../../../hooks/useAlive'; import { useAlive } from '../../../hooks/useAlive';
@@ -86,7 +85,7 @@ export function PermissionGroups({
return draftPowerLevels; return draftPowerLevels;
}); });
await mx.sendStateEvent(room.roomId, StateEvent.RoomPowerLevels as any, editedPowerLevels); await mx.sendStateEvent(room.roomId, EventType.RoomPowerLevels, editedPowerLevels);
}, [mx, room, powerLevels, permissionUpdate, permissionGroups]), }, [mx, room, powerLevels, permissionUpdate, permissionGroups]),
); );
@@ -1,4 +1,3 @@
/* eslint-disable react/no-array-index-key */
import React, { useState, MouseEventHandler, ReactNode } from 'react'; import React, { useState, MouseEventHandler, ReactNode } from 'react';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { import {
@@ -332,7 +332,7 @@ export function PowersEditor({ powerLevels, requestClose }: PowersEditorProps) {
deleted.forEach((power) => { deleted.forEach((power) => {
delete content[power]; delete content[power];
}); });
await mx.sendStateEvent(room.roomId, StateEvent.PowerLevelTags as any, content); await mx.sendStateEvent(room.roomId, StateEvent.PowerLevelTags, content);
}, [mx, room, powerLevelTags, editedPowerTags, deleted]), }, [mx, room, powerLevelTags, editedPowerTags, deleted]),
); );
@@ -14,6 +14,7 @@ import {
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { useAtomValue } from 'jotai'; import { useAtomValue } from 'jotai';
import { EventType } from 'matrix-js-sdk'; import { EventType } from 'matrix-js-sdk';
import type { RoomJoinRulesEventContent } from 'matrix-js-sdk/lib/@types/state_events';
import { Icon, Icons } from '../../components/icons'; import { Icon, Icons } from '../../components/icons';
import { useAllJoinedRoomsSet, useGetRoom } from '../../hooks/useGetRoom'; import { useAllJoinedRoomsSet, useGetRoom } from '../../hooks/useGetRoom';
import { SpaceProvider } from '../../hooks/useSpace'; import { SpaceProvider } from '../../hooks/useSpace';
@@ -56,7 +57,7 @@ function CreateRoomModal({ state }: CreateRoomModalProps) {
// Set m.space.parent on the new room pointing to parent // Set m.space.parent on the new room pointing to parent
await mx.sendStateEvent( await mx.sendStateEvent(
newRoomId, newRoomId,
StateEvent.SpaceParent, EventType.SpaceParent,
{ {
canonical: true, canonical: true,
via: viaServers, via: viaServers,
@@ -67,7 +68,7 @@ function CreateRoomModal({ state }: CreateRoomModalProps) {
// Set m.space.child on the parent room pointing to this sub-room // Set m.space.child on the parent room pointing to this sub-room
await mx.sendStateEvent( await mx.sendStateEvent(
parentSubRoomId, parentSubRoomId,
StateEvent.SpaceChild, EventType.SpaceChild,
{ via: viaServers }, { via: viaServers },
newRoomId, newRoomId,
); );
@@ -78,8 +79,8 @@ function CreateRoomModal({ state }: CreateRoomModalProps) {
'', '',
); );
if (parentJoinRulesEvent) { if (parentJoinRulesEvent) {
const joinRulesContent = parentJoinRulesEvent.getContent(); const joinRulesContent = parentJoinRulesEvent.getContent<RoomJoinRulesEventContent>();
await mx.sendStateEvent(newRoomId, StateEvent.RoomJoinRules, joinRulesContent, ''); await mx.sendStateEvent(newRoomId, EventType.RoomJoinRules, joinRulesContent, '');
} }
// Add new room to parent's sub-rooms list // Add new room to parent's sub-rooms list
@@ -89,12 +90,7 @@ function CreateRoomModal({ state }: CreateRoomModalProps) {
const newContent: PaarrotSubRoomsContent = { const newContent: PaarrotSubRoomsContent = {
children: [...currentChildren, newRoomId], children: [...currentChildren, newRoomId],
}; };
await mx.sendStateEvent( await mx.sendStateEvent(parentSubRoomId, StateEvent.PaarrotSubRooms, newContent, '');
parentSubRoomId,
StateEvent.PaarrotSubRooms as any,
newContent,
'',
);
// Also add sub-room to parent's space(s) for joining/permissions // Also add sub-room to parent's space(s) for joining/permissions
// The UI will hide it from the top-level display and only show it nested // The UI will hide it from the top-level display and only show it nested
@@ -54,7 +54,7 @@ export function ForumAuthorIdentity({
return ( return (
<div className={identityClass}> <div className={identityClass}>
<span className={avatarClass} aria-hidden> <span className={avatarClass} aria-hidden>
<Avatar size="200" radii="300" shrink="No"> <Avatar size="200" radii="300">
<UserAvatar <UserAvatar
userId={sender} userId={sender}
src={avatarUrl} src={avatarUrl}
+13 -11
View File
@@ -5,12 +5,14 @@ import { IconButton, Line, PopOut } from 'folds';
import { useAtomValue } from 'jotai'; import { useAtomValue } from 'jotai';
import { Icon, Icons } from '../../components/icons'; import { Icon, Icons } from '../../components/icons';
import { import {
AUTOCOMPLETE_PREFIXES,
CustomEditor, CustomEditor,
Toolbar, Toolbar,
EmoticonAutocomplete, EmoticonAutocomplete,
AutocompletePrefix, AutocompletePrefix,
AutocompleteQuery, AutocompleteQuery,
getAutocompleteQuery, getAutocompleteQuery,
getPrevWorldRange,
createEmoticonElement, createEmoticonElement,
moveCursor, moveCursor,
safeFocusEditor, safeFocusEditor,
@@ -62,17 +64,17 @@ export function ForumChatComposer({
[enterForNewline, onSend], [enterForNewline, onSend],
); );
const handleKeyUp: KeyboardEventHandler = useCallback( const handleKeyUp: KeyboardEventHandler = useCallback(() => {
(evt) => { const prevWordRange = getPrevWorldRange(editor);
const prevWordRange = getAutocompleteQuery(editor, evt); const query = prevWordRange
if (prevWordRange?.prefix === AutocompletePrefix.Emoticon) { ? getAutocompleteQuery<AutocompletePrefix>(editor, prevWordRange, AUTOCOMPLETE_PREFIXES)
setAutocompleteQuery({ prefix: AutocompletePrefix.Emoticon, range: prevWordRange.range }); : undefined;
return; if (query?.prefix === AutocompletePrefix.Emoticon) {
} setAutocompleteQuery(query);
setAutocompleteQuery(undefined); return;
}, }
[editor], setAutocompleteQuery(undefined);
); }, [editor]);
const handleEmoticonSelect = (key: string, shortcode: string) => { const handleEmoticonSelect = (key: string, shortcode: string) => {
editor.insertNode(createEmoticonElement(key, shortcode)); editor.insertNode(createEmoticonElement(key, shortcode));
+7 -1
View File
@@ -44,7 +44,13 @@ export function ForumEventContent({
} }
const content = getContent(); const content = getContent();
const msgType = typeof content.msgtype === 'string' ? content.msgtype : 'm.text'; const msgType =
typeof content === 'object' &&
content !== null &&
'msgtype' in content &&
typeof content.msgtype === 'string'
? content.msgtype
: 'm.text';
return ( return (
<div className={theme.ForumEventContentRoot}> <div className={theme.ForumEventContentRoot}>
+1 -1
View File
@@ -323,7 +323,7 @@ export function ForumNewPostModal({
<Box className={t.ForumPostModalActions}> <Box className={t.ForumPostModalActions}>
<Button <Button
type="button" type="button"
variant="SurfaceVariant" variant="Secondary"
size="400" size="400"
radii="300" radii="300"
onClick={handleClose} onClick={handleClose}
@@ -137,7 +137,7 @@ export function ForumPostUploadField({
variant="SurfaceVariant" variant="SurfaceVariant"
size="300" size="300"
radii="300" radii="300"
onClick={pickFiles} onClick={() => pickFiles('*')}
disabled={disabled} disabled={disabled}
aria-label="Attach files" aria-label="Attach files"
> >
@@ -154,7 +154,7 @@ export function ForumPostUploadField({
variant="SurfaceVariant" variant="SurfaceVariant"
size="300" size="300"
radii="300" radii="300"
onClick={pickFiles} onClick={() => pickFiles('*')}
disabled={disabled} disabled={disabled}
aria-label="Attach more files" aria-label="Attach more files"
> >
@@ -180,7 +180,6 @@ export function ForumPostUploadField({
.reverse() .reverse()
.map((fileItem, index) => ( .map((fileItem, index) => (
<UploadCardRenderer <UploadCardRenderer
// eslint-disable-next-line react/no-array-index-key
key={index} key={index}
isEncrypted={!!fileItem.encInfo} isEncrypted={!!fileItem.encInfo}
fileItem={fileItem} fileItem={fileItem}
@@ -52,7 +52,7 @@ export function ForumReplyComposer({
</PowerLevelsContextProvider> </PowerLevelsContextProvider>
{onCancel && ( {onCancel && (
<div className={t.ForumReplyFormActions}> <div className={t.ForumReplyFormActions}>
<Button type="button" variant="SurfaceVariant" size="300" onClick={onCancel}> <Button type="button" variant="Secondary" size="300" onClick={onCancel}>
<Text size="B400">Cancel</Text> <Text size="B400">Cancel</Text>
</Button> </Button>
</div> </div>
@@ -108,7 +108,7 @@ export function ForumRichReplyComposer({
{onCancel && ( {onCancel && (
<Button <Button
type="button" type="button"
variant="SurfaceVariant" variant="Secondary"
size="300" size="300"
onClick={onCancel} onClick={onCancel}
disabled={sending} disabled={sending}
+4 -12
View File
@@ -307,7 +307,7 @@ type ForumThreadDetailProps = {
onReplySent?: (reply: ForumPost) => void; onReplySent?: (reply: ForumPost) => void;
}; };
type ForumThreadDetailBodyProps = ForumThreadDetailProps & { type ForumThreadDetailBodyProps = Omit<ForumThreadDetailProps, 'initialPost'> & {
post: ForumPost; post: ForumPost;
room: Room; room: Room;
onPostUpdate: (post: ForumPost | null) => void; onPostUpdate: (post: ForumPost | null) => void;
@@ -348,7 +348,6 @@ function ForumThreadDetailBody({
setReplyToEventId(rootEventId); setReplyToEventId(rootEventId);
} }
}, [replyDraft, rootEventId]); }, [replyDraft, rootEventId]);
const [contentRevision, setContentRevision] = useState(0);
const [collapsedBranches, setCollapsedBranches] = useState<Set<string>>(() => new Set()); const [collapsedBranches, setCollapsedBranches] = useState<Set<string>>(() => new Set());
const localDropRef = useRef<HTMLDivElement>(null); const localDropRef = useRef<HTMLDivElement>(null);
const dropRef = fileDropContainerRef ?? localDropRef; const dropRef = fileDropContainerRef ?? localDropRef;
@@ -393,14 +392,8 @@ function ForumThreadDetailBody({
handleComposerSent(); handleComposerSent();
}, [handleComposerSent]); }, [handleComposerSent]);
useForumRoomLiveUpdates( // post is the reactive source: reloadThread pushes the local thread back through onPostUpdate
[room], useForumRoomLiveUpdates([room], reloadThread, { threadRootId: rootEventId, wait: 150 });
() => {
setContentRevision((revision) => revision + 1);
reloadThread();
},
{ threadRootId: rootEventId, wait: 150 },
);
const rootEvent = room.findEventById(rootEventId); const rootEvent = room.findEventById(rootEventId);
const rootEditing = editEventId === rootEventId; const rootEditing = editEventId === rootEventId;
@@ -424,7 +417,6 @@ function ForumThreadDetailBody({
const handleEditRootClose = useCallback(() => { const handleEditRootClose = useCallback(() => {
setEditEventId(undefined); setEditEventId(undefined);
setContentRevision((revision) => revision + 1);
handleComposerSent(); handleComposerSent();
}, [handleComposerSent]); }, [handleComposerSent]);
@@ -476,7 +468,7 @@ function ForumThreadDetailBody({
const title = useMemo(() => { const title = useMemo(() => {
const local = loadPostThreadLocal(mx, roomId, rootEventId); const local = loadPostThreadLocal(mx, roomId, rootEventId);
return local?.title || post.title || titleHint || '(untitled post)'; return local?.title || post.title || titleHint || '(untitled post)';
}, [contentRevision, mx, post.title, roomId, rootEventId, titleHint]); }, [mx, post.title, roomId, rootEventId, titleHint]);
return ( return (
<article ref={localDropRef} className={theme.ForumTopicDetailRoot} data-event-id={post.eventId}> <article ref={localDropRef} className={theme.ForumTopicDetailRoot} data-event-id={post.eventId}>
+21 -15
View File
@@ -2,13 +2,17 @@ import {
Direction, Direction,
EventType, EventType,
type IContent, type IContent,
type IEventRelation,
type IRoomEvent, type IRoomEvent,
type MatrixClient, type MatrixClient,
type MatrixEvent, type MatrixEvent,
type Room, type Room,
MsgType,
RelationType, RelationType,
} from 'matrix-js-sdk'; } from 'matrix-js-sdk';
import type {
RoomMessageEventContent,
RoomMessageTextEventContent,
} from 'matrix-js-sdk/lib/@types/events';
import type { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces'; import type { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces';
import { getMemberDisplayName, getSpaceChildren, isSpace } from '../../utils/room'; import { getMemberDisplayName, getSpaceChildren, isSpace } from '../../utils/room';
import type { ForumPost, ForumTopic } from './types'; import type { ForumPost, ForumTopic } from './types';
@@ -675,7 +679,7 @@ export async function sendForumPost(
} }
const res = await mx.sendMessage(roomId, { const res = await mx.sendMessage(roomId, {
msgtype: 'm.text', msgtype: MsgType.Text,
body: `${title}\n\n${plainText}`, body: `${title}\n\n${plainText}`,
'com.matrixsso.title': title, 'com.matrixsso.title': title,
format: 'org.matrix.custom.html', format: 'org.matrix.custom.html',
@@ -703,7 +707,7 @@ export async function sendForumMediaRoot(
const res = await mx.sendMessage(roomId, { const res = await mx.sendMessage(roomId, {
...content, ...content,
'com.matrixsso.title': trimmedTitle, 'com.matrixsso.title': trimmedTitle,
}); } as RoomMessageEventContent);
return res.event_id; return res.event_id;
} }
@@ -726,10 +730,9 @@ export async function sendForumThreadAttachment(
'm.relates_to': { 'm.relates_to': {
rel_type: RelationType.Thread, rel_type: RelationType.Thread,
event_id: rootId, event_id: rootId,
is_falling_back: false,
'm.in_reply_to': { event_id: parentId }, 'm.in_reply_to': { event_id: parentId },
} as IEventRelation, },
}); } as unknown as RoomMessageEventContent);
return res.event_id; return res.event_id;
} }
@@ -760,15 +763,9 @@ export function sendForumReply(
let formattedHtml = typeof message === 'string' ? '' : String(message.formattedHtml || '').trim(); let formattedHtml = typeof message === 'string' ? '' : String(message.formattedHtml || '').trim();
formattedHtml = formattedHtml.replace(/(<br\s*\/?>\s*)+$/gi, ''); formattedHtml = formattedHtml.replace(/(<br\s*\/?>\s*)+$/gi, '');
const content: Record<string, unknown> = { const content: RoomMessageTextEventContent = {
msgtype: 'm.text', msgtype: MsgType.Text,
body: plainText, body: plainText,
'm.relates_to': {
rel_type: RelationType.Thread,
event_id: rootId,
is_falling_back: false,
'm.in_reply_to': { event_id: parentId },
},
}; };
if (formattedHtml) { if (formattedHtml) {
@@ -776,7 +773,16 @@ export function sendForumReply(
content.formatted_body = formattedHtml; content.formatted_body = formattedHtml;
} }
return mx.sendMessage(roomId, content).then((res) => res.event_id); return mx
.sendMessage(roomId, {
...content,
'm.relates_to': {
rel_type: RelationType.Thread,
event_id: rootId,
'm.in_reply_to': { event_id: parentId },
},
})
.then((res) => res.event_id);
} }
export function createForumPostFromPayload( export function createForumPostFromPayload(
+22 -22
View File
@@ -1,5 +1,6 @@
import React from 'react'; import React, { forwardRef } from 'react';
import type { IconSrc } from 'folds'; import type { LucideProps } from 'lucide-react';
import type { IconSrc } from '../../components/icons';
/** Lucide paths (ISC) — same icons as matrixsso sort toggle (flame / sparkles / crown). */ /** Lucide paths (ISC) — same icons as matrixsso sort toggle (flame / sparkles / crown). */
@@ -36,26 +37,25 @@ const CROWN: SvgNode[] = [
['path', { d: 'M5 21h14' }], ['path', { d: 'M5 21h14' }],
]; ];
function lucideIcon(nodes: SvgNode): IconSrc { function lucideIcon(nodes: SvgNode[]): IconSrc {
return function Icon() { return forwardRef<SVGSVGElement, LucideProps>((_, ref) => (
return ( <svg
<svg ref={ref}
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24" viewBox="0 0 24 24"
fill="none" fill="none"
stroke="currentColor" stroke="currentColor"
strokeWidth={2} strokeWidth={2}
strokeLinecap="round" strokeLinecap="round"
strokeLinejoin="round" strokeLinejoin="round"
aria-hidden aria-hidden
focusable="false" focusable="false"
> >
{nodes.map(([tag, attrs]) => {nodes.map(([tag, attrs]) =>
React.createElement(tag, { key: `${tag}-${attrs.d ?? attrs.cx ?? ''}`, ...attrs }), React.createElement(tag, { key: `${tag}-${attrs.d ?? attrs.cx ?? ''}`, ...attrs }),
)} )}
</svg> </svg>
); ));
};
} }
/** hot → flame, new → sparkles, top → crown (matrixsso SORT_LUCIDE_ICONS) */ /** hot → flame, new → sparkles, top → crown (matrixsso SORT_LUCIDE_ICONS) */
+1 -1
View File
@@ -1136,7 +1136,7 @@ export const ForumSenderLabel = style({
export const ForumAuthorServer = style({ export const ForumAuthorServer = style({
background: color.SurfaceVariant.Container, background: color.SurfaceVariant.Container,
border: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`, border: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
borderRadius: config.radii.R200, borderRadius: config.radii.R300,
color: muted, color: muted,
fontSize: toRem(12), fontSize: toRem(12),
fontWeight: 600, fontWeight: 600,
@@ -79,8 +79,7 @@ export function useForumMessageReactions(room: Room, mEvent: MatrixEvent | undef
const reactionRelations = useMemo(() => { const reactionRelations = useMemo(() => {
if (!eventId) return undefined; if (!eventId) return undefined;
return getEventReactions(roomTimelineSet, eventId); return getEventReactions(roomTimelineSet, eventId);
// relationsRevision forces re-read after timeline / relation updates }, [eventId, roomTimelineSet]);
}, [eventId, relationsRevision, roomTimelineSet]);
const hasReactions = Boolean(reactionRelations?.getSortedAnnotationsByKey()?.length); const hasReactions = Boolean(reactionRelations?.getSortedAnnotationsByKey()?.length);
@@ -108,7 +107,7 @@ export function useForumMessageReactions(room: Room, mEvent: MatrixEvent | undef
(reactions.find(eventWithShortcode)?.getContent().shortcode as string | undefined); (reactions.find(eventWithShortcode)?.getContent().shortcode as string | undefined);
mx.sendEvent( mx.sendEvent(
room.roomId, room.roomId,
MessageEvent.Reaction as never, EventType.Reaction,
getReactionContent(targetEventId, key, rShortcode), getReactionContent(targetEventId, key, rShortcode),
).finally(() => { ).finally(() => {
bumpRelations(); bumpRelations();
+4 -3
View File
@@ -13,10 +13,11 @@ import {
Spinner, Spinner,
toRem, toRem,
} from 'folds'; } from 'folds';
import { EventType } from 'matrix-js-sdk';
import { Icon, Icons } from '../../components/icons'; import { Icon, Icons } from '../../components/icons';
import { HierarchyItem } from '../../hooks/useSpaceHierarchy'; import { HierarchyItem } from '../../hooks/useSpaceHierarchy';
import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useMatrixClient } from '../../hooks/useMatrixClient';
import { MSpaceChildContent, StateEvent } from '../../../types/matrix/room'; import { MSpaceChildContent } from '../../../types/matrix/room';
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
import { UseStateProvider } from '../../components/UseStateProvider'; import { UseStateProvider } from '../../components/UseStateProvider';
import { LeaveSpacePrompt } from '../../components/leave-space-prompt'; import { LeaveSpacePrompt } from '../../components/leave-space-prompt';
@@ -47,7 +48,7 @@ function SuggestMenuItem({
const [toggleState, handleToggleSuggested] = useAsyncCallback( const [toggleState, handleToggleSuggested] = useAsyncCallback(
useCallback(() => { useCallback(() => {
const newContent: MSpaceChildContent = { ...content, suggested: !content.suggested }; const newContent: MSpaceChildContent = { ...content, suggested: !content.suggested };
return mx.sendStateEvent(parentId, StateEvent.SpaceChild as any, newContent, roomId); return mx.sendStateEvent(parentId, EventType.SpaceChild, newContent, roomId);
}, [mx, parentId, roomId, content]), }, [mx, parentId, roomId, content]),
); );
@@ -84,7 +85,7 @@ function RemoveMenuItem({
const [removeState, handleRemove] = useAsyncCallback( const [removeState, handleRemove] = useAsyncCallback(
useCallback( useCallback(
() => mx.sendStateEvent(parentId, StateEvent.SpaceChild as any, {}, roomId), () => mx.sendStateEvent(parentId, EventType.SpaceChild, {}, roomId),
[mx, parentId, roomId], [mx, parentId, roomId],
), ),
); );
+1 -1
View File
@@ -456,7 +456,7 @@ function SpaceCardLobby() {
newItems.push(rId); newItems.push(rId);
} }
const newSpacesContent = makeCinnySpacesContent(mx, newItems); const newSpacesContent = makeCinnySpacesContent(mx, newItems);
mx.setAccountData(AccountDataEvent.CinnySpaces as any, newSpacesContent as any); mx.setAccountData(AccountDataEvent.CinnySpaces, newSpacesContent);
}, },
[mx, sidebarItems, sidebarSpaces], [mx, sidebarItems, sidebarSpaces],
); );
+1 -1
View File
@@ -321,7 +321,7 @@ export function LobbyHeader({ showProfile, showSpaceToolbar, powerLevels }: Lobb
</IconButton> </IconButton>
</Box> </Box>
)} )}
<Avatar size="300" shrink="No"> <Avatar size="300">
<RoomAvatar <RoomAvatar
roomId={space.roomId} roomId={space.roomId}
src={avatarUrl} src={avatarUrl}
+6 -3
View File
@@ -8,6 +8,7 @@ import {
HierarchyItemSpace, HierarchyItemSpace,
isHierarchySpaceRoom, isHierarchySpaceRoom,
useFetchSpaceHierarchyLevel, useFetchSpaceHierarchyLevel,
viaFromParent,
} from '../../hooks/useSpaceHierarchy'; } from '../../hooks/useSpaceHierarchy';
import { IPowerLevels } from '../../hooks/usePowerLevels'; import { IPowerLevels } from '../../hooks/usePowerLevels';
import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useMatrixClient } from '../../hooks/useMatrixClient';
@@ -107,8 +108,9 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
// This ensures sub-rooms are hidden even if their parent isn't in this space // This ensures sub-rooms are hidden even if their parent isn't in this space
const globalSubRoomIds = useMemo(() => { const globalSubRoomIds = useMemo(() => {
const subRoomIds = new Set<string>(); const subRoomIds = new Set<string>();
mx.getRooms().forEach((room) => { allJoinedRooms.forEach((roomId) => {
const subRoomsEvent = room.currentState.getStateEvents(StateEvent.PaarrotSubRooms, ''); const room = mx.getRoom(roomId);
const subRoomsEvent = room?.currentState.getStateEvents(StateEvent.PaarrotSubRooms, '');
const content = subRoomsEvent?.getContent<PaarrotSubRoomsContent>(); const content = subRoomsEvent?.getContent<PaarrotSubRoomsContent>();
content?.children?.forEach((childId: string) => subRoomIds.add(childId)); content?.children?.forEach((childId: string) => subRoomIds.add(childId));
}); });
@@ -258,7 +260,8 @@ export const SpaceHierarchy = forwardRef<HTMLDivElement, SpaceHierarchyProps>(
const subRoomItem: HierarchyItemRoom = { const subRoomItem: HierarchyItemRoom = {
roomId: subRoomId, roomId: subRoomId,
parentId: roomItem.roomId, parentId: roomItem.roomId,
content: {}, content: { via: viaFromParent(roomSummary, subRoomId) },
ts: 0,
}; };
const subRoomDragging = const subRoomDragging =
draggingItem?.roomId === subRoomId && draggingItem?.roomId === subRoomId &&
+2 -2
View File
@@ -26,7 +26,7 @@ export function RoomAppView({ room, onShowChat }: RoomAppViewProps) {
const handleAction = useCallback( const handleAction = useCallback(
async (payload: PaarrotUiActionContent) => { async (payload: PaarrotUiActionContent) => {
await mx.sendEvent(room.roomId, MessageEvent.PaarrotUiAction as any, payload); await mx.sendEvent(room.roomId, MessageEvent.PaarrotUiAction, payload);
}, },
[mx, room.roomId], [mx, room.roomId],
); );
@@ -35,7 +35,7 @@ export function RoomAppView({ room, onShowChat }: RoomAppViewProps) {
<Page> <Page>
<Header className={css.Header} size="600"> <Header className={css.Header} size="600">
<Box grow="Yes" alignItems="Center" gap="200"> <Box grow="Yes" alignItems="Center" gap="200">
<Box grow="Yes" alignItems="Center" gap="200" minWidth="0"> <Box grow="Yes" alignItems="Center" gap="200">
<Text size="H6" truncate> <Text size="H6" truncate>
{title} {title}
</Text> </Text>
+21 -29
View File
@@ -35,32 +35,7 @@ export function scopeRoomAppCss(css: string, scopeSelector: string): string {
return `${scoped}{${body}}`; return `${scoped}{${body}}`;
}; };
const rewriteBlock = (block: string): string => { function rewriteChunk(chunk: string): string {
const trimmed = block.trim();
if (!trimmed) return '';
if (trimmed.startsWith('@')) {
const open = trimmed.indexOf('{');
if (open === -1) return `${trimmed};`;
const header = trimmed.slice(0, open).trim();
const inner = trimmed.slice(open + 1);
// @keyframes / @font-face: keep as-is (namespaced risk is low for MVP)
if (/^@(keyframes|font-face)\b/i.test(header)) {
return `${header}{${inner}}`;
}
// @media / @supports: re-scope nested rules
const nested = rewriteCssChunk(inner);
return `${header}{${nested}}`;
}
const open = trimmed.indexOf('{');
if (open === -1) return '';
const selectors = trimmed.slice(0, open);
const body = trimmed.slice(open + 1);
return scopeRule(selectors, body);
};
const rewriteCssChunk = (chunk: string): string => {
const parts: string[] = []; const parts: string[] = [];
let depth = 0; let depth = 0;
let start = 0; let start = 0;
@@ -70,15 +45,32 @@ export function scopeRoomAppCss(css: string, scopeSelector: string): string {
else if (ch === '}') { else if (ch === '}') {
depth -= 1; depth -= 1;
if (depth === 0) { if (depth === 0) {
parts.push(rewriteBlock(chunk.slice(start, i))); const block = chunk.slice(start, i).trim();
start = i + 1; start = i + 1;
if (block) {
const open = block.indexOf('{');
if (open === -1) {
parts.push(`${block};`);
} else {
const header = block.slice(0, open).trim();
const inner = block.slice(open + 1);
if (!header.startsWith('@')) {
parts.push(scopeRule(header, inner));
} else if (/^@(keyframes|font-face)\b/i.test(header)) {
parts.push(`${header}{${inner}}`);
} else {
// @media / @supports: re-scope nested rules
parts.push(`${header}{${rewriteChunk(inner)}}`);
}
}
}
} }
} }
} }
return parts.filter(Boolean).join('\n'); return parts.filter(Boolean).join('\n');
}; }
return rewriteCssChunk(sanitized); return rewriteChunk(sanitized);
} }
export function isAllowedRoomAppImageSrc(src: string): boolean { export function isAllowedRoomAppImageSrc(src: string): boolean {
@@ -93,7 +93,7 @@ export function CallParticipantsIndicator({ roomId }: CallParticipantsIndicatorP
/** /**
* Get the appropriate audio icon for a participant * Get the appropriate audio icon for a participant
*/ */
const getAudioIcon = (userId: string): string => { const getAudioIcon = (userId: string) => {
if (isLocalUserDeafened(userId)) { if (isLocalUserDeafened(userId)) {
return Icons.VolumeMute; return Icons.VolumeMute;
} }
@@ -82,7 +82,6 @@ export function SubRooms() {
children: newSubRooms, children: newSubRooms,
}; };
// Custom state event type - need to cast // Custom state event type - need to cast
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await mx.sendStateEvent(room.roomId, StateEvent.PaarrotSubRooms as any, content, ''); await mx.sendStateEvent(room.roomId, StateEvent.PaarrotSubRooms as any, content, '');
}, },
[mx, room], [mx, room],
@@ -126,7 +125,6 @@ export function SubRooms() {
// Add as m.space.child to the space // Add as m.space.child to the space
await mx.sendStateEvent( await mx.sendStateEvent(
parentSpaceId, parentSpaceId,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
StateEvent.SpaceChild as any, StateEvent.SpaceChild as any,
{ via: spaceViaServers }, { via: spaceViaServers },
roomIdToAdd, roomIdToAdd,
+5 -4
View File
@@ -98,7 +98,7 @@ import {
import { getMemberDisplayName, getMentionContent, trimReplyFromBody } from '../../utils/room'; import { getMemberDisplayName, getMentionContent, trimReplyFromBody } from '../../utils/room';
import { CommandAutocomplete } from './CommandAutocomplete'; import { CommandAutocomplete } from './CommandAutocomplete';
import { Command, SHRUG, TABLEFLIP, UNFLIP, useCommands } from '../../hooks/useCommands'; import { Command, SHRUG, TABLEFLIP, UNFLIP, useCommands } from '../../hooks/useCommands';
import { pluginRegistry } from '../settings/plugins/PluginAPI'; import { pluginRegistry, type CommandArg } from '../settings/plugins/PluginAPI';
import { PluginButtonSlot } from '../settings/plugins/PluginButtonSlot'; import { PluginButtonSlot } from '../settings/plugins/PluginButtonSlot';
import { mobileOrTablet } from '../../utils/user-agent'; import { mobileOrTablet } from '../../utils/user-agent';
import { ReplyLayout, ThreadIndicator } from '../../components/message'; import { ReplyLayout, ThreadIndicator } from '../../components/message';
@@ -219,7 +219,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
const [commandHint, setCommandHint] = useState<{ const [commandHint, setCommandHint] = useState<{
command: string; command: string;
description: string; description: string;
args?: string[]; args?: string[] | CommandArg[];
}>(); }>();
const sendTypingStatus = useTypingStatusUpdater(mx, roomId); const sendTypingStatus = useTypingStatusUpdater(mx, roomId);
@@ -635,7 +635,6 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
.reverse() .reverse()
.map((fileItem, index) => ( .map((fileItem, index) => (
<UploadCardRenderer <UploadCardRenderer
// eslint-disable-next-line react/no-array-index-key
key={index} key={index}
isEncrypted={!!fileItem.encInfo} isEncrypted={!!fileItem.encInfo}
fileItem={fileItem} fileItem={fileItem}
@@ -733,7 +732,9 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
{commandHint.args && commandHint.args.length > 0 && ( {commandHint.args && commandHint.args.length > 0 && (
<span style={{ opacity: 0.6 }}> <span style={{ opacity: 0.6 }}>
{' '} {' '}
{commandHint.args.map((arg) => `[${arg}]`).join(' ')} {commandHint.args
.map((arg) => `[${typeof arg === 'string' ? arg : arg.name}]`)
.join(' ')}
</span> </span>
)} )}
</Text> </Text>
+3 -1
View File
@@ -1,5 +1,5 @@
import { style } from '@vanilla-extract/css'; import { style } from '@vanilla-extract/css';
import { recipe } from '@vanilla-extract/recipes'; import { RecipeVariants, recipe } from '@vanilla-extract/recipes';
import { DefaultReset, color, config, toRem } from 'folds'; import { DefaultReset, color, config, toRem } from 'folds';
export const TimelineFloat = recipe({ export const TimelineFloat = recipe({
@@ -29,6 +29,8 @@ export const TimelineFloat = recipe({
}, },
}); });
export type TimelineFloatVariants = RecipeVariants<typeof TimelineFloat>;
export const DmNameplateBackground = style({ export const DmNameplateBackground = style({
position: 'absolute', position: 'absolute',
inset: 0, inset: 0,
+4 -2
View File
@@ -16,6 +16,7 @@ import {
EventTimeline, EventTimeline,
EventTimelineSet, EventTimelineSet,
EventTimelineSetHandlerMap, EventTimelineSetHandlerMap,
EventType,
IContent, IContent,
MatrixClient, MatrixClient,
MatrixEvent, MatrixEvent,
@@ -1529,7 +1530,7 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
(reactions.find(eventWithShortcode)?.getContent().shortcode as string | undefined); (reactions.find(eventWithShortcode)?.getContent().shortcode as string | undefined);
mx.sendEvent( mx.sendEvent(
room.roomId, room.roomId,
MessageEvent.Reaction as any, EventType.Reaction,
getReactionContent(targetEventId, key, rShortcode), getReactionContent(targetEventId, key, rShortcode),
); );
}, },
@@ -2010,7 +2011,8 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
}, },
[StateEvent.CallMember]: (mEventId, mEvent, item) => { [StateEvent.CallMember]: (mEventId, mEvent, item) => {
const senderId = mEvent.getSender() ?? ''; const senderId = mEvent.getSender() ?? '';
const senderName = getMemberDisplayName(room, senderId) || getMxIdLocalPart(senderId); const senderName =
getMemberDisplayName(room, senderId) || getMxIdLocalPart(senderId) || senderId;
const content = mEvent.getContent(); const content = mEvent.getContent();
const prevContent = mEvent.getPrevContent(); const prevContent = mEvent.getPrevContent();
+3 -1
View File
@@ -36,7 +36,9 @@ export function RoomTombstone({ roomId, body, replacementRoomId }: RoomTombstone
<Text size="T400">{body || 'This room has been replaced and is no longer active.'}</Text> <Text size="T400">{body || 'This room has been replaced and is no longer active.'}</Text>
{joinState.status === AsyncStatus.Error && ( {joinState.status === AsyncStatus.Error && (
<Text style={{ color: color.Critical.Main }} size="T200"> <Text style={{ color: color.Critical.Main }} size="T200">
{(joinState.error as any)?.message ?? 'Failed to join replacement room!'} {joinState.error instanceof Error
? joinState.error.message
: 'Failed to join replacement room!'}
</Text> </Text>
)} )}
</Box> </Box>
+1 -1
View File
@@ -330,7 +330,7 @@ function CallIndicator({ roomId }: CallIndicatorProps) {
offset={8} offset={8}
tooltip={ tooltip={
<SpeechBubble tail="top" tailX="50%"> <SpeechBubble tail="top" tailX="50%">
<Box direction="Column" gap="50"> <Box direction="Column" gap="100">
<Text <Text
size="T300" size="T300"
style={{ fontWeight: 600, color: color.SurfaceVariant.OnContainer }} style={{ fontWeight: 600, color: color.SurfaceVariant.OnContainer }}
+3 -2
View File
@@ -50,7 +50,8 @@ export const RoomViewTyping = as<'div', RoomViewTypingProps>(
// One verb for everyone keeps the joined form; mixed verbs need a clause per person // One verb for everyone keeps the joined form; mixed verbs need a clause per person
const firstVerb = verbs[typers[0].userId]; const firstVerb = verbs[typers[0].userId];
const sameVerb = typers.every((typer) => verbs[typer.userId] === firstVerb); const sameVerb = typers.every((typer) => verbs[typer.userId] === firstVerb);
const clauses = entries.map((entry) => ({ const clauses = entries.map((entry, index) => ({
key: entry.plural ? 'others' : typers[index].userId,
name: entry.name, name: entry.name,
suffix: `${entry.plural ? 'are' : 'is'} ${entry.verb ?? DEFAULT_VERB}`, suffix: `${entry.plural ? 'are' : 'is'} ${entry.verb ?? DEFAULT_VERB}`,
})); }));
@@ -81,7 +82,7 @@ export const RoomViewTyping = as<'div', RoomViewTypingProps>(
<TypingIndicator /> <TypingIndicator />
<Text className={css.TypingText} size="T300" truncate> <Text className={css.TypingText} size="T300" truncate>
{clauses.map((clause, index) => ( {clauses.map((clause, index) => (
<React.Fragment key={index}> <React.Fragment key={clause.key}>
{index > 0 && (index === clauses.length - 1 ? ' and ' : ', ')} {index > 0 && (index === clauses.length - 1 ? ' and ' : ', ')}
<b>{clause.name}</b> <b>{clause.name}</b>
{!sharedSuffix && ` ${clause.suffix}`} {!sharedSuffix && ` ${clause.suffix}`}
-5
View File
@@ -270,7 +270,6 @@ export function ThreadView({ room, threadRootId }: ThreadViewProps) {
repliesCount: replies.length, repliesCount: replies.length,
threadLength: t.length, threadLength: t.length,
hasRootEvent: !!t.rootEvent, hasRootEvent: !!t.rootEvent,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
initialEventsFetched: (t as any).initialEventsFetched, initialEventsFetched: (t as any).initialEventsFetched,
liveTimelineEventsCount: liveTimelineEvents.length, liveTimelineEventsCount: liveTimelineEvents.length,
threadEventsMatch: replies.length === liveTimelineEvents.length, threadEventsMatch: replies.length === liveTimelineEvents.length,
@@ -334,7 +333,6 @@ export function ThreadView({ room, threadRootId }: ThreadViewProps) {
threadExists: !!thread, threadExists: !!thread,
threadLength: thread?.length, threadLength: thread?.length,
eventsCount: thread?.events?.length, eventsCount: thread?.events?.length,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
initialEventsFetched: (thread as any)?.initialEventsFetched, initialEventsFetched: (thread as any)?.initialEventsFetched,
}); });
@@ -351,7 +349,6 @@ export function ThreadView({ room, threadRootId }: ThreadViewProps) {
thread.on(ThreadEvent.NewReply, handleUpdate); thread.on(ThreadEvent.NewReply, handleUpdate);
thread.on(ThreadEvent.Update, handleUpdate); thread.on(ThreadEvent.Update, handleUpdate);
// Fires when initial events are loaded after the SDK paginates the thread. // Fires when initial events are loaded after the SDK paginates the thread.
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(thread as any).on(RoomEvent.TimelineReset, handleUpdate); (thread as any).on(RoomEvent.TimelineReset, handleUpdate);
// Also listen to Timeline events which fire when events are added // Also listen to Timeline events which fire when events are added
@@ -378,7 +375,6 @@ export function ThreadView({ room, threadRootId }: ThreadViewProps) {
if (thread) { if (thread) {
thread.off(ThreadEvent.NewReply, handleUpdate); thread.off(ThreadEvent.NewReply, handleUpdate);
thread.off(ThreadEvent.Update, handleUpdate); thread.off(ThreadEvent.Update, handleUpdate);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(thread as any).off(RoomEvent.TimelineReset, handleUpdate); (thread as any).off(RoomEvent.TimelineReset, handleUpdate);
thread.off(RoomEvent.Timeline, handleUpdate); thread.off(RoomEvent.Timeline, handleUpdate);
} }
@@ -484,7 +480,6 @@ export function ThreadView({ room, threadRootId }: ThreadViewProps) {
(reactions.find(eventWithShortcode)?.getContent().shortcode as string | undefined); (reactions.find(eventWithShortcode)?.getContent().shortcode as string | undefined);
mx.sendEvent( mx.sendEvent(
room.roomId, room.roomId,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
MessageEvent.Reaction as any, MessageEvent.Reaction as any,
getReactionContent(targetEventId, key, rShortcode), getReactionContent(targetEventId, key, rShortcode),
); );
@@ -1,4 +1,4 @@
import React, { useEffect, useMemo, useRef } from 'react'; import React, { useCallback, useEffect, useMemo, useRef } from 'react';
import { createPortal } from 'react-dom'; import { createPortal } from 'react-dom';
import { EmojiConfettiBurst } from './types'; import { EmojiConfettiBurst } from './types';
import { import {
@@ -238,7 +238,7 @@ function LocalBurstCanvas({ burst, primaryEmoji, onComplete }: BurstCanvasProps)
[burst.origin.maskRadius, canvasSize], [burst.origin.maskRadius, canvasSize],
); );
const updateLayerPosition = () => { const updateLayerPosition = useCallback(() => {
const layer = layerRef.current; const layer = layerRef.current;
if (!layer) return false; if (!layer) return false;
@@ -249,7 +249,7 @@ function LocalBurstCanvas({ burst, primaryEmoji, onComplete }: BurstCanvasProps)
layer.style.left = `${rect.left + rect.width / 2 - canvasSize / 2}px`; layer.style.left = `${rect.left + rect.width / 2 - canvasSize / 2}px`;
layer.style.top = `${rect.top + rect.height / 2 - canvasSize / 2}px`; layer.style.top = `${rect.top + rect.height / 2 - canvasSize / 2}px`;
return true; return true;
}; }, [burst.targetEventId, canvasSize]);
useEffect(() => { useEffect(() => {
const onScrollOrResize = () => { const onScrollOrResize = () => {
@@ -263,7 +263,7 @@ function LocalBurstCanvas({ burst, primaryEmoji, onComplete }: BurstCanvasProps)
window.removeEventListener('scroll', onScrollOrResize, true); window.removeEventListener('scroll', onScrollOrResize, true);
window.removeEventListener('resize', onScrollOrResize); window.removeEventListener('resize', onScrollOrResize);
}; };
}, [burst.targetEventId, canvasSize]); }, [burst.targetEventId, canvasSize, updateLayerPosition]);
useEffect(() => { useEffect(() => {
if (!canvasRef.current || spawnedRef.current) return undefined; if (!canvasRef.current || spawnedRef.current) return undefined;
@@ -348,7 +348,7 @@ function LocalBurstCanvas({ burst, primaryEmoji, onComplete }: BurstCanvasProps)
window.clearInterval(retry); window.clearInterval(retry);
frameCleanup?.(); frameCleanup?.();
}; };
}, [burst.id, burst.targetEventId, canvasSize, localOrigin, primaryEmoji]); }, [burst.id, burst.targetEventId, canvasSize, localOrigin, primaryEmoji, updateLayerPosition]);
return createPortal( return createPortal(
<div <div
@@ -2,6 +2,7 @@ import { MatrixClient } from 'matrix-js-sdk';
import { EMOJI_REG_G, JUMBO_EMOJI_REG } from '../../../utils/regex'; import { EMOJI_REG_G, JUMBO_EMOJI_REG } from '../../../utils/regex';
import { trimReplyFromBody } from '../../../utils/room'; import { trimReplyFromBody } from '../../../utils/room';
import { emojis } from '../../../plugins/emoji'; import { emojis } from '../../../plugins/emoji';
import { MessageEvent } from '../../../../types/matrix/room';
import { EMOJI_CONFETTI_EVENT_TYPE, EmojiConfettiContent } from './types'; import { EMOJI_CONFETTI_EVENT_TYPE, EmojiConfettiContent } from './types';
const SHORTCODE_PATTERN = /:([^\s:]+):/g; const SHORTCODE_PATTERN = /:([^\s:]+):/g;
@@ -43,5 +44,5 @@ export function sendEmojiConfettiEvent(
target_event_id: targetEventId, target_event_id: targetEventId,
}; };
return mx.sendEvent(roomId, EMOJI_CONFETTI_EVENT_TYPE as never, content); return mx.sendEvent(roomId, MessageEvent.RelayEmojiConfetti, content);
} }
@@ -115,7 +115,6 @@ export const MessageQuickReactions = as<'div', MessageQuickReactionsProps>(
{mostUsedEmojis.map((emoji) => ( {mostUsedEmojis.map((emoji) => (
<IconButton <IconButton
key={emoji.unicode} key={emoji.unicode}
className={css.MessageQuickReaction}
size="300" size="300"
variant="SurfaceVariant" variant="SurfaceVariant"
radii="Pill" radii="Pill"
@@ -8,6 +8,7 @@ import React, {
import { Box, Chip, IconButton, Line, PopOut, RectCords, Spinner, Text, as, config } from 'folds'; import { Box, Chip, IconButton, Line, PopOut, RectCords, Spinner, Text, as, config } from 'folds';
import { Editor, Transforms } from 'slate'; import { Editor, Transforms } from 'slate';
import { IContent, IMentions, MatrixEvent, RelationType, Room } from 'matrix-js-sdk'; import { IContent, IMentions, MatrixEvent, RelationType, Room } from 'matrix-js-sdk';
import type { RoomMessageEventContent } from 'matrix-js-sdk/lib/@types/events';
import { isKeyHotkey } from 'is-hotkey'; import { isKeyHotkey } from 'is-hotkey';
import { Icon, Icons } from '../../../components/icons'; import { Icon, Icons } from '../../../components/icons';
import { import {
@@ -141,7 +142,7 @@ export const MessageEditor = as<'div', MessageEditorProps>(
}, },
}; };
return mx.sendMessage(roomId, content); return mx.sendMessage(roomId, content as RoomMessageEventContent);
}, [mx, editor, roomId, mEvent, isMarkdown, getPrevBodyAndFormattedBody]), }, [mx, editor, roomId, mEvent, isMarkdown, getPrevBodyAndFormattedBody]),
); );
+1 -1
View File
@@ -97,7 +97,7 @@ export const Reactions = as<'div', ReactionsProps>(
})} })}
{reactions.length > 0 && ( {reactions.length > 0 && (
<Overlay <Overlay
onContextMenu={(evt: any) => { onContextMenu={(evt) => {
evt.stopPropagation(); evt.stopPropagation();
}} }}
open={!!viewer} open={!!viewer}
@@ -32,7 +32,7 @@ import { ContainerColor } from '../../../styles/ContainerColor.css';
const fetchAuthenticatedMedia = async ( const fetchAuthenticatedMedia = async (
url: string, url: string,
accessToken: string | null, accessToken: string | undefined,
): Promise<string> => { ): Promise<string> => {
try { try {
let response = await fetch(url, { let response = await fetch(url, {
@@ -1,6 +1,6 @@
/* eslint-disable react/destructuring-assignment */ /* eslint-disable react/destructuring-assignment */
import React, { forwardRef, MouseEventHandler, useCallback, useMemo, useRef } from 'react'; import React, { forwardRef, MouseEventHandler, useCallback, useMemo, useRef } from 'react';
import { MatrixEvent, Room } from 'matrix-js-sdk'; import { EventType, MatrixEvent, Room } from 'matrix-js-sdk';
import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types'; import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types';
import { import {
Avatar, Avatar,
@@ -123,13 +123,13 @@ function PinnedMessage({
pinned: content.pinned.filter((id) => id !== eventId), pinned: content.pinned.filter((id) => id !== eventId),
}; };
return mx.sendStateEvent(room.roomId, StateEvent.RoomPinnedEvents as any, newContent); return mx.sendStateEvent(room.roomId, EventType.RoomPinnedEvents, newContent);
}, [room, eventId, mx]), }, [room, eventId, mx]),
); );
const sender = pinnedEvent?.getSender(); const sender = pinnedEvent?.getSender() ?? '';
const senderAvatarMxc = sender ? getMemberAvatarMxc(room, sender) : undefined; const senderAvatarMxc = sender ? getMemberAvatarMxc(room, sender) : undefined;
const customUserColor = useOtherUserColor(sender ?? '', room); const customUserColor = useOtherUserColor(sender, room);
const handleOpenClick: MouseEventHandler = (evt) => { const handleOpenClick: MouseEventHandler = (evt) => {
evt.stopPropagation(); evt.stopPropagation();
@@ -178,7 +178,7 @@ function PinnedMessage({
</Box> </Box>
); );
const displayName = getMemberDisplayName(room, sender!) ?? getMxIdLocalPart(sender!) ?? sender!; const displayName = getMemberDisplayName(room, sender) ?? getMxIdLocalPart(sender) ?? sender;
const getContent = (() => pinnedEvent.getContent()) as GetContentCallback; const getContent = (() => pinnedEvent.getContent()) as GetContentCallback;
const memberPowerTag = getMemberPowerTag(sender); const memberPowerTag = getMemberPowerTag(sender);
@@ -366,8 +366,8 @@ function ProfileBanner() {
handleRemoveUpload(); handleRemoveUpload();
// Sync user object to propagate changes throughout app // Sync user object to propagate changes throughout app
await syncUserAvatar(); await syncUserAvatar();
} catch (e: any) { } catch (e) {
const errorMsg = e?.message || 'Unknown error'; const errorMsg = e instanceof Error ? e.message : 'Unknown error';
console.error('[ProfileBanner] setUserBanner failed:', e); console.error('[ProfileBanner] setUserBanner failed:', e);
setError(`Failed to save banner: ${errorMsg}`); setError(`Failed to save banner: ${errorMsg}`);
} }
@@ -391,8 +391,8 @@ function ProfileBanner() {
} }
setAvatarFile(undefined); setAvatarFile(undefined);
await syncUserAvatar(); await syncUserAvatar();
} catch (e: any) { } catch (e) {
setError(`Failed to save avatar: ${e?.message || 'Unknown error'}`); setError(`Failed to save avatar: ${e instanceof Error ? e.message : 'Unknown error'}`);
} }
setSaving(false); setSaving(false);
}, },
@@ -77,7 +77,7 @@ export function ProfileEffectHeroPreview({
<div className={css.ProfileEffectHeroInfo}> <div className={css.ProfileEffectHeroInfo}>
<Text <Text
size="T100" size="T200"
className={css.ProfileEffectHeroName} className={css.ProfileEffectHeroName}
title={resolvedName} title={resolvedName}
style={{ color: nameColor }} style={{ color: nameColor }}
@@ -12,6 +12,7 @@ import {
OverlayCenter, OverlayCenter,
} from 'folds'; } from 'folds';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import type { AccountDataEvents } from 'matrix-js-sdk';
import { Icon, Icons } from '../../../components/icons'; import { Icon, Icons } from '../../../components/icons';
import { Page, PageContent, PageHeader } from '../../../components/page'; import { Page, PageContent, PageHeader } from '../../../components/page';
import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCard } from '../../../components/sequence-card';
@@ -107,7 +108,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
const submitAccountData: AccountDataSubmitCallback = useCallback( const submitAccountData: AccountDataSubmitCallback = useCallback(
async (type, content) => { async (type, content) => {
await mx.setAccountData(type, content); await mx.setAccountData(type as keyof AccountDataEvents, content);
}, },
[mx], [mx],
); );
@@ -118,7 +119,11 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
return ( return (
<AccountDataEditor <AccountDataEditor
type={accountDataType ?? undefined} type={accountDataType ?? undefined}
content={accountDataType ? mx.getAccountData(accountDataType)?.getContent() : undefined} content={
accountDataType
? mx.getAccountData(accountDataType as keyof AccountDataEvents)?.getContent()
: undefined
}
submitChange={submitAccountData} submitChange={submitAccountData}
requestClose={() => setAccountDataType(undefined)} requestClose={() => setAccountDataType(undefined)}
/> />
@@ -239,7 +244,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
</PageContent> </PageContent>
</Scroll> </Scroll>
</Box> </Box>
{profileFieldKey !== undefined && ( {profileFieldKey && (
<Overlay open backdrop={<OverlayBackdrop />}> <Overlay open backdrop={<OverlayBackdrop />}>
<OverlayCenter> <OverlayCenter>
<FocusTrap <FocusTrap
@@ -82,8 +82,8 @@ export function ProfileFields({
<Box gap="100" alignItems="Center"> <Box gap="100" alignItems="Center">
{editable && ( {editable && (
<IconButton <IconButton
size="200" size="300"
radii="Round" radii="Pill"
title={`Delete ${key}`} title={`Delete ${key}`}
onClick={() => onDelete(key)} onClick={() => onDelete(key)}
> >
@@ -25,7 +25,6 @@ export type {
IPluginEventClient, IPluginEventClient,
PluginMarketplaceClientOptions, PluginMarketplaceClientOptions,
PluginMarketplaceHostAdapter, PluginMarketplaceHostAdapter,
PluginMarketplaceInstalledRecord,
PluginMarketplaceManagerOptions, PluginMarketplaceManagerOptions,
PluginRegistryOptions, PluginRegistryOptions,
PluginContextOptions, PluginContextOptions,
@@ -1,6 +1,7 @@
import React, { useSyncExternalStore } from 'react'; import React, { useSyncExternalStore } from 'react';
import { IconButton } from 'folds'; import { IconButton } from 'folds';
import * as lucide from 'lucide-react'; import * as lucide from 'lucide-react';
import type { LucideIcon } from 'lucide-react';
import { UILocation } from '@paarrot/plugin-manager'; import { UILocation } from '@paarrot/plugin-manager';
import { Icon, Icons, type IconName } from '../../../components/icons'; import { Icon, Icons, type IconName } from '../../../components/icons';
import { pluginRegistry } from './PluginAPI'; import { pluginRegistry } from './PluginAPI';
@@ -52,12 +53,7 @@ function renderPluginButtonIcon(button: { icon?: string; lucideIcon?: string }):
} }
if (lucideName) { if (lucideName) {
const IconComponent = ( const IconComponent = lucide[lucideName as keyof typeof lucide] as LucideIcon | undefined;
lucide as Record<
string,
React.ComponentType<{ size?: number; strokeWidth?: number }> | undefined
>
)[lucideName];
if (IconComponent) { if (IconComponent) {
return <IconComponent size={18} strokeWidth={2} aria-hidden />; return <IconComponent size={18} strokeWidth={2} aria-hidden />;
} }
@@ -71,7 +71,7 @@ function SettingRenderer({
variant="Background" variant="Background"
value={value ?? definition.default ?? ''} value={value ?? definition.default ?? ''}
onChange={(e) => onChange(e.target.value)} onChange={(e) => onChange(e.target.value)}
placeholder={definition.default} placeholder={typeof definition.default === 'string' ? definition.default : ''}
/> />
</SettingTile> </SettingTile>
); );
@@ -127,7 +127,7 @@ function SettingRenderer({
<Menu> <Menu>
{definition.options.map((option) => ( {definition.options.map((option) => (
<MenuItem <MenuItem
key={option.value} key={String(option.value)}
size="300" size="300"
after={ after={
currentValue === option.value ? ( currentValue === option.value ? (
@@ -214,7 +214,7 @@ function PluginSettingsRenderer({ pluginId }: { pluginId: string }) {
if (!schema || Object.keys(schema).length === 0) { if (!schema || Object.keys(schema).length === 0) {
return ( return (
<Box padding="300"> <Box>
<Text size="T300" priority="300"> <Text size="T300" priority="300">
No settings available for this plugin. No settings available for this plugin.
</Text> </Text>
@@ -406,12 +406,12 @@ export function Plugins({ requestClose }: PluginsProps) {
<Page> <Page>
<PageHeader> <PageHeader>
<Box grow="Yes" alignItems="Center" gap="200"> <Box grow="Yes" alignItems="Center" gap="200">
<Header size="H3" className="truncate"> <Header size="400" className="truncate">
Plugins Plugins
</Header> </Header>
</Box> </Box>
<Box shrink="No" gap="200"> <Box shrink="No" gap="200">
<Button variant="Background" size="300" onClick={requestClose}> <Button variant="Secondary" size="300" onClick={requestClose}>
<Text size="B300">Close</Text> <Text size="B300">Close</Text>
</Button> </Button>
</Box> </Box>
@@ -454,7 +454,7 @@ export function Plugins({ requestClose }: PluginsProps) {
searchQuery && ( searchQuery && (
<IconButton <IconButton
size="300" size="300"
variant="SurfaceLow" variant="Surface"
radii="300" radii="300"
onClick={() => setSearchQuery('')} onClick={() => setSearchQuery('')}
> >
@@ -688,7 +688,7 @@ export function Plugins({ requestClose }: PluginsProps) {
direction="Column" direction="Column"
style={{ style={{
borderTop: `1px solid ${color.Surface.ContainerLine}`, borderTop: `1px solid ${color.Surface.ContainerLine}`,
background: color.Surface.ContainerLowest, background: color.Surface.Container,
}} }}
> >
<PluginSettingsRenderer pluginId={plugin.id} /> <PluginSettingsRenderer pluginId={plugin.id} />
@@ -142,6 +142,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
// Preserve all users in child room who have power >= mine // Preserve all users in child room who have power >= mine
if (childPowerLevels.users) { if (childPowerLevels.users) {
Object.entries(childPowerLevels.users).forEach(([userId, power]) => { Object.entries(childPowerLevels.users).forEach(([userId, power]) => {
if (typeof power !== 'number') return;
if (power >= myPowerInChild) { if (power >= myPowerInChild) {
mergedUsers[userId] = power; mergedUsers[userId] = power;
} }
@@ -191,11 +192,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
// Also copy power level tags if they exist // Also copy power level tags if they exist
if (powerLevelTags) { if (powerLevelTags) {
await mx.sendStateEvent( await mx.sendStateEvent(childId, StateEvent.PowerLevelTags, powerLevelTags);
childId,
'in.cinny.room.power_level_tags' as any,
powerLevelTags,
);
} }
completed += 1; completed += 1;
@@ -253,6 +250,7 @@ export function Permissions({ requestClose }: PermissionsProps) {
// Preserve all users in child room who have power >= mine // Preserve all users in child room who have power >= mine
if (childPowerLevels.users) { if (childPowerLevels.users) {
Object.entries(childPowerLevels.users).forEach(([userId, power]) => { Object.entries(childPowerLevels.users).forEach(([userId, power]) => {
if (typeof power !== 'number') return;
if (power >= myPowerInChild) { if (power >= myPowerInChild) {
mergedUsers[userId] = power; mergedUsers[userId] = power;
} }
@@ -422,7 +420,10 @@ export function Permissions({ requestClose }: PermissionsProps) {
)} )}
{syncError && ( {syncError && (
<Text size="T300" style={{ color: color.Critical.Main }}> <Text size="T300" style={{ color: color.Critical.Main }}>
Error syncing permissions: {syncState.error.message} Error syncing permissions:{' '}
{syncState.error instanceof Error
? syncState.error.message
: String(syncState.error)}
</Text> </Text>
)} )}
</Box> </Box>
@@ -456,7 +457,10 @@ export function Permissions({ requestClose }: PermissionsProps) {
)} )}
{powerLevelsSyncError && ( {powerLevelsSyncError && (
<Text size="T300" style={{ color: color.Critical.Main }}> <Text size="T300" style={{ color: color.Critical.Main }}>
Error syncing power levels: {syncPowerLevelsState.error.message} Error syncing power levels:{' '}
{syncPowerLevelsState.error instanceof Error
? syncPowerLevelsState.error.message
: String(syncPowerLevelsState.error)}
</Text> </Text>
)} )}
</Box> </Box>
+2 -2
View File
@@ -23,12 +23,12 @@ export const useSpaceFeedSelected = (): boolean => {
return /\/feed\/?$/.test(pathname); return /\/feed\/?$/.test(pathname);
}; };
export const useSpaceLobbySelected = (_spaceIdOrAlias?: string): boolean => { export const useSpaceLobbySelected = (): boolean => {
const { pathname } = useLocation(); const { pathname } = useLocation();
return /\/lobby\/?$/.test(pathname); return /\/lobby\/?$/.test(pathname);
}; };
export const useSpaceSearchSelected = (_spaceIdOrAlias?: string): boolean => { export const useSpaceSearchSelected = (): boolean => {
const { pathname } = useLocation(); const { pathname } = useLocation();
return /\/search\/?$/.test(pathname); return /\/search\/?$/.test(pathname);
}; };
+2 -1
View File
@@ -1,10 +1,11 @@
import { useState, useCallback } from 'react'; import { useState, useCallback } from 'react';
import type { AccountDataEvents } from 'matrix-js-sdk';
import { useMatrixClient } from './useMatrixClient'; import { useMatrixClient } from './useMatrixClient';
import { useAccountDataCallback } from './useAccountDataCallback'; import { useAccountDataCallback } from './useAccountDataCallback';
export function useAccountData(eventType: string) { export function useAccountData(eventType: string) {
const mx = useMatrixClient(); const mx = useMatrixClient();
const [event, setEvent] = useState(() => mx.getAccountData(eventType)); const [event, setEvent] = useState(() => mx.getAccountData(eventType as keyof AccountDataEvents));
useAccountDataCallback( useAccountDataCallback(
mx, mx,
+2 -1
View File
@@ -1,8 +1,9 @@
import { useCallback, useMemo } from 'react'; import { useCallback, useMemo } from 'react';
import { useMatrixClient } from './useMatrixClient'; import { useMatrixClient } from './useMatrixClient';
import { useAccountData } from './useAccountData'; import { useAccountData } from './useAccountData';
import { AccountDataEvent } from '../../types/matrix/accountData';
const PAARROT_EMOJI_USAGE_EVENT = 'paarrot.favemojis'; const PAARROT_EMOJI_USAGE_EVENT = AccountDataEvent.PaarrotFavemojis;
const MAX_TRACKED_EMOJIS = 50; const MAX_TRACKED_EMOJIS = 50;
export type EmojiUsageData = { export type EmojiUsageData = {
+1 -1
View File
@@ -3,7 +3,7 @@ import { useReducer } from 'react';
const reducer = (prevCount: number): number => prevCount + 1; const reducer = (prevCount: number): number => prevCount + 1;
export const useForceUpdate = (): [number, () => void] => { export const useForceUpdate = (): [number, () => void] => {
const [state, dispatch] = useReducer<typeof reducer>(reducer, 0); const [state, dispatch] = useReducer(reducer, 0);
return [state, dispatch]; return [state, dispatch];
}; };
+6 -5
View File
@@ -51,14 +51,15 @@ const getPersonalEmbedFiltersFromRoom = (room: Room): EmbedFiltersContent => {
* @returns A tuple of [filters, setFilters] * @returns A tuple of [filters, setFilters]
*/ */
export const useRoomEmbedFilters = ( export const useRoomEmbedFilters = (
room: Room, room: Room | undefined,
): [EmbedFiltersContent, (filters: EmbedFiltersContent) => Promise<void>] => { ): [EmbedFiltersContent, (filters: EmbedFiltersContent) => Promise<void>] => {
const mx = useMatrixClient(); const mx = useMatrixClient();
const [filters, setFiltersState] = useState<EmbedFiltersContent>(() => const [filters, setFiltersState] = useState<EmbedFiltersContent>(() =>
getPersonalEmbedFiltersFromRoom(room), room ? getPersonalEmbedFiltersFromRoom(room) : DEFAULT_EMBED_FILTERS,
); );
useEffect(() => { useEffect(() => {
if (!room) return undefined;
const handleAccountData: RoomEventHandlerMap[RoomEvent.AccountData] = (event) => { const handleAccountData: RoomEventHandlerMap[RoomEvent.AccountData] = (event) => {
if (event.getType() === EMBED_FILTERS_ACCOUNT_DATA_TYPE) { if (event.getType() === EMBED_FILTERS_ACCOUNT_DATA_TYPE) {
setFiltersState(getPersonalEmbedFiltersFromRoom(room)); setFiltersState(getPersonalEmbedFiltersFromRoom(room));
@@ -73,9 +74,10 @@ export const useRoomEmbedFilters = (
const setFilters = useCallback( const setFilters = useCallback(
async (newFilters: EmbedFiltersContent): Promise<void> => { async (newFilters: EmbedFiltersContent): Promise<void> => {
if (!room) return;
await mx.setRoomAccountData(room.roomId, EMBED_FILTERS_ACCOUNT_DATA_TYPE, newFilters); await mx.setRoomAccountData(room.roomId, EMBED_FILTERS_ACCOUNT_DATA_TYPE, newFilters);
}, },
[mx, room.roomId], [mx, room?.roomId],
); );
return [filters, setFilters]; return [filters, setFilters];
@@ -87,7 +89,7 @@ export const useRoomEmbedFilters = (
* @param room - The Matrix room * @param room - The Matrix room
* @returns The room-wide embed filters content * @returns The room-wide embed filters content
*/ */
export const useRoomWideEmbedFilters = (room: Room): EmbedFiltersContent => { export const useRoomWideEmbedFilters = (room: Room | undefined): EmbedFiltersContent => {
const stateEvent = useStateEvent(room, StateEvent.RoomEmbedFilters); const stateEvent = useStateEvent(room, StateEvent.RoomEmbedFilters);
if (!stateEvent) { if (!stateEvent) {
return DEFAULT_EMBED_FILTERS; return DEFAULT_EMBED_FILTERS;
@@ -112,7 +114,6 @@ export const useSetRoomWideEmbedFilters = (
const setFilters = useCallback( const setFilters = useCallback(
async (newFilters: EmbedFiltersContent): Promise<void> => { async (newFilters: EmbedFiltersContent): Promise<void> => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
await mx.sendStateEvent(room.roomId, StateEvent.RoomEmbedFilters as any, newFilters); await mx.sendStateEvent(room.roomId, StateEvent.RoomEmbedFilters as any, newFilters);
}, },
[mx, room.roomId], [mx, room.roomId],
+17 -11
View File
@@ -1,17 +1,16 @@
import { useEffect, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
import { MatrixClient, MatrixEvent, Room, RoomEvent, IRoomTimelineData } from 'matrix-js-sdk'; import { MatrixClient, MatrixEvent, Room, RoomEvent, IRoomTimelineData } from 'matrix-js-sdk';
/** /**
* Hook that tracks timeline events across all rooms to trigger re-sorting of room lists. * Hook that tracks timeline events across all rooms to order room lists by activity.
* Returns a counter that increments whenever a message is sent or received in any room. * Returns the room IDs sorted by last active timestamp, recomputed on each live timeline event.
* This can be used as a dependency in useMemo to trigger re-sorting of room lists.
* *
* @param mx - The Matrix client instance * @param mx - The Matrix client instance
* @param roomIds - Optional array of room IDs to track. If not provided, tracks all rooms. * @param roomIds - Room IDs to track
* @returns A number that increments on each timeline event * @returns Room IDs ordered by most recently active
*/ */
export const useRoomListReorder = (mx: MatrixClient, roomIds?: string[]): number => { export const useRoomListReorder = (mx: MatrixClient, roomIds: string[]): string[] => {
const [updateCounter, setUpdateCounter] = useState(0); const [lastActivity, setLastActivity] = useState<Map<string, number>>(new Map());
useEffect(() => { useEffect(() => {
const handleTimelineEvent = ( const handleTimelineEvent = (
@@ -24,9 +23,9 @@ export const useRoomListReorder = (mx: MatrixClient, roomIds?: string[]): number
if (!room || !data.liveEvent) return; if (!room || !data.liveEvent) return;
if (toStartOfTimeline) return; if (toStartOfTimeline) return;
if (roomIds && !roomIds.includes(room.roomId)) return; if (!roomIds.includes(room.roomId)) return;
setUpdateCounter((prev) => prev + 1); setLastActivity((prev) => new Map(prev).set(room.roomId, room.getLastActiveTimestamp()));
}; };
mx.on(RoomEvent.Timeline, handleTimelineEvent); mx.on(RoomEvent.Timeline, handleTimelineEvent);
@@ -36,7 +35,14 @@ export const useRoomListReorder = (mx: MatrixClient, roomIds?: string[]): number
}; };
}, [mx, roomIds]); }, [mx, roomIds]);
return updateCounter; return useMemo(() => {
const activityOf = (roomId: string) =>
lastActivity.get(roomId) ??
mx.getRoom(roomId)?.getLastActiveTimestamp() ??
Number.MIN_SAFE_INTEGER;
return [...roomIds].sort((a, b) => activityOf(b) - activityOf(a));
}, [mx, roomIds, lastActivity]);
}; };
/** /**
-1
View File
@@ -242,7 +242,6 @@ export const useRoomMediaEvents = (room: Room) => {
cancelled = true; cancelled = true;
}; };
// Only re-bootstrap when switching rooms — not when callback identities change. // Only re-bootstrap when switching rooms — not when callback identities change.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [roomId]); }, [roomId]);
return { items, loading, hasMore, loadMore }; return { items, loading, hasMore, loadMore };
+9 -5
View File
@@ -1,7 +1,7 @@
import { atom, useAtom, useAtomValue } from 'jotai'; import { atom, useAtom, useAtomValue } from 'jotai';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { MatrixClient, MatrixError, Room } from 'matrix-js-sdk'; import { MatrixClient, MatrixError, Room } from 'matrix-js-sdk';
import { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces'; import type { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces';
import { QueryFunction, useInfiniteQuery } from '@tanstack/react-query'; import { QueryFunction, useInfiniteQuery } from '@tanstack/react-query';
import { useMatrixClient } from './useMatrixClient'; import { useMatrixClient } from './useMatrixClient';
import { roomToParentsAtom } from '../state/room/roomToParents'; import { roomToParentsAtom } from '../state/room/roomToParents';
@@ -55,6 +55,10 @@ export function buildParentByRoomId(rooms: Iterable<IHierarchyRoom>): Map<string
return parentByRoomId; return parentByRoomId;
} }
/** Hierarchy summaries carry no via; the parent's space.child relation does. */
export const viaFromParent = (parent: IHierarchyRoom | undefined, childId: string): string[] =>
parent?.children_state?.find((childState) => childState.state_key === childId)?.content.via ?? [];
/** Space or forum container in hierarchy API (room_type may be absent on some servers). */ /** Space or forum container in hierarchy API (room_type may be absent on some servers). */
export function isHierarchySpaceRoom(room: IHierarchyRoom | undefined): boolean { export function isHierarchySpaceRoom(room: IHierarchyRoom | undefined): boolean {
if (!room) return false; if (!room) return false;
@@ -101,13 +105,13 @@ const getChildRoomsFromSummaries = (
getRoom: GetRoomCallback, getRoom: GetRoomCallback,
): HierarchyItemRoom[] => { ): HierarchyItemRoom[] => {
const childItems: HierarchyItemRoom[] = []; const childItems: HierarchyItemRoom[] = [];
hierarchySummaries.forEach((summary, roomId) => { hierarchySummaries.forEach((_, roomId) => {
if (parentByRoomId.get(roomId) !== spaceItemId) return; if (parentByRoomId.get(roomId) !== spaceItemId) return;
if (isChildSpace(roomId, getRoom, spaceRooms, hierarchySummaries)) return; if (isChildSpace(roomId, getRoom, spaceRooms, hierarchySummaries)) return;
childItems.push({ childItems.push({
roomId, roomId,
content: { via: summary.via ?? [] }, content: { via: viaFromParent(hierarchySummaries.get(spaceItemId), roomId) },
ts: 0, ts: 0,
parentId: spaceItemId, parentId: spaceItemId,
}); });
@@ -157,14 +161,14 @@ const getHierarchySpaces = (
} }
// Unjoined sub-spaces: discover children from hierarchy API summaries. // Unjoined sub-spaces: discover children from hierarchy API summaries.
hierarchySummaries.forEach((summary, roomId) => { hierarchySummaries.forEach((_, roomId) => {
if (parentByRoomId.get(roomId) !== spaceItem.roomId) return; if (parentByRoomId.get(roomId) !== spaceItem.roomId) return;
if (!isChildSpace(roomId, getRoom, spaceRooms, hierarchySummaries)) return; if (!isChildSpace(roomId, getRoom, spaceRooms, hierarchySummaries)) return;
if (spaceItems.find((item) => item.roomId === roomId)) return; if (spaceItems.find((item) => item.roomId === roomId)) return;
findAndCollectHierarchySpaces({ findAndCollectHierarchySpaces({
roomId, roomId,
content: { via: summary.via ?? [] }, content: { via: viaFromParent(hierarchySummaries.get(spaceItem.roomId), roomId) },
ts: 0, ts: 0,
space: true, space: true,
parentId: spaceItem.roomId, parentId: spaceItem.roomId,
+4 -4
View File
@@ -5,14 +5,15 @@ import { useForceUpdate } from './useForceUpdate';
import { getStateEvent } from '../utils/room'; import { getStateEvent } from '../utils/room';
import { StateEvent } from '../../types/matrix/room'; import { StateEvent } from '../../types/matrix/room';
export const useStateEvent = (room: Room, eventType: StateEvent, stateKey = '') => { export const useStateEvent = (room: Room | undefined, eventType: StateEvent, stateKey = '') => {
const [updateCount, forceUpdate] = useForceUpdate(); const [updateCount, forceUpdate] = useForceUpdate();
useStateEventCallback( useStateEventCallback(
room.client, room?.client,
useCallback( useCallback(
(event) => { (event) => {
if ( if (
room &&
event.getRoomId() === room.roomId && event.getRoomId() === room.roomId &&
event.getType() === eventType && event.getType() === eventType &&
event.getStateKey() === stateKey event.getStateKey() === stateKey
@@ -25,8 +26,7 @@ export const useStateEvent = (room: Room, eventType: StateEvent, stateKey = '')
); );
return useMemo( return useMemo(
() => getStateEvent(room, eventType, stateKey), () => (room ? getStateEvent(room, eventType, stateKey) : undefined),
// eslint-disable-next-line react-hooks/exhaustive-deps
[room, eventType, stateKey, updateCount], [room, eventType, stateKey, updateCount],
); );
}; };
+5 -1
View File
@@ -7,8 +7,12 @@ export type StateEventCallback = (
lastStateEvent: MatrixEvent | null, lastStateEvent: MatrixEvent | null,
) => void; ) => void;
export const useStateEventCallback = (mx: MatrixClient, onStateEvent: StateEventCallback) => { export const useStateEventCallback = (
mx: MatrixClient | undefined,
onStateEvent: StateEventCallback,
) => {
useEffect(() => { useEffect(() => {
if (!mx) return undefined;
mx.on(RoomStateEvent.Events, onStateEvent); mx.on(RoomStateEvent.Events, onStateEvent);
return () => { return () => {
mx.removeListener(RoomStateEvent.Events, onStateEvent); mx.removeListener(RoomStateEvent.Events, onStateEvent);
+1 -5
View File
@@ -20,9 +20,5 @@ export const useStateEvents = (room: Room, eventType: StateEvent) => {
), ),
); );
return useMemo( return useMemo(() => getStateEvents(room, eventType), [room, eventType, updateCount]);
() => getStateEvents(room, eventType),
// eslint-disable-next-line react-hooks/exhaustive-deps
[room, eventType, updateCount],
);
}; };
+1 -1
View File
@@ -63,7 +63,7 @@ export function useUserCollectibles(): [
await saveAvatarDecoration(mx, collectible); await saveAvatarDecoration(mx, collectible);
} }
clearProfileCache(mx.getUserId()); clearProfileCache(mx.getUserId() ?? undefined);
setCollectibles((prev) => ({ ...prev, [kind]: collectible })); setCollectibles((prev) => ({ ...prev, [kind]: collectible }));
}, },
[mx], [mx],
+4 -4
View File
@@ -113,7 +113,7 @@ async function getStatus(matrixClient: MatrixClient) {
/** /**
* Toggle microphone mute * Toggle microphone mute
*/ */
async function toggleMute(matrixClient: MatrixClient) { async function toggleMute() {
const callService = getCallService(); const callService = getCallService();
if (!callService) { if (!callService) {
@@ -173,7 +173,7 @@ async function setMute(matrixClient: MatrixClient, muted: boolean) {
/** /**
* Toggle deafen (mute speakers) * Toggle deafen (mute speakers)
*/ */
async function toggleDeafen(matrixClient: MatrixClient) { async function toggleDeafen() {
const callService = getCallService(); const callService = getCallService();
if (!callService) { if (!callService) {
@@ -590,7 +590,7 @@ export function initPaarrotAPI(matrixClient: MatrixClient) {
break; break;
case 'toggle-mute': case 'toggle-mute':
result = await toggleMute(matrixClient); result = await toggleMute();
break; break;
case 'set-mute': case 'set-mute':
@@ -598,7 +598,7 @@ export function initPaarrotAPI(matrixClient: MatrixClient) {
break; break;
case 'toggle-deafen': case 'toggle-deafen':
result = await toggleDeafen(matrixClient); result = await toggleDeafen();
break; break;
case 'set-deafen': case 'set-deafen':
+1 -4
View File
@@ -34,10 +34,7 @@ export function SSOLogin({ providers, redirectUrl, action, saveScreenSpace }: SS
} }
try { try {
const existingDeviceId = localStorage.getItem('cinny_device_id') ?? undefined; await openExternalUrl(mx.getSsoLoginUrl(redirectUrl, 'sso', providerId, action));
await openExternalUrl(
mx.getSsoLoginUrl(redirectUrl, 'sso', providerId, action, existingDeviceId),
);
} finally { } finally {
setLaunchingProviderId(null); setLaunchingProviderId(null);
} }
+3 -2
View File
@@ -15,6 +15,7 @@ import {
getLocalStorageItem, getLocalStorageItem,
setLocalStorageItem, setLocalStorageItem,
} from '../../../state/utils/atomWithLocalStorage'; } from '../../../state/utils/atomWithLocalStorage';
import { Sessions } from '../../../state/sessions';
export enum GetBaseUrlError { export enum GetBaseUrlError {
NotAllow = 'NotAllow', NotAllow = 'NotAllow',
@@ -120,7 +121,7 @@ export const useLoginComplete = (data?: CustomLoginResponse) => {
const { response: loginRes, baseUrl: loginBaseUrl } = data; const { response: loginRes, baseUrl: loginBaseUrl } = data;
// Add session to sessions list // Add session to sessions list
const sessions = getLocalStorageItem('matrixSessions', []); const sessions = getLocalStorageItem<Sessions>('matrixSessions', []);
const newSession = { const newSession = {
baseUrl: loginBaseUrl, baseUrl: loginBaseUrl,
@@ -134,7 +135,7 @@ export const useLoginComplete = (data?: CustomLoginResponse) => {
// Check if session already exists (by userId AND deviceId to avoid conflicts) // Check if session already exists (by userId AND deviceId to avoid conflicts)
const existingIndex = sessions.findIndex( const existingIndex = sessions.findIndex(
(s: any) => s.userId === loginRes.user_id && s.deviceId === loginRes.device_id, (s) => s.userId === loginRes.user_id && s.deviceId === loginRes.device_id,
); );
if (existingIndex >= 0) { if (existingIndex >= 0) {
// Preserve fallbackSdkStores if it was set, but never enable it for new logins // Preserve fallbackSdkStores if it was set, but never enable it for new logins
+14 -10
View File
@@ -167,14 +167,21 @@ export function ClientRoot({ children }: ClientRootProps) {
// first sync) can not leave the splash up forever. // first sync) can not leave the splash up forever.
const splashDeadline = useRef<number | undefined>(undefined); const splashDeadline = useRef<number | undefined>(undefined);
const scheduleHide = useCallback((reason?: string) => { // The splash particles animate for 450ms with up to 640ms of stagger. Hold only
if (splashHoldTimer.current !== undefined) return; // for whatever is left of that, so a load that already took longer swaps at once.
const splashShownAt = useRef(performance.now());
const splashHidden = useRef(false);
if (reason) console.log(`[ClientRoot] Hiding splash: ${reason}`); const scheduleHide = useCallback((reason?: string) => {
if (splashHidden.current) return;
const hold = Math.max(0, 1100 - (performance.now() - splashShownAt.current));
if (reason) console.log(`[ClientRoot] Hiding splash: ${reason} (hold ${Math.round(hold)}ms)`);
splashHidden.current = true;
splashHoldTimer.current = window.setTimeout(() => { splashHoldTimer.current = window.setTimeout(() => {
splashHoldTimer.current = undefined; splashHoldTimer.current = undefined;
setLoading(false); setLoading(false);
}, 1500); }, hold);
}, []); }, []);
// The UI renders chats from the room-list atoms, which are filled by // The UI renders chats from the room-list atoms, which are filled by
@@ -182,10 +189,9 @@ export function ClientRoot({ children }: ClientRootProps) {
// so the first paint after the splash already contains the chats. // so the first paint after the splash already contains the chats.
const roomsAtom = useAtomValue(allRoomsAtom); const roomsAtom = useAtomValue(allRoomsAtom);
const directsAtom = useAtomValue(mDirectAtom); const directsAtom = useAtomValue(mDirectAtom);
const chatsReady = // An account with no direct chats can never satisfy a gate that requires one, so it
roomsAtom.length > 0 && // always waits for the deadline. Gate on the rooms only.
directsAtom.size > 0 && const chatsReady = roomsAtom.length > 0;
roomsAtom.some((roomId) => directsAtom.has(roomId));
const tryHide = useCallback( const tryHide = useCallback(
(reason: string): boolean => { (reason: string): boolean => {
@@ -285,12 +291,10 @@ export function ClientRoot({ children }: ClientRootProps) {
}, 10000); }, 10000);
} }
const poll = window.setInterval(check, 400);
mx.on(ClientEvent.Room, check); mx.on(ClientEvent.Room, check);
mx.on(ClientEvent.AccountData, check); mx.on(ClientEvent.AccountData, check);
return () => { return () => {
window.clearInterval(poll);
mx.removeListener(ClientEvent.Room, check); mx.removeListener(ClientEvent.Room, check);
mx.removeListener(ClientEvent.AccountData, check); mx.removeListener(ClientEvent.AccountData, check);
}; };
+4 -6
View File
@@ -18,7 +18,6 @@ import FocusTrap from 'focus-trap-react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { Icon, Icons } from '../../../components/icons'; import { Icon, Icons } from '../../../components/icons';
import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { useMatrixClient } from '../../../hooks/useMatrixClient';
import { factoryRoomIdByActivity } from '../../../utils/sort';
import { import {
NavButton, NavButton,
NavCategory, NavCategory,
@@ -251,15 +250,14 @@ export function Direct() {
const [closedCategories, setClosedCategories] = useAtom(useClosedNavCategoriesAtom()); const [closedCategories, setClosedCategories] = useAtom(useClosedNavCategoriesAtom());
const scrollRef = useRef<HTMLDivElement>(null); const scrollRef = useRef<HTMLDivElement>(null);
const reorderTrigger = useRoomListReorder(mx, directs); const activityOrder = useRoomListReorder(mx, directs);
const sortedDirects = useMemo(() => { const sortedDirects = useMemo(() => {
const items = Array.from(directs).sort(factoryRoomIdByActivity(mx));
if (closedCategories.has(DEFAULT_CATEGORY_ID)) { if (closedCategories.has(DEFAULT_CATEGORY_ID)) {
return items.filter((rId) => roomToUnread.has(rId) || rId === selectedRoomId); return activityOrder.filter((rId) => roomToUnread.has(rId) || rId === selectedRoomId);
} }
return items; return activityOrder;
}, [mx, directs, closedCategories, roomToUnread, selectedRoomId, reorderTrigger]); }, [activityOrder, closedCategories, roomToUnread, selectedRoomId]);
const animationRef = useListReorderAnimation(sortedDirects); const animationRef = useListReorderAnimation(sortedDirects);
+9 -6
View File
@@ -274,7 +274,9 @@ export function SpaceTombstone({ roomId, replacementRoomId }: SpaceTombstoneProp
<Text size="T200">This space has been replaced and is no longer active.</Text> <Text size="T200">This space has been replaced and is no longer active.</Text>
{joinState.status === AsyncStatus.Error && ( {joinState.status === AsyncStatus.Error && (
<Text className={BreakWord} style={{ color: color.Critical.Main }} size="T200"> <Text className={BreakWord} style={{ color: color.Critical.Main }} size="T200">
{(joinState.error as any)?.message ?? 'Failed to join replacement space!'} {joinState.error instanceof Error
? joinState.error.message
: 'Failed to join replacement space!'}
</Text> </Text>
)} )}
</Box> </Box>
@@ -321,8 +323,8 @@ export function Space() {
const tombstoneEvent = useStateEvent(space, StateEvent.RoomTombstone); const tombstoneEvent = useStateEvent(space, StateEvent.RoomTombstone);
const selectedRoomId = useSelectedRoom(); const selectedRoomId = useSelectedRoom();
const lobbySelected = useSpaceLobbySelected(spaceIdOrAlias); const lobbySelected = useSpaceLobbySelected();
const searchSelected = useSpaceSearchSelected(spaceIdOrAlias); const searchSelected = useSpaceSearchSelected();
const [closedCategories, setClosedCategories] = useAtom(useClosedNavCategoriesAtom()); const [closedCategories, setClosedCategories] = useAtom(useClosedNavCategoriesAtom());
@@ -360,13 +362,14 @@ export function Space() {
// This prevents sub-rooms from appearing both as top-level entries AND nested under parents // This prevents sub-rooms from appearing both as top-level entries AND nested under parents
const globalSubRoomIds = useMemo(() => { const globalSubRoomIds = useMemo(() => {
const subRoomIds = new Set<string>(); const subRoomIds = new Set<string>();
mx.getRooms().forEach((room) => { allJoinedRooms.forEach((roomId) => {
const subRoomsEvent = room.currentState.getStateEvents(StateEvent.PaarrotSubRooms, ''); const room = mx.getRoom(roomId);
const subRoomsEvent = room?.currentState.getStateEvents(StateEvent.PaarrotSubRooms, '');
const content = subRoomsEvent?.getContent<{ children: string[] }>(); const content = subRoomsEvent?.getContent<{ children: string[] }>();
content?.children?.forEach((childId: string) => subRoomIds.add(childId)); content?.children?.forEach((childId: string) => subRoomIds.add(childId));
}); });
return subRoomIds; return subRoomIds;
}, [mx, allJoinedRooms, hierarchy]); }, [mx, allJoinedRooms]);
// Filter hierarchy to exclude sub-rooms (they'll be shown nested under their parent) // Filter hierarchy to exclude sub-rooms (they'll be shown nested under their parent)
const filteredHierarchy = useMemo( const filteredHierarchy = useMemo(
+2 -1
View File
@@ -21,7 +21,7 @@ export const usePdfDocumentLoader = (pdfJS: typeof PdfJsDist | undefined, src: s
if (!pdfJS) { if (!pdfJS) {
throw new Error('PdfJS is not loaded'); throw new Error('PdfJS is not loaded');
} }
const doc = await pdfJS.getDocument(src).promise; const doc = await pdfJS.getDocument({ url: src }).promise;
return doc; return doc;
}, [pdfJS, src]), }, [pdfJS, src]),
); );
@@ -43,6 +43,7 @@ export const createPage = async (
page.render({ page.render({
canvasContext: context, canvasContext: context,
canvas,
viewport: pageViewport, viewport: pageViewport,
}); });
+17 -12
View File
@@ -8,6 +8,7 @@ import React, {
useState, useState,
} from 'react'; } from 'react';
import { import {
DOMNode,
Element, Element,
Text as DOMText, Text as DOMText,
HTMLReactParserOptions, HTMLReactParserOptions,
@@ -34,7 +35,6 @@ import {
import { IntermediateRepresentation, Opts as LinkifyOpts, OptFn } from 'linkifyjs'; import { IntermediateRepresentation, Opts as LinkifyOpts, OptFn } from 'linkifyjs';
import Linkify from 'linkify-react'; import Linkify from 'linkify-react';
import { ErrorBoundary } from 'react-error-boundary'; import { ErrorBoundary } from 'react-error-boundary';
import { ChildNode } from 'domhandler';
import FocusTrap from 'focus-trap-react'; import FocusTrap from 'focus-trap-react';
import { Icon, Icons } from '../components/icons'; import { Icon, Icons } from '../components/icons';
import * as css from '../styles/CustomHtml.css'; import * as css from '../styles/CustomHtml.css';
@@ -254,27 +254,31 @@ export const highlightText = (
); );
}); });
// domhandler's Element.children can hold CDATA and Directive, which html-react-parser's DOMNode excludes
const domNodes = (nodes: Element['children']): DOMNode[] =>
nodes.filter((node): node is DOMNode => node.type !== 'cdata' && node.type !== 'directive');
/** /**
* Recursively extracts and concatenates all text content from an array of ChildNode objects. * Recursively extracts and concatenates all text content from an array of DOMNode objects.
* *
* @param {ChildNode[]} nodes - An array of ChildNode objects to extract text from. * @param {DOMNode[]} nodes - An array of DOMNode objects to extract text from.
* @returns {string} The concatenated plain text content of all descendant text nodes. * @returns {string} The concatenated plain text content of all descendant text nodes.
*/ */
const extractTextFromChildren = (nodes: ChildNode[]): string => { const extractTextFromChildren = (nodes: DOMNode[]): string => {
let text = ''; let text = '';
nodes.forEach((node) => { nodes.forEach((node) => {
if (node.type === 'text') { if (node.type === 'text') {
text += node.data; text += node.data;
} else if (node instanceof Element && node.children) { } else if (node instanceof Element && node.children) {
text += extractTextFromChildren(node.children); text += extractTextFromChildren(domNodes(node.children));
} }
}); });
return text; return text;
}; };
export function CodeBlock({ children }: { children: ChildNode[] }) { export function CodeBlock({ children }: { children: DOMNode[] }) {
const code = children[0]; const code = children[0];
const languageClass = const languageClass =
code instanceof Element && code.name === 'code' ? code.attribs.class : undefined; code instanceof Element && code.name === 'code' ? code.attribs.class : undefined;
@@ -338,7 +342,7 @@ export function CodeBlock({ children }: { children: ChildNode[] }) {
<Header variant="Surface" size="400" className={css.CodeBlockHeader}> <Header variant="Surface" size="400" className={css.CodeBlockHeader}>
<Box grow="Yes"> <Box grow="Yes">
<Button <Button
variant="Surface" variant="Secondary"
fill="None" fill="None"
size="300" size="300"
radii="300" radii="300"
@@ -500,7 +504,7 @@ export function InlineCode({
opts, opts,
props, props,
}: { }: {
children: ChildNode[]; children: DOMNode[];
opts: HTMLReactParserOptions; opts: HTMLReactParserOptions;
props: ReturnType<typeof attributesToProps>; props: ReturnType<typeof attributesToProps>;
}) { }) {
@@ -556,7 +560,8 @@ export const getReactCustomHtmlParser = (
const opts: HTMLReactParserOptions = { const opts: HTMLReactParserOptions = {
replace: (domNode) => { replace: (domNode) => {
if (domNode instanceof Element && 'name' in domNode) { if (domNode instanceof Element && 'name' in domNode) {
const { name, attribs, children, parent } = domNode; const { name, attribs, parent } = domNode;
const children = domNodes(domNode.children);
const props = attributesToProps(attribs); const props = attributesToProps(attribs);
if (name === 'h1') { if (name === 'h1') {
@@ -646,7 +651,7 @@ export const getReactCustomHtmlParser = (
if (parent && 'name' in parent && parent.name === 'pre') { if (parent && 'name' in parent && parent.name === 'pre') {
const codeReact = domToReact(children, opts); const codeReact = domToReact(children, opts);
if (typeof codeReact === 'string') { if (typeof codeReact === 'string') {
let lang = props.className; let lang = typeof props.className === 'string' ? props.className : '';
if (lang === 'language-rs') lang = 'language-rust'; if (lang === 'language-rs') lang = 'language-rust';
else if (lang === 'language-js') lang = 'language-javascript'; else if (lang === 'language-js') lang = 'language-javascript';
else if (lang === 'language-ts') lang = 'language-typescript'; else if (lang === 'language-ts') lang = 'language-typescript';
@@ -673,7 +678,7 @@ export const getReactCustomHtmlParser = (
} }
} }
if (name === 'a') { if (name === 'a' && typeof props.href === 'string') {
const href = tryDecodeURIComponent(props.href); const href = tryDecodeURIComponent(props.href);
// Handle matrix.to links as mentions // Handle matrix.to links as mentions
if (testMatrixTo(href)) { if (testMatrixTo(href)) {
@@ -723,7 +728,7 @@ export const getReactCustomHtmlParser = (
); );
} }
if (name === 'img') { if (name === 'img' && typeof props.src === 'string') {
const htmlSrc = mxcUrlToHttp(mx, props.src, params.useAuthentication); const htmlSrc = mxcUrlToHttp(mx, props.src, params.useAuthentication);
if (htmlSrc && props.src.startsWith('mxc://') === false) { if (htmlSrc && props.src.startsWith('mxc://') === false) {
return ( return (
+1 -3
View File
@@ -25,7 +25,7 @@ const TRANSPARENT_COLOR = 0xff00ff;
* @returns The Lottie animation JSON object * @returns The Lottie animation JSON object
*/ */
function decompressTgs(tgsData: ArrayBuffer): object { function decompressTgs(tgsData: ArrayBuffer): object {
const decompressed = inflate(new Uint8Array(tgsData), { to: 'string' }); const decompressed = inflate(new Uint8Array(tgsData), { toText: true });
return JSON.parse(decompressed); return JSON.parse(decompressed);
} }
@@ -82,7 +82,6 @@ async function renderLottieToGif(
return; return;
} }
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const workerScript = (GIF as any).getWorkerScript?.() || '/gif.worker.js'; const workerScript = (GIF as any).getWorkerScript?.() || '/gif.worker.js';
// Initialize GIF encoder with transparency support // Initialize GIF encoder with transparency support
@@ -236,7 +235,6 @@ export async function webmToGif(
return; return;
} }
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const workerScript = (GIF as any).getWorkerScript?.() || '/gif.worker.js'; const workerScript = (GIF as any).getWorkerScript?.() || '/gif.worker.js';
// Initialize GIF encoder with transparency support // Initialize GIF encoder with transparency support

Some files were not shown because too many files have changed in this diff Show More