imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Iterate

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2024-12-05 13:27:34 +00:00
parent c3f3c9364f
commit 6946b90b11
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx
View file

@ -8,6 +8,7 @@ Please see LICENSE files in the repository root for full details.
import React, { useCallback, useMemo, useState } from "react"; import React, { useCallback, useMemo, useState } from "react";
import { JoinRule, EventType, RoomState, Room } from "matrix-js-sdk/src/matrix"; import { JoinRule, EventType, RoomState, Room } from "matrix-js-sdk/src/matrix";
import { RoomPowerLevelsEventContent } from "matrix-js-sdk/src/types";
import { _t } from "../../../../../languageHandler"; import { _t } from "../../../../../languageHandler";
import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch"; import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
@ -24,23 +25,24 @@ interface ElementCallSwitchProps {
const ElementCallSwitch: React.FC<ElementCallSwitchProps> = ({ room }) => { const ElementCallSwitch: React.FC<ElementCallSwitchProps> = ({ room }) => {
const isPublic = useMemo(() => room.getJoinRule() === JoinRule.Public, [room]); const isPublic = useMemo(() => room.getJoinRule() === JoinRule.Public, [room]);
const [content, events, maySend] = useRoomState( const [content, maySend] = useRoomState(
room, room,
useCallback( useCallback(
(state: RoomState) => { (state: RoomState) => {
const content = state?.getStateEvents(EventType.RoomPowerLevels, "")?.getContent(); const content = state
?.getStateEvents(EventType.RoomPowerLevels, "")
?.getContent<RoomPowerLevelsEventContent>();
return [ return [
content ?? {}, content ?? {},
content?.["events"] ?? {},
state?.maySendStateEvent(EventType.RoomPowerLevels, room.client.getSafeUserId()), state?.maySendStateEvent(EventType.RoomPowerLevels, room.client.getSafeUserId()),
]; ] as const;
}, },
[room.client], [room.client],
), ),
); );
const [elementCallEnabled, setElementCallEnabled] = useState<boolean>(() => { const [elementCallEnabled, setElementCallEnabled] = useState<boolean>(() => {
return events[ElementCall.MEMBER_EVENT_TYPE.name] === 0; return content.events?.[ElementCall.MEMBER_EVENT_TYPE.name] === 0;
}); });
const onChange = useCallback( const onChange = useCallback(
@ -48,27 +50,24 @@ const ElementCallSwitch: React.FC<ElementCallSwitchProps> = ({ room }) => {
setElementCallEnabled(enabled); setElementCallEnabled(enabled);
// Take a copy to avoid mutating the original // Take a copy to avoid mutating the original
const newEvents = { ...events }; const newContent = { events: {}, ...content };
if (enabled) { if (enabled) {
const userLevel = newEvents[EventType.RoomMessage] ?? content.users_default ?? 0; const userLevel = newContent.events[EventType.RoomMessage] ?? content.users_default ?? 0;
const moderatorLevel = content.kick ?? 50; const moderatorLevel = content.kick ?? 50;
newEvents[ElementCall.CALL_EVENT_TYPE.name] = isPublic ? moderatorLevel : userLevel; newContent.events[ElementCall.CALL_EVENT_TYPE.name] = isPublic ? moderatorLevel : userLevel;
newEvents[ElementCall.MEMBER_EVENT_TYPE.name] = userLevel; newContent.events[ElementCall.MEMBER_EVENT_TYPE.name] = userLevel;
} else { } else {
const adminLevel = newEvents[EventType.RoomPowerLevels] ?? content.state_default ?? 100; const adminLevel = newContent.events[EventType.RoomPowerLevels] ?? content.state_default ?? 100;
newEvents[ElementCall.CALL_EVENT_TYPE.name] = adminLevel; newContent.events[ElementCall.CALL_EVENT_TYPE.name] = adminLevel;
newEvents[ElementCall.MEMBER_EVENT_TYPE.name] = adminLevel; newContent.events[ElementCall.MEMBER_EVENT_TYPE.name] = adminLevel;
} }
room.client.sendStateEvent(room.roomId, EventType.RoomPowerLevels, { room.client.sendStateEvent(room.roomId, EventType.RoomPowerLevels, newContent);
events: newEvents,
...content,
});
}, },
[room.client, room.roomId, content, events, isPublic], [room.client, room.roomId, content, isPublic],
); );
const brand = SdkConfig.get("element_call").brand ?? DEFAULTS.element_call.brand; const brand = SdkConfig.get("element_call").brand ?? DEFAULTS.element_call.brand;