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

Introduce Membership type

Browse source
This commit is contained in:
Stanislav Demydiuk 2024-03-11 17:16:53 +00:00 • committed by Andy Balaam
parent 3c6fd58628
commit da99bad7b9
115 changed files with 582 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/components/structures/RoomView.tsx
View file

@ -1454,7 +1454,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
private async loadMembersIfJoined(room: Room): Promise<void> {
// lazy load members if enabled
if (this.context.client?.hasLazyLoadMembersEnabled()) {
if (room && room.getMyMembership() === "join") {
if (room && room.getMyMembership() === Membership.Join) {
try {
await room.loadMembersIfNeeded();
if (!this.unmounted) {
@ -1588,7 +1588,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
if (room && this.context.client) {
const me = this.context.client.getSafeUserId();
const canReact =
room.getMyMembership() === "join" && room.currentState.maySendEvent(EventType.Reaction, me);
room.getMyMembership() === Membership.Join && room.currentState.maySendEvent(EventType.Reaction, me);
const canSendMessages = room.maySendMessage();
const canSelfRedact = room.currentState.maySendEvent(EventType.RoomRedaction, me);
@ -1622,7 +1622,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
private updateDMState(): void {
const room = this.state.room;
if (room?.getMyMembership() !== "join") {
if (room.getMyMembership() != Membership.Join) {
return;
}
const dmInviter = room.getDMInviter();
@ -1662,7 +1662,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
action: Action.JoinRoom,
roomId,
opts: { inviteSignUrl: signUrl },
metricsTrigger: this.state.room?.getMyMembership() === "invite" ? "Invite" : "RoomPreview",
metricsTrigger:
this.state.room?.getMyMembership() === Membership.Invite ? "Invite" : "RoomPreview",
canAskToJoin: this.state.canAskToJoin,
});
}
@ -2183,7 +2184,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
const myMembership = this.state.room.getMyMembership();
if (
isVideoRoom(this.state.room) &&
!(SettingsStore.getValue("feature_video_rooms") && myMembership === "join")
!(SettingsStore.getValue("feature_video_rooms") && myMembership === Membership.Join)
) {
return (
<ErrorBoundary>
@ -2200,7 +2201,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
}
// SpaceRoomView handles invites itself
if (myMembership === "invite" && !this.state.room.isSpaceRoom()) {
if (myMembership === Membership.Invite && !this.state.room.isSpaceRoom()) {
if (this.state.joining || this.state.rejecting) {
return (
<ErrorBoundary>
@ -2247,16 +2248,16 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
}
}
if (this.state.canAskToJoin && ["knock", "leave"].includes(myMembership)) {
if (this.state.canAskToJoin && [Membership.Knock, Membership.Leave].includes(myMembership)) {
return (
<div className="mx_RoomView" data-room-header={roomHeaderType}>
<ErrorBoundary>
<RoomPreviewBar
onJoinClick={this.onJoinButtonClicked}
room={this.state.room}
canAskToJoinAndMembershipIsLeave={myMembership === "leave"}
canAskToJoinAndMembershipIsLeave={myMembership === Membership.Leave}
promptAskToJoin={this.state.promptAskToJoin}
knocked={myMembership === "knock"}
knocked={myMembership === Membership.Knock}
onSubmitAskToJoin={this.onSubmitAskToJoin}
onCancelAskToJoin={this.onCancelAskToJoin}
onForgetClick={this.onForgetClick}
@ -2288,7 +2289,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
statusBar = (
<RoomStatusBar
room={this.state.room}
isPeeking={myMembership !== "join"}
isPeeking={myMembership !== Membership.Join}
onInviteClick={this.onInviteClick}
onVisible={this.onStatusBarVisible}
onHidden={this.onStatusBarHidden}
@ -2332,7 +2333,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
);
} else if (showRoomUpgradeBar) {
aux = <RoomUpgradeWarningBar room={this.state.room} />;
} else if (myMembership !== "join") {
} else if (myMembership !== Membership.Join) {
// We do have a room object for this room, but we're not currently in it.
// We may have a 3rd party invite to it.
let inviterName: string | undefined;
@ -2406,7 +2407,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
let messageComposer;
const showComposer =
// joined and not showing search results
myMembership === "join" && !this.state.search;
myMembership === Membership.Join && !this.state.search;
if (showComposer) {
messageComposer = (
<MessageComposer
@ -2603,7 +2604,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
const myMember = this.state.room!.getMember(this.context.client!.getSafeUserId());
const showForgetButton =
!this.context.client.isGuest() && (["leave", "ban"].includes(myMembership) || myMember?.isKicked());
!this.context.client.isGuest() &&
([Membership.Leave, Membership.Ban].includes(myMembership) || myMember?.isKicked());
return (
<RoomContext.Provider value={this.state}>
@ -2640,7 +2642,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
room={this.state.room}
searchInfo={this.state.search}
oobData={this.props.oobData}
inRoom={myMembership === "join"}
inRoom={myMembership === Membership.Join}
onSearchClick={onSearchClick}
onInviteClick={onInviteClick}
onForgetClick={showForgetButton ? onForgetClick : null}

6
src/components/structures/SpaceHierarchy.tsx
View file

@ -112,7 +112,7 @@ const Tile: React.FC<ITileProps> = ({
const cli = useContext(MatrixClientContext);
const joinedRoom = useTypedEventEmitterState(cli, ClientEvent.Room, () => {
const cliRoom = cli?.getRoom(room.room_id);
return cliRoom?.getMyMembership() === "join" ? cliRoom : undefined;
return cliRoom?.getMyMembership() === Membership.Join ? cliRoom : undefined;
});
const joinedRoomName = useTypedEventEmitterState(joinedRoom, RoomEvent.Name, (room) => room?.name);
const name =
@ -828,7 +828,7 @@ const SpaceHierarchy: React.FC<IProps> = ({ space, initialText = "", showRoom, a
content = <Spinner />;
} else {
const hasPermissions =
space?.getMyMembership() === "join" &&
space?.getMyMembership() === Membership.Join &&
space.currentState.maySendStateEvent(EventType.SpaceChild, cli.getSafeUserId());
const root = hierarchy.roomMap.get(space.roomId);
@ -846,7 +846,7 @@ const SpaceHierarchy: React.FC<IProps> = ({ space, initialText = "", showRoom, a
onViewRoomClick={(roomId, roomType) => showRoom(cli, hierarchy, roomId, roomType)}
onJoinRoomClick={async (roomId, parents) => {
for (const parent of parents) {
if (cli.getRoom(parent)?.getMyMembership() !== "join") {
if (cli.getRoom(parent)?.getMyMembership() !== Membership.Join) {
await joinRoom(cli, hierarchy, parent);
}
}

4
src/components/structures/SpaceRoomView.tsx
View file

@ -237,7 +237,7 @@ const SpaceLanding: React.FC<{ space: Room }> = ({ space }) => {
}
const hasAddRoomPermissions =
myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
myMembership === Membership.Join && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
let addRoomButton;
if (hasAddRoomPermissions) {
@ -678,7 +678,7 @@ export default class SpaceRoomView extends React.PureComponent<IProps, IState> {
private renderBody(): JSX.Element {
switch (this.state.phase) {
case Phase.Landing:
if (this.state.myMembership === "join") {
if (this.state.myMembership === Membership.Join) {
return <SpaceLanding space={this.props.space} />;
} else {
return (

14
src/components/structures/TimelinePanel.tsx
View file

@ -1824,7 +1824,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
// that the event belongs to, and traversing the timeline looking for
// that event, while keeping track of the user's membership
let i = events.length - 1;
let userMembership = "leave";
let userMembership = Membership.Leave;
for (; i >= 0; i--) {
const timeline = this.props.timelineSet.getTimelineForEvent(events[i].getId()!);
if (!timeline) {
@ -1837,14 +1837,15 @@ class TimelinePanel extends React.Component<IProps, IState> {
continue;
}
userMembership = timeline.getState(EventTimeline.FORWARDS)?.getMember(userId)?.membership ?? "leave";
userMembership =
timeline.getState(EventTimeline.FORWARDS)?.getMember(userId)?.membership ?? Membership.Leave;
const timelineEvents = timeline.getEvents();
for (let j = timelineEvents.length - 1; j >= 0; j--) {
const event = timelineEvents[j];
if (event.getId() === events[i].getId()) {
break;
} else if (event.getStateKey() === userId && event.getType() === EventType.RoomMember) {
userMembership = event.getPrevContent().membership || "leave";
userMembership = event.getPrevContent().membership || Membership.Leave;
}
}
break;
@ -1855,8 +1856,11 @@ class TimelinePanel extends React.Component<IProps, IState> {
for (; i >= 0; i--) {
const event = events[i];
if (event.getStateKey() === userId && event.getType() === EventType.RoomMember) {
userMembership = event.getPrevContent().membership || "leave";
} else if (userMembership === "leave" && (event.isDecryptionFailure() || event.isBeingDecrypted())) {
userMembership = event.getPrevContent().membership || Membership.Leave;
} else if (
userMembership === Membership.Leave &&
(event.isDecryptionFailure() || event.isBeingDecrypted())
) {
// reached an undecryptable message when the user wasn't in the room -- don't try to load any more
// Note: for now, we assume that events that are being decrypted are
// not decryptable - we will be called once more when it is decrypted.

2
src/components/structures/grouper/CreationGrouper.tsx
View file

@ -48,7 +48,7 @@ export class CreationGrouper extends BaseGrouper {
const eventType = event.getType();
if (
eventType === EventType.RoomMember &&
(event.getStateKey() !== createEvent.getSender() || event.getContent()["membership"] !== "join")
(event.getStateKey() !== createEvent.getSender() || event.getContent()["membership"] !== Membership.Join)
) {
return false;
}