mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 17:11:17 -08:00
refactor: align matrix event types with sdk primitives
This commit is contained in:
1 parent
bb9d59d7f6
commit
840ff239b2
146 files changed
+1056
-913
No files matched your search
@@ -21,7 +21,7 @@ import { HOME_ROOM_PATH, DIRECT_ROOM_PATH, SPACE_ROOM_PATH } from '$pages/paths'
|
||||
import { getCanonicalAliasOrRoomId } from '$utils/matrix';
|
||||
import { announce } from '$utils/announce';
|
||||
import { roomIdToReplyDraftAtomFamily } from '$state/room/roomInputDrafts';
|
||||
import type { Room } from 'matrix-js-sdk';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
|
||||
export function GlobalKeyboardShortcuts() {
|
||||
const navigate = useNavigate();
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
OverlayCenter,
|
||||
OverlayBackdrop,
|
||||
} from 'folds';
|
||||
import type { Room } from 'matrix-js-sdk';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useRoomName } from '$hooks/useRoomMeta';
|
||||
import { getRoomAvatarUrl } from '$utils/room';
|
||||
|
||||
@@ -121,7 +121,7 @@ function RenderMessageContentInternal({
|
||||
}));
|
||||
const mediaLinks = analyzed.filter((item) => item.type !== null);
|
||||
const previewCandidates = mediaLinks.length > 0 ? mediaLinks : analyzed;
|
||||
const toRender = multiplePreviews ? previewCandidates : [previewCandidates[0]];
|
||||
const toRender = multiplePreviews ? previewCandidates : [previewCandidates[0]!];
|
||||
return (
|
||||
<UrlPreviewHolder>
|
||||
{toRender.map((item) => {
|
||||
|
||||
@@ -5,8 +5,8 @@ import type {
|
||||
Room,
|
||||
RoomJoinRulesEventContent,
|
||||
} from '$types/matrix-sdk';
|
||||
import { JoinRule, RestrictedAllowType } from '$types/matrix-sdk';
|
||||
import { RoomType, StateEvent } from '$types/matrix/room';
|
||||
import { JoinRule, RestrictedAllowType, EventType, RoomType } from '$types/matrix-sdk';
|
||||
|
||||
import type { StateEvents } from '$types/matrix-sdk';
|
||||
import { getViaServers } from '$plugins/via-servers';
|
||||
import { getMxIdServer } from '$utils/matrix';
|
||||
@@ -59,14 +59,14 @@ export const createRoomJoinRulesState = (
|
||||
}
|
||||
|
||||
return {
|
||||
type: StateEvent.RoomJoinRules,
|
||||
type: EventType.RoomJoinRules,
|
||||
state_key: '',
|
||||
content,
|
||||
};
|
||||
};
|
||||
|
||||
export const createRoomParentState = (parent: Room) => ({
|
||||
type: StateEvent.SpaceParent,
|
||||
type: EventType.SpaceParent,
|
||||
state_key: parent.roomId,
|
||||
content: {
|
||||
canonical: true,
|
||||
@@ -94,7 +94,7 @@ export const createRoomCallState = () => ({
|
||||
|
||||
export const createVoiceRoomPowerLevelsOverride = () => ({
|
||||
events: {
|
||||
[StateEvent.GroupCallMemberPrefix]: 0,
|
||||
[EventType.GroupCallMemberPrefix]: 0,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -122,7 +122,7 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
|
||||
initialState.push(createRoomParentState(data.parent));
|
||||
}
|
||||
|
||||
if (data.type === RoomType.Call) {
|
||||
if (data.type === RoomType.UnstableCall) {
|
||||
initialState.push(createRoomCallState());
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
|
||||
data.additionalCreators
|
||||
),
|
||||
power_level_content_override:
|
||||
data.type === RoomType.Call ? createVoiceRoomPowerLevelsOverride() : undefined,
|
||||
data.type === RoomType.UnstableCall ? createVoiceRoomPowerLevelsOverride() : undefined,
|
||||
initial_state: initialState,
|
||||
};
|
||||
|
||||
@@ -152,7 +152,7 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
|
||||
if (data.parent) {
|
||||
await mx.sendStateEvent(
|
||||
data.parent.roomId,
|
||||
StateEvent.SpaceChild as keyof StateEvents,
|
||||
EventType.SpaceChild as keyof StateEvents,
|
||||
{
|
||||
auto_join: false,
|
||||
suggested: false,
|
||||
|
||||
@@ -15,12 +15,13 @@ import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
|
||||
import { getMemberDisplayName, getMemberSearchStr } from '$utils/room';
|
||||
import { UserAvatar } from '$components/user-avatar';
|
||||
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
|
||||
import { useAtomValue } from 'jotai';
|
||||
import { nicknamesAtom } from '$state/nicknames';
|
||||
import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils';
|
||||
import { AutocompleteMenu } from './AutocompleteMenu';
|
||||
import type { AutocompleteQuery } from './autocompleteQuery';
|
||||
import { KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
type MentionAutoCompleteHandler = (userId: string, name: string) => void;
|
||||
|
||||
@@ -70,9 +71,9 @@ type UserMentionAutocompleteProps = {
|
||||
};
|
||||
|
||||
const withAllowedMembership = (member: RoomMember): boolean =>
|
||||
member.membership === Membership.Join ||
|
||||
member.membership === Membership.Invite ||
|
||||
member.membership === Membership.Knock;
|
||||
member.membership === KnownMembership.Join ||
|
||||
member.membership === KnownMembership.Invite ||
|
||||
member.membership === KnownMembership.Knock;
|
||||
|
||||
const SEARCH_OPTIONS: UseAsyncSearchOptions = {
|
||||
limit: 1000,
|
||||
|
||||
@@ -38,9 +38,10 @@ import { roomIdToReplyDraftAtomFamily } from '$state/room/roomInputDrafts';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
|
||||
import { MessageEvent } from '$types/matrix/room';
|
||||
|
||||
import { useSettingsLinkBaseUrl } from '$features/settings/useSettingsLinkBaseUrl';
|
||||
import * as css from './EventHistory.css';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
export type EventHistoryProps = {
|
||||
room: Room;
|
||||
@@ -85,7 +86,7 @@ export const EventHistory = as<'div', EventHistoryProps>(
|
||||
const creators = useRoomCreators(room);
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canRedact = permissions.action('redact', mx.getSafeUserId());
|
||||
const canDeleteOwn = permissions.event(MessageEvent.RoomRedaction, mx.getSafeUserId());
|
||||
const canDeleteOwn = permissions.event(EventType.RoomRedaction, mx.getSafeUserId());
|
||||
const canDelete = canRedact || (canDeleteOwn && mEvents[0]?.getSender() === mx.getUserId());
|
||||
|
||||
const setReplyDraft = useSetAtom(roomIdToReplyDraftAtomFamily(room.roomId));
|
||||
|
||||
@@ -4,12 +4,13 @@ import { usePowerLevels } from '$hooks/usePowerLevels';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import type { PackContent } from '$plugins/custom-emoji';
|
||||
import { ImagePack } from '$plugins/custom-emoji';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useRoomImagePack } from '$hooks/useImagePacks';
|
||||
import { randomStr } from '$utils/common';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { ImagePackContent } from './ImagePackContent';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
type RoomImagePackProps = {
|
||||
room: Room;
|
||||
@@ -23,7 +24,7 @@ export function RoomImagePack({ room, stateKey }: RoomImagePackProps) {
|
||||
const creators = useRoomCreators(room);
|
||||
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canEditImagePack = permissions.stateEvent(StateEvent.PoniesRoomEmotes, userId);
|
||||
const canEditImagePack = permissions.stateEvent(CustomStateEvent.PoniesRoomEmotes, userId);
|
||||
|
||||
const fallbackPack = useMemo(() => {
|
||||
const fakePackId = randomStr(4);
|
||||
@@ -45,7 +46,7 @@ export function RoomImagePack({ room, stateKey }: RoomImagePackProps) {
|
||||
|
||||
await mx.sendStateEvent(
|
||||
address.roomId,
|
||||
StateEvent.PoniesRoomEmotes,
|
||||
CustomStateEvent.PoniesRoomEmotes,
|
||||
packContent,
|
||||
address.stateKey
|
||||
);
|
||||
|
||||
@@ -2,9 +2,10 @@ import { useCallback, useMemo } from 'react';
|
||||
import type { PackContent } from '$plugins/custom-emoji';
|
||||
import { ImagePack } from '$plugins/custom-emoji';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { useUserImagePack } from '$hooks/useImagePacks';
|
||||
import { ImagePackContent } from './ImagePackContent';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
export function UserImagePack() {
|
||||
const mx = useMatrixClient();
|
||||
@@ -14,7 +15,7 @@ export function UserImagePack() {
|
||||
|
||||
const handleUpdate = useCallback(
|
||||
async (packContent: PackContent) => {
|
||||
await mx.setAccountData(AccountDataEvent.PoniesUserEmotes, packContent);
|
||||
await mx.setAccountData(CustomAccountDataEvent.PoniesUserEmotes, packContent);
|
||||
},
|
||||
[mx]
|
||||
);
|
||||
|
||||
@@ -28,7 +28,7 @@ import FocusTrap from 'focus-trap-react';
|
||||
import { stopPropagation } from '$utils/keyboard';
|
||||
import { useDirectUsers } from '$hooks/useDirectUsers';
|
||||
import { getMxIdLocalPart, getMxIdServer, isUserId } from '$utils/matrix';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
|
||||
import type { UseAsyncSearchOptions } from '$hooks/useAsyncSearch';
|
||||
import { useAsyncSearch } from '$hooks/useAsyncSearch';
|
||||
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
|
||||
@@ -36,6 +36,7 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { BreakWord } from '$styles/Text.css';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
const SEARCH_OPTIONS: UseAsyncSearchOptions = {
|
||||
limit: 1000,
|
||||
@@ -61,7 +62,7 @@ export function InviteUserPrompt({ room, requestClose }: InviteUserProps) {
|
||||
() =>
|
||||
directUsers.filter((userId) => {
|
||||
const membership = room.getMember(userId)?.membership;
|
||||
return membership !== Membership.Join;
|
||||
return membership !== KnownMembership.Join;
|
||||
}),
|
||||
[directUsers, room]
|
||||
);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { MouseEventHandler } from 'react';
|
||||
import type { KeyboardEventHandler, MouseEventHandler } from 'react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { HTMLReactParserOptions } from 'html-react-parser';
|
||||
import parse from 'html-react-parser';
|
||||
@@ -86,10 +86,20 @@ type AbbreviationTermProps = {
|
||||
function AbbreviationTerm({ text, definition }: AbbreviationTermProps) {
|
||||
const [anchor, setAnchor] = useState<RectCords | undefined>();
|
||||
|
||||
const toggleAnchor = (target: HTMLElement) => {
|
||||
setAnchor((prev) => (prev ? undefined : target.getBoundingClientRect()));
|
||||
};
|
||||
|
||||
const handleClick: MouseEventHandler<HTMLElement> = (e) => {
|
||||
if (e.currentTarget === null) return;
|
||||
e.stopPropagation();
|
||||
setAnchor((prev) => (prev ? undefined : e.currentTarget?.getBoundingClientRect()));
|
||||
toggleAnchor(e.currentTarget);
|
||||
};
|
||||
|
||||
const handleKeyDown: KeyboardEventHandler<HTMLElement> = (e) => {
|
||||
if (e.key !== 'Enter' && e.key !== ' ') return;
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
toggleAnchor(e.currentTarget);
|
||||
};
|
||||
|
||||
// On mobile, tapping an abbreviation pins the tooltip open.
|
||||
@@ -111,10 +121,12 @@ function AbbreviationTerm({ text, definition }: AbbreviationTermProps) {
|
||||
<>
|
||||
<TooltipProvider position="Top" tooltip={tooltipContent}>
|
||||
{(triggerRef) => (
|
||||
// eslint-disable-next-line jsx-a11y/click-events-have-key-events
|
||||
<abbr
|
||||
ref={triggerRef as React.Ref<HTMLElement>}
|
||||
onClick={handleClick}
|
||||
onKeyDown={handleKeyDown}
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
style={{ textDecoration: 'underline dotted', cursor: 'help' }}
|
||||
>
|
||||
{text}
|
||||
|
||||
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
|
||||
import { describe, expect, it, vi } from 'vitest';
|
||||
import { Reply } from './Reply';
|
||||
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
/* oxlint-disable typescript/no-explicit-any */
|
||||
|
||||
const { mockUseRoomEvent, mockInvalidateQueries } = vi.hoisted(() => ({
|
||||
mockUseRoomEvent:
|
||||
|
||||
@@ -26,7 +26,7 @@ import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
|
||||
import { nicknamesAtom } from '$state/nicknames';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useMemberEventParser } from '$hooks/useMemberEventParser';
|
||||
import { StateEvent, MessageEvent } from '$types/matrix/room';
|
||||
|
||||
import { useMentionClickHandler } from '$hooks/useMentionClickHandler';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import * as customHtmlCss from '$styles/CustomHtml.css';
|
||||
@@ -39,6 +39,7 @@ import {
|
||||
} from './content';
|
||||
import * as css from './Reply.css';
|
||||
import { LinePlaceholder } from './placeholder';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
type ReplyLayoutProps = {
|
||||
userColor?: string;
|
||||
@@ -194,7 +195,7 @@ export const Reply = as<'div', ReplyProps>(
|
||||
} else if (hasPlainTextReply) {
|
||||
const strippedBody = trimReplyFromBody(body).replaceAll(/(?:\r\n|\r|\n)/g, ' ');
|
||||
bodyJSX = scaleSystemEmoji(strippedBody);
|
||||
} else if (eventType === StateEvent.RoomMember && !!replyEvent) {
|
||||
} else if (eventType === EventType.RoomMember && !!replyEvent) {
|
||||
const parsedMemberEvent = parseMemberEvent(replyEvent);
|
||||
image = parsedMemberEvent.icon;
|
||||
mentioned = false;
|
||||
@@ -204,20 +205,20 @@ export const Reply = as<'div', ReplyProps>(
|
||||
{parsedMemberEvent.body}{' '}
|
||||
</Box>
|
||||
);
|
||||
} else if (eventType === StateEvent.RoomName) {
|
||||
} else if (eventType === EventType.RoomName) {
|
||||
image = Icons.Hash;
|
||||
bodyJSX = t('Organisms.RoomCommon.changed_room_name');
|
||||
} else if (eventType === StateEvent.RoomTopic) {
|
||||
} else if (eventType === EventType.RoomTopic) {
|
||||
image = Icons.Hash;
|
||||
bodyJSX = ' changed room topic';
|
||||
} else if (eventType === StateEvent.RoomAvatar) {
|
||||
} else if (eventType === EventType.RoomAvatar) {
|
||||
image = Icons.Hash;
|
||||
bodyJSX = ' changed room avatar';
|
||||
} else if (eventType === StateEvent.GroupCallMemberPrefix && !!replyEvent) {
|
||||
} else if (eventType === EventType.GroupCallMemberPrefix && !!replyEvent) {
|
||||
const callJoined = replyEvent.getContent<SessionMembershipData>().application;
|
||||
image = callJoined ? Icons.Phone : Icons.PhoneDown;
|
||||
bodyJSX = callJoined ? ' joined the call' : ' ended the call';
|
||||
} else if (eventType === StateEvent.RoomPinnedEvents && replyEvent) {
|
||||
} else if (eventType === EventType.RoomPinnedEvents && replyEvent) {
|
||||
const { pinned } = replyEvent.getContent();
|
||||
const prevPinned = replyEvent.getPrevContent().pinned;
|
||||
const pinsAdded =
|
||||
@@ -269,7 +270,7 @@ export const Reply = as<'div', ReplyProps>(
|
||||
mentioned={mentioned}
|
||||
username={
|
||||
sender &&
|
||||
eventType !== StateEvent.RoomMember && (
|
||||
eventType !== EventType.RoomMember && (
|
||||
<Text size="T300" truncate style={{ fontFamily: usernameFont }}>
|
||||
<b>{getMemberDisplayName(room, sender, nicknames) ?? getMxIdLocalPart(sender)}</b>
|
||||
</Text>
|
||||
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
} from 'folds';
|
||||
import { useAtomValue, useSetAtom } from 'jotai';
|
||||
import type { MatrixEvent, Room } from '$types/matrix-sdk';
|
||||
import { JoinRule } from '$types/matrix-sdk';
|
||||
import { JoinRule, EventType } from '$types/matrix-sdk';
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { allRoomsAtom } from '$state/room-list/roomList';
|
||||
import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom';
|
||||
@@ -26,7 +26,7 @@ import { factoryRoomIdByActivity } from '$utils/sort';
|
||||
import * as css from '$features/room/message/styles.css';
|
||||
import { sanitizeCustomHtml, sanitizeText } from '$utils/sanitize';
|
||||
import { getStateEvents } from '$utils/room';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { createDebugLogger } from '$utils/debugLogger';
|
||||
import * as Sentry from '@sentry/react';
|
||||
|
||||
@@ -116,7 +116,7 @@ export function MessageForwardInternal({
|
||||
// detect if it's a public room or not
|
||||
const joinRule = room.getJoinRule() ?? JoinRule.Invite;
|
||||
|
||||
const parentSpaceIds = getStateEvents(room, StateEvent.SpaceParent)
|
||||
const parentSpaceIds = getStateEvents(room, EventType.SpaceParent)
|
||||
.map((e) => e.getStateKey())
|
||||
.filter((id): id is string => Boolean(id));
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { ReactNode } from 'react';
|
||||
import { useCallback, useRef, useState } from 'react';
|
||||
import type { MatrixError, Room } from '$types/matrix-sdk';
|
||||
import { JoinRule } from '$types/matrix-sdk';
|
||||
import { JoinRule, EventType, RoomType } from '$types/matrix-sdk';
|
||||
import {
|
||||
Avatar,
|
||||
Badge,
|
||||
@@ -26,7 +26,7 @@ import { nameInitials } from '$utils/common';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { onEnterOrSpace, stopPropagation } from '$utils/keyboard';
|
||||
import { RoomType, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useJoinedRoomId } from '$hooks/useJoinedRoomId';
|
||||
import { useElementSizeObserver } from '$hooks/useElementSizeObserver';
|
||||
import { getRoomAvatarUrl, getStateEvent } from '$utils/room';
|
||||
@@ -175,7 +175,7 @@ export const RoomCard = as<'div', RoomCardProps>(
|
||||
const joinedRoomId = useJoinedRoomId(allRooms, roomIdOrAlias);
|
||||
const joinedRoom = mx.getRoom(joinedRoomId);
|
||||
const [topicEvent, setTopicEvent] = useState(() =>
|
||||
joinedRoom ? getStateEvent(joinedRoom, StateEvent.RoomTopic) : undefined
|
||||
joinedRoom ? getStateEvent(joinedRoom, EventType.RoomTopic) : undefined
|
||||
);
|
||||
const [knocking, setKnocking] = useState(false);
|
||||
const fallbackName = getMxIdLocalPart(roomIdOrAlias) ?? roomIdOrAlias;
|
||||
@@ -197,9 +197,9 @@ export const RoomCard = as<'div', RoomCardProps>(
|
||||
if (
|
||||
joinedRoom &&
|
||||
event.getRoomId() === joinedRoom.roomId &&
|
||||
event.getType() === (StateEvent.RoomTopic as string)
|
||||
event.getType() === (EventType.RoomTopic as string)
|
||||
) {
|
||||
setTopicEvent(getStateEvent(joinedRoom, StateEvent.RoomTopic));
|
||||
setTopicEvent(getStateEvent(joinedRoom, EventType.RoomTopic));
|
||||
}
|
||||
},
|
||||
[joinedRoom]
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Avatar, Box, Button, Icon, Icons, Spinner, Text, as } from 'folds';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { useAtomValue } from 'jotai';
|
||||
import type { IRoomCreateContent } from '$types/matrix/room';
|
||||
import { Membership, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { getMemberDisplayName, getStateEvent } from '$utils/room';
|
||||
import { nicknamesAtom } from '$state/nicknames';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
@@ -21,6 +21,7 @@ import { RoomAvatar } from '$components/room-avatar';
|
||||
import { InviteUserPrompt } from '$components/invite-user-prompt';
|
||||
import { InfoCard } from '$components/info-card';
|
||||
import { DirectInvitePrompt } from '$components/direct-invite-prompt';
|
||||
import { EventType, KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
export type RoomIntroProps = {
|
||||
room: Room;
|
||||
@@ -36,7 +37,7 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) =>
|
||||
const [invitePrompt, setInvitePrompt] = useState(false);
|
||||
const [directInvitePrompt, setDirectInvitePrompt] = useState(false);
|
||||
|
||||
const createEvent = getStateEvent(room, StateEvent.RoomCreate);
|
||||
const createEvent = getStateEvent(room, EventType.RoomCreate);
|
||||
const avatarMxc = useRoomAvatar(room, mDirects.has(room.roomId));
|
||||
const name = useRoomName(room);
|
||||
const topic = useRoomTopic(room);
|
||||
@@ -134,7 +135,7 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) =>
|
||||
</Button>
|
||||
)}
|
||||
{typeof prevRoomId === 'string' &&
|
||||
(mx.getRoom(prevRoomId)?.getMyMembership() === Membership.Join ? (
|
||||
(mx.getRoom(prevRoomId)?.getMyMembership() === KnownMembership.Join ? (
|
||||
<Button
|
||||
onClick={() => navigateRoom(prevRoomId, createContent?.predecessor?.event_id)}
|
||||
variant="Success"
|
||||
|
||||
@@ -29,7 +29,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
|
||||
import { useGetMemberPowerLevel, usePowerLevels } from '$hooks/usePowerLevels';
|
||||
import { getPowers, usePowerLevelTags } from '$hooks/usePowerLevelTags';
|
||||
import { stopPropagation } from '$utils/keyboard';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useOpenRoomSettings } from '$state/hooks/roomSettings';
|
||||
import { RoomSettingsPage } from '$state/roomSettings';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
@@ -44,6 +44,7 @@ import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { useMemberPowerCompare } from '$hooks/useMemberPowerCompare';
|
||||
import { CutoutCard } from '$components/cutout-card';
|
||||
import { PowerColorBadge, PowerIcon } from '$components/power';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
type SelfDemoteAlertProps = {
|
||||
power: number;
|
||||
@@ -165,7 +166,7 @@ export function PowerChip({ userId }: { userId: string }) {
|
||||
|
||||
const myUserId = mx.getSafeUserId();
|
||||
const canChangePowers =
|
||||
permissions.stateEvent(StateEvent.RoomPowerLevels, myUserId) &&
|
||||
permissions.stateEvent(EventType.RoomPowerLevels, myUserId) &&
|
||||
(myUserId === userId ? true : hasMorePower(myUserId, userId));
|
||||
|
||||
const tag = getMemberPowerTag(userId);
|
||||
|
||||
@@ -15,7 +15,7 @@ import { useUserPresence } from '$hooks/useUserPresence';
|
||||
import { useCloseUserRoomProfile } from '$state/hooks/userRoomProfile';
|
||||
import { useIgnoredUsers } from '$hooks/useIgnoredUsers';
|
||||
import { useMembership } from '$hooks/useMembership';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { useMemberPowerCompare } from '$hooks/useMemberPowerCompare';
|
||||
@@ -43,6 +43,7 @@ import { UserInviteAlert, UserBanAlert, UserModeration, UserKickAlert } from './
|
||||
import { PowerChip } from './PowerChip';
|
||||
import { IgnoredUserAlert, MutualRoomsChip, OptionsChip, ServerChip, ShareChip } from './UserChips';
|
||||
import { UserHero, UserHeroName } from './UserHero';
|
||||
import { KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
const KNOWN_KEYS = new Set([
|
||||
'moe.sable.app.bio',
|
||||
@@ -72,11 +73,6 @@ const renderValue = (val: unknown) => {
|
||||
return String(val as string | number | boolean);
|
||||
};
|
||||
|
||||
const clamp = (str: string | null | undefined, len: number) => {
|
||||
const stringified = str ?? '';
|
||||
return stringified.length > len ? `${stringified.slice(0, len)}...` : stringified;
|
||||
};
|
||||
|
||||
function UserExtendedSection({
|
||||
profile,
|
||||
htmlReactParserOptions,
|
||||
@@ -152,6 +148,7 @@ function UserExtendedSection({
|
||||
const unknownFields = Object.entries(profile.extended || {}).filter(
|
||||
([key]) => !KNOWN_KEYS.has(key)
|
||||
);
|
||||
const selectedUnknownField = miscDataIndex > -1 ? unknownFields[miscDataIndex] : undefined;
|
||||
|
||||
function handleMiscSelector(index: number) {
|
||||
setMiscDataIndex(index);
|
||||
@@ -212,13 +209,13 @@ function UserExtendedSection({
|
||||
<Text size="T200" priority="400">
|
||||
{miscDataIndex === -1
|
||||
? `Show Misc. Data (${unknownFields.length} value${unknownFields.length > 1 ? 's' : ''})`
|
||||
: `${unknownFields[miscDataIndex][0]} ${unknownFields.length > 1 ? `(${miscDataIndex + 1}/${unknownFields.length})` : ''}`}
|
||||
: `${selectedUnknownField?.[0] ?? 'Unknown'} ${unknownFields.length > 1 ? `(${miscDataIndex + 1}/${unknownFields.length})` : ''}`}
|
||||
</Text>
|
||||
</Button>
|
||||
{showMisc && miscSelector}
|
||||
</Box>
|
||||
),
|
||||
[miscSelector, miscDataIndex, showMisc, unknownFields]
|
||||
[miscSelector, miscDataIndex, selectedUnknownField, showMisc, unknownFields]
|
||||
);
|
||||
|
||||
return (
|
||||
@@ -336,7 +333,7 @@ function UserExtendedSection({
|
||||
}}
|
||||
>
|
||||
<TextViewerContent
|
||||
text={renderValue(unknownFields[miscDataIndex][1])}
|
||||
text={renderValue(selectedUnknownField?.[1])}
|
||||
langName="json"
|
||||
/>
|
||||
</Box>
|
||||
@@ -380,6 +377,10 @@ export function UserRoomProfile({ userId, initialProfile }: Readonly<UserRoomPro
|
||||
|
||||
const member = room.getMember(userId);
|
||||
const membership = useMembership(room, userId);
|
||||
const bannedMembership: string = KnownMembership.Ban;
|
||||
const invitedMembership: string = KnownMembership.Invite;
|
||||
const joinedMembership: string = KnownMembership.Join;
|
||||
const leftMembership: string = KnownMembership.Leave;
|
||||
|
||||
const server = getMxIdServer(userId);
|
||||
const nicknames = useAtomValue(nicknamesAtom);
|
||||
@@ -491,7 +492,7 @@ export function UserRoomProfile({ userId, initialProfile }: Readonly<UserRoomPro
|
||||
</Box>
|
||||
</Box>
|
||||
{ignored && <IgnoredUserAlert />}
|
||||
{member && membership === Membership.Ban && (
|
||||
{member && membership === bannedMembership && (
|
||||
<UserBanAlert
|
||||
userId={userId}
|
||||
reason={member.events.member?.getContent().reason}
|
||||
@@ -501,7 +502,7 @@ export function UserRoomProfile({ userId, initialProfile }: Readonly<UserRoomPro
|
||||
/>
|
||||
)}
|
||||
{member &&
|
||||
membership === Membership.Leave &&
|
||||
membership === leftMembership &&
|
||||
member.events.member &&
|
||||
member.events.member.getSender() !== userId && (
|
||||
<UserKickAlert
|
||||
@@ -510,7 +511,7 @@ export function UserRoomProfile({ userId, initialProfile }: Readonly<UserRoomPro
|
||||
ts={member.events.member?.getTs()}
|
||||
/>
|
||||
)}
|
||||
{member && membership === Membership.Invite && (
|
||||
{member && membership === invitedMembership && (
|
||||
<UserInviteAlert
|
||||
userId={userId}
|
||||
reason={member.events.member?.getContent().reason}
|
||||
@@ -521,9 +522,9 @@ export function UserRoomProfile({ userId, initialProfile }: Readonly<UserRoomPro
|
||||
)}
|
||||
<UserModeration
|
||||
userId={userId}
|
||||
canInvite={canInvite && membership === Membership.Leave}
|
||||
canKick={canKickUser && membership === Membership.Join}
|
||||
canBan={canBanUser && membership !== Membership.Ban}
|
||||
canInvite={canInvite && membership === leftMembership}
|
||||
canKick={canKickUser && membership === joinedMembership}
|
||||
canBan={canBanUser && membership !== bannedMembership}
|
||||
/>
|
||||
</Box>
|
||||
</Box>
|
||||
|
||||
@@ -41,10 +41,11 @@ import type { SearchItemStrGetter, UseAsyncSearchOptions } from '$hooks/useAsync
|
||||
import { useAsyncSearch } from '$hooks/useAsyncSearch';
|
||||
import { highlightText, makeHighlightRegex } from '$plugins/react-custom-html-parser';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { getViaServers } from '$plugins/via-servers';
|
||||
import { rateLimitedActions } from '$utils/matrix';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
const SEARCH_OPTS: UseAsyncSearchOptions = {
|
||||
limit: 500,
|
||||
@@ -153,12 +154,12 @@ export function AddExistingModal({ parentId, space, requestClose }: AddExistingM
|
||||
|
||||
await mx.sendStateEvent(
|
||||
parentId,
|
||||
StateEvent.SpaceChild as keyof StateEvents,
|
||||
EventType.SpaceChild,
|
||||
{
|
||||
auto_join: false,
|
||||
suggested: false,
|
||||
via,
|
||||
},
|
||||
} as StateEvents[typeof EventType.SpaceChild],
|
||||
room.roomId
|
||||
);
|
||||
});
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { Room } from 'matrix-js-sdk';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { Chip, Text } from 'folds';
|
||||
import { useAtomValue } from 'jotai';
|
||||
import { useRoomName } from '../../hooks/useRoomMeta';
|
||||
|
||||
@@ -16,9 +16,9 @@ import {
|
||||
Text,
|
||||
toRem,
|
||||
} from 'folds';
|
||||
import type { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
|
||||
import type { CallMembership } from '$types/matrix-sdk';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import type { Room } from 'matrix-js-sdk';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import * as css from './styles.css';
|
||||
import { stopPropagation } from '../../utils/keyboard';
|
||||
import { getMemberAvatarMxc, getMemberDisplayName } from '../../utils/room';
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Box, config, Icon, Icons, Text } from 'folds';
|
||||
import type { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
|
||||
import type { Room } from 'matrix-js-sdk';
|
||||
import type { CallMembership } from '$types/matrix-sdk';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { UserAvatar } from '../../components/user-avatar';
|
||||
import { getMemberAvatarMxc, getMemberDisplayName } from '../../utils/room';
|
||||
import { getMxIdLocalPart, mxcUrlToHttp } from '../../utils/matrix';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { Room } from 'matrix-js-sdk';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { Box, Icon, Icons, Text } from 'folds';
|
||||
import { getMemberDisplayName } from '../../utils/room';
|
||||
import { getMxIdLocalPart } from '../../utils/matrix';
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
import type {
|
||||
CallMembership,
|
||||
SessionMembershipData,
|
||||
} from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
|
||||
import type { CallMembership, SessionMembershipData } from '$types/matrix-sdk';
|
||||
import { useState } from 'react';
|
||||
import { Avatar, Box, Icon, Icons, Text } from 'folds';
|
||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||
|
||||
@@ -7,7 +7,7 @@ import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { useLivekitSupport } from '$hooks/useLivekitSupport';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useCallMembers, useCallSession } from '$hooks/useCall';
|
||||
import { useCallEmbed, useCallEmbedPlacementSync, useCallJoined } from '$hooks/useCallEmbed';
|
||||
import { ScreenSize, useScreenSizeContext } from '$hooks/useScreenSize';
|
||||
@@ -15,6 +15,7 @@ import * as css from './styles.css';
|
||||
import { CallMemberRenderer } from './CallMemberCard';
|
||||
import { PrescreenControls } from './PrescreenControls';
|
||||
import { CallControls } from './CallControls';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
function LivekitServerMissingMessage() {
|
||||
return (
|
||||
@@ -69,7 +70,7 @@ function CallPrescreen() {
|
||||
const creators = useRoomCreators(room);
|
||||
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const hasPermission = permissions.event(StateEvent.GroupCallMemberPrefix, mx.getSafeUserId());
|
||||
const hasPermission = permissions.event(EventType.GroupCallMemberPrefix, mx.getSafeUserId());
|
||||
|
||||
const callSession = useCallSession(room);
|
||||
const callMembers = useCallMembers(room, callSession);
|
||||
|
||||
@@ -26,7 +26,7 @@ import { SettingTile } from '$components/setting-tile';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { usePowerLevels } from '$hooks/usePowerLevels';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { createLogger } from '$utils/debug';
|
||||
@@ -53,6 +53,8 @@ import { ModalWide } from '$styles/Modal.css';
|
||||
import { NameColorEditor } from '$features/settings/account/NameColorEditor';
|
||||
import { PronounEditor } from '$features/settings/account/PronounEditor';
|
||||
import type { PronounSet } from '$utils/pronouns';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
const log = createLogger('Cosmetics');
|
||||
|
||||
@@ -370,15 +372,15 @@ export function Cosmetics({ requestClose }: CosmeticsProps) {
|
||||
const isSpace = room.isSpaceRoom();
|
||||
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canEditPermissions = permissions.stateEvent(StateEvent.RoomPowerLevels, mx.getSafeUserId());
|
||||
const canEditPermissions = permissions.stateEvent(EventType.RoomPowerLevels, mx.getSafeUserId());
|
||||
|
||||
const commands = useCommands(mx, room);
|
||||
|
||||
const getLevel = (eventType: string) => (powerLevels.events ?? {})?.[eventType] ?? 50;
|
||||
|
||||
const canHaveRoomColor = getLevel(StateEvent.RoomCosmeticsColor) === 0;
|
||||
const canHaveRoomPronouns = getLevel(StateEvent.RoomCosmeticsPronouns) === 0;
|
||||
const canHaveRoomFont = getLevel(StateEvent.RoomCosmeticsFont) === 0;
|
||||
const canHaveRoomColor = getLevel(CustomStateEvent.RoomCosmeticsColor) === 0;
|
||||
const canHaveRoomPronouns = getLevel(CustomStateEvent.RoomCosmeticsPronouns) === 0;
|
||||
const canHaveRoomFont = getLevel(CustomStateEvent.RoomCosmeticsFont) === 0;
|
||||
|
||||
const handleToggle = useCallback(
|
||||
async (eventType: string, enabled: boolean) => {
|
||||
@@ -394,7 +396,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) {
|
||||
try {
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.RoomPowerLevels as keyof StateEvents,
|
||||
EventType.RoomPowerLevels as keyof StateEvents,
|
||||
newContent,
|
||||
''
|
||||
);
|
||||
@@ -522,7 +524,9 @@ export function Cosmetics({ requestClose }: CosmeticsProps) {
|
||||
<Switch
|
||||
variant="Primary"
|
||||
value={canHaveRoomColor}
|
||||
onChange={(enabled) => handleToggle(StateEvent.RoomCosmeticsColor, enabled)}
|
||||
onChange={(enabled) =>
|
||||
handleToggle(CustomStateEvent.RoomCosmeticsColor, enabled)
|
||||
}
|
||||
disabled={!canEditPermissions}
|
||||
/>
|
||||
}
|
||||
@@ -542,7 +546,7 @@ export function Cosmetics({ requestClose }: CosmeticsProps) {
|
||||
variant="Primary"
|
||||
value={canHaveRoomPronouns}
|
||||
onChange={(enabled) =>
|
||||
handleToggle(StateEvent.RoomCosmeticsPronouns, enabled)
|
||||
handleToggle(CustomStateEvent.RoomCosmeticsPronouns, enabled)
|
||||
}
|
||||
disabled={!canEditPermissions}
|
||||
/>
|
||||
@@ -562,7 +566,9 @@ export function Cosmetics({ requestClose }: CosmeticsProps) {
|
||||
<Switch
|
||||
variant="Primary"
|
||||
value={canHaveRoomFont}
|
||||
onChange={(enabled) => handleToggle(StateEvent.RoomCosmeticsFont, enabled)}
|
||||
onChange={(enabled) =>
|
||||
handleToggle(CustomStateEvent.RoomCosmeticsFont, enabled)
|
||||
}
|
||||
disabled={!canEditPermissions}
|
||||
/>
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ import { SequenceCard } from '$components/sequence-card';
|
||||
import { TextViewerContent } from '$components/text-viewer';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import type { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { Cursor } from '$plugins/text-area';
|
||||
@@ -244,7 +244,7 @@ export type StateEventEditorProps = StateEventInfo & {
|
||||
export function StateEventEditor({ type, stateKey, requestClose }: StateEventEditorProps) {
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
const stateEvent = useStateEvent(room, type as unknown as StateEvent, stateKey);
|
||||
const stateEvent = useStateEvent(room, type as keyof StateEvents, stateKey);
|
||||
const [editContent, setEditContent] = useState<object>();
|
||||
const powerLevels = usePowerLevels(room);
|
||||
const creators = useRoomCreators(room);
|
||||
|
||||
@@ -17,7 +17,7 @@ import {
|
||||
IconButton,
|
||||
Menu,
|
||||
} from 'folds';
|
||||
import type { MatrixError, StateEvents } from '$types/matrix-sdk';
|
||||
import type { MatrixError } from '$types/matrix-sdk';
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import type { ImagePack, PackAddress, PackContent } from '$plugins/custom-emoji';
|
||||
import { ImageUsage, packAddressEqual } from '$plugins/custom-emoji';
|
||||
@@ -29,13 +29,14 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { mxcUrlToHttp } from '$utils/matrix';
|
||||
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
|
||||
import { usePowerLevels } from '$hooks/usePowerLevels';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { suffixRename } from '$utils/common';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { SequenceCardStyle } from '$features/common-settings/styles.css';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
type CreatePackTileProps = {
|
||||
packs: ImagePack[];
|
||||
@@ -53,12 +54,7 @@ function CreatePackTile({ packs, roomId }: Readonly<CreatePackTileProps>) {
|
||||
display_name: name,
|
||||
},
|
||||
};
|
||||
await mx.sendStateEvent(
|
||||
roomId,
|
||||
StateEvent.PoniesRoomEmotes as keyof StateEvents,
|
||||
content,
|
||||
stateKey
|
||||
);
|
||||
await mx.sendStateEvent(roomId, CustomStateEvent.PoniesRoomEmotes, content, stateKey);
|
||||
},
|
||||
[mx, roomId]
|
||||
)
|
||||
@@ -152,7 +148,7 @@ export function RoomPacks({ onViewPack }: Readonly<RoomPacksProps>) {
|
||||
const creators = useRoomCreators(room);
|
||||
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canEdit = permissions.stateEvent(StateEvent.PoniesRoomEmotes, mx.getSafeUserId());
|
||||
const canEdit = permissions.stateEvent(CustomStateEvent.PoniesRoomEmotes, mx.getSafeUserId());
|
||||
|
||||
const unfilteredPacks = useRoomImagePacks(room);
|
||||
const packs = useMemo(() => unfilteredPacks.filter((pack) => !pack.deleted), [unfilteredPacks]);
|
||||
@@ -166,12 +162,7 @@ export function RoomPacks({ onViewPack }: Readonly<RoomPacksProps>) {
|
||||
const addr = removedPacks[i];
|
||||
if (!addr) continue;
|
||||
// oxlint-disable-next-line no-await-in-loop
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.PoniesRoomEmotes as keyof StateEvents,
|
||||
{},
|
||||
addr.stateKey
|
||||
);
|
||||
await mx.sendStateEvent(room.roomId, CustomStateEvent.PoniesRoomEmotes, {}, addr.stateKey);
|
||||
}
|
||||
}, [mx, room, removedPacks])
|
||||
);
|
||||
|
||||
@@ -31,9 +31,10 @@ import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { CutoutCard } from '$components/cutout-card';
|
||||
import { replaceSpaceWithDash } from '$utils/common';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import type { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
|
||||
import { getMxIdServer } from '$utils/matrix';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
type RoomPublishedAddressesProps = {
|
||||
permissions: RoomPermissionsAPI;
|
||||
@@ -43,10 +44,7 @@ export function RoomPublishedAddresses({ permissions }: RoomPublishedAddressesPr
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
|
||||
const canEditCanonical = permissions.stateEvent(
|
||||
StateEvent.RoomCanonicalAlias,
|
||||
mx.getSafeUserId()
|
||||
);
|
||||
const canEditCanonical = permissions.stateEvent(EventType.RoomCanonicalAlias, mx.getSafeUserId());
|
||||
|
||||
const [canonicalAlias, publishedAliases] = usePublishedAliases(room);
|
||||
const setMainAlias = useSetMainAlias(room);
|
||||
@@ -365,10 +363,7 @@ export function RoomLocalAddresses({ permissions }: { permissions: RoomPermissio
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
|
||||
const canEditCanonical = permissions.stateEvent(
|
||||
StateEvent.RoomCanonicalAlias,
|
||||
mx.getSafeUserId()
|
||||
);
|
||||
const canEditCanonical = permissions.stateEvent(EventType.RoomCanonicalAlias, mx.getSafeUserId());
|
||||
|
||||
const [expand, setExpand] = useState(false);
|
||||
|
||||
|
||||
@@ -22,12 +22,13 @@ import { SequenceCard } from '$components/sequence-card';
|
||||
import { SequenceCardStyle } from '$features/room-settings/styles.css';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { stopPropagation } from '$utils/keyboard';
|
||||
import type { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
const ROOM_ENC_ALGO = 'm.megolm.v1.aes-sha2';
|
||||
|
||||
@@ -38,15 +39,15 @@ export function RoomEncryption({ permissions }: RoomEncryptionProps) {
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
|
||||
const canEnable = permissions.stateEvent(StateEvent.RoomEncryption, mx.getSafeUserId());
|
||||
const content = useStateEvent(room, StateEvent.RoomEncryption)?.getContent<{
|
||||
const canEnable = permissions.stateEvent(EventType.RoomEncryption, mx.getSafeUserId());
|
||||
const content = useStateEvent(room, EventType.RoomEncryption)?.getContent<{
|
||||
algorithm: string;
|
||||
}>();
|
||||
const enabled = content?.algorithm === ROOM_ENC_ALGO;
|
||||
|
||||
const [enableState, enable] = useAsyncCallback(
|
||||
useCallback(async () => {
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomEncryption as keyof StateEvents, {
|
||||
await mx.sendStateEvent(room.roomId, EventType.RoomEncryption as keyof StateEvents, {
|
||||
algorithm: ROOM_ENC_ALGO,
|
||||
});
|
||||
}, [mx, room.roomId])
|
||||
|
||||
@@ -7,14 +7,14 @@ import type {
|
||||
RoomHistoryVisibilityEventContent,
|
||||
StateEvents,
|
||||
} from '$types/matrix-sdk';
|
||||
import { HistoryVisibility } from '$types/matrix-sdk';
|
||||
import { HistoryVisibility, EventType } from '$types/matrix-sdk';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { SequenceCardStyle } from '$features/room-settings/styles.css';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { stopPropagation } from '$utils/keyboard';
|
||||
@@ -49,9 +49,9 @@ export function RoomHistoryVisibility({ permissions }: RoomHistoryVisibilityProp
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
|
||||
const canEdit = permissions.stateEvent(StateEvent.RoomHistoryVisibility, mx.getSafeUserId());
|
||||
const canEdit = permissions.stateEvent(EventType.RoomHistoryVisibility, mx.getSafeUserId());
|
||||
|
||||
const visibilityEvent = useStateEvent(room, StateEvent.RoomHistoryVisibility);
|
||||
const visibilityEvent = useStateEvent(room, EventType.RoomHistoryVisibility);
|
||||
const historyVisibility: HistoryVisibility =
|
||||
visibilityEvent?.getContent<RoomHistoryVisibilityEventContent>().history_visibility ??
|
||||
HistoryVisibility.Shared;
|
||||
@@ -72,7 +72,7 @@ export function RoomHistoryVisibility({ permissions }: RoomHistoryVisibilityProp
|
||||
};
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.RoomHistoryVisibility as keyof StateEvents,
|
||||
EventType.RoomHistoryVisibility as keyof StateEvents,
|
||||
content
|
||||
);
|
||||
},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useCallback, useMemo } from 'react';
|
||||
import { color, Text } from 'folds';
|
||||
import type { MatrixError, RoomJoinRulesEventContent, StateEvents } from '$types/matrix-sdk';
|
||||
import { JoinRule, RestrictedAllowType } from '$types/matrix-sdk';
|
||||
import { JoinRule, RestrictedAllowType, EventType } from '$types/matrix-sdk';
|
||||
import { useAtomValue } from 'jotai';
|
||||
import type { ExtendedJoinRules } from '$components/JoinRulesSwitcher';
|
||||
import {
|
||||
@@ -14,7 +14,7 @@ import { SequenceCardStyle } from '$features/room-settings/styles.css';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { useSpaceOptionally } from '$hooks/useSpace';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
@@ -45,9 +45,9 @@ export function RoomJoinRules({ permissions }: RoomJoinRulesProps) {
|
||||
const subspacesScope = useRecursiveChildSpaceScopeFactory(mx, roomIdToParents);
|
||||
const subspaces = useSpaceChildren(allRoomsAtom, space?.roomId ?? '', subspacesScope);
|
||||
|
||||
const canEdit = permissions.stateEvent(StateEvent.RoomHistoryVisibility, mx.getSafeUserId());
|
||||
const canEdit = permissions.stateEvent(EventType.RoomHistoryVisibility, mx.getSafeUserId());
|
||||
|
||||
const joinRuleEvent = useStateEvent(room, StateEvent.RoomJoinRules);
|
||||
const joinRuleEvent = useStateEvent(room, EventType.RoomJoinRules);
|
||||
const content = joinRuleEvent?.getContent<RoomJoinRulesEventContent>();
|
||||
const rule: JoinRule = content?.join_rule ?? JoinRule.Invite;
|
||||
|
||||
@@ -77,7 +77,7 @@ export function RoomJoinRules({ permissions }: RoomJoinRulesProps) {
|
||||
if (joinRule === JoinRule.Restricted || joinRule === 'knock_restricted') {
|
||||
const roomParents = roomIdToParents.get(room.roomId);
|
||||
|
||||
const parents = getStateEvents(room, StateEvent.SpaceParent)
|
||||
const parents = getStateEvents(room, EventType.SpaceParent)
|
||||
.map((event) => event.getStateKey())
|
||||
.filter((parentId) => typeof parentId === 'string')
|
||||
.filter((parentId) => roomParents?.has(parentId));
|
||||
@@ -104,7 +104,7 @@ export function RoomJoinRules({ permissions }: RoomJoinRulesProps) {
|
||||
join_rule: joinRule as JoinRule,
|
||||
};
|
||||
if (allow.length > 0) c.allow = allow;
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomJoinRules as keyof StateEvents, c);
|
||||
await mx.sendStateEvent(room.roomId, EventType.RoomJoinRules as keyof StateEvents, c);
|
||||
},
|
||||
[mx, room, space, subspaces, roomIdToParents]
|
||||
)
|
||||
|
||||
@@ -17,7 +17,7 @@ import { useAtomValue } from 'jotai';
|
||||
import Linkify from 'linkify-react';
|
||||
import classNames from 'classnames';
|
||||
import type { MatrixError, StateEvents } from '$types/matrix-sdk';
|
||||
import { JoinRule } from '$types/matrix-sdk';
|
||||
import { JoinRule, EventType } from '$types/matrix-sdk';
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { SequenceCardStyle } from '$features/room-settings/styles.css';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
@@ -29,7 +29,7 @@ import { RoomAvatar, RoomIcon } from '$components/room-avatar';
|
||||
import { mxcUrlToHttp } from '$utils/matrix';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { CompactUploadCardRenderer } from '$components/upload-card';
|
||||
import { useObjectURL } from '$hooks/useObjectURL';
|
||||
import type { UploadSuccess } from '$state/upload';
|
||||
@@ -95,17 +95,19 @@ export function RoomProfileEdit({
|
||||
useCallback(
|
||||
async (roomAvatarMxc?: string | null, roomName?: string, roomTopic?: string) => {
|
||||
if (roomAvatarMxc !== undefined) {
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomAvatar as keyof StateEvents, {
|
||||
url: roomAvatarMxc,
|
||||
});
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
EventType.RoomAvatar as keyof StateEvents,
|
||||
roomAvatarMxc ? { url: roomAvatarMxc } : {}
|
||||
);
|
||||
}
|
||||
if (roomName !== undefined) {
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomName as keyof StateEvents, {
|
||||
await mx.sendStateEvent(room.roomId, EventType.RoomName as keyof StateEvents, {
|
||||
name: roomName,
|
||||
});
|
||||
}
|
||||
if (roomTopic !== undefined) {
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomTopic as keyof StateEvents, {
|
||||
await mx.sendStateEvent(room.roomId, EventType.RoomTopic as keyof StateEvents, {
|
||||
topic: roomTopic,
|
||||
});
|
||||
}
|
||||
@@ -310,9 +312,9 @@ export function RoomProfile({ permissions }: RoomProfileProps) {
|
||||
const topic = useRoomTopic(room);
|
||||
const joinRule = useRoomJoinRule(room);
|
||||
|
||||
const canEditAvatar = permissions.stateEvent(StateEvent.RoomAvatar, mx.getSafeUserId());
|
||||
const canEditName = permissions.stateEvent(StateEvent.RoomName, mx.getSafeUserId());
|
||||
const canEditTopic = permissions.stateEvent(StateEvent.RoomTopic, mx.getSafeUserId());
|
||||
const canEditAvatar = permissions.stateEvent(EventType.RoomAvatar, mx.getSafeUserId());
|
||||
const canEditName = permissions.stateEvent(EventType.RoomName, mx.getSafeUserId());
|
||||
const canEditTopic = permissions.stateEvent(EventType.RoomTopic, mx.getSafeUserId());
|
||||
const canEdit = canEditAvatar || canEditName || canEditTopic;
|
||||
|
||||
const avatarUrl = avatar
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { Box, color, Spinner, Switch, Text } from 'folds';
|
||||
import type { MatrixError, RoomJoinRulesEventContent } from '$types/matrix-sdk';
|
||||
import { JoinRule } from '$types/matrix-sdk';
|
||||
import { JoinRule, EventType } from '$types/matrix-sdk';
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { SequenceCardStyle } from '$features/room-settings/styles.css';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { useRoomDirectoryVisibility } from '$hooks/useRoomDirectoryVisibility';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import type { ExtendedJoinRules } from '$components/JoinRulesSwitcher';
|
||||
@@ -20,11 +20,8 @@ export function RoomPublish({ permissions }: RoomPublishProps) {
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
|
||||
const canEditCanonical = permissions.stateEvent(
|
||||
StateEvent.RoomCanonicalAlias,
|
||||
mx.getSafeUserId()
|
||||
);
|
||||
const joinRuleEvent = useStateEvent(room, StateEvent.RoomJoinRules);
|
||||
const canEditCanonical = permissions.stateEvent(EventType.RoomCanonicalAlias, mx.getSafeUserId());
|
||||
const joinRuleEvent = useStateEvent(room, EventType.RoomJoinRules);
|
||||
const content = joinRuleEvent?.getContent<RoomJoinRulesEventContent>();
|
||||
const rule: ExtendedJoinRules = (content?.join_rule as ExtendedJoinRules) ?? JoinRule.Invite;
|
||||
|
||||
|
||||
@@ -17,14 +17,14 @@ import {
|
||||
} from 'folds';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import type { MatrixError, RoomTombstoneEventContent } from '$types/matrix-sdk';
|
||||
import { Method } from '$types/matrix-sdk';
|
||||
import { Method, EventType } from '$types/matrix-sdk';
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { SequenceCardStyle } from '$features/room-settings/styles.css';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import type { IRoomCreateContent } from '$types/matrix/room';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { useRoomNavigate } from '$hooks/useRoomNavigate';
|
||||
@@ -167,20 +167,17 @@ export function RoomUpgrade({ permissions, requestClose }: RoomUpgradeProps) {
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
const { navigateRoom, navigateSpace } = useRoomNavigate();
|
||||
const createContent = useStateEvent(
|
||||
room,
|
||||
StateEvent.RoomCreate
|
||||
)?.getContent<IRoomCreateContent>();
|
||||
const createContent = useStateEvent(room, EventType.RoomCreate)?.getContent<IRoomCreateContent>();
|
||||
const roomVersion = createContent?.room_version ?? '1';
|
||||
const predecessorRoomId = createContent?.predecessor?.room_id;
|
||||
|
||||
const tombstoneContent = useStateEvent(
|
||||
room,
|
||||
StateEvent.RoomTombstone
|
||||
EventType.RoomTombstone
|
||||
)?.getContent<RoomTombstoneEventContent>();
|
||||
const replacementRoom = tombstoneContent?.replacement_room;
|
||||
|
||||
const canUpgrade = permissions.stateEvent(StateEvent.RoomTombstone, mx.getSafeUserId());
|
||||
const canUpgrade = permissions.stateEvent(EventType.RoomTombstone, mx.getSafeUserId());
|
||||
|
||||
const handleOpenRoom = () => {
|
||||
if (replacementRoom) {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
/* eslint-disable react/no-array-index-key */
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { Badge, Box, Button, Chip, config, Icon, Icons, Menu, Spinner, Text } from 'folds';
|
||||
import { produce } from 'immer';
|
||||
@@ -10,12 +9,13 @@ import { getPowerLevelTag, getPowers, usePowerLevelTags } from '$hooks/usePowerL
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import type { StateEvents } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { PowerSwitcher } from '$components/power';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { SequenceCardStyle } from '$features/common-settings/styles.css';
|
||||
import type { PermissionGroup } from './types';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
const USER_DEFAULT_LOCATION: PermissionLocation = {
|
||||
user: true,
|
||||
@@ -26,6 +26,9 @@ type PermissionGroupsProps = {
|
||||
powerLevels: IPowerLevels;
|
||||
permissionGroups: PermissionGroup[];
|
||||
};
|
||||
|
||||
const getPermissionLocationKey = (location: PermissionLocation): string => JSON.stringify(location);
|
||||
|
||||
export function PermissionGroups({
|
||||
powerLevels,
|
||||
permissionGroups,
|
||||
@@ -84,7 +87,7 @@ export function PermissionGroups({
|
||||
});
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.RoomPowerLevels as keyof StateEvents,
|
||||
EventType.RoomPowerLevels as keyof StateEvents,
|
||||
editedPowerLevels
|
||||
);
|
||||
}, [mx, room, powerLevels, permissionUpdate, permissionGroups])
|
||||
@@ -167,10 +170,10 @@ export function PermissionGroups({
|
||||
return (
|
||||
<>
|
||||
{renderUserGroup()}
|
||||
{permissionGroups.map((group, groupIndex) => (
|
||||
<Box key={groupIndex} direction="Column" gap="100">
|
||||
{permissionGroups.map((group) => (
|
||||
<Box key={group.name} direction="Column" gap="100">
|
||||
<Text size="L400">{group.name}</Text>
|
||||
{group.items.map((item, itemIndex) => {
|
||||
{group.items.map((item) => {
|
||||
const power = getPermissionPower(powerLevels, item.location);
|
||||
const powerUpdate = permissionUpdate.get(item.location);
|
||||
const value = powerUpdate ?? power;
|
||||
@@ -180,7 +183,7 @@ export function PermissionGroups({
|
||||
|
||||
return (
|
||||
<SequenceCard
|
||||
key={itemIndex}
|
||||
key={getPermissionLocationKey(item.location)}
|
||||
variant="SurfaceVariant"
|
||||
className={SequenceCardStyle}
|
||||
direction="Column"
|
||||
|
||||
@@ -42,13 +42,13 @@ import type { UploadSuccess } from '$state/upload';
|
||||
import { createUploadAtom } from '$state/upload';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import type { MemberPowerTag, MemberPowerTagIcon } from '$types/matrix/room';
|
||||
import type { StateEvents } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { BetaNoticeBadge } from '$components/BetaNoticeBadge';
|
||||
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
|
||||
import { creatorsSupported } from '$utils/matrix';
|
||||
import { SequenceCardStyle } from '$features/common-settings/styles.css';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
type EditPowerProps = {
|
||||
maxPower: number;
|
||||
@@ -352,7 +352,7 @@ export function PowersEditor({ powerLevels, requestClose }: Readonly<PowersEdito
|
||||
deleted.forEach((power) => {
|
||||
delete content[power];
|
||||
});
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.PowerLevelTags as keyof StateEvents, content);
|
||||
await mx.sendStateEvent(room.roomId, CustomStateEvent.PowerLevelTags, content);
|
||||
}, [mx, room, powerLevelTags, editedPowerTags, deleted])
|
||||
);
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { FormEventHandler } from 'react';
|
||||
import { useCallback, useEffect, useState } from 'react';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { MatrixError, JoinRule } from '$types/matrix-sdk';
|
||||
import { MatrixError, JoinRule, RoomType } from '$types/matrix-sdk';
|
||||
import {
|
||||
Box,
|
||||
Button,
|
||||
@@ -40,7 +40,7 @@ import {
|
||||
useAdditionalCreators,
|
||||
CreateRoomType,
|
||||
} from '$components/create-room';
|
||||
import { RoomType } from '$types/matrix/room';
|
||||
|
||||
import { CreateRoomTypeSelector } from '$components/create-room/CreateRoomTypeSelector';
|
||||
import { getRoomIconSrc } from '$utils/room';
|
||||
import { createDebugLogger } from '$utils/debugLogger';
|
||||
@@ -55,7 +55,7 @@ const getCreateRoomAccessToIcon = (access: CreateRoomAccess, type?: CreateRoomTy
|
||||
if (access === CreateRoomAccess.Restricted) joinRule = JoinRule.Restricted;
|
||||
if (access === CreateRoomAccess.Private) joinRule = JoinRule.Knock;
|
||||
|
||||
return getRoomIconSrc(Icons, isVoiceRoom ? RoomType.Call : undefined, joinRule);
|
||||
return getRoomIconSrc(Icons, isVoiceRoom ? RoomType.UnstableCall : undefined, joinRule);
|
||||
};
|
||||
|
||||
const getCreateRoomTypeToIcon = (type: CreateRoomType) => {
|
||||
@@ -142,7 +142,7 @@ export function CreateRoomForm({
|
||||
}
|
||||
|
||||
let roomType: RoomType | undefined;
|
||||
if (type === CreateRoomType.VoiceRoom) roomType = RoomType.Call;
|
||||
if (type === CreateRoomType.VoiceRoom) roomType = RoomType.UnstableCall;
|
||||
|
||||
debugLog.info('ui', 'Create room button clicked', {
|
||||
roomName,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { FormEventHandler } from 'react';
|
||||
import { useCallback, useEffect, useState } from 'react';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { MatrixError } from '$types/matrix-sdk';
|
||||
import { MatrixError, RoomType } from '$types/matrix-sdk';
|
||||
import {
|
||||
Box,
|
||||
Button,
|
||||
@@ -39,7 +39,7 @@ import {
|
||||
RoomVersionSelector,
|
||||
useAdditionalCreators,
|
||||
} from '$components/create-room';
|
||||
import { RoomType } from '$types/matrix/room';
|
||||
|
||||
import { ErrorCode } from '../../cs-errorcode';
|
||||
|
||||
const getCreateSpaceAccessToIcon = (access: CreateRoomAccess) => {
|
||||
|
||||
@@ -20,7 +20,7 @@ import type { HierarchyItem } from '$hooks/useSpaceHierarchy';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import type { MSpaceChildContent } from '$types/matrix/room';
|
||||
import type { StateEvents } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { UseStateProvider } from '$components/UseStateProvider';
|
||||
import { LeaveSpacePrompt } from '$components/leave-space-prompt';
|
||||
@@ -36,6 +36,7 @@ import { InviteUserPrompt } from '$components/invite-user-prompt';
|
||||
import { getCanonicalAliasOrRoomId } from '$utils/matrix';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { getSpaceLobbyPath } from '$pages/pathUtils';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
type HierarchyItemWithParent = HierarchyItem & {
|
||||
parentId: string;
|
||||
@@ -56,7 +57,7 @@ function SuggestMenuItem({
|
||||
const newContent: MSpaceChildContent = { ...content, suggested: !content.suggested };
|
||||
return mx.sendStateEvent(
|
||||
parentId,
|
||||
StateEvent.SpaceChild as keyof StateEvents,
|
||||
EventType.SpaceChild as keyof StateEvents,
|
||||
newContent,
|
||||
roomId
|
||||
);
|
||||
@@ -96,7 +97,7 @@ function RemoveMenuItem({
|
||||
|
||||
const [removeState, handleRemove] = useAsyncCallback(
|
||||
useCallback(
|
||||
() => mx.sendStateEvent(parentId, StateEvent.SpaceChild as keyof StateEvents, {}, roomId),
|
||||
() => mx.sendStateEvent(parentId, EventType.SpaceChild as keyof StateEvents, {}, roomId),
|
||||
[mx, parentId, roomId]
|
||||
)
|
||||
);
|
||||
|
||||
@@ -24,7 +24,7 @@ import type {
|
||||
StateEvents,
|
||||
AccountDataEvents,
|
||||
} from '$types/matrix-sdk';
|
||||
import { JoinRule, RestrictedAllowType } from '$types/matrix-sdk';
|
||||
import { JoinRule, RestrictedAllowType, EventType } from '$types/matrix-sdk';
|
||||
import { produce } from 'immer';
|
||||
import { useSpace } from '$hooks/useSpace';
|
||||
import { Page, PageContent, PageContentCenter, PageHeroSection } from '$components/page';
|
||||
@@ -50,7 +50,7 @@ import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { allRoomsAtom } from '$state/room-list/roomList';
|
||||
import { getCanonicalAliasOrRoomId, rateLimitedActions } from '$utils/matrix';
|
||||
import { getSpaceRoomPath } from '$pages/pathUtils';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { ASCIILexicalTable, orderKeys } from '$utils/ASCIILexicalTable';
|
||||
import { getStateEvent } from '$utils/room';
|
||||
import { useClosedLobbyCategoriesAtom } from '$state/hooks/closedLobbyCategories';
|
||||
@@ -61,7 +61,7 @@ import {
|
||||
} from '$hooks/useSidebarItems';
|
||||
import { useOrphanSpaces } from '$state/hooks/roomList';
|
||||
import { roomToParentsAtom } from '$state/room/roomToParents';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { useRoomMembers } from '$hooks/useRoomMembers';
|
||||
import { useGetRoom } from '$hooks/useGetRoom';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
@@ -74,6 +74,7 @@ import { useDnDMonitor } from './DnD';
|
||||
import { LobbyHero } from './LobbyHero';
|
||||
import { LobbyHeader } from './LobbyHeader';
|
||||
import { SpaceHierarchyNavItem } from './SpaceHierarchyNavItem';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
const useCanDropLobbyItem = (
|
||||
space: Room,
|
||||
@@ -103,7 +104,7 @@ const useCanDropLobbyItem = (
|
||||
|
||||
if (
|
||||
getRoom(containerSpaceId) === undefined ||
|
||||
!permissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
!permissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId())
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
@@ -129,7 +130,7 @@ const useCanDropLobbyItem = (
|
||||
const itemPermissions = getRoomPermissionsAPI(itemCreators, itemPowerLevels);
|
||||
|
||||
const canChangeJoinRuleAllow = itemPermissions.stateEvent(
|
||||
StateEvent.RoomJoinRules,
|
||||
EventType.RoomJoinRules,
|
||||
mx.getSafeUserId()
|
||||
);
|
||||
if (!canChangeJoinRuleAllow) {
|
||||
@@ -142,7 +143,7 @@ const useCanDropLobbyItem = (
|
||||
const permissions = getRoomPermissionsAPI(creators, powerLevels);
|
||||
if (
|
||||
getRoom(containerSpaceId) === undefined ||
|
||||
!permissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
!permissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId())
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
@@ -372,7 +373,7 @@ export function Lobby() {
|
||||
|
||||
const creators = getRoomCreatorsForRoomId(mx, reorder.item.parentId);
|
||||
const permissions = getRoomPermissionsAPI(creators, parentPL);
|
||||
const canEdit = permissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId());
|
||||
const canEdit = permissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId());
|
||||
return canEdit && reorder.orderKey !== currentOrders[index];
|
||||
});
|
||||
|
||||
@@ -381,7 +382,7 @@ export function Lobby() {
|
||||
if (!reorder.item || !reorder.item.parentId) return;
|
||||
await mx.sendStateEvent(
|
||||
reorder.item.parentId,
|
||||
StateEvent.SpaceChild as keyof StateEvents,
|
||||
EventType.SpaceChild as keyof StateEvents,
|
||||
{ ...reorder.item.content, order: reorder.orderKey },
|
||||
reorder.item.roomId
|
||||
);
|
||||
@@ -408,7 +409,7 @@ export function Lobby() {
|
||||
if (item.parentId !== containerParentId) {
|
||||
await mx.sendStateEvent(
|
||||
item.parentId,
|
||||
StateEvent.SpaceChild as keyof StateEvents,
|
||||
EventType.SpaceChild as keyof StateEvents,
|
||||
{},
|
||||
item.roomId
|
||||
);
|
||||
@@ -422,7 +423,7 @@ export function Lobby() {
|
||||
// restricted room from one space to another
|
||||
const joinRuleContent = getStateEvent(
|
||||
itemRoom,
|
||||
StateEvent.RoomJoinRules
|
||||
EventType.RoomJoinRules
|
||||
)?.getContent<RoomJoinRulesEventContent>();
|
||||
|
||||
if (joinRuleContent) {
|
||||
@@ -433,14 +434,10 @@ export function Lobby() {
|
||||
type: RestrictedAllowType.RoomMembership,
|
||||
room_id: containerParentId,
|
||||
});
|
||||
await mx.sendStateEvent(
|
||||
itemRoom.roomId,
|
||||
StateEvent.RoomJoinRules as keyof StateEvents,
|
||||
{
|
||||
...joinRuleContent,
|
||||
allow,
|
||||
}
|
||||
);
|
||||
await mx.sendStateEvent(itemRoom.roomId, EventType.RoomJoinRules as keyof StateEvents, {
|
||||
...joinRuleContent,
|
||||
allow,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -480,7 +477,7 @@ export function Lobby() {
|
||||
if (!reorder.item) return;
|
||||
await mx.sendStateEvent(
|
||||
containerParentId,
|
||||
StateEvent.SpaceChild as keyof StateEvents,
|
||||
EventType.SpaceChild as keyof StateEvents,
|
||||
{ ...reorder.item.content, order: reorder.orderKey },
|
||||
reorder.item.roomId
|
||||
);
|
||||
@@ -551,7 +548,10 @@ export function Lobby() {
|
||||
newItems.push(rId);
|
||||
}
|
||||
const newSpacesContent = makeCinnySpacesContent(mx, newItems);
|
||||
mx.setAccountData(AccountDataEvent.CinnySpaces as keyof AccountDataEvents, newSpacesContent);
|
||||
mx.setAccountData(
|
||||
CustomAccountDataEvent.CinnySpaces as keyof AccountDataEvents,
|
||||
newSpacesContent
|
||||
);
|
||||
},
|
||||
[mx, sidebarItems, sidebarSpaces]
|
||||
);
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
} from 'folds';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import type { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk';
|
||||
import { JoinRule } from '$types/matrix-sdk';
|
||||
import { JoinRule, KnownMembership } from '$types/matrix-sdk';
|
||||
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
@@ -31,7 +31,7 @@ import { LocalRoomSummaryLoader } from '$components/RoomSummaryLoader';
|
||||
import { UseStateProvider } from '$components/UseStateProvider';
|
||||
import { RoomTopicViewer } from '$components/room-topic-viewer';
|
||||
import { onEnterOrSpace, stopPropagation } from '$utils/keyboard';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '$utils/room';
|
||||
import { mxcUrlToHttp } from '$utils/matrix';
|
||||
@@ -364,7 +364,7 @@ export const RoomItemCard = as<'div', RoomItemCardProps>(
|
||||
const targetHandleRef = useRef<HTMLDivElement>(null);
|
||||
useDraggableItem(item, targetRef, onDragging, targetHandleRef);
|
||||
|
||||
const joined = room?.getMyMembership() === Membership.Join;
|
||||
const joined = room?.getMyMembership() === KnownMembership.Join;
|
||||
|
||||
return (
|
||||
<SequenceCard
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import type { MouseEventHandler } from 'react';
|
||||
import { forwardRef, useEffect, useMemo } from 'react';
|
||||
import type { Room, IHierarchyRoom } from '$types/matrix-sdk';
|
||||
import { MatrixError } from '$types/matrix-sdk';
|
||||
import { Box, config, Text } from 'folds';
|
||||
import type {
|
||||
HierarchyItem,
|
||||
@@ -11,7 +10,7 @@ import type {
|
||||
import { useFetchSpaceHierarchyLevel } from '$hooks/useSpaceHierarchy';
|
||||
import type { IPowerLevels } from '$hooks/usePowerLevels';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { RoomType, StateEvent } from '$types/matrix/room';
|
||||
import { ErrorCode } from '../../cs-errorcode';
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { getRoomCreatorsForRoomId } from '$hooks/useRoomCreators';
|
||||
import { getRoomPermissionsAPI } from '$hooks/useRoomPermissions';
|
||||
@@ -20,6 +19,7 @@ import type { CanDropCallback } from './DnD';
|
||||
import { AfterItemDropTarget } from './DnD';
|
||||
import { HierarchyItemMenu } from './HierarchyItemMenu';
|
||||
import { RoomItemCard } from './RoomItem';
|
||||
import { EventType, MatrixError, RoomType } from '$types/matrix-sdk';
|
||||
|
||||
type SpaceHierarchyItemProps = {
|
||||
summary: IHierarchyRoom | undefined;
|
||||
@@ -104,10 +104,10 @@ export const SpaceHierarchyItem = forwardRef<HTMLDivElement, SpaceHierarchyItemP
|
||||
let childItems: HierarchyItemRoom[] | undefined = roomItems?.filter(
|
||||
(i) => !subspaces.has(i.roomId)
|
||||
);
|
||||
if (!spacePermissions?.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())) {
|
||||
if (!spacePermissions?.stateEvent(EventType.SpaceChild, mx.getSafeUserId())) {
|
||||
// hide unknown rooms for normal user
|
||||
childItems = childItems?.filter((i) => {
|
||||
const forbidden = error instanceof MatrixError ? error.errcode === 'M_FORBIDDEN' : false;
|
||||
const forbidden = error instanceof MatrixError && error.errcode === ErrorCode.M_FORBIDDEN;
|
||||
const inaccessibleRoom = !rooms.get(i.roomId) && !fetching && (error ? forbidden : true);
|
||||
return !inaccessibleRoom;
|
||||
});
|
||||
@@ -124,10 +124,10 @@ export const SpaceHierarchyItem = forwardRef<HTMLDivElement, SpaceHierarchyItemP
|
||||
closed={closed}
|
||||
handleClose={handleClose}
|
||||
getRoom={getRoom}
|
||||
canEditChild={!!spacePermissions?.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())}
|
||||
canEditChild={!!spacePermissions?.stateEvent(EventType.SpaceChild, mx.getSafeUserId())}
|
||||
canReorder={
|
||||
parentPowerLevels && !disabledReorder && parentPermissions
|
||||
? parentPermissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
? parentPermissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId())
|
||||
: false
|
||||
}
|
||||
options={
|
||||
@@ -138,7 +138,7 @@ export const SpaceHierarchyItem = forwardRef<HTMLDivElement, SpaceHierarchyItemP
|
||||
powerLevels={spacePowerLevels}
|
||||
joined={allJoinedRooms.has(spaceItem.roomId)}
|
||||
canEditChild={
|
||||
!!parentPermissions?.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
!!parentPermissions?.stateEvent(EventType.SpaceChild, mx.getSafeUserId())
|
||||
}
|
||||
pinned={pinned}
|
||||
onTogglePin={togglePinToSidebar}
|
||||
@@ -181,7 +181,7 @@ export const SpaceHierarchyItem = forwardRef<HTMLDivElement, SpaceHierarchyItemP
|
||||
onOpen={onOpenRoom}
|
||||
getRoom={getRoom}
|
||||
canReorder={
|
||||
!!spacePermissions?.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId()) &&
|
||||
!!spacePermissions?.stateEvent(EventType.SpaceChild, mx.getSafeUserId()) &&
|
||||
!disabledReorder
|
||||
}
|
||||
options={
|
||||
@@ -190,7 +190,7 @@ export const SpaceHierarchyItem = forwardRef<HTMLDivElement, SpaceHierarchyItemP
|
||||
powerLevels={roomPowerLevels}
|
||||
joined={allJoinedRooms.has(roomItem.roomId)}
|
||||
canEditChild={
|
||||
!!spacePermissions?.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
!!spacePermissions?.stateEvent(EventType.SpaceChild, mx.getSafeUserId())
|
||||
}
|
||||
/>
|
||||
}
|
||||
|
||||
@@ -4,13 +4,14 @@ import { Box } from 'folds';
|
||||
import type { HierarchyItem, HierarchyItemSpace } from '$hooks/useSpaceHierarchy';
|
||||
import type { IPowerLevels } from '$hooks/usePowerLevels';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { getRoomCreatorsForRoomId } from '$hooks/useRoomCreators';
|
||||
import { getRoomPermissionsAPI } from '$hooks/useRoomPermissions';
|
||||
import type { CanDropCallback } from './DnD';
|
||||
import { AfterItemDropTarget } from './DnD';
|
||||
import { HierarchyItemMenu } from './HierarchyItemMenu';
|
||||
import { SpaceNavItemCard } from './SpaceNavItem';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
type SpaceHierarchyNavItemProps = {
|
||||
summary: IHierarchyRoom | undefined;
|
||||
@@ -70,7 +71,7 @@ export const SpaceHierarchyNavItem = forwardRef<HTMLDivElement, SpaceHierarchyNa
|
||||
categoryId={categoryId}
|
||||
canReorder={
|
||||
parentPowerLevels && !disabledReorder && parentPermissions
|
||||
? parentPermissions.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
? parentPermissions.stateEvent(EventType.SpaceChild, mx.getSafeUserId())
|
||||
: false
|
||||
}
|
||||
options={
|
||||
@@ -81,7 +82,7 @@ export const SpaceHierarchyNavItem = forwardRef<HTMLDivElement, SpaceHierarchyNa
|
||||
powerLevels={spacePowerLevels}
|
||||
joined={allJoinedRooms.has(spaceItem.roomId)}
|
||||
canEditChild={
|
||||
!!parentPermissions?.stateEvent(StateEvent.SpaceChild, mx.getSafeUserId())
|
||||
!!parentPermissions?.stateEvent(EventType.SpaceChild, mx.getSafeUserId())
|
||||
}
|
||||
pinned={pinned}
|
||||
onTogglePin={togglePinToSidebar}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { MouseEventHandler } from 'react';
|
||||
import { useMemo } from 'react';
|
||||
import type { IEventWithRoomId, Room } from '$types/matrix-sdk';
|
||||
import { JoinRule, RelationType } from '$types/matrix-sdk';
|
||||
import { JoinRule, RelationType, EventType } from '$types/matrix-sdk';
|
||||
import type { IImageContent } from '$types/matrix/common';
|
||||
import type { HTMLReactParserOptions } from 'html-react-parser';
|
||||
import { Avatar, Box, Chip, Header, Icon, Icons, Text, config } from 'folds';
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
|
||||
import { useMatrixEventRenderer } from '$hooks/useMatrixEventRenderer';
|
||||
import type { GetContentCallback } from '$types/matrix/room';
|
||||
import { MessageEvent, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import {
|
||||
AvatarBase,
|
||||
ImageContent,
|
||||
@@ -143,7 +143,7 @@ export function SearchResultGroup({
|
||||
|
||||
const renderMatrixEvent = useMatrixEventRenderer<[IEventWithRoomId, string, GetContentCallback]>(
|
||||
{
|
||||
[MessageEvent.RoomMessage]: (event, displayName, getContent) => {
|
||||
[EventType.RoomMessage]: (event, displayName, getContent) => {
|
||||
if (event.unsigned?.redacted_because) {
|
||||
return <RedactedContent reason={event.unsigned?.redacted_because.content.reason} />;
|
||||
}
|
||||
@@ -163,7 +163,7 @@ export function SearchResultGroup({
|
||||
/>
|
||||
);
|
||||
},
|
||||
[MessageEvent.Reaction]: (event, displayName, getContent) => {
|
||||
[EventType.Reaction]: (event, displayName, getContent) => {
|
||||
if (event.unsigned?.redacted_because) {
|
||||
return <RedactedContent reason={event.unsigned?.redacted_because.content.reason} />;
|
||||
}
|
||||
@@ -181,7 +181,7 @@ export function SearchResultGroup({
|
||||
/>
|
||||
);
|
||||
},
|
||||
[StateEvent.RoomTombstone]: (event) => {
|
||||
[EventType.RoomTombstone]: (event) => {
|
||||
const { content } = event;
|
||||
return (
|
||||
<Box grow="Yes" direction="Column">
|
||||
|
||||
@@ -25,13 +25,14 @@ import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { useStateEventCallback } from '$hooks/useStateEventCallback';
|
||||
import { useForceUpdate } from '$hooks/useForceUpdate';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import type { MatrixError, StateEvents } from '$types/matrix-sdk';
|
||||
import type { MatrixError } from '$types/matrix-sdk';
|
||||
import type { AbbreviationEntry, RoomAbbreviationsContent } from '$utils/abbreviations';
|
||||
import { getAllParents, getStateEvent } from '$utils/room';
|
||||
import { roomToParentsAtom } from '$state/room/roomToParents';
|
||||
import { SequenceCardStyle } from '$features/common-settings/styles.css';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
type AbbreviationsProps = {
|
||||
requestClose: () => void;
|
||||
@@ -46,7 +47,7 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps)
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const userId = mx.getUserId() ?? '';
|
||||
|
||||
const stateEvent = useStateEvent(room, StateEvent.RoomAbbreviations);
|
||||
const stateEvent = useStateEvent(room, CustomStateEvent.RoomAbbreviations);
|
||||
const content = stateEvent?.getContent<RoomAbbreviationsContent>();
|
||||
const entries: AbbreviationEntry[] = Array.isArray(content?.entries) ? content.entries : [];
|
||||
|
||||
@@ -58,7 +59,7 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps)
|
||||
mx,
|
||||
useCallback(
|
||||
(event) => {
|
||||
if (event.getType() !== (StateEvent.RoomAbbreviations as string)) return;
|
||||
if (event.getType() !== (CustomStateEvent.RoomAbbreviations as string)) return;
|
||||
const eventRoomId = event.getRoomId();
|
||||
if (eventRoomId && getAllParents(roomToParents, room.roomId).has(eventRoomId)) {
|
||||
forceAncestorUpdate();
|
||||
@@ -75,7 +76,7 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps)
|
||||
(groups, parentId) => {
|
||||
const parentRoom = mx.getRoom(parentId);
|
||||
if (!parentRoom) return groups;
|
||||
const ev = getStateEvent(parentRoom, StateEvent.RoomAbbreviations);
|
||||
const ev = getStateEvent(parentRoom, CustomStateEvent.RoomAbbreviations);
|
||||
const c = ev?.getContent<RoomAbbreviationsContent>();
|
||||
const parentEntries: AbbreviationEntry[] = Array.isArray(c?.entries) ? c.entries : [];
|
||||
if (parentEntries.length > 0) {
|
||||
@@ -95,18 +96,13 @@ export function RoomAbbreviations({ requestClose, isSpace }: AbbreviationsProps)
|
||||
[ancestorGroups]
|
||||
);
|
||||
|
||||
const canEdit = permissions.stateEvent(StateEvent.RoomAbbreviations, userId);
|
||||
const canEdit = permissions.stateEvent(CustomStateEvent.RoomAbbreviations, userId);
|
||||
|
||||
const [saveState, saveAbbreviations] = useAsyncCallback<void, MatrixError, [AbbreviationEntry[]]>(
|
||||
useCallback(
|
||||
async (newEntries) => {
|
||||
const newContent: RoomAbbreviationsContent = { entries: newEntries };
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.RoomAbbreviations as keyof StateEvents,
|
||||
newContent,
|
||||
''
|
||||
);
|
||||
await mx.sendStateEvent(room.roomId, CustomStateEvent.RoomAbbreviations, newContent, '');
|
||||
},
|
||||
[mx, room.roomId]
|
||||
)
|
||||
|
||||
@@ -4,11 +4,13 @@ import { Page, PageContent, PageHeader } from '$components/page';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { usePowerLevels } from '$hooks/usePowerLevels';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { PermissionGroups, Powers, PowersEditor } from '$features/common-settings/permissions';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { usePermissionGroups } from './usePermissionItems';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
type PermissionsProps = {
|
||||
requestClose: () => void;
|
||||
@@ -21,8 +23,8 @@ export function Permissions({ requestClose }: PermissionsProps) {
|
||||
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
|
||||
const canEditPowers = permissions.stateEvent(StateEvent.PowerLevelTags, mx.getSafeUserId());
|
||||
const canEditPermissions = permissions.stateEvent(StateEvent.RoomPowerLevels, mx.getSafeUserId());
|
||||
const canEditPowers = permissions.stateEvent(CustomStateEvent.PowerLevelTags, mx.getSafeUserId());
|
||||
const canEditPermissions = permissions.stateEvent(EventType.RoomPowerLevels, mx.getSafeUserId());
|
||||
const permissionGroups = usePermissionGroups(room.isCallRoom());
|
||||
|
||||
const [powerEditor, setPowerEditor] = useState(false);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { useMemo } from 'react';
|
||||
import { MessageEvent, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import type { PermissionGroup } from '$features/common-settings/permissions';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
const groups: PermissionGroup[] = useMemo(() => {
|
||||
@@ -9,19 +11,19 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
items: [
|
||||
{
|
||||
location: {
|
||||
key: MessageEvent.RoomMessage,
|
||||
key: EventType.RoomMessage,
|
||||
},
|
||||
name: 'Send Messages',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
key: MessageEvent.Sticker,
|
||||
key: EventType.Sticker,
|
||||
},
|
||||
name: 'Send Stickers',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
key: MessageEvent.Reaction,
|
||||
key: EventType.Reaction,
|
||||
},
|
||||
name: 'Send Reactions',
|
||||
},
|
||||
@@ -35,7 +37,7 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomPinnedEvents,
|
||||
key: EventType.RoomPinnedEvents,
|
||||
},
|
||||
name: 'Pin Messages',
|
||||
},
|
||||
@@ -52,7 +54,7 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.GroupCallMemberPrefix,
|
||||
key: EventType.GroupCallMemberPrefix,
|
||||
},
|
||||
name: 'Join Call',
|
||||
},
|
||||
@@ -92,7 +94,7 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
},
|
||||
{
|
||||
location: {
|
||||
key: MessageEvent.RoomRedaction,
|
||||
key: EventType.RoomRedaction,
|
||||
},
|
||||
name: 'Delete Self Messages',
|
||||
},
|
||||
@@ -105,21 +107,21 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomAvatar,
|
||||
key: EventType.RoomAvatar,
|
||||
},
|
||||
name: 'Room Avatar',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomName,
|
||||
key: EventType.RoomName,
|
||||
},
|
||||
name: 'Room Name',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomTopic,
|
||||
key: EventType.RoomTopic,
|
||||
},
|
||||
name: 'Room Topic',
|
||||
},
|
||||
@@ -132,49 +134,49 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomJoinRules,
|
||||
key: EventType.RoomJoinRules,
|
||||
},
|
||||
name: 'Change Room Access',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomCanonicalAlias,
|
||||
key: EventType.RoomCanonicalAlias,
|
||||
},
|
||||
name: 'Publish Address',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomPowerLevels,
|
||||
key: EventType.RoomPowerLevels,
|
||||
},
|
||||
name: 'Change All Permission',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.PowerLevelTags,
|
||||
key: CustomStateEvent.PowerLevelTags,
|
||||
},
|
||||
name: 'Edit Power Levels',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomEncryption,
|
||||
key: EventType.RoomEncryption,
|
||||
},
|
||||
name: 'Enable Encryption',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomHistoryVisibility,
|
||||
key: EventType.RoomHistoryVisibility,
|
||||
},
|
||||
name: 'History Visibility',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomTombstone,
|
||||
key: EventType.RoomTombstone,
|
||||
},
|
||||
name: 'Upgrade Room',
|
||||
},
|
||||
@@ -193,14 +195,14 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.PoniesRoomEmotes,
|
||||
key: CustomStateEvent.PoniesRoomEmotes,
|
||||
},
|
||||
name: 'Manage Emojis & Stickers',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomServerAcl,
|
||||
key: EventType.RoomServerAcl,
|
||||
},
|
||||
name: 'Change Server ACLs',
|
||||
},
|
||||
|
||||
@@ -7,6 +7,7 @@ import type {
|
||||
MatrixEvent,
|
||||
Room,
|
||||
IEventRelation,
|
||||
RoomMessageEventContent,
|
||||
StickerEventContent,
|
||||
} from '$types/matrix-sdk';
|
||||
import { EventType, MsgType, RelationType } from '$types/matrix-sdk';
|
||||
@@ -112,7 +113,7 @@ import {
|
||||
} from '$utils/delayedEvents';
|
||||
import { timeHourMinute, timeDayMonthYear } from '$utils/time';
|
||||
import { stopPropagation } from '$utils/keyboard';
|
||||
import { MessageEvent } from '$types/matrix/room';
|
||||
|
||||
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
@@ -266,7 +267,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
const powerLevels = usePowerLevelsContext();
|
||||
const creators = useRoomCreators(room);
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canSendReaction = permissions.event(MessageEvent.Reaction, mx.getSafeUserId());
|
||||
const canSendReaction = permissions.event(EventType.Reaction, mx.getSafeUserId());
|
||||
|
||||
const [msgDraft, setMsgDraft] = useAtom(roomIdToMsgDraftAtomFamily(draftKey));
|
||||
const [replyDraft, setReplyDraft] = useAtom(roomIdToReplyDraftAtomFamily(draftKey));
|
||||
@@ -607,8 +608,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
await Promise.all(
|
||||
contents.map((content) =>
|
||||
mx
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
.sendMessage(roomId, threadRootId ?? null, content as any)
|
||||
.sendMessage(roomId, threadRootId ?? null, content as RoomMessageEventContent)
|
||||
.then((res: { event_id: string }) => {
|
||||
debugLog.info('message', 'Uploaded file message sent', {
|
||||
roomId,
|
||||
@@ -644,9 +644,9 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
.findLast((event) =>
|
||||
(
|
||||
[
|
||||
MessageEvent.RoomMessage,
|
||||
MessageEvent.RoomMessageEncrypted,
|
||||
MessageEvent.Sticker,
|
||||
EventType.RoomMessage,
|
||||
EventType.RoomMessageEncrypted,
|
||||
EventType.Sticker,
|
||||
] as string[]
|
||||
).includes(event.getType())
|
||||
);
|
||||
@@ -791,7 +791,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
const formattedBody = customHtml;
|
||||
const mentionData = getMentions(mx, roomId, editor);
|
||||
|
||||
const content: IContent = {
|
||||
const content: IContent & Pick<RoomMessageEventContent, 'msgtype' | 'body'> = {
|
||||
msgtype: msgType,
|
||||
body,
|
||||
};
|
||||
@@ -883,7 +883,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
if (isEncrypted) {
|
||||
await sendDelayedMessageE2EE(mx, roomId, room, content, delayMs);
|
||||
} else {
|
||||
await sendDelayedMessage(mx, roomId, content, delayMs);
|
||||
await sendDelayedMessage(mx, roomId, content as RoomMessageEventContent, delayMs);
|
||||
}
|
||||
invalidate();
|
||||
setEditingScheduledDelayId(null);
|
||||
@@ -899,8 +899,11 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
roomId,
|
||||
scheduledDelayId: editingScheduledDelayId,
|
||||
});
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const res = await mx.sendMessage(roomId, threadRootId ?? null, content as any);
|
||||
const res = await mx.sendMessage(
|
||||
roomId,
|
||||
threadRootId ?? null,
|
||||
content as RoomMessageEventContent
|
||||
);
|
||||
debugLog.info('message', 'Message sent successfully', {
|
||||
roomId,
|
||||
eventId: res.event_id,
|
||||
@@ -920,8 +923,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
resetInput();
|
||||
debugLog.info('message', 'Sending message', {
|
||||
roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
msgtype: (content as any).msgtype,
|
||||
msgtype: content.msgtype,
|
||||
});
|
||||
Sentry.startSpan(
|
||||
{
|
||||
@@ -929,8 +931,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
op: 'matrix.message',
|
||||
attributes: { encrypted: String(isEncrypted) },
|
||||
},
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
() => mx.sendMessage(roomId, threadRootId ?? null, content as any)
|
||||
() => mx.sendMessage(roomId, threadRootId ?? null, content as RoomMessageEventContent)
|
||||
)
|
||||
.then((res: { event_id: string }) => {
|
||||
debugLog.info('message', 'Message sent successfully', {
|
||||
|
||||
@@ -732,11 +732,11 @@ export function RoomTimeline({
|
||||
(!isReady || timelineSync.canPaginateBack || timelineSync.backwardStatus === 'loading')
|
||||
? 3
|
||||
: timelineSync.eventsLength;
|
||||
const vListIndices = useMemo(
|
||||
() => Array.from({ length: vListItemCount }, (_, i) => i),
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[vListItemCount, timelineSync.timeline]
|
||||
);
|
||||
const vListIndices = useMemo(() => {
|
||||
// Keep the cache-busting timeline identity explicit for exhaustive-deps.
|
||||
void timelineSync.timeline;
|
||||
return Array.from({ length: vListItemCount }, (_, i) => i);
|
||||
}, [vListItemCount, timelineSync.timeline]);
|
||||
|
||||
const processedEvents = useProcessedTimeline({
|
||||
items: vListIndices,
|
||||
|
||||
@@ -3,11 +3,12 @@ import { Box, Button, Spinner, Text, color } from 'folds';
|
||||
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
|
||||
import { useRoomNavigate } from '$hooks/useRoomNavigate';
|
||||
import { getViaServers } from '$plugins/via-servers';
|
||||
import { RoomInputPlaceholder } from './RoomInputPlaceholder';
|
||||
import * as css from './RoomTombstone.css';
|
||||
import { KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
type RoomTombstoneProps = { roomId: string; body?: string; replacementRoomId: string };
|
||||
export function RoomTombstone({ roomId, body, replacementRoomId }: RoomTombstoneProps) {
|
||||
@@ -41,7 +42,7 @@ export function RoomTombstone({ roomId, body, replacementRoomId }: RoomTombstone
|
||||
)}
|
||||
</Box>
|
||||
<Box shrink="No">
|
||||
{replacementRoom?.getMyMembership() === Membership.Join ||
|
||||
{replacementRoom?.getMyMembership() === KnownMembership.Join ||
|
||||
joinState.status === AsyncStatus.Success ? (
|
||||
<Button onClick={handleOpen} size="300" variant="Success" fill="Solid" radii="300">
|
||||
<Text size="B300">Open New Room</Text>
|
||||
|
||||
@@ -6,7 +6,7 @@ import { EventType } from '$types/matrix-sdk';
|
||||
import { ReactEditor } from 'slate-react';
|
||||
import { isKeyHotkey } from 'is-hotkey';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useEditor, resetEditor } from '$components/editor';
|
||||
@@ -84,7 +84,7 @@ export function RoomView({ eventId }: { eventId?: string }) {
|
||||
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const tombstoneEvent = useStateEvent(room, StateEvent.RoomTombstone);
|
||||
const tombstoneEvent = useStateEvent(room, EventType.RoomTombstone);
|
||||
const powerLevels = usePowerLevelsContext();
|
||||
const creators = useRoomCreators(room);
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ import {
|
||||
NotificationCountType,
|
||||
ThreadEvent,
|
||||
RoomEvent,
|
||||
EventType,
|
||||
} from '$types/matrix-sdk';
|
||||
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
@@ -39,7 +40,7 @@ import { PageHeader } from '$components/page';
|
||||
import { RoomAvatar, RoomIcon } from '$components/room-avatar';
|
||||
import { UseStateProvider } from '$components/UseStateProvider';
|
||||
import { RoomTopicViewer } from '$components/room-topic-viewer';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useIsDirectRoom, useRoom } from '$hooks/useRoom';
|
||||
import { useSetting } from '$state/hooks/settings';
|
||||
@@ -81,7 +82,7 @@ import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { InviteUserPrompt } from '$components/invite-user-prompt';
|
||||
import { ContainerColor } from '$styles/ContainerColor.css';
|
||||
import { useRoomWidgets } from '$hooks/useRoomWidgets';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { DirectInvitePrompt } from '$components/direct-invite-prompt';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { mDirectAtom } from '$state/mDirectList';
|
||||
@@ -93,6 +94,7 @@ import { JumpToTime } from './jump-to-time';
|
||||
import { RoomPinMenu } from './room-pin-menu';
|
||||
import * as css from './RoomViewHeader.css';
|
||||
import { RoomCallButton } from './RoomCallButton';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
const log = createLogger('RoomViewHeader');
|
||||
|
||||
@@ -366,7 +368,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
|
||||
const [alwaysShowCallButton] = useSetting(settingsAtom, 'alwaysShowCallButton');
|
||||
const shouldShowCallButton = alwaysShowCallButton || room.getJoinedMemberCount() <= 10;
|
||||
|
||||
const encryptionEvent = useStateEvent(room, StateEvent.RoomEncryption);
|
||||
const encryptionEvent = useStateEvent(room, EventType.RoomEncryption);
|
||||
const encryptedRoom = !!encryptionEvent;
|
||||
const avatarMxc = useRoomAvatar(room, direct && !customDMCards);
|
||||
const name = useRoomName(room);
|
||||
@@ -381,7 +383,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
|
||||
|
||||
const pinnedIds = useRoomPinnedEvents(room);
|
||||
const pinMarker = room
|
||||
.getAccountData(AccountDataEvent.SablePinStatus)
|
||||
.getAccountData(CustomAccountDataEvent.SablePinStatus)
|
||||
?.getContent() as PinReadMarker;
|
||||
const [unreadPinsCount, setUnreadPinsCount] = useState(0);
|
||||
const [unreadThreadsCount, setUnreadThreadsCount] = useState(0);
|
||||
@@ -526,20 +528,14 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
|
||||
|
||||
// Listen for thread updates
|
||||
const onThreadUpdate = () => checkThreadUnreads();
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.on(ThreadEvent.New as any, onThreadUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.on(ThreadEvent.Update as any, onThreadUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.on(ThreadEvent.NewReply as any, onThreadUpdate);
|
||||
room.on(ThreadEvent.New, onThreadUpdate);
|
||||
room.on(ThreadEvent.Update, onThreadUpdate);
|
||||
room.on(ThreadEvent.NewReply, onThreadUpdate);
|
||||
|
||||
return () => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.off(ThreadEvent.New as any, onThreadUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.off(ThreadEvent.Update as any, onThreadUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.off(ThreadEvent.NewReply as any, onThreadUpdate);
|
||||
room.off(ThreadEvent.New, onThreadUpdate);
|
||||
room.off(ThreadEvent.Update, onThreadUpdate);
|
||||
room.off(ThreadEvent.NewReply, onThreadUpdate);
|
||||
};
|
||||
}, [room, mx]);
|
||||
|
||||
@@ -564,7 +560,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
|
||||
if (pinnedIds.length === 0) return;
|
||||
|
||||
const hash = await getPinsHash(pinnedIds);
|
||||
await mx.setRoomAccountData(room.roomId, AccountDataEvent.SablePinStatus, {
|
||||
await mx.setRoomAccountData(room.roomId, CustomAccountDataEvent.SablePinStatus, {
|
||||
hash,
|
||||
count: pinnedIds.length,
|
||||
last_seen_id: pinnedIds.at(-1),
|
||||
|
||||
@@ -304,12 +304,9 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr
|
||||
// always be a no-op and left threadsReady=true prematurely.
|
||||
useEffect(() => {
|
||||
const onUpdate = () => forceUpdate((n) => n + 1);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.on(ThreadEvent.New as any, onUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.on(ThreadEvent.Update as any, onUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.on(ThreadEvent.NewReply as any, onUpdate);
|
||||
room.on(ThreadEvent.New, onUpdate);
|
||||
room.on(ThreadEvent.Update, onUpdate);
|
||||
room.on(ThreadEvent.NewReply, onUpdate);
|
||||
|
||||
let cancelled = false;
|
||||
const loadThreads = async () => {
|
||||
@@ -369,12 +366,9 @@ export function ThreadBrowser({ room, onOpenThread, onClose, overlay }: ThreadBr
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.off(ThreadEvent.New as any, onUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.off(ThreadEvent.Update as any, onUpdate);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
room.off(ThreadEvent.NewReply as any, onUpdate);
|
||||
room.off(ThreadEvent.New, onUpdate);
|
||||
room.off(ThreadEvent.Update, onUpdate);
|
||||
room.off(ThreadEvent.NewReply, onUpdate);
|
||||
};
|
||||
}, [room, mx]);
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
* timeline. The fix: filter first, then check.
|
||||
*/
|
||||
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
/* oxlint-disable typescript/no-explicit-any */
|
||||
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import { RelationType } from '$types/matrix-sdk';
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
RelationType,
|
||||
RoomEvent,
|
||||
ThreadEvent,
|
||||
EventType,
|
||||
} from '$types/matrix-sdk';
|
||||
import { useAtomValue, useSetAtom } from 'jotai';
|
||||
import { ReactEditor } from 'slate-react';
|
||||
@@ -35,7 +36,7 @@ import { buildAbbrReplaceTextNode } from '$components/message/RenderBody';
|
||||
import { createMentionElement, moveCursor, useEditor } from '$components/editor';
|
||||
import { useMentionClickHandler } from '$hooks/useMentionClickHandler';
|
||||
import { useSpoilerClickHandler } from '$hooks/useSpoilerClickHandler';
|
||||
import { MessageEvent, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
@@ -190,9 +191,9 @@ export function ThreadDrawer({ room, threadRootId, onClose, overlay }: ThreadDra
|
||||
const creators = useRoomCreators(room);
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canRedact = permissions.action('redact', mx.getSafeUserId());
|
||||
const canDeleteOwn = permissions.event(MessageEvent.RoomRedaction, mx.getSafeUserId());
|
||||
const canSendReaction = permissions.event(MessageEvent.Reaction, mx.getSafeUserId());
|
||||
const canPinEvent = permissions.stateEvent(StateEvent.RoomPinnedEvents, mx.getSafeUserId());
|
||||
const canDeleteOwn = permissions.event(EventType.RoomRedaction, mx.getSafeUserId());
|
||||
const canSendReaction = permissions.event(EventType.Reaction, mx.getSafeUserId());
|
||||
const canPinEvent = permissions.stateEvent(EventType.RoomPinnedEvents, mx.getSafeUserId());
|
||||
const isReadOnly = useMemo(() => {
|
||||
const myPowerLevel = powerLevels?.users?.[mx.getUserId()!] ?? powerLevels?.users_default ?? 0;
|
||||
const sendLevel = powerLevels?.events?.['m.room.message'] ?? powerLevels?.events_default ?? 0;
|
||||
|
||||
@@ -21,14 +21,14 @@ import {
|
||||
PopOut,
|
||||
} from 'folds';
|
||||
import type { MatrixError } from '$types/matrix-sdk';
|
||||
import { Direction } from '$types/matrix-sdk';
|
||||
import { Direction, EventType } from '$types/matrix-sdk';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { stopPropagation } from '$utils/keyboard';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { useStateEvent } from '$hooks/useStateEvent';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { getToday, getYesterday, timeDayMonthYear, timeHourMinute } from '$utils/time';
|
||||
import { DatePicker, TimePicker } from '$components/time-date';
|
||||
import { useSetting } from '$state/hooks/settings';
|
||||
@@ -42,7 +42,7 @@ export function JumpToTime({ onCancel, onSubmit }: JumpToTimeProps) {
|
||||
const mx = useMatrixClient();
|
||||
const room = useRoom();
|
||||
const alive = useAlive();
|
||||
const createStateEvent = useStateEvent(room, StateEvent.RoomCreate);
|
||||
const createStateEvent = useStateEvent(room, EventType.RoomCreate);
|
||||
|
||||
const todayTs = getToday();
|
||||
const yesterdayTs = getYesterday();
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import type { MatrixEvent, MatrixEventHandlerMap } from '$types/matrix-sdk';
|
||||
import { MatrixEventEvent } from '$types/matrix-sdk';
|
||||
import { MatrixEventEvent, EventType } from '$types/matrix-sdk';
|
||||
import type { ReactNode } from 'react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { MessageEvent } from '$types/matrix/room';
|
||||
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import * as Sentry from '@sentry/react';
|
||||
|
||||
@@ -14,11 +14,11 @@ type EncryptedContentProps = {
|
||||
export function EncryptedContent({ mEvent, children }: EncryptedContentProps) {
|
||||
const mx = useMatrixClient();
|
||||
const [, toggleEncrypted] = useState(
|
||||
mEvent.getType() === (MessageEvent.RoomMessageEncrypted as string)
|
||||
mEvent.getType() === (EventType.RoomMessageEncrypted as string)
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (mEvent.getType() !== (MessageEvent.RoomMessageEncrypted as string)) return;
|
||||
if (mEvent.getType() !== (EventType.RoomMessageEncrypted as string)) return;
|
||||
// Sample 5% of events for per-event decryption latency profiling
|
||||
if (Math.random() < 0.05) {
|
||||
const start = performance.now();
|
||||
@@ -33,14 +33,14 @@ export function EncryptedContent({ mEvent, children }: EncryptedContentProps) {
|
||||
}, [mx, mEvent]);
|
||||
|
||||
useEffect(() => {
|
||||
toggleEncrypted(mEvent.getType() === (MessageEvent.RoomMessageEncrypted as string));
|
||||
toggleEncrypted(mEvent.getType() === (EventType.RoomMessageEncrypted as string));
|
||||
const handleDecrypted: MatrixEventHandlerMap[MatrixEventEvent.Decrypted] = (event) => {
|
||||
if (event.isDecryptionFailure()) {
|
||||
Sentry.metrics.count('sable.decryption.failure', 1, {
|
||||
attributes: { reason: event.decryptionFailureReason ?? 'UNKNOWN_ERROR' },
|
||||
});
|
||||
}
|
||||
toggleEncrypted(event.getType() === (MessageEvent.RoomMessageEncrypted as string));
|
||||
toggleEncrypted(event.getType() === (EventType.RoomMessageEncrypted as string));
|
||||
};
|
||||
mEvent.on(MatrixEventEvent.Decrypted, handleDecrypted);
|
||||
return () => {
|
||||
|
||||
@@ -19,7 +19,7 @@ import { memo, useCallback, useRef, useState, useEffect, useMemo } from 'react';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { useHover, useFocusWithin } from 'react-aria';
|
||||
import type { MatrixEvent, Room, Relations, RoomPinnedEventsEventContent } from '$types/matrix-sdk';
|
||||
import { EventStatus, MatrixEventEvent, RoomEvent } from '$types/matrix-sdk';
|
||||
import { EventStatus, MatrixEventEvent, RoomEvent, EventType } from '$types/matrix-sdk';
|
||||
import classNames from 'classnames';
|
||||
import { useAtomValue, useSetAtom } from 'jotai';
|
||||
import {
|
||||
@@ -50,7 +50,7 @@ import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
|
||||
import { useRoomPinnedEvents } from '$hooks/useRoomPinnedEvents';
|
||||
import type { MemberPowerTag } from '$types/matrix/room';
|
||||
import type { StateEvents } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { PowerIcon } from '$components/power';
|
||||
import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag';
|
||||
import { useSableCosmetics } from '$hooks/useSableCosmetics';
|
||||
@@ -173,7 +173,7 @@ export const MessagePinItem = as<
|
||||
if (!isPinned && eventId) {
|
||||
pinContent.pinned.push(eventId);
|
||||
}
|
||||
mx.sendStateEvent(room.roomId, StateEvent.RoomPinnedEvents as keyof StateEvents, pinContent);
|
||||
mx.sendStateEvent(room.roomId, EventType.RoomPinnedEvents as keyof StateEvents, pinContent);
|
||||
onClose?.();
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Descendant } from 'slate';
|
||||
import type { Descendant } from 'slate';
|
||||
import {
|
||||
hasSettingsLinksToRewriteInDescendants,
|
||||
rewriteSettingsLinksInDescendants,
|
||||
|
||||
@@ -52,7 +52,7 @@ import {
|
||||
} from '$utils/room';
|
||||
import type { GetContentCallback } from '$types/matrix/room';
|
||||
import type { StateEvents } from '$types/matrix-sdk';
|
||||
import { MessageEvent, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useMentionClickHandler } from '$hooks/useMentionClickHandler';
|
||||
import { useSpoilerClickHandler } from '$hooks/useSpoilerClickHandler';
|
||||
import { useSettingsLinkBaseUrl } from '$features/settings/useSettingsLinkBaseUrl';
|
||||
@@ -89,11 +89,13 @@ import {
|
||||
} from '$hooks/useMemberPowerTag';
|
||||
import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag';
|
||||
import { nicknamesAtom } from '$state/nicknames';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { useSableCosmetics } from '$hooks/useSableCosmetics';
|
||||
import { EncryptedContent } from '$features/room/message';
|
||||
import type { PinReadMarker } from '$features/room/RoomViewHeader';
|
||||
import * as css from './RoomPinMenu.css';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
const log = createLogger('RoomPinMenu');
|
||||
|
||||
@@ -205,7 +207,7 @@ function PinnedMessage(props: PinnedMessageProps) {
|
||||
|
||||
const [unpinState, unpin] = useAsyncCallback(
|
||||
useCallback(() => {
|
||||
const pinEvent = getStateEvent(room, StateEvent.RoomPinnedEvents);
|
||||
const pinEvent = getStateEvent(room, EventType.RoomPinnedEvents);
|
||||
const content = pinEvent?.getContent<RoomPinnedEventsEventContent>() ?? { pinned: [] };
|
||||
const newContent: RoomPinnedEventsEventContent = {
|
||||
pinned: content.pinned.filter((id: string) => id !== eventId),
|
||||
@@ -213,7 +215,7 @@ function PinnedMessage(props: PinnedMessageProps) {
|
||||
|
||||
return mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.RoomPinnedEvents as keyof StateEvents,
|
||||
EventType.RoomPinnedEvents as keyof StateEvents,
|
||||
newContent
|
||||
);
|
||||
}, [room, eventId, mx])
|
||||
@@ -298,7 +300,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
const creators = useRoomCreators(room);
|
||||
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canPinEvent = permissions.stateEvent(StateEvent.RoomPinnedEvents, userId);
|
||||
const canPinEvent = permissions.stateEvent(EventType.RoomPinnedEvents, userId);
|
||||
|
||||
const creatorsTag = useRoomCreatorsTag();
|
||||
const powerLevelTags = usePowerLevelTags(room, powerLevels);
|
||||
@@ -324,7 +326,8 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
const scrollRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const pinMarker = useMemo(
|
||||
() => room.getAccountData(AccountDataEvent.SablePinStatus)?.getContent() as PinReadMarker,
|
||||
() =>
|
||||
room.getAccountData(CustomAccountDataEvent.SablePinStatus)?.getContent() as PinReadMarker,
|
||||
[room]
|
||||
);
|
||||
|
||||
@@ -386,7 +389,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
|
||||
const renderMatrixEvent = useMatrixEventRenderer<[MatrixEvent, string, GetContentCallback]>(
|
||||
{
|
||||
[MessageEvent.RoomMessage]: (event, displayName, getContent) => {
|
||||
[EventType.RoomMessage]: (event, displayName, getContent) => {
|
||||
if (event.isRedacted()) {
|
||||
const unsigned = event.getUnsigned();
|
||||
const redactionContent = unsigned.redacted_because?.content as
|
||||
@@ -410,7 +413,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
/>
|
||||
);
|
||||
},
|
||||
[MessageEvent.RoomMessageEncrypted]: (event, displayName) => {
|
||||
[EventType.RoomMessageEncrypted]: (event, displayName) => {
|
||||
const eventId = event.getId()!;
|
||||
const evtTimeline = room.getTimelineForEvent(eventId);
|
||||
|
||||
@@ -430,8 +433,12 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
return (
|
||||
<EncryptedContent mEvent={mEvent}>
|
||||
{() => {
|
||||
const eventType = mEvent.getType();
|
||||
const stickerEventType: string = EventType.Sticker;
|
||||
const roomMessageEventType: string = EventType.RoomMessage;
|
||||
const encryptedMessageEventType: string = EventType.RoomMessageEncrypted;
|
||||
if (mEvent.isRedacted()) return <RedactedContent />;
|
||||
if ((mEvent.getType() as MessageEvent) === MessageEvent.Sticker)
|
||||
if (eventType === stickerEventType)
|
||||
return (
|
||||
<MSticker
|
||||
content={mEvent.getContent()}
|
||||
@@ -445,7 +452,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
)}
|
||||
/>
|
||||
);
|
||||
if ((mEvent.getType() as MessageEvent) === MessageEvent.RoomMessage) {
|
||||
if (eventType === roomMessageEventType) {
|
||||
const editedEvent = getEditedEvent(eventId, mEvent, evtTimeline.getTimelineSet());
|
||||
const getContent = (() => {
|
||||
const eventContent = mEvent.getContent();
|
||||
@@ -470,7 +477,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
/>
|
||||
);
|
||||
}
|
||||
if ((mEvent.getType() as MessageEvent) === MessageEvent.RoomMessageEncrypted)
|
||||
if (eventType === encryptedMessageEventType)
|
||||
return (
|
||||
<Text>
|
||||
<MessageNotDecryptedContent />
|
||||
@@ -485,7 +492,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
|
||||
</EncryptedContent>
|
||||
);
|
||||
},
|
||||
[MessageEvent.Sticker]: (event, _displayName, getContent) => {
|
||||
[EventType.Sticker]: (event, _displayName, getContent) => {
|
||||
if (event.isRedacted()) {
|
||||
const unsigned = event.getUnsigned();
|
||||
const redactionContent = unsigned.redacted_because?.content as
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { find as findLinks } from 'linkifyjs';
|
||||
import { Descendant, Text } from 'slate';
|
||||
import type { Descendant } from 'slate';
|
||||
import { Text } from 'slate';
|
||||
import type {
|
||||
BlockQuoteElement,
|
||||
FormattedText,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { Box, Button, Text, Avatar, config, Icon, IconButton, Icons, Input } from 'folds';
|
||||
import type { MatrixClient } from 'matrix-js-sdk';
|
||||
import type { MatrixClient } from '$types/matrix-sdk';
|
||||
import { useCallback, useMemo, useState } from 'react';
|
||||
import { mxcUrlToHttp } from '$utils/matrix';
|
||||
import { useFilePicker } from '$hooks/useFilePicker';
|
||||
|
||||
@@ -25,7 +25,7 @@ vi.mock('$hooks/useMediaAuthentication', () => ({
|
||||
}));
|
||||
|
||||
vi.mock('$state/hooks/settings', () => ({
|
||||
useSetting: () => [true, vi.fn()] as const,
|
||||
useSetting: () => [true, vi.fn<() => void>()] as const,
|
||||
}));
|
||||
|
||||
vi.mock('$state/settings', () => ({
|
||||
|
||||
@@ -6,10 +6,10 @@ import { Profile } from './Profile';
|
||||
|
||||
const mockMatrixClient = {
|
||||
getUserId: () => '@alice:example.org',
|
||||
setAvatarUrl: vi.fn(),
|
||||
setDisplayName: vi.fn(),
|
||||
setExtendedProfileProperty: vi.fn(),
|
||||
setPresence: vi.fn(),
|
||||
setAvatarUrl: vi.fn<() => Promise<void>>(),
|
||||
setDisplayName: vi.fn<() => Promise<void>>(),
|
||||
setExtendedProfileProperty: vi.fn<() => Promise<void>>(),
|
||||
setPresence: vi.fn<() => Promise<void>>(),
|
||||
};
|
||||
|
||||
vi.mock('$hooks/useMatrixClient', () => ({
|
||||
@@ -38,7 +38,7 @@ vi.mock('$hooks/useUserPresence', () => ({
|
||||
}));
|
||||
|
||||
vi.mock('$hooks/useFilePicker', () => ({
|
||||
useFilePicker: () => vi.fn(),
|
||||
useFilePicker: () => vi.fn<() => void>(),
|
||||
}));
|
||||
|
||||
vi.mock('$hooks/useObjectURL', () => ({
|
||||
@@ -55,7 +55,7 @@ vi.mock('$hooks/useAsyncCallback', () => ({
|
||||
useAsyncCallback: (callback: (...args: unknown[]) => unknown) => [
|
||||
{ status: 'idle' },
|
||||
callback,
|
||||
vi.fn(),
|
||||
vi.fn<() => void>(),
|
||||
],
|
||||
}));
|
||||
|
||||
@@ -64,10 +64,10 @@ vi.mock('$components/user-avatar', () => ({
|
||||
}));
|
||||
|
||||
vi.mock('jotai', async () => {
|
||||
const actual = await vi.importActual<typeof import('jotai')>('jotai');
|
||||
const actual = (await vi.importActual('jotai')) as object;
|
||||
return {
|
||||
...actual,
|
||||
useSetAtom: () => vi.fn(),
|
||||
useSetAtom: () => vi.fn<() => void>(),
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import { SequenceCard } from '$components/sequence-card';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { getClientSyncDiagnostics } from '$client/initMatrix';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { Direction, EventType, NotificationCountType } from '$types/matrix-sdk';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
import { Direction, EventType, NotificationCountType, KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
import { SequenceCardStyle } from '$features/settings/styles.css';
|
||||
import { getUnreadInfo, isNotificationEvent } from '$utils/room';
|
||||
|
||||
@@ -39,8 +39,8 @@ const getRoomRenderingDiagnostics = (rooms: Room[]): RoomRenderingDiagnostics =>
|
||||
|
||||
rooms.forEach((room) => {
|
||||
const membership = room.getMyMembership();
|
||||
if (membership === (Membership.Join as string)) joinedRooms += 1;
|
||||
if (membership === (Membership.Invite as string)) inviteRooms += 1;
|
||||
if (membership === (KnownMembership.Join as string)) joinedRooms += 1;
|
||||
if (membership === (KnownMembership.Invite as string)) inviteRooms += 1;
|
||||
|
||||
if (!room.name || room.name.trim().length === 0) roomsMissingName += 1;
|
||||
|
||||
@@ -70,7 +70,9 @@ const getUnreadDriftRooms = (mx: ReturnType<typeof useMatrixClient>): UnreadDrif
|
||||
|
||||
return mx
|
||||
.getRooms()
|
||||
.filter((room) => !room.isSpaceRoom() && room.getMyMembership() === (Membership.Join as string))
|
||||
.filter(
|
||||
(room) => !room.isSpaceRoom() && room.getMyMembership() === (KnownMembership.Join as string)
|
||||
)
|
||||
.reduce<UnreadDriftRoom[]>((driftRooms, room) => {
|
||||
const reconciledUnread = getUnreadInfo(room);
|
||||
const sdkTotal = room.getUnreadNotificationCount(NotificationCountType.Total);
|
||||
|
||||
@@ -2,6 +2,7 @@ import { render, screen, within } from '@testing-library/react';
|
||||
import { describe, expect, it, vi } from 'vitest';
|
||||
import { ScreenSize, ScreenSizeProvider } from '$hooks/useScreenSize';
|
||||
import { SettingsLinkProvider } from '$features/settings/SettingsLinkContext';
|
||||
import type { ImagePack } from '$plugins/custom-emoji';
|
||||
import { GlobalPacks } from './GlobalPacks';
|
||||
|
||||
const globalPack = {
|
||||
@@ -31,12 +32,12 @@ vi.mock('$hooks/useMatrixClient', () => ({
|
||||
useMatrixClient: () => ({
|
||||
getRoom: () => undefined,
|
||||
getAccountData: () => undefined,
|
||||
setAccountData: vi.fn(),
|
||||
setAccountData: vi.fn<() => Promise<void>>(),
|
||||
}),
|
||||
}));
|
||||
|
||||
vi.mock('jotai', async () => {
|
||||
const actual = await vi.importActual<typeof import('jotai')>('jotai');
|
||||
const actual = (await vi.importActual('jotai')) as object;
|
||||
return {
|
||||
...actual,
|
||||
useAtomValue: () => [],
|
||||
@@ -48,7 +49,7 @@ describe('GlobalPacks', () => {
|
||||
const { container } = render(
|
||||
<ScreenSizeProvider value={ScreenSize.Desktop}>
|
||||
<SettingsLinkProvider value={{ section: 'emojis', baseUrl: 'https://app.example' }}>
|
||||
<GlobalPacks onViewPack={vi.fn()} />
|
||||
<GlobalPacks onViewPack={vi.fn<(imagePack: ImagePack) => void>()} />
|
||||
</SettingsLinkProvider>
|
||||
</ScreenSizeProvider>
|
||||
);
|
||||
|
||||
@@ -36,10 +36,11 @@ import type { EmoteRoomsContent, ImagePack, PackAddress } from '$plugins/custom-
|
||||
import { ImageUsage, packAddressEqual } from '$plugins/custom-emoji';
|
||||
import { LineClamp2 } from '$styles/Text.css';
|
||||
import { allRoomsAtom } from '$state/room-list/roomList';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { stopPropagation } from '$utils/keyboard';
|
||||
import { SequenceCardStyle } from '$features/settings/styles.css';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
function GlobalPackSelector({
|
||||
packs,
|
||||
@@ -307,7 +308,9 @@ export function GlobalPacks({ onViewPack }: GlobalPacksProps) {
|
||||
const [applyState, applyChanges] = useAsyncCallback(
|
||||
useCallback(async () => {
|
||||
const content =
|
||||
mx.getAccountData(AccountDataEvent.PoniesEmoteRooms)?.getContent<EmoteRoomsContent>() ?? {};
|
||||
mx
|
||||
.getAccountData(CustomAccountDataEvent.PoniesEmoteRooms)
|
||||
?.getContent<EmoteRoomsContent>() ?? {};
|
||||
const updatedContent: EmoteRoomsContent = JSON.parse(JSON.stringify(content));
|
||||
|
||||
selectedPacks.forEach((addr) => {
|
||||
@@ -324,7 +327,7 @@ export function GlobalPacks({ onViewPack }: GlobalPacksProps) {
|
||||
}
|
||||
});
|
||||
|
||||
await mx.setAccountData(AccountDataEvent.PoniesEmoteRooms, updatedContent);
|
||||
await mx.setAccountData(CustomAccountDataEvent.PoniesEmoteRooms, updatedContent);
|
||||
}, [mx, selectedPacks, removedPacks])
|
||||
);
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { useCallback, useMemo } from 'react';
|
||||
import { Badge, Box, Text } from 'folds';
|
||||
import type { IPushRules, PushRuleCondition } from '$types/matrix-sdk';
|
||||
import { ConditionKind, PushRuleKind, RuleId } from '$types/matrix-sdk';
|
||||
import { ConditionKind, PushRuleKind, RuleId, EventType } from '$types/matrix-sdk';
|
||||
import { useAccountData } from '$hooks/useAccountData';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { SettingMenuSelector } from '$components/setting-menu-selector';
|
||||
@@ -88,7 +88,7 @@ function AllMessagesModeSwitcher({
|
||||
}
|
||||
|
||||
export function AllMessagesNotifications() {
|
||||
const pushRulesEvt = useAccountData(AccountDataEvent.PushRules);
|
||||
const pushRulesEvt = useAccountData(EventType.PushRules);
|
||||
const pushRules = useMemo(
|
||||
() => pushRulesEvt?.getContent<IPushRules>() ?? { global: {} },
|
||||
[pushRulesEvt]
|
||||
|
||||
@@ -23,9 +23,9 @@ vi.mock('$hooks/useAccountData', () => ({
|
||||
|
||||
vi.mock('$hooks/useMatrixClient', () => ({
|
||||
useMatrixClient: () => ({
|
||||
addPushRule: vi.fn(),
|
||||
deletePushRule: vi.fn(),
|
||||
setPushRuleActions: vi.fn(),
|
||||
addPushRule: vi.fn<() => Promise<void>>(),
|
||||
deletePushRule: vi.fn<() => Promise<void>>(),
|
||||
setPushRuleActions: vi.fn<() => Promise<void>>(),
|
||||
}),
|
||||
}));
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import type { ChangeEventHandler, FormEventHandler } from 'react';
|
||||
import { useCallback, useMemo, useState } from 'react';
|
||||
import type { IPushRule, IPushRules } from '$types/matrix-sdk';
|
||||
import { PushRuleKind } from '$types/matrix-sdk';
|
||||
import { PushRuleKind, EventType } from '$types/matrix-sdk';
|
||||
import { Box, Text, Badge, Button, Input, config, IconButton, Icons, Icon, Spinner } from 'folds';
|
||||
import { useAccountData } from '$hooks/useAccountData';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { SettingMenuSelector } from '$components/setting-menu-selector';
|
||||
@@ -161,7 +161,7 @@ function KeywordModeSwitcher({ pushRule }: PushRulesProps) {
|
||||
}
|
||||
|
||||
export function KeywordMessagesNotifications() {
|
||||
const pushRulesEvt = useAccountData(AccountDataEvent.PushRules);
|
||||
const pushRulesEvt = useAccountData(EventType.PushRules);
|
||||
const pushRules = useMemo(
|
||||
() => pushRulesEvt?.getContent<IPushRules>() ?? { global: {} },
|
||||
[pushRulesEvt]
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { useCallback, useMemo } from 'react';
|
||||
import type { IPushRules } from '$types/matrix-sdk';
|
||||
import { ConditionKind, PushRuleKind, RuleId } from '$types/matrix-sdk';
|
||||
import { ConditionKind, PushRuleKind, RuleId, EventType } from '$types/matrix-sdk';
|
||||
import { Box, Text, Badge } from 'folds';
|
||||
import { useAccountData } from '$hooks/useAccountData';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { SequenceCard } from '$components/sequence-card';
|
||||
import { SettingTile } from '$components/setting-tile';
|
||||
import { SettingMenuSelector } from '$components/setting-menu-selector';
|
||||
@@ -130,7 +130,7 @@ export function SpecialMessagesNotifications() {
|
||||
const mx = useMatrixClient();
|
||||
const userId = mx.getUserId()!;
|
||||
const { displayName } = useUserProfile(userId);
|
||||
const pushRulesEvt = useAccountData(AccountDataEvent.PushRules);
|
||||
const pushRulesEvt = useAccountData(EventType.PushRules);
|
||||
const pushRules = useMemo(
|
||||
() => pushRulesEvt?.getContent<IPushRules>() ?? { global: {} },
|
||||
[pushRulesEvt]
|
||||
|
||||
@@ -243,7 +243,7 @@ const withSettingsLinkAction = (path: string): string => {
|
||||
const parseSettingsAppPath = (appPath: string): SettingsLink | undefined => {
|
||||
if (!appPath.startsWith('/settings/')) return undefined;
|
||||
|
||||
const [pathname, search = ''] = appPath.split('?');
|
||||
const [pathname = '', search = ''] = appPath.split('?');
|
||||
const sectionMatch = pathname.match(/^\/settings\/([^/]+)\/?$/);
|
||||
if (!sectionMatch) return undefined;
|
||||
|
||||
@@ -306,7 +306,7 @@ const getCrossBaseSettingsAppPathFromHref = (href: string): string | undefined =
|
||||
const hashPath = target.hash.startsWith('#') ? target.hash.slice(1) : target.hash;
|
||||
if (!hashPath) return undefined;
|
||||
|
||||
const [hashPathname, hashSearch = ''] = hashPath.split('?');
|
||||
const [hashPathname = '', hashSearch = ''] = hashPath.split('?');
|
||||
return getCrossBaseSettingsAppPath(hashPathname, hashSearch);
|
||||
};
|
||||
|
||||
|
||||
@@ -4,11 +4,13 @@ import { Page, PageContent, PageHeader } from '$components/page';
|
||||
import { useRoom } from '$hooks/useRoom';
|
||||
import { usePowerLevels } from '$hooks/usePowerLevels';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { PermissionGroups, Powers, PowersEditor } from '$features/common-settings/permissions';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { usePermissionGroups } from './usePermissionItems';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
type PermissionsProps = {
|
||||
requestClose: () => void;
|
||||
@@ -21,8 +23,8 @@ export function Permissions({ requestClose }: PermissionsProps) {
|
||||
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
|
||||
const canEditPowers = permissions.stateEvent(StateEvent.PowerLevelTags, mx.getSafeUserId());
|
||||
const canEditPermissions = permissions.stateEvent(StateEvent.RoomPowerLevels, mx.getSafeUserId());
|
||||
const canEditPowers = permissions.stateEvent(CustomStateEvent.PowerLevelTags, mx.getSafeUserId());
|
||||
const canEditPermissions = permissions.stateEvent(EventType.RoomPowerLevels, mx.getSafeUserId());
|
||||
const permissionGroups = usePermissionGroups();
|
||||
|
||||
const [powerEditor, setPowerEditor] = useState(false);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { useMemo } from 'react';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import type { PermissionGroup } from '$features/common-settings/permissions';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
export const usePermissionGroups = (): PermissionGroup[] => {
|
||||
const groups: PermissionGroup[] = useMemo(() => {
|
||||
@@ -10,7 +12,7 @@ export const usePermissionGroups = (): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.SpaceChild,
|
||||
key: EventType.SpaceChild,
|
||||
},
|
||||
name: 'Manage space rooms',
|
||||
},
|
||||
@@ -54,21 +56,21 @@ export const usePermissionGroups = (): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomAvatar,
|
||||
key: EventType.RoomAvatar,
|
||||
},
|
||||
name: 'Space Avatar',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomName,
|
||||
key: EventType.RoomName,
|
||||
},
|
||||
name: 'Space Name',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomTopic,
|
||||
key: EventType.RoomTopic,
|
||||
},
|
||||
name: 'Space Topic',
|
||||
},
|
||||
@@ -81,35 +83,35 @@ export const usePermissionGroups = (): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomJoinRules,
|
||||
key: EventType.RoomJoinRules,
|
||||
},
|
||||
name: 'Change Space Access',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomCanonicalAlias,
|
||||
key: EventType.RoomCanonicalAlias,
|
||||
},
|
||||
name: 'Publish Address',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomPowerLevels,
|
||||
key: EventType.RoomPowerLevels,
|
||||
},
|
||||
name: 'Change All Permission',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.PowerLevelTags,
|
||||
key: CustomStateEvent.PowerLevelTags,
|
||||
},
|
||||
name: 'Edit Power Levels',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomTombstone,
|
||||
key: EventType.RoomTombstone,
|
||||
},
|
||||
name: 'Upgrade Space',
|
||||
},
|
||||
@@ -128,14 +130,14 @@ export const usePermissionGroups = (): PermissionGroup[] => {
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.PoniesRoomEmotes,
|
||||
key: CustomStateEvent.PoniesRoomEmotes,
|
||||
},
|
||||
name: 'Manage Emojis & Stickers',
|
||||
},
|
||||
{
|
||||
location: {
|
||||
state: true,
|
||||
key: StateEvent.RoomServerAcl,
|
||||
key: EventType.RoomServerAcl,
|
||||
},
|
||||
name: 'Change Server ACLs',
|
||||
},
|
||||
|
||||
@@ -16,7 +16,7 @@ import {
|
||||
Button,
|
||||
Line,
|
||||
} from 'folds';
|
||||
import type { Room, StateEvents } from '$types/matrix-sdk';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import type { RoomWidget } from '$hooks/useRoomWidgets';
|
||||
@@ -26,11 +26,12 @@ import { settingsAtom } from '$state/settings';
|
||||
import { usePowerLevelsContext } from '$hooks/usePowerLevels';
|
||||
import { useRoomCreators } from '$hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '$hooks/useRoomPermissions';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { createLogger } from '$utils/debug';
|
||||
import { WidgetIframe } from './WidgetIframe';
|
||||
import * as css from './WidgetsDrawer.css';
|
||||
import { IntegrationManager } from './IntegrationManager';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
type WidgetsDrawerHeaderProps = {
|
||||
activeWidget: RoomWidget | null;
|
||||
@@ -104,14 +105,14 @@ function AddWidgetForm({ room, onAdded }: AddWidgetFormProps) {
|
||||
const widgetId = `${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.RoomWidget as string as keyof StateEvents,
|
||||
CustomStateEvent.RoomWidget,
|
||||
{
|
||||
type: 'm.custom',
|
||||
url: enrichWidgetUrl(url.trim()),
|
||||
name: name.trim(),
|
||||
id: widgetId,
|
||||
creatorUserId: mx.getUserId(),
|
||||
} as StateEvents[keyof StateEvents],
|
||||
},
|
||||
widgetId
|
||||
);
|
||||
setName('');
|
||||
@@ -226,16 +227,11 @@ export function WidgetsDrawer({ room }: WidgetsDrawerProps) {
|
||||
const powerLevels = usePowerLevelsContext();
|
||||
const creators = useRoomCreators(room);
|
||||
const permissions = useRoomPermissions(creators, powerLevels);
|
||||
const canManageWidgets = permissions.stateEvent(StateEvent.RoomWidget, mx.getSafeUserId());
|
||||
const canManageWidgets = permissions.stateEvent(CustomStateEvent.RoomWidget, mx.getSafeUserId());
|
||||
|
||||
const handleRemoveWidget = async (widget: RoomWidget) => {
|
||||
try {
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
StateEvent.RoomWidget as string as keyof StateEvents,
|
||||
{} as StateEvents[keyof StateEvents],
|
||||
widget.id
|
||||
);
|
||||
await mx.sendStateEvent(room.roomId, CustomStateEvent.RoomWidget, {}, widget.id);
|
||||
if (activeWidget?.id === widget.id) {
|
||||
setActiveWidget(null);
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ import type {
|
||||
EventTimelineSet,
|
||||
} from '$types/matrix-sdk';
|
||||
import type { IImageContent } from '$types/matrix/common';
|
||||
import { NotificationCountType, RoomEvent, ThreadEvent } from '$types/matrix-sdk';
|
||||
import type { SessionMembershipData } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
|
||||
import { NotificationCountType, RoomEvent, ThreadEvent, EventType } from '$types/matrix-sdk';
|
||||
import type { SessionMembershipData } from '$types/matrix-sdk';
|
||||
import type { HTMLReactParserOptions } from 'html-react-parser';
|
||||
import type { Opts as LinkifyOpts } from 'linkifyjs';
|
||||
import { Box, Chip, Avatar, Text, Icons, config, toRem, Icon } from 'folds';
|
||||
@@ -40,7 +40,7 @@ import { RenderMessageContent } from '$components/RenderMessageContent';
|
||||
import { ClientSideHoverFreeze } from '$components/ClientSideHoverFreeze';
|
||||
import { UserAvatar } from '$components/user-avatar';
|
||||
import type { GetContentCallback } from '$types/matrix/room';
|
||||
import { MessageEvent, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { getMxIdLocalPart, mxcUrlToHttp } from '$utils/matrix';
|
||||
import {
|
||||
getEditedEvent,
|
||||
@@ -352,7 +352,7 @@ export function useTimelineEventRenderer({
|
||||
|
||||
return useMatrixEventRenderer<[string, MatrixEvent, number, EventTimelineSet, boolean]>(
|
||||
{
|
||||
[MessageEvent.RoomMessage]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.RoomMessage]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const { replyEventId: rawReplyEventId, threadRootId } = mEvent;
|
||||
// In the thread drawer (hideThreadChip=true), suppress reply headers for events
|
||||
// that only have m.in_reply_to as a non-thread-client fallback (is_falling_back: true).
|
||||
@@ -507,7 +507,7 @@ export function useTimelineEventRenderer({
|
||||
</Message>
|
||||
);
|
||||
},
|
||||
[MessageEvent.RoomMessageEncrypted]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.RoomMessageEncrypted]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const { replyEventId: rawReplyEventId, threadRootId } = mEvent;
|
||||
const replyEventId =
|
||||
hideThreadChip && mEvent.getWireContent()?.['m.relates_to']?.is_falling_back
|
||||
@@ -606,7 +606,7 @@ export function useTimelineEventRenderer({
|
||||
{() => {
|
||||
if (mEvent.isRedacted()) return <RedactedContent />;
|
||||
const type = mEvent.getType();
|
||||
if (type === (MessageEvent.Sticker as string))
|
||||
if (type === (EventType.Sticker as string))
|
||||
return (
|
||||
<MSticker
|
||||
content={mEvent.getContent() as unknown as IImageContent}
|
||||
@@ -629,7 +629,7 @@ export function useTimelineEventRenderer({
|
||||
)}
|
||||
/>
|
||||
);
|
||||
if (type === (MessageEvent.RoomMessage as string)) {
|
||||
if (type === (EventType.RoomMessage as string)) {
|
||||
const editedEvent = getEditedEvent(mEventId, mEvent, timelineSet);
|
||||
let editedNewContent: unknown;
|
||||
if (editedEvent) {
|
||||
@@ -671,7 +671,7 @@ export function useTimelineEventRenderer({
|
||||
</Message>
|
||||
);
|
||||
},
|
||||
[MessageEvent.Sticker]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.Sticker]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const { replyEventId: rawReplyEventId, threadRootId } = mEvent;
|
||||
const replyEventId =
|
||||
hideThreadChip && mEvent.getWireContent()?.['m.relates_to']?.is_falling_back
|
||||
@@ -786,7 +786,7 @@ export function useTimelineEventRenderer({
|
||||
</Message>
|
||||
);
|
||||
},
|
||||
[StateEvent.RoomMember]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.RoomMember]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const membershipChanged = isMembershipChanged(mEvent);
|
||||
if (hideMemberInReadOnly && isReadOnly) return null;
|
||||
if (membershipChanged && hideMembershipEvents) return null;
|
||||
@@ -834,7 +834,7 @@ export function useTimelineEventRenderer({
|
||||
</Event>
|
||||
);
|
||||
},
|
||||
[StateEvent.RoomName]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.RoomName]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
const senderName =
|
||||
@@ -879,7 +879,7 @@ export function useTimelineEventRenderer({
|
||||
</Event>
|
||||
);
|
||||
},
|
||||
[StateEvent.RoomTopic]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.RoomTopic]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
const senderName =
|
||||
@@ -925,7 +925,7 @@ export function useTimelineEventRenderer({
|
||||
</Event>
|
||||
);
|
||||
},
|
||||
[StateEvent.RoomAvatar]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.RoomAvatar]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
const senderName =
|
||||
@@ -971,7 +971,7 @@ export function useTimelineEventRenderer({
|
||||
</Event>
|
||||
);
|
||||
},
|
||||
[StateEvent.GroupCallMemberPrefix]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.GroupCallMemberPrefix]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
const senderName = getMemberDisplayName(room, senderId) || getMxIdLocalPart(senderId);
|
||||
@@ -1024,7 +1024,7 @@ export function useTimelineEventRenderer({
|
||||
</Event>
|
||||
);
|
||||
},
|
||||
[StateEvent.RoomPinnedEvents]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
[EventType.RoomPinnedEvents]: (mEventId, mEvent, item, timelineSet, collapse) => {
|
||||
if (!showHiddenEvents) return null;
|
||||
const highlighted = focusItem?.index === item && focusItem.highlight;
|
||||
const senderId = mEvent.getSender() ?? '';
|
||||
|
||||
@@ -40,14 +40,13 @@ export function useAppVisibility(mx: MatrixClient | undefined) {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!mx) return;
|
||||
if (!mx) return undefined;
|
||||
|
||||
const handleVisibilityForNotifications = (isVisible: boolean) => {
|
||||
togglePusher(mx, clientConfig, isVisible, usePushNotifications, pushSubAtom, isMobile);
|
||||
};
|
||||
|
||||
appEvents.onVisibilityChange = handleVisibilityForNotifications;
|
||||
// eslint-disable-next-line consistent-return
|
||||
return () => {
|
||||
appEvents.onVisibilityChange = null;
|
||||
};
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
import type { Room } from 'matrix-js-sdk';
|
||||
import {
|
||||
MatrixRTCSession,
|
||||
MatrixRTCSessionEvent,
|
||||
} from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSession';
|
||||
import type { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { MatrixRTCSession, MatrixRTCSessionEvent } from '$types/matrix-sdk';
|
||||
import type { CallMembership } from '$types/matrix-sdk';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { MatrixRTCSessionManagerEvents } from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSessionManager';
|
||||
import { MatrixRTCSessionManagerEvents } from '$types/matrix-sdk';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
|
||||
export const useCallSession = (room: Room): MatrixRTCSession => {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { RefObject } from 'react';
|
||||
import { createContext, useCallback, useContext, useEffect, useState } from 'react';
|
||||
import { MatrixRTCSession } from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSession';
|
||||
import type { MatrixClient, Room } from 'matrix-js-sdk';
|
||||
import { MatrixRTCSession } from '$types/matrix-sdk';
|
||||
import type { MatrixClient, Room } from '$types/matrix-sdk';
|
||||
import { useSetAtom } from 'jotai';
|
||||
import * as Sentry from '@sentry/react';
|
||||
import type { ElementCallThemeKind } from '../plugins/call';
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { useEffect, useRef, useCallback } from 'react';
|
||||
import * as Sentry from '@sentry/react';
|
||||
import { RoomStateEvent } from 'matrix-js-sdk';
|
||||
import { MatrixRTCSession } from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSession';
|
||||
import { MatrixRTCSessionManagerEvents } from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSessionManager';
|
||||
import { RoomStateEvent } from '$types/matrix-sdk';
|
||||
import { MatrixRTCSession } from '$types/matrix-sdk';
|
||||
import { MatrixRTCSessionManagerEvents } from '$types/matrix-sdk';
|
||||
import { useSetAtom, useAtomValue } from 'jotai';
|
||||
import { mDirectAtom } from '$state/mDirectList';
|
||||
import { incomingCallRoomIdAtom, mutedCallRoomIdAtom } from '$state/callEmbed';
|
||||
|
||||
+69
-103
@@ -3,12 +3,23 @@ import type {
|
||||
MatrixClient,
|
||||
Room,
|
||||
RoomMember,
|
||||
RoomMemberEventContent,
|
||||
RoomMessageEventContent,
|
||||
RoomServerAclEventContent,
|
||||
} from '$types/matrix-sdk';
|
||||
import { Direction, EventTimeline, Method, Preset, Visibility, MsgType } from '$types/matrix-sdk';
|
||||
import {
|
||||
Direction,
|
||||
EventTimeline,
|
||||
EventType,
|
||||
Method,
|
||||
MatrixError,
|
||||
Preset,
|
||||
Visibility,
|
||||
MsgType,
|
||||
KnownMembership,
|
||||
} from '$types/matrix-sdk';
|
||||
import { useMemo } from 'react';
|
||||
import { Membership, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import {
|
||||
addRoomIdToMDirect,
|
||||
getDMRoomFor,
|
||||
@@ -29,10 +40,13 @@ import { createRoomEncryptionState } from '$components/create-room';
|
||||
import { parsePronounsInput } from '$utils/pronouns';
|
||||
import { sendFeedback } from '$utils/sendFeedbackToUser';
|
||||
import { PKitCommandMessageHandler } from '$plugins/pluralkit-handler/PKitCommandMessageHandler';
|
||||
import { ErrorCode } from '../cs-errorcode';
|
||||
import { useRoomNavigate } from './useRoomNavigate';
|
||||
import { enrichWidgetUrl } from './useRoomWidgets';
|
||||
import { useUserProfile } from './useUserProfile';
|
||||
import type { PerMessageProfile } from './usePerMessageProfile';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
import {
|
||||
addOrUpdatePerMessageProfile,
|
||||
deletePerMessageProfile,
|
||||
@@ -403,7 +417,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
const serverMembers = servers?.flatMap((server) => getServerMembers(room, server));
|
||||
const serverUsers = serverMembers
|
||||
?.filter((m) => m.membership !== Membership.Ban)
|
||||
?.filter((m) => m.membership !== KnownMembership.Ban)
|
||||
.map((m) => m.userId);
|
||||
|
||||
if (Array.isArray(serverUsers)) {
|
||||
@@ -480,17 +494,10 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
const mEvent = room
|
||||
.getLiveTimeline()
|
||||
.getState(EventTimeline.FORWARDS)
|
||||
?.getStateEvents(StateEvent.RoomMember, mx.getSafeUserId());
|
||||
const content = mEvent?.getContent();
|
||||
?.getStateEvents(EventType.RoomMember, mx.getSafeUserId());
|
||||
const content = mEvent?.getContent<RoomMemberEventContent>();
|
||||
if (!content) return;
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomMember as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
content as any,
|
||||
mx.getSafeUserId()
|
||||
);
|
||||
await mx.sendStateEvent(room.roomId, EventType.RoomMember, content, mx.getSafeUserId());
|
||||
},
|
||||
},
|
||||
[Command.AddPerMessageProfileToAccount]: {
|
||||
@@ -643,17 +650,10 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
const mEvent = room
|
||||
.getLiveTimeline()
|
||||
.getState(EventTimeline.FORWARDS)
|
||||
?.getStateEvents(StateEvent.RoomMember, mx.getSafeUserId());
|
||||
const content = mEvent?.getContent();
|
||||
?.getStateEvents(EventType.RoomMember, mx.getSafeUserId());
|
||||
const content = mEvent?.getContent<RoomMemberEventContent>();
|
||||
if (!content) return;
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomMember as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
content as any,
|
||||
mx.getSafeUserId()
|
||||
);
|
||||
await mx.sendStateEvent(room.roomId, EventType.RoomMember, content, mx.getSafeUserId());
|
||||
},
|
||||
},
|
||||
[Command.ConvertToDm]: {
|
||||
@@ -757,7 +757,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
const serverAcl = getStateEvent(
|
||||
room,
|
||||
StateEvent.RoomServerAcl
|
||||
EventType.RoomServerAcl
|
||||
)?.getContent<RoomServerAclEventContent>();
|
||||
|
||||
const aclContent: RoomServerAclEventContent = {
|
||||
@@ -785,8 +785,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
aclContent.allow?.sort();
|
||||
aclContent.deny?.sort();
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomServerAcl as any, aclContent as any);
|
||||
await mx.sendStateEvent(room.roomId, EventType.RoomServerAcl, aclContent);
|
||||
},
|
||||
},
|
||||
// Sable commands
|
||||
@@ -813,14 +812,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
try {
|
||||
if (input === 'reset' || input === 'clear') {
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsColor as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{} as any,
|
||||
userId
|
||||
);
|
||||
await mx.sendStateEvent(room.roomId, CustomStateEvent.RoomCosmeticsColor, {}, userId);
|
||||
sendFeedback('Room color has been reset.', room, userId);
|
||||
return;
|
||||
}
|
||||
@@ -828,10 +820,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
if (/^#[0-9A-F]{6}$/i.test(input)) {
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsColor as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{ color: input } as any,
|
||||
CustomStateEvent.RoomCosmeticsColor,
|
||||
{ color: input },
|
||||
userId
|
||||
);
|
||||
sendFeedback(`Room color set to ${input}.`, room, userId);
|
||||
@@ -839,8 +829,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
sendFeedback('Invalid format. Use #RRGGBB.', room, userId);
|
||||
}
|
||||
} catch (e: unknown) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if ((e as any).errcode === 'M_FORBIDDEN') {
|
||||
if (e instanceof MatrixError && e.errcode === ErrorCode.M_FORBIDDEN) {
|
||||
sendFeedback(
|
||||
'Permission Denied. An admin must enable "Room Colors" in Settings > Cosmetics in app.sable.moe or another supported client.',
|
||||
room,
|
||||
@@ -861,7 +850,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
const parents = room
|
||||
.getLiveTimeline()
|
||||
.getState(EventTimeline.FORWARDS)
|
||||
?.getStateEvents(StateEvent.SpaceParent);
|
||||
?.getStateEvents(EventType.SpaceParent);
|
||||
|
||||
const targetSpaceId =
|
||||
parents && parents.length > 0 ? parents[0]!.getStateKey() : room.roomId;
|
||||
@@ -870,10 +859,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
if (input === 'reset' || input === 'clear') {
|
||||
await mx.sendStateEvent(
|
||||
targetSpaceId as string,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsColor as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{} as any,
|
||||
CustomStateEvent.RoomCosmeticsColor,
|
||||
{},
|
||||
userId
|
||||
);
|
||||
sendFeedback('Global space color reset.', room, userId);
|
||||
@@ -883,10 +870,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
if (/^#[0-9A-F]{6}$/i.test(input)) {
|
||||
await mx.sendStateEvent(
|
||||
targetSpaceId as string,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsColor as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{ color: input } as any,
|
||||
CustomStateEvent.RoomCosmeticsColor,
|
||||
{ color: input },
|
||||
userId
|
||||
);
|
||||
sendFeedback(`Global space color set to ${input}.`, room, userId);
|
||||
@@ -894,8 +879,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
sendFeedback('Invalid format. Use #RRGGBB.', room, userId);
|
||||
}
|
||||
} catch (e: unknown) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if ((e as any).errcode === 'M_FORBIDDEN') {
|
||||
if (e instanceof MatrixError && e.errcode === ErrorCode.M_FORBIDDEN) {
|
||||
sendFeedback(
|
||||
'Permission Denied. An admin must enable "Space-Wide Colors" in Settings > Cosmetics in app.sable.moe or another supported client.',
|
||||
room,
|
||||
@@ -917,24 +901,20 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
try {
|
||||
if (input.toLowerCase() === 'reset' || input === '') {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomCosmeticsFont as any, {}, userId);
|
||||
await mx.sendStateEvent(room.roomId, CustomStateEvent.RoomCosmeticsFont, {}, userId);
|
||||
sendFeedback('Room font reset.', room, userId);
|
||||
return;
|
||||
}
|
||||
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsFont as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{ font: input } as any,
|
||||
CustomStateEvent.RoomCosmeticsFont,
|
||||
{ font: input },
|
||||
userId
|
||||
);
|
||||
sendFeedback(`Room font set to "${input}".`, room, userId);
|
||||
} catch (e: unknown) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if ((e as any).errcode === 'M_FORBIDDEN') {
|
||||
if (e instanceof MatrixError && e.errcode === ErrorCode.M_FORBIDDEN) {
|
||||
sendFeedback(
|
||||
'Permission Denied. An admin must enable "Room Fonts" in Settings > Cosmetics in app.sable.moe or another supported client.',
|
||||
room,
|
||||
@@ -957,7 +937,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
const parents = room
|
||||
.getLiveTimeline()
|
||||
.getState(EventTimeline.FORWARDS)
|
||||
?.getStateEvents(StateEvent.SpaceParent);
|
||||
?.getStateEvents(EventType.SpaceParent);
|
||||
|
||||
const targetSpaceId =
|
||||
parents && parents.length > 0 ? parents[0]!.getStateKey() : room.roomId;
|
||||
@@ -966,10 +946,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
if (input.toLowerCase() === 'reset' || input === '') {
|
||||
await mx.sendStateEvent(
|
||||
targetSpaceId as string,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsFont as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{} as any,
|
||||
CustomStateEvent.RoomCosmeticsFont,
|
||||
{},
|
||||
userId
|
||||
);
|
||||
sendFeedback('Space font reset.', room, userId);
|
||||
@@ -978,16 +956,13 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
await mx.sendStateEvent(
|
||||
targetSpaceId as string,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsFont as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{ font: input } as any,
|
||||
CustomStateEvent.RoomCosmeticsFont,
|
||||
{ font: input },
|
||||
userId
|
||||
);
|
||||
sendFeedback(`Space font set to "${input}".`, room, userId);
|
||||
} catch (e: unknown) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if ((e as any).errcode === 'M_FORBIDDEN') {
|
||||
if (e instanceof MatrixError && e.errcode === ErrorCode.M_FORBIDDEN) {
|
||||
sendFeedback(
|
||||
'Permission Denied. An admin must enable "Space-Wide Fonts" in Settings > Cosmetics in app.sable.moe or another supported client.',
|
||||
room,
|
||||
@@ -1024,22 +999,19 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
const widgetId = `${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomWidget as any,
|
||||
CustomStateEvent.RoomWidget,
|
||||
{
|
||||
type: 'm.custom',
|
||||
url: enrichWidgetUrl(parsedUrl.toString()),
|
||||
name,
|
||||
id: widgetId,
|
||||
creatorUserId: userId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
} as any,
|
||||
},
|
||||
widgetId
|
||||
);
|
||||
sendFeedback(`Widget "${name}" added.`, room, userId);
|
||||
} catch (e: unknown) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if ((e as any).errcode === 'M_FORBIDDEN') {
|
||||
if (e instanceof MatrixError && e.errcode === ErrorCode.M_FORBIDDEN) {
|
||||
sendFeedback(
|
||||
'Permission denied. You need permission to manage widgets in this room.',
|
||||
room,
|
||||
@@ -1068,10 +1040,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
if (['reset', 'clear', ''].includes(rawInput.toLowerCase())) {
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsPronouns as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{} as any,
|
||||
CustomStateEvent.RoomCosmeticsPronouns,
|
||||
{},
|
||||
userId
|
||||
);
|
||||
sendFeedback('Room pronouns have been reset.', room, userId);
|
||||
@@ -1082,10 +1052,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsPronouns as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{ pronouns: pronounsArray } as any,
|
||||
CustomStateEvent.RoomCosmeticsPronouns,
|
||||
{ pronouns: pronounsArray },
|
||||
userId
|
||||
);
|
||||
|
||||
@@ -1095,8 +1063,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
sendFeedback(`Room pronouns set: ${feedbackString}`, room, userId);
|
||||
} catch (e: unknown) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if ((e as any).errcode === 'M_FORBIDDEN') {
|
||||
if (e instanceof MatrixError && e.errcode === ErrorCode.M_FORBIDDEN) {
|
||||
sendFeedback('Permission Denied. Could not update room pronouns.', room, userId);
|
||||
}
|
||||
}
|
||||
@@ -1114,7 +1081,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
const parents = room
|
||||
.getLiveTimeline()
|
||||
.getState(EventTimeline.FORWARDS)
|
||||
?.getStateEvents(StateEvent.SpaceParent);
|
||||
?.getStateEvents(EventType.SpaceParent);
|
||||
|
||||
const targetSpaceId =
|
||||
parents && parents.length > 0 ? parents[0]!.getStateKey() : room.roomId;
|
||||
@@ -1123,10 +1090,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
if (['reset', 'clear', ''].includes(rawInput.toLowerCase())) {
|
||||
await mx.sendStateEvent(
|
||||
targetSpaceId as string,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsPronouns as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{} as any,
|
||||
CustomStateEvent.RoomCosmeticsPronouns,
|
||||
{},
|
||||
userId
|
||||
);
|
||||
sendFeedback('Global space pronouns reset.', room, userId);
|
||||
@@ -1137,10 +1102,8 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
await mx.sendStateEvent(
|
||||
targetSpaceId as string,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
StateEvent.RoomCosmeticsPronouns as any,
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
{ pronouns: pronounsArray } as any,
|
||||
CustomStateEvent.RoomCosmeticsPronouns,
|
||||
{ pronouns: pronounsArray },
|
||||
userId
|
||||
);
|
||||
|
||||
@@ -1150,8 +1113,7 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
|
||||
sendFeedback(`Global space pronouns set: ${feedbackString}`, room, userId);
|
||||
} catch (e: unknown) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
if ((e as any).errcode === 'M_FORBIDDEN') {
|
||||
if (e instanceof MatrixError && e.errcode === ErrorCode.M_FORBIDDEN) {
|
||||
sendFeedback('Permission Denied. Could not update space pronouns.', room, userId);
|
||||
}
|
||||
}
|
||||
@@ -1265,8 +1227,9 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
try {
|
||||
const newContent = JSON.parse(jsonString);
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const existingEvent = mx.getAccountData(type as any);
|
||||
const existingEvent = mx.getAccountData(
|
||||
type as Parameters<typeof mx.getAccountData>[0]
|
||||
);
|
||||
const existingContent = existingEvent ? existingEvent.getContent() : {};
|
||||
|
||||
const mergedContent = { ...existingContent, ...newContent };
|
||||
@@ -1290,8 +1253,9 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
}
|
||||
const [type, key] = parts;
|
||||
try {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const existingEvent = mx.getAccountData(type as any);
|
||||
const existingEvent = mx.getAccountData(
|
||||
type as Parameters<typeof mx.getAccountData>[0]
|
||||
);
|
||||
if (!existingEvent) {
|
||||
sendFeedback(`No account data found for type "${type}".`, room, userId);
|
||||
return;
|
||||
@@ -1306,8 +1270,10 @@ export const useCommands = (mx: MatrixClient, room: Room): CommandRecord => {
|
||||
return;
|
||||
}
|
||||
delete content[key as keyof typeof content];
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await mx.setAccountData(type as any, content as any);
|
||||
await mx.setAccountData(
|
||||
type as Parameters<typeof mx.setAccountData>[0],
|
||||
content as Parameters<typeof mx.setAccountData>[1]
|
||||
);
|
||||
sendFeedback(`Key "${key}" removed from "${type}".`, room, userId);
|
||||
} catch (e: unknown) {
|
||||
sendFeedback(`Error: ${(e as Error).message}`, room, userId);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import type { SecretAccountData } from '$types/matrix/accountData';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { useAccountData } from './useAccountData';
|
||||
|
||||
export const useCrossSigningActive = (): boolean => {
|
||||
const masterEvent = useAccountData(AccountDataEvent.CrossSigningMaster);
|
||||
const masterEvent = useAccountData('m.cross_signing.master');
|
||||
const content = masterEvent?.getContent<SecretAccountData>();
|
||||
|
||||
return !!content;
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { useMemo } from 'react';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { useAccountData } from './useAccountData';
|
||||
import { useAllJoinedRoomsSet, useGetRoom } from './useGetRoom';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
export const useDirectUsers = (): string[] => {
|
||||
const directEvent = useAccountData(AccountDataEvent.Direct);
|
||||
const directEvent = useAccountData(EventType.Direct);
|
||||
const content = directEvent?.getContent();
|
||||
|
||||
const allJoinedRooms = useAllJoinedRoomsSet();
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
import { useMemo } from 'react';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { useAccountData } from './useAccountData';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
export type IgnoredUserListContent = {
|
||||
ignored_users?: Record<string, object>;
|
||||
};
|
||||
|
||||
export const useIgnoredUsers = (): string[] => {
|
||||
const ignoredUserListEvt = useAccountData(AccountDataEvent.IgnoredUserList);
|
||||
const ignoredUserListEvt = useAccountData(EventType.IgnoredUserList);
|
||||
const ignoredUsers = useMemo(() => {
|
||||
const ignoredUsersRecord =
|
||||
ignoredUserListEvt?.getContent<IgnoredUserListContent>().ignored_users ?? {};
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import type { ImagePack, ImageUsage } from '$plugins/custom-emoji';
|
||||
import {
|
||||
getGlobalImagePacks,
|
||||
@@ -19,6 +18,8 @@ import {
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { useAccountDataCallback } from './useAccountDataCallback';
|
||||
import { useStateEventCallback } from './useStateEventCallback';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
const imagePackEqual = (a: ImagePack | undefined, b: ImagePack | undefined): boolean => {
|
||||
if (!a && !b) return true;
|
||||
@@ -74,7 +75,7 @@ export const useUserImagePack = (): ImagePack | undefined => {
|
||||
mx,
|
||||
useCallback(
|
||||
(mEvent) => {
|
||||
if (mEvent.getType() === (AccountDataEvent.PoniesUserEmotes as string)) {
|
||||
if (mEvent.getType() === (CustomAccountDataEvent.PoniesUserEmotes as string)) {
|
||||
setUserPack((prev) => {
|
||||
const next = getUserImagePack(mx);
|
||||
return imagePackEqual(prev, next) ? prev : next;
|
||||
@@ -109,7 +110,7 @@ export const useGlobalImagePacks = (): ImagePack[] => {
|
||||
mx,
|
||||
useCallback(
|
||||
(mEvent) => {
|
||||
if (mEvent.getType() === (AccountDataEvent.PoniesEmoteRooms as string)) {
|
||||
if (mEvent.getType() === (CustomAccountDataEvent.PoniesEmoteRooms as string)) {
|
||||
setGlobalPacks((prev) => {
|
||||
const next = getGlobalImagePacks(mx);
|
||||
return imagePackListEqual(prev, next) ? prev : next;
|
||||
@@ -128,7 +129,7 @@ export const useGlobalImagePacks = (): ImagePack[] => {
|
||||
const roomId = mEvent.getRoomId();
|
||||
const stateKey = mEvent.getStateKey();
|
||||
if (
|
||||
eventType === (StateEvent.PoniesRoomEmotes as string) &&
|
||||
eventType === (CustomStateEvent.PoniesRoomEmotes as string) &&
|
||||
roomId &&
|
||||
typeof stateKey === 'string'
|
||||
) {
|
||||
@@ -177,7 +178,7 @@ export const useRoomImagePack = (room: Room, stateKey: string): ImagePack | unde
|
||||
(mEvent) => {
|
||||
if (
|
||||
mEvent.getRoomId() === room.roomId &&
|
||||
mEvent.getType() === (StateEvent.PoniesRoomEmotes as string) &&
|
||||
mEvent.getType() === (CustomStateEvent.PoniesRoomEmotes as string) &&
|
||||
mEvent.getStateKey() === stateKey
|
||||
) {
|
||||
setRoomPack((prev) => {
|
||||
@@ -216,7 +217,7 @@ export const useRoomImagePacks = (room: Room): ImagePack[] => {
|
||||
(mEvent) => {
|
||||
if (
|
||||
mEvent.getRoomId() === room.roomId &&
|
||||
mEvent.getType() === (StateEvent.PoniesRoomEmotes as string)
|
||||
mEvent.getType() === (CustomStateEvent.PoniesRoomEmotes as string)
|
||||
) {
|
||||
setRoomPacks((prev) => {
|
||||
const next = getRoomImagePacks(room);
|
||||
@@ -269,7 +270,7 @@ export const useRoomsImagePacks = (rooms: Room[]) => {
|
||||
(mEvent) => {
|
||||
if (
|
||||
rooms.find((room) => room.roomId === mEvent.getRoomId()) &&
|
||||
mEvent.getType() === (StateEvent.PoniesRoomEmotes as string)
|
||||
mEvent.getType() === (CustomStateEvent.PoniesRoomEmotes as string)
|
||||
) {
|
||||
setRoomPacks((prev) => {
|
||||
const next = rooms.flatMap(getRoomImagePacks);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { JoinRule, Room } from '$types/matrix-sdk';
|
||||
import { GuestAccess, HistoryVisibility } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
import { GuestAccess, HistoryVisibility, EventType } from '$types/matrix-sdk';
|
||||
|
||||
import { getStateEvent } from '$utils/room';
|
||||
|
||||
export type LocalRoomSummary = {
|
||||
@@ -16,12 +16,12 @@ export type LocalRoomSummary = {
|
||||
joinRule?: JoinRule;
|
||||
};
|
||||
export const useLocalRoomSummary = (room: Room): LocalRoomSummary => {
|
||||
const topicEvent = getStateEvent(room, StateEvent.RoomTopic);
|
||||
const topicEvent = getStateEvent(room, EventType.RoomTopic);
|
||||
const topicContent = topicEvent?.getContent();
|
||||
const topic =
|
||||
topicContent && typeof topicContent.topic === 'string' ? topicContent.topic : undefined;
|
||||
|
||||
const historyEvent = getStateEvent(room, StateEvent.RoomHistoryVisibility);
|
||||
const historyEvent = getStateEvent(room, EventType.RoomHistoryVisibility);
|
||||
const historyContent = historyEvent?.getContent();
|
||||
const worldReadable =
|
||||
historyContent && typeof historyContent.history_visibility === 'string'
|
||||
|
||||
@@ -4,12 +4,13 @@ import type { IconSrc } from 'folds';
|
||||
import { Icons, Text } from 'folds';
|
||||
import type { MatrixEvent, Room } from '$types/matrix-sdk';
|
||||
import type { IMemberContent } from '$types/matrix/room';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
|
||||
import { getMxIdLocalPart } from '$utils/matrix';
|
||||
import { isMembershipChanged } from '$utils/room';
|
||||
import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile';
|
||||
import { useSableCosmetics } from './useSableCosmetics';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
type DecoratedUserProps = {
|
||||
roomId: string;
|
||||
@@ -68,8 +69,8 @@ export const useMemberEventParser = (): MemberEventParser => {
|
||||
: getMxIdLocalPart(userId);
|
||||
|
||||
if (isMembershipChanged(mEvent)) {
|
||||
if (content.membership === Membership.Invite) {
|
||||
if (prevContent.membership === Membership.Knock) {
|
||||
if (content.membership === KnownMembership.Invite) {
|
||||
if (prevContent.membership === KnownMembership.Knock) {
|
||||
return {
|
||||
icon: Icons.ArrowGoRightPlus,
|
||||
body: (
|
||||
@@ -99,7 +100,7 @@ export const useMemberEventParser = (): MemberEventParser => {
|
||||
};
|
||||
}
|
||||
|
||||
if (content.membership === Membership.Knock) {
|
||||
if (content.membership === KnownMembership.Knock) {
|
||||
return {
|
||||
icon: Icons.Mail,
|
||||
body: (
|
||||
@@ -114,7 +115,7 @@ export const useMemberEventParser = (): MemberEventParser => {
|
||||
};
|
||||
}
|
||||
|
||||
if (content.membership === Membership.Join) {
|
||||
if (content.membership === KnownMembership.Join) {
|
||||
return {
|
||||
icon: Icons.ArrowGoRight,
|
||||
body: (
|
||||
@@ -126,8 +127,8 @@ export const useMemberEventParser = (): MemberEventParser => {
|
||||
};
|
||||
}
|
||||
|
||||
if (content.membership === Membership.Leave) {
|
||||
if (prevContent.membership === Membership.Invite) {
|
||||
if (content.membership === KnownMembership.Leave) {
|
||||
if (prevContent.membership === KnownMembership.Invite) {
|
||||
return {
|
||||
icon: Icons.ArrowGoRightCross,
|
||||
body:
|
||||
@@ -153,7 +154,7 @@ export const useMemberEventParser = (): MemberEventParser => {
|
||||
};
|
||||
}
|
||||
|
||||
if (prevContent.membership === Membership.Knock) {
|
||||
if (prevContent.membership === KnownMembership.Knock) {
|
||||
return {
|
||||
icon: Icons.ArrowGoRightCross,
|
||||
body:
|
||||
@@ -179,7 +180,7 @@ export const useMemberEventParser = (): MemberEventParser => {
|
||||
};
|
||||
}
|
||||
|
||||
if (prevContent.membership === Membership.Ban) {
|
||||
if (prevContent.membership === KnownMembership.Ban) {
|
||||
return {
|
||||
icon: Icons.ArrowGoLeft,
|
||||
body: (
|
||||
@@ -215,7 +216,7 @@ export const useMemberEventParser = (): MemberEventParser => {
|
||||
};
|
||||
}
|
||||
|
||||
if (content.membership === Membership.Ban) {
|
||||
if (content.membership === KnownMembership.Ban) {
|
||||
return {
|
||||
icon: Icons.ArrowGoLeft,
|
||||
body: (
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
import { useMemo } from 'react';
|
||||
import type { RoomMember } from '$types/matrix-sdk';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
import { KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
export const MembershipFilter = {
|
||||
filterJoined: (m: RoomMember) => m.membership === Membership.Join,
|
||||
filterInvited: (m: RoomMember) => m.membership === Membership.Invite,
|
||||
filterJoined: (m: RoomMember) => m.membership === KnownMembership.Join,
|
||||
filterInvited: (m: RoomMember) => m.membership === KnownMembership.Invite,
|
||||
filterLeaved: (m: RoomMember) =>
|
||||
m.membership === Membership.Leave &&
|
||||
m.membership === KnownMembership.Leave &&
|
||||
m.events.member?.getStateKey() === m.events.member?.getSender(),
|
||||
filterKicked: (m: RoomMember) =>
|
||||
m.membership === Membership.Leave &&
|
||||
m.membership === KnownMembership.Leave &&
|
||||
m.events.member?.getStateKey() !== m.events.member?.getSender(),
|
||||
filterBanned: (m: RoomMember) => m.membership === Membership.Ban,
|
||||
filterBanned: (m: RoomMember) => m.membership === KnownMembership.Ban,
|
||||
};
|
||||
|
||||
export type MembershipFilterFn = (m: RoomMember) => boolean;
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { Room, RoomMemberEventHandlerMap } from '$types/matrix-sdk';
|
||||
import { RoomMemberEvent } from '$types/matrix-sdk';
|
||||
import { Membership } from '$types/matrix/room';
|
||||
import type { Membership, Room, RoomMemberEventHandlerMap } from '$types/matrix-sdk';
|
||||
import { RoomMemberEvent, KnownMembership } from '$types/matrix-sdk';
|
||||
|
||||
export const useMembership = (room: Room, userId: string): Membership => {
|
||||
const member = room.getMember(userId);
|
||||
|
||||
const [membership, setMembership] = useState<Membership>(
|
||||
() => (member?.membership as Membership | undefined) ?? Membership.Leave
|
||||
() => member?.membership ?? KnownMembership.Leave
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -16,7 +15,7 @@ export const useMembership = (room: Room, userId: string): Membership => {
|
||||
m
|
||||
) => {
|
||||
if (event.getRoomId() === room.roomId && m.userId === userId) {
|
||||
setMembership((m.membership as Membership | undefined) ?? Membership.Leave);
|
||||
setMembership(m.membership ?? KnownMembership.Leave);
|
||||
}
|
||||
};
|
||||
member?.on(RoomMemberEvent.Membership, handleMembershipChange);
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { useAtomValue, useSetAtom } from 'jotai';
|
||||
import { useCallback, useEffect } from 'react';
|
||||
import type { MatrixClient } from '$types/matrix-sdk';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { nicknamesAtom, setNicknameAtom } from '$state/nicknames';
|
||||
import { useAccountDataCallback } from './useAccountDataCallback';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
export const useNickname = (userId: string): string | undefined => {
|
||||
const nicknames = useAtomValue(nicknamesAtom);
|
||||
@@ -28,7 +29,7 @@ export const useSyncNicknames = (mx?: MatrixClient) => {
|
||||
|
||||
useEffect(() => {
|
||||
if (!mx) return;
|
||||
const event = mx.getAccountData(AccountDataEvent.SableNicknames);
|
||||
const event = mx.getAccountData(CustomAccountDataEvent.SableNicknames);
|
||||
if (event) {
|
||||
setNicknames(event.getContent() || {});
|
||||
}
|
||||
@@ -38,7 +39,7 @@ export const useSyncNicknames = (mx?: MatrixClient) => {
|
||||
mx,
|
||||
useCallback(
|
||||
(mEvent) => {
|
||||
if (mEvent.getType() === (AccountDataEvent.SableNicknames as string)) {
|
||||
if (mEvent.getType() === (CustomAccountDataEvent.SableNicknames as string)) {
|
||||
setNicknames(mEvent.getContent() || {});
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import type { AccountDataCompatVersion } from '$types/matrix/accountData';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
import type { PronounSet } from '$utils/pronouns';
|
||||
import type { MatrixClient } from 'matrix-js-sdk';
|
||||
|
||||
const ACCOUNT_DATA_PREFIX = AccountDataEvent.SablePerProfileMessageProfiles;
|
||||
import type { PronounSet } from '$utils/pronouns';
|
||||
import type { MatrixClient } from '$types/matrix-sdk';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
const ACCOUNT_DATA_PREFIX = CustomAccountDataEvent.SablePerProfileMessageProfiles;
|
||||
|
||||
/**
|
||||
* a per message profile
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { useMemo } from 'react';
|
||||
import type { MemberPowerTag } from '$types/matrix/room';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import type { IPowerLevels } from './usePowerLevels';
|
||||
import { useStateEvent } from './useStateEvent';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
export type PowerLevelTags = Record<number, MemberPowerTag>;
|
||||
|
||||
@@ -89,7 +90,7 @@ const generateFallbackTag = (powerLevelTags: PowerLevelTags, power: number): Mem
|
||||
};
|
||||
|
||||
export const usePowerLevelTags = (room: Room, powerLevels: IPowerLevels): PowerLevelTags => {
|
||||
const tagsEvent = useStateEvent(room, StateEvent.PowerLevelTags);
|
||||
const tagsEvent = useStateEvent(room, CustomStateEvent.PowerLevelTags);
|
||||
|
||||
const powerLevelTags: PowerLevelTags = useMemo(() => {
|
||||
const content = tagsEvent?.getContent();
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import type { MatrixEvent, Room } from '$types/matrix-sdk';
|
||||
import { createContext, useCallback, useContext, useMemo, useState } from 'react';
|
||||
import { produce } from 'immer';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { getStateEvent } from '$utils/room';
|
||||
import { useStateEvent } from './useStateEvent';
|
||||
import { useStateEventCallback } from './useStateEventCallback';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
export type PowerLevelActions = 'invite' | 'redact' | 'kick' | 'ban' | 'historical';
|
||||
export type PowerLevelNotificationsAction = 'room';
|
||||
@@ -65,7 +66,7 @@ const getPowersLevelFromMatrixEvent = (mEvent?: MatrixEvent): IPowerLevels => {
|
||||
};
|
||||
|
||||
export function usePowerLevels(room: Room): IPowerLevels {
|
||||
const powerLevelsEvent = useStateEvent(room, StateEvent.RoomPowerLevels);
|
||||
const powerLevelsEvent = useStateEvent(room, EventType.RoomPowerLevels);
|
||||
const powerLevels: IPowerLevels = useMemo(
|
||||
() => getPowersLevelFromMatrixEvent(powerLevelsEvent),
|
||||
[powerLevelsEvent]
|
||||
@@ -90,7 +91,7 @@ export const useRoomsPowerLevels = (rooms: Room[]): Map<string, IPowerLevels> =>
|
||||
const rToPl = new Map<string, IPowerLevels>();
|
||||
|
||||
rooms.forEach((room) => {
|
||||
const mEvent = getStateEvent(room, StateEvent.RoomPowerLevels, '');
|
||||
const mEvent = getStateEvent(room, EventType.RoomPowerLevels, '');
|
||||
rToPl.set(room.roomId, getPowersLevelFromMatrixEvent(mEvent));
|
||||
});
|
||||
|
||||
@@ -106,7 +107,7 @@ export const useRoomsPowerLevels = (rooms: Room[]): Map<string, IPowerLevels> =>
|
||||
const roomId = event.getRoomId();
|
||||
if (
|
||||
roomId &&
|
||||
event.getType() === (StateEvent.RoomPowerLevels as string) &&
|
||||
event.getType() === (EventType.RoomPowerLevels as string) &&
|
||||
event.getStateKey() === '' &&
|
||||
rooms.find((r) => r.roomId === roomId)
|
||||
) {
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { MatrixClient, MatrixEvent } from '$types/matrix-sdk';
|
||||
import { ClientEvent } from '$types/matrix-sdk';
|
||||
import { AccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
import { getRecentEmojis } from '$plugins/recent-emoji';
|
||||
import type { IEmoji } from '$plugins/emoji';
|
||||
import { CustomAccountDataEvent } from '$types/matrix/accountData';
|
||||
|
||||
export const useRecentEmoji = (mx: MatrixClient, limit?: number): IEmoji[] => {
|
||||
const [recentEmoji, setRecentEmoji] = useState(() => getRecentEmojis(mx, limit));
|
||||
|
||||
useEffect(() => {
|
||||
const handleAccountData = (event: MatrixEvent) => {
|
||||
if (event.getType() !== (AccountDataEvent.ElementRecentEmoji as string)) return;
|
||||
if (event.getType() !== (CustomAccountDataEvent.ElementRecentEmoji as string)) return;
|
||||
setRecentEmoji(getRecentEmojis(mx, limit));
|
||||
};
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { createContext, useContext, useCallback, useMemo } from 'react';
|
||||
import { useAtomValue } from 'jotai';
|
||||
import type { Room } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import type { RoomAbbreviationsContent } from '$utils/abbreviations';
|
||||
import { buildAbbreviationsMap } from '$utils/abbreviations';
|
||||
import { getAllParents, getStateEvent } from '$utils/room';
|
||||
@@ -10,6 +10,7 @@ import { useMatrixClient } from './useMatrixClient';
|
||||
import { useStateEvent } from './useStateEvent';
|
||||
import { useStateEventCallback } from './useStateEventCallback';
|
||||
import { useForceUpdate } from './useForceUpdate';
|
||||
import { CustomStateEvent } from '$types/matrix/room';
|
||||
|
||||
const EMPTY_MAP: Map<string, string> = new Map();
|
||||
|
||||
@@ -19,7 +20,7 @@ export const useRoomAbbreviationsContext = () => useContext(RoomAbbreviationsCon
|
||||
|
||||
/** Read the room's abbreviations state event and return a term→definition map. */
|
||||
export const useRoomAbbreviations = (room: Room): Map<string, string> => {
|
||||
const stateEvent = useStateEvent(room, StateEvent.RoomAbbreviations);
|
||||
const stateEvent = useStateEvent(room, CustomStateEvent.RoomAbbreviations);
|
||||
if (!stateEvent) return EMPTY_MAP;
|
||||
const content = stateEvent.getContent<RoomAbbreviationsContent>();
|
||||
if (!Array.isArray(content?.entries) || content.entries.length === 0) return EMPTY_MAP;
|
||||
@@ -40,7 +41,7 @@ export const useMergedAbbreviations = (room: Room): Map<string, string> => {
|
||||
mx,
|
||||
useCallback(
|
||||
(event) => {
|
||||
if (event.getType() !== (StateEvent.RoomAbbreviations as string)) return;
|
||||
if (event.getType() !== (CustomStateEvent.RoomAbbreviations as string)) return;
|
||||
const eventRoomId = event.getRoomId();
|
||||
if (!eventRoomId) return;
|
||||
if (
|
||||
@@ -63,14 +64,14 @@ export const useMergedAbbreviations = (room: Room): Map<string, string> => {
|
||||
if (!parentRoom) return [];
|
||||
const content = getStateEvent(
|
||||
parentRoom,
|
||||
StateEvent.RoomAbbreviations
|
||||
CustomStateEvent.RoomAbbreviations
|
||||
)?.getContent<RoomAbbreviationsContent>();
|
||||
return Array.isArray(content?.entries) ? content.entries : [];
|
||||
});
|
||||
|
||||
const roomContent = getStateEvent(
|
||||
room,
|
||||
StateEvent.RoomAbbreviations
|
||||
CustomStateEvent.RoomAbbreviations
|
||||
)?.getContent<RoomAbbreviationsContent>();
|
||||
const roomEntries = Array.isArray(roomContent?.entries) ? roomContent.entries : [];
|
||||
|
||||
|
||||
@@ -1,17 +1,23 @@
|
||||
import { useCallback, useEffect, useMemo } from 'react';
|
||||
import type { MatrixError, Room, RoomCanonicalAliasEventContent } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
import type {
|
||||
MatrixError,
|
||||
Room,
|
||||
RoomCanonicalAliasEventContent,
|
||||
StateEvents,
|
||||
} from '$types/matrix-sdk';
|
||||
|
||||
import { getStateEvent } from '$utils/room';
|
||||
import type { AsyncState } from './useAsyncCallback';
|
||||
import { useAsyncCallback } from './useAsyncCallback';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { useAlive } from './useAlive';
|
||||
import { useStateEvent } from './useStateEvent';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
export const usePublishedAliases = (room: Room): [string | undefined, string[]] => {
|
||||
const aliasContent = useStateEvent(
|
||||
room,
|
||||
StateEvent.RoomCanonicalAlias
|
||||
EventType.RoomCanonicalAlias
|
||||
)?.getContent<RoomCanonicalAliasEventContent>();
|
||||
|
||||
const canonicalAlias = aliasContent?.alias;
|
||||
@@ -38,7 +44,7 @@ export const useSetMainAlias = (room: Room): ((alias: string | undefined) => Pro
|
||||
async (alias: string | undefined) => {
|
||||
const content = getStateEvent(
|
||||
room,
|
||||
StateEvent.RoomCanonicalAlias
|
||||
EventType.RoomCanonicalAlias
|
||||
)?.getContent<RoomCanonicalAliasEventContent>();
|
||||
|
||||
const altAliases: string[] = [];
|
||||
@@ -56,8 +62,11 @@ export const useSetMainAlias = (room: Room): ((alias: string | undefined) => Pro
|
||||
alt_aliases: altAliases,
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomCanonicalAlias as any, newContent);
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
EventType.RoomCanonicalAlias as keyof StateEvents,
|
||||
newContent
|
||||
);
|
||||
},
|
||||
[mx, room]
|
||||
);
|
||||
@@ -76,7 +85,7 @@ export const usePublishUnpublishAliases = (
|
||||
async (aliases: string[]) => {
|
||||
const content = getStateEvent(
|
||||
room,
|
||||
StateEvent.RoomCanonicalAlias
|
||||
EventType.RoomCanonicalAlias
|
||||
)?.getContent<RoomCanonicalAliasEventContent>();
|
||||
const altAliases = content?.alt_aliases ?? [];
|
||||
|
||||
@@ -91,8 +100,11 @@ export const usePublishUnpublishAliases = (
|
||||
alt_aliases: altAliases,
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomCanonicalAlias as any, newContent);
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
EventType.RoomCanonicalAlias as keyof StateEvents,
|
||||
newContent
|
||||
);
|
||||
},
|
||||
[mx, room]
|
||||
);
|
||||
@@ -101,7 +113,7 @@ export const usePublishUnpublishAliases = (
|
||||
async (aliases: string[]) => {
|
||||
const content = getStateEvent(
|
||||
room,
|
||||
StateEvent.RoomCanonicalAlias
|
||||
EventType.RoomCanonicalAlias
|
||||
)?.getContent<RoomCanonicalAliasEventContent>();
|
||||
const altAliases: string[] = [];
|
||||
|
||||
@@ -116,8 +128,11 @@ export const usePublishUnpublishAliases = (
|
||||
alt_aliases: altAliases,
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await mx.sendStateEvent(room.roomId, StateEvent.RoomCanonicalAlias as any, newContent);
|
||||
await mx.sendStateEvent(
|
||||
room.roomId,
|
||||
EventType.RoomCanonicalAlias as keyof StateEvents,
|
||||
newContent
|
||||
);
|
||||
},
|
||||
[mx, room]
|
||||
);
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import type { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk';
|
||||
import { useMemo } from 'react';
|
||||
import type { IRoomCreateContent } from '$types/matrix/room';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { creatorsSupported } from '$utils/matrix';
|
||||
import { getStateEvent } from '$utils/room';
|
||||
import { useStateEvent } from './useStateEvent';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
export const getRoomCreators = (createEvent: MatrixEvent): Set<string> => {
|
||||
const createContent = createEvent.getContent<IRoomCreateContent>();
|
||||
@@ -29,7 +30,7 @@ export const getRoomCreators = (createEvent: MatrixEvent): Set<string> => {
|
||||
};
|
||||
|
||||
export const useRoomCreators = (room: Room): Set<string> => {
|
||||
const createEvent = useStateEvent(room, StateEvent.RoomCreate);
|
||||
const createEvent = useStateEvent(room, EventType.RoomCreate);
|
||||
|
||||
const creators = useMemo(
|
||||
() => (createEvent ? getRoomCreators(createEvent) : new Set<string>()),
|
||||
@@ -43,7 +44,7 @@ export const getRoomCreatorsForRoomId = (mx: MatrixClient, roomId: string): Set<
|
||||
const room = mx.getRoom(roomId);
|
||||
if (!room) return new Set();
|
||||
|
||||
const createEvent = getStateEvent(room, StateEvent.RoomCreate);
|
||||
const createEvent = getStateEvent(room, EventType.RoomCreate);
|
||||
if (!createEvent) return new Set();
|
||||
|
||||
return getRoomCreators(createEvent);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { MatrixEvent, Room, RoomEventHandlerMap } from '$types/matrix-sdk';
|
||||
import { RoomEvent } from '$types/matrix-sdk';
|
||||
import { RoomEvent, EventType } from '$types/matrix-sdk';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { MessageEvent, StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { settingsAtom } from '$state/settings';
|
||||
import { useSetting } from '$state/hooks/settings';
|
||||
import { isMembershipChanged, reactionOrEditEvent } from '$utils/room';
|
||||
@@ -20,7 +20,7 @@ export const useRoomLatestRenderedEvent = (room: Room) => {
|
||||
|
||||
if (!evt) continue;
|
||||
if (reactionOrEditEvent(evt)) continue;
|
||||
if (evt.getType() === (StateEvent.RoomMember as string)) {
|
||||
if (evt.getType() === (EventType.RoomMember as string)) {
|
||||
const membershipChanged = isMembershipChanged(evt);
|
||||
if (membershipChanged && hideMembershipEvents) continue;
|
||||
if (!membershipChanged && hideNickAvatarEvents) continue;
|
||||
@@ -28,12 +28,12 @@ export const useRoomLatestRenderedEvent = (room: Room) => {
|
||||
}
|
||||
|
||||
if (
|
||||
evt.getType() === (MessageEvent.RoomMessage as string) ||
|
||||
evt.getType() === (MessageEvent.RoomMessageEncrypted as string) ||
|
||||
evt.getType() === (MessageEvent.Sticker as string) ||
|
||||
evt.getType() === (StateEvent.RoomName as string) ||
|
||||
evt.getType() === (StateEvent.RoomTopic as string) ||
|
||||
evt.getType() === (StateEvent.RoomAvatar as string)
|
||||
evt.getType() === (EventType.RoomMessage as string) ||
|
||||
evt.getType() === (EventType.RoomMessageEncrypted as string) ||
|
||||
evt.getType() === (EventType.Sticker as string) ||
|
||||
evt.getType() === (EventType.RoomName as string) ||
|
||||
evt.getType() === (EventType.RoomTopic as string) ||
|
||||
evt.getType() === (EventType.RoomAvatar as string)
|
||||
) {
|
||||
return evt;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import type { RoomJoinRulesEventContent, Room } from '$types/matrix-sdk';
|
||||
import { RoomEvent, RoomStateEvent } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
import { RoomEvent, RoomStateEvent, EventType } from '$types/matrix-sdk';
|
||||
|
||||
import { useStateEvent } from './useStateEvent';
|
||||
import { useNickname } from './useNickname';
|
||||
|
||||
export const useRoomAvatar = (room: Room, dm?: boolean): string | undefined => {
|
||||
const avatarEvent = useStateEvent(room, StateEvent.RoomAvatar);
|
||||
const avatarEvent = useStateEvent(room, EventType.RoomAvatar);
|
||||
|
||||
if (dm) {
|
||||
return room.getAvatarFallbackMember()?.getMxcAvatarUrl();
|
||||
@@ -51,7 +51,7 @@ export const useRoomName = (room: Room): string => {
|
||||
};
|
||||
|
||||
export const useRoomTopic = (room: Room): string | undefined => {
|
||||
const topicEvent = useStateEvent(room, StateEvent.RoomTopic);
|
||||
const topicEvent = useStateEvent(room, EventType.RoomTopic);
|
||||
|
||||
const content = topicEvent?.getContent();
|
||||
const topic = content && typeof content.topic === 'string' ? content.topic : undefined;
|
||||
@@ -60,7 +60,7 @@ export const useRoomTopic = (room: Room): string | undefined => {
|
||||
};
|
||||
|
||||
export const useRoomJoinRule = (room: Room): RoomJoinRulesEventContent | undefined => {
|
||||
const mEvent = useStateEvent(room, StateEvent.RoomJoinRules);
|
||||
const mEvent = useStateEvent(room, EventType.RoomJoinRules);
|
||||
const joinRuleContent = mEvent?.getContent<RoomJoinRulesEventContent>();
|
||||
return joinRuleContent;
|
||||
};
|
||||
@@ -1,10 +1,11 @@
|
||||
import { useMemo } from 'react';
|
||||
import type { RoomPinnedEventsEventContent, Room } from '$types/matrix-sdk';
|
||||
import { StateEvent } from '$types/matrix/room';
|
||||
|
||||
import { useStateEvent } from './useStateEvent';
|
||||
import { EventType } from '$types/matrix-sdk';
|
||||
|
||||
export const useRoomPinnedEvents = (room: Room): string[] => {
|
||||
const pinEvent = useStateEvent(room, StateEvent.RoomPinnedEvents);
|
||||
const pinEvent = useStateEvent(room, EventType.RoomPinnedEvents);
|
||||
const events = useMemo(() => {
|
||||
const content = pinEvent?.getContent<RoomPinnedEventsEventContent>();
|
||||
return content?.pinned ?? [];
|
||||
|
||||
Loaded 100 of 146 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user