diff --git a/src/app/components/AccountDataEditor.tsx b/src/app/components/AccountDataEditor.tsx index 2dbaf1f1..07334543 100644 --- a/src/app/components/AccountDataEditor.tsx +++ b/src/app/components/AccountDataEditor.tsx @@ -14,7 +14,6 @@ import { Scroll, config, } from 'folds'; -import { MatrixError } from 'matrix-js-sdk'; import { Cursor } from '../plugins/text-area'; import { syntaxErrorPosition } from '../utils/dom'; import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback'; @@ -57,7 +56,7 @@ function AccountDataEdit({ EDITOR_INTENT_SPACE_COUNT ); - const [submitState, submit] = useAsyncCallback(submitChange); + const [submitState, submit] = useAsyncCallback(submitChange); const submitting = submitState.status === AsyncStatus.Loading; const handleSubmit: FormEventHandler = (evt) => { @@ -159,7 +158,9 @@ function AccountDataEdit({ {submitState.status === AsyncStatus.Error && ( - {submitState.error.message} + + {submitState.error instanceof Error ? submitState.error.message : 'Unknown Error'} + )} diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx index 29b6aa51..7d12a7c9 100644 --- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx +++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useState } from 'react'; +import React, { useCallback, useMemo, useState } from 'react'; import { Box, Text, @@ -12,6 +12,9 @@ import { config, color, } from 'folds'; +import { putRoomAccountData } from 'neurone/lib/api/matrix/client/v3/user'; +import { parseMatrixResp } from 'neurone/lib/matrix-request'; +import { AccountDataEvent, StateEventWithoutRoomId } from 'neurone/lib/api/types'; import { Page, PageContent, PageHeader } from '../../../components/page'; import { SequenceCard } from '../../../components/sequence-card'; import { SequenceCardStyle } from '../styles.css'; @@ -20,54 +23,240 @@ import { useSetting } from '../../../state/hooks/settings'; import { settingsAtom } from '../../../state/settings'; import { copyToClipboard } from '../../../utils/dom'; import { useRoom } from '../../../hooks/useRoom'; -import { useRoomState } from '../../../hooks/useRoomState'; -import { StateEventEditor, StateEventInfo } from './StateEventEditor'; -import { SendRoomEvent } from './SendRoomEvent'; -import { useRoomAccountData } from '../../../hooks/useRoomAccountData'; +import { StateEventEditor } from './StateEventEditor'; +import { EventLocation, SendRoomEvent } from './SendRoomEvent'; import { CutoutCard } from '../../../components/cutout-card'; import { AccountDataEditor, AccountDataSubmitCallback, } from '../../../components/AccountDataEditor'; -import { useMatrixClient } from '../../../hooks/useMatrixClient'; +import { useClient } from '../../../hooks/useClient'; +import { useRoomState } from '../../../hooks/storage/useRoomStateEvent'; +import { JoinRoomStateObject } from '../../../../client/storage/collections'; +import { useRoomAccountData } from '../../../hooks/storage/useRoomAccountData'; + +export function RoomStateList({ + onCompose, + onView, +}: { + onCompose: (location: EventLocation) => void; + onView: (event: StateEventWithoutRoomId) => void; +}) { + const roomId = useRoom(); + const roomStateResult = useRoomState(roomId); + const [expandStateType, setExpandStateType] = useState(); + + const typeToEvents = useMemo(() => { + const events = roomStateResult.value ?? []; + + const tToE = new Map(); + + events.forEach((event) => { + const list = tToE.get(event.type) ?? []; + list.push(event); + tToE.set(event.type, list); + }); + + return tToE; + }, [roomStateResult]); + + return ( + + + Events + {roomStateResult.value && Total: {roomStateResult.value.length}} + + + onCompose({ stateKey: '' })} + variant="Surface" + fill="None" + size="300" + radii="0" + before={} + > + + + Add New + + + + {Array.from(typeToEvents.keys()) + .sort() + .map((eventType) => { + const expanded = eventType === expandStateType; + + const events = typeToEvents.get(eventType); + if (!events) return null; + + return ( + + setExpandStateType(expanded ? undefined : eventType)} + variant="Surface" + fill="None" + size="300" + radii="0" + before={ + + } + after={{events.length}} + > + + + {eventType} + + + + {expanded && ( +
+ onCompose({ type: eventType, stateKey: '' })} + variant="Surface" + fill="None" + size="300" + radii="0" + before={} + > + + + Add New + + + + {Array.from(events) + .sort() + .map((eventObj) => ( + { + onView(eventObj.event); + }} + key={eventObj.event.state_key} + variant="Surface" + fill="None" + size="300" + radii="0" + after={} + > + + + {eventObj.event.state_key + ? `"${eventObj.event.state_key}"` + : 'Default'} + + + + ))} +
+ )} +
+ ); + })} +
+
+ ); +} + +export function AccountDataList({ + onCompose, +}: { + onCompose: (event: AccountDataEvent | null) => void; +}) { + const roomId = useRoom(); + const accountDataResult = useRoomAccountData(roomId); + + return ( + + + Events + {accountDataResult.value && ( + Total: {accountDataResult.value.length} + )} + + + } + onClick={() => onCompose(null)} + > + + + Add New + + + + {Array.from(accountDataResult.value ?? []) + .sort((e1, e2) => (e1.type < e2.type ? -1 : 1)) + .map((event) => ( + } + onClick={() => onCompose(event.event)} + > + + + {event.type} + + + + ))} + + + ); +} type DeveloperToolsProps = { requestClose: () => void; }; export function DeveloperTools({ requestClose }: DeveloperToolsProps) { const [developerTools, setDeveloperTools] = useSetting(settingsAtom, 'developerTools'); - const mx = useMatrixClient(); - const room = useRoom(); - - const roomState = useRoomState(room); - const accountData = useRoomAccountData(room); + const ct = useClient(); + const roomId = useRoom(); const [expandState, setExpandState] = useState(false); - const [expandStateType, setExpandStateType] = useState(); - const [openStateEvent, setOpenStateEvent] = useState(); - const [composeEvent, setComposeEvent] = useState<{ type?: string; stateKey?: string }>(); + const [openStateEvent, setOpenStateEvent] = useState(); + const [composeEvent, setComposeEvent] = useState(); const [expandAccountData, setExpandAccountData] = useState(false); - const [accountDataType, setAccountDataType] = useState(); + const [openAccountData, setOpenAccountData] = useState(); const handleClose = useCallback(() => { setOpenStateEvent(undefined); setComposeEvent(undefined); - setAccountDataType(undefined); + setOpenAccountData(undefined); }, []); const submitAccountData: AccountDataSubmitCallback = useCallback( async (type, content) => { - await mx.setRoomAccountData(room.roomId, type, content); + const resp = await ct.requestAuthJSON( + putRoomAccountData({ + pathParams: { roomId, type, userId: ct.session.userId }, + body: content, + }) + ); + const [err] = await parseMatrixResp(resp); + if (err) throw new Error(err.data.error ?? err.data.errcode); }, - [mx, room.roomId] + [ct, roomId] ); - if (accountDataType !== undefined) { + if (openAccountData !== undefined) { return ( @@ -79,7 +268,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) { } if (openStateEvent) { - return ; + return ; } return ( @@ -130,10 +319,10 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) { > copyToClipboard(room.roomId ?? '')} + onClick={() => copyToClipboard(roomId)} variant="Secondary" fill="Soft" size="300" @@ -205,111 +394,7 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) { } /> {expandState && ( - - - Events - Total: {roomState.size} - - - setComposeEvent({ stateKey: '' })} - variant="Surface" - fill="None" - size="300" - radii="0" - before={} - > - - - Add New - - - - {Array.from(roomState.keys()) - .sort() - .map((eventType) => { - const expanded = eventType === expandStateType; - const stateKeyToEvents = roomState.get(eventType); - if (!stateKeyToEvents) return null; - - return ( - - - setExpandStateType(expanded ? undefined : eventType) - } - variant="Surface" - fill="None" - size="300" - radii="0" - before={ - - } - after={{stateKeyToEvents.size}} - > - - - {eventType} - - - - {expanded && ( -
- - setComposeEvent({ type: eventType, stateKey: '' }) - } - variant="Surface" - fill="None" - size="300" - radii="0" - before={} - > - - - Add New - - - - {Array.from(stateKeyToEvents.keys()) - .sort() - .map((stateKey) => ( - { - setOpenStateEvent({ - type: eventType, - stateKey, - }); - }} - key={stateKey} - variant="Surface" - fill="None" - size="300" - radii="0" - after={} - > - - - {stateKey ? `"${stateKey}"` : 'Default'} - - - - ))} -
- )} -
- ); - })} -
-
+ )} } /> - {expandAccountData && ( - - - Events - Total: {accountData.size} - - - } - onClick={() => setAccountDataType(null)} - > - - - Add New - - - - {Array.from(accountData.keys()) - .sort() - .map((type) => ( - } - onClick={() => setAccountDataType(type)} - > - - - {type} - - - - ))} - - - )} + {expandAccountData && } )} diff --git a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx index f25ba7c3..8a2dc59d 100644 --- a/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx +++ b/src/app/features/common-settings/developer-tools/SendRoomEvent.tsx @@ -1,5 +1,4 @@ import React, { useCallback, useRef, useState, FormEventHandler, useEffect } from 'react'; -import { MatrixError } from 'matrix-js-sdk'; import { Box, Chip, @@ -14,25 +13,30 @@ import { TextArea as TextAreaComponent, Input, } from 'folds'; +import { putSend, putStateEvent } from 'neurone/lib/api/matrix/client/v3/rooms'; +import { parseMatrixResp } from 'neurone/lib/matrix-request'; import { Page, PageHeader } from '../../../components/page'; -import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { useRoom } from '../../../hooks/useRoom'; import { useAlive } from '../../../hooks/useAlive'; import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor'; import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; import { syntaxErrorPosition } from '../../../utils/dom'; import { Cursor } from '../../../plugins/text-area'; +import { useClient } from '../../../hooks/useClient'; const EDITOR_INTENT_SPACE_COUNT = 2; -export type SendRoomEventProps = { +export type EventLocation = { type?: string; stateKey?: string; +}; + +export type SendRoomEventProps = EventLocation & { requestClose: () => void; }; export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventProps) { - const mx = useMatrixClient(); - const room = useRoom(); + const ct = useClient(); + const roomId = useRoom(); const alive = useAlive(); const composeStateEvent = typeof stateKey === 'string'; @@ -44,18 +48,28 @@ export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventPro ); const [submitState, submit] = useAsyncCallback< - object, - MatrixError, + void, + unknown, [string, string | undefined, object] >( useCallback( - (evtType, evtStateKey, evtContent) => { - if (typeof evtStateKey === 'string') { - return mx.sendStateEvent(room.roomId, evtType as any, evtContent, evtStateKey); - } - return mx.sendEvent(room.roomId, evtType as any, evtContent); + async (evtType, evtStateKey, evtContent) => { + const resp = await ct.requestAuthJSON( + typeof evtStateKey === 'string' + ? putStateEvent({ + pathParams: { roomId, eventType: evtType, stateKey: evtStateKey }, + body: evtContent, + }) + : putSend({ + pathParams: { roomId, eventType: evtType, txnId: ct.getTxnId() }, + body: evtContent, + }) + ); + + const [err] = await parseMatrixResp(resp); + if (err) throw new Error(err.data.error ?? err.data.errcode); }, - [mx, room] + [ct, roomId] ) ); const submitting = submitState.status === AsyncStatus.Loading; @@ -162,7 +176,9 @@ export function SendRoomEvent({ type, stateKey, requestClose }: SendRoomEventPro {submitState.status === AsyncStatus.Error && ( - {submitState.error.message} + + {submitState.error instanceof Error ? submitState.error.message : 'Unknown Error'} + )} diff --git a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx index 0ea96901..cfb54a20 100644 --- a/src/app/features/common-settings/developer-tools/StateEventEditor.tsx +++ b/src/app/features/common-settings/developer-tools/StateEventEditor.tsx @@ -13,24 +13,24 @@ import { Spinner, Button, } from 'folds'; -import { MatrixError } from 'matrix-js-sdk'; +import { StateEventWithoutRoomId } from 'neurone/lib/api/types'; +import { putStateEvent } from 'neurone/lib/api/matrix/client/v3/rooms'; +import { parseMatrixResp } from 'neurone/lib/matrix-request'; import { Page, PageHeader } from '../../../components/page'; import { SequenceCard } from '../../../components/sequence-card'; import { TextViewerContent } from '../../../components/text-viewer'; -import { useStateEvent } from '../../../hooks/useStateEvent'; import { useRoom } from '../../../hooks/useRoom'; -import { StateEvent } from '../../../../types/matrix/room'; -import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { useAlive } from '../../../hooks/useAlive'; import { Cursor } from '../../../plugins/text-area'; import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback'; import { syntaxErrorPosition } from '../../../utils/dom'; import { SettingTile } from '../../../components/setting-tile'; import { SequenceCardStyle } from '../styles.css'; -import { usePowerLevels } from '../../../hooks/usePowerLevels'; +import { usePowerLevelsContext } from '../../../hooks/usePowerLevels'; import { useTextAreaCodeEditor } from '../../../hooks/useTextAreaCodeEditor'; import { useRoomCreators } from '../../../hooks/useRoomCreators'; import { useRoomPermissions } from '../../../hooks/useRoomPermissions'; +import { useClient } from '../../../hooks/useClient'; const EDITOR_INTENT_SPACE_COUNT = 2; @@ -41,8 +41,8 @@ type StateEventEditProps = { requestClose: () => void; }; function StateEventEdit({ type, stateKey, content, requestClose }: StateEventEditProps) { - const mx = useMatrixClient(); - const room = useRoom(); + const ct = useClient(); + const roomId = useRoom(); const alive = useAlive(); const defaultContentStr = useMemo( @@ -57,10 +57,20 @@ function StateEventEdit({ type, stateKey, content, requestClose }: StateEventEdi EDITOR_INTENT_SPACE_COUNT ); - const [submitState, submit] = useAsyncCallback( + const [submitState, submit] = useAsyncCallback( useCallback( - (c) => mx.sendStateEvent(room.roomId, type as any, c, stateKey), - [mx, room, type, stateKey] + async (c) => { + const resp = await ct.requestAuthJSON( + putStateEvent({ + pathParams: { roomId, eventType: type, stateKey }, + body: c, + }) + ); + + const [err] = await parseMatrixResp(resp); + if (err) throw new Error(err.data.error ?? err.data.errcode); + }, + [ct, roomId, type, stateKey] ) ); const submitting = submitState.status === AsyncStatus.Loading; @@ -157,7 +167,9 @@ function StateEventEdit({ type, stateKey, content, requestClose }: StateEventEdi {submitState.status === AsyncStatus.Error && ( - {submitState.error.message} + + {submitState.error instanceof Error ? submitState.error.message : 'Unknown Error'} + )} @@ -232,29 +244,26 @@ function StateEventView({ content, eventJSONStr, onEditContent }: StateEventView ); } -export type StateEventInfo = { - type: string; - stateKey: string; -}; -export type StateEventEditorProps = StateEventInfo & { +export type StateEventEditorProps = { + event: StateEventWithoutRoomId; requestClose: () => void; }; -export function StateEventEditor({ type, stateKey, requestClose }: StateEventEditorProps) { - const mx = useMatrixClient(); - const room = useRoom(); - const stateEvent = useStateEvent(room, type as unknown as StateEvent, stateKey); +export function StateEventEditor({ event, requestClose }: StateEventEditorProps) { + const ct = useClient(); + const roomId = useRoom(); + const [editContent, setEditContent] = useState(); - const powerLevels = usePowerLevels(room); - const creators = useRoomCreators(room); + const powerLevels = usePowerLevelsContext(); + const creators = useRoomCreators(roomId); const permissions = useRoomPermissions(creators, powerLevels); - const canEdit = permissions.stateEvent(type, mx.getSafeUserId()); + const canEdit = permissions.stateEvent(event.type, ct.session.userId); - const eventJSONStr = useMemo(() => { - if (!stateEvent) return ''; - return JSON.stringify(stateEvent.event, null, EDITOR_INTENT_SPACE_COUNT); - }, [stateEvent]); + const eventJSONStr = useMemo( + () => JSON.stringify(event, null, EDITOR_INTENT_SPACE_COUNT), + [event] + ); const handleCloseEdit = useCallback(() => { setEditContent(undefined); @@ -284,14 +293,14 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi {editContent ? ( ) : ( diff --git a/src/app/hooks/storage/useRoomStateEvent.ts b/src/app/hooks/storage/useRoomStateEvent.ts index 376f6d95..157f1a2f 100644 --- a/src/app/hooks/storage/useRoomStateEvent.ts +++ b/src/app/hooks/storage/useRoomStateEvent.ts @@ -43,3 +43,15 @@ export const useRoomStateEvents = ( return stateEventResult; }; + +export const useRoomState = (roomId: string): PendingObservableResult => { + const ct = useClient(); + const eventsPromise = useMemo( + () => ct.storage.joinRoomState.observableRead.queryIndex('roomId', roomId), + [ct, roomId] + ); + + const eventsResult = useObservableValuePromise(eventsPromise); + + return eventsResult; +};