refactor(DP15): centralize sendStateEvent as-any cast in typed helper
Add a typed `sendStateEvent(mx, roomId, eventType, content, stateKey?)` helper in utils/room.ts that mirrors the DP16 account-data helper pattern. The SDK's typed `sendStateEvent` overload rejects the fork's custom `StateEvent` enum values, so every call site cast arg 2 to `any` (which also collapsed the content type). The single `as any` cast now lives inside the helper; a generic `content: T extends object` keeps each call site's content type checked. Route all 32 `mx.sendStateEvent(..., StateEvent.X as any, ...)` casts across 20 files through the helper. The 2 dynamic-string casts in developer-tools (SendRoomEvent, StateEventEditor) pass a runtime string, not an enum value, so they stay as-is. No behavior change. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -18,6 +18,7 @@ import {
|
||||
import { HierarchyItem } from '../../hooks/useSpaceHierarchy';
|
||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||
import { MSpaceChildContent, StateEvent } from '../../../types/matrix/room';
|
||||
import { sendStateEvent } from '../../utils/room';
|
||||
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
|
||||
import { UseStateProvider } from '../../components/UseStateProvider';
|
||||
import { LeaveSpacePrompt } from '../../components/leave-space-prompt';
|
||||
@@ -48,7 +49,7 @@ function SuggestMenuItem({
|
||||
const [toggleState, handleToggleSuggested] = useAsyncCallback(
|
||||
useCallback(() => {
|
||||
const newContent: MSpaceChildContent = { ...content, suggested: !content.suggested };
|
||||
return mx.sendStateEvent(parentId, StateEvent.SpaceChild as any, newContent, roomId);
|
||||
return sendStateEvent(mx, parentId, StateEvent.SpaceChild, newContent, roomId);
|
||||
}, [mx, parentId, roomId, content]),
|
||||
);
|
||||
|
||||
@@ -85,7 +86,7 @@ function RemoveMenuItem({
|
||||
|
||||
const [removeState, handleRemove] = useAsyncCallback(
|
||||
useCallback(
|
||||
() => mx.sendStateEvent(parentId, StateEvent.SpaceChild as any, {}, roomId),
|
||||
() => sendStateEvent(mx, parentId, StateEvent.SpaceChild, {}, roomId),
|
||||
[mx, parentId, roomId],
|
||||
),
|
||||
);
|
||||
|
||||
@@ -40,7 +40,7 @@ import { getSpaceRoomPath, withSearchParam } from '../../pages/pathUtils';
|
||||
import { StateEvent } from '../../../types/matrix/room';
|
||||
import { CanDropCallback, useDnDMonitor } from './DnD';
|
||||
import { ASCIILexicalTable, orderKeys } from '../../utils/ASCIILexicalTable';
|
||||
import { getStateEvent } from '../../utils/room';
|
||||
import { getStateEvent, sendStateEvent } from '../../utils/room';
|
||||
import { setAccountData } from '../../utils/accountData';
|
||||
import { useClosedLobbyCategoriesAtom } from '../../state/hooks/closedLobbyCategories';
|
||||
import {
|
||||
@@ -272,9 +272,10 @@ export function Lobby() {
|
||||
if (reorders) {
|
||||
await rateLimitedActions(reorders, async (reorder) => {
|
||||
if (!reorder.item.parentId) return;
|
||||
await mx.sendStateEvent(
|
||||
await sendStateEvent(
|
||||
mx,
|
||||
reorder.item.parentId,
|
||||
StateEvent.SpaceChild as any,
|
||||
StateEvent.SpaceChild,
|
||||
{ ...reorder.item.content, order: reorder.orderKey },
|
||||
reorder.item.roomId,
|
||||
);
|
||||
@@ -299,7 +300,7 @@ export function Lobby() {
|
||||
|
||||
// remove from current space
|
||||
if (item.parentId !== containerParentId) {
|
||||
mx.sendStateEvent(item.parentId, StateEvent.SpaceChild as any, {}, item.roomId);
|
||||
sendStateEvent(mx, item.parentId, StateEvent.SpaceChild, {}, item.roomId);
|
||||
}
|
||||
|
||||
if (
|
||||
@@ -319,7 +320,7 @@ export function Lobby() {
|
||||
joinRuleContent.allow?.filter((allowRule) => allowRule.room_id !== item.parentId) ??
|
||||
[];
|
||||
allow.push({ type: RestrictedAllowType.RoomMembership, room_id: containerParentId });
|
||||
mx.sendStateEvent(itemRoom.roomId, StateEvent.RoomJoinRules as any, {
|
||||
sendStateEvent(mx, itemRoom.roomId, StateEvent.RoomJoinRules, {
|
||||
...joinRuleContent,
|
||||
allow,
|
||||
});
|
||||
@@ -359,9 +360,10 @@ export function Lobby() {
|
||||
|
||||
if (reorders) {
|
||||
await rateLimitedActions(reorders, async (reorder) => {
|
||||
await mx.sendStateEvent(
|
||||
await sendStateEvent(
|
||||
mx,
|
||||
containerParentId,
|
||||
StateEvent.SpaceChild as any,
|
||||
StateEvent.SpaceChild,
|
||||
{ ...reorder.item.content, order: reorder.orderKey },
|
||||
reorder.item.roomId,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user