Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 0f26ddd

Browse files
authored
Update local aliases checks to use stable API (#8698)
Fixes element-hq/element-web#22337
1 parent 8b17007 commit 0f26ddd

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

src/components/views/room_settings/AliasSettings.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,11 @@ export default class AliasSettings extends React.Component<IProps, IState> {
139139
this.setState({ localAliasesLoading: true });
140140
try {
141141
const mxClient = this.context;
142+
142143
let localAliases = [];
143-
if (await mxClient.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
144-
const response = await mxClient.unstableGetLocalAliases(this.props.roomId);
145-
if (Array.isArray(response.aliases)) {
146-
localAliases = response.aliases;
147-
}
144+
const response = await mxClient.getLocalAliases(this.props.roomId);
145+
if (Array.isArray(response?.aliases)) {
146+
localAliases = response.aliases;
148147
}
149148
this.setState({ localAliases });
150149

src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,9 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
220220

221221
private async hasAliases(): Promise<boolean> {
222222
const cli = this.context;
223-
if (await cli.doesServerSupportUnstableFeature("org.matrix.msc2432")) {
224-
const response = await cli.unstableGetLocalAliases(this.props.roomId);
225-
const localAliases = response.aliases;
226-
return Array.isArray(localAliases) && localAliases.length !== 0;
227-
} else {
228-
const room = cli.getRoom(this.props.roomId);
229-
const aliasEvents = room.currentState.getStateEvents(EventType.RoomAliases) || [];
230-
const hasAliases = !!aliasEvents.find((ev) => (ev.getContent().aliases || []).length > 0);
231-
return hasAliases;
232-
}
223+
const response = await cli.getLocalAliases(this.props.roomId);
224+
const localAliases = response.aliases;
225+
return Array.isArray(localAliases) && localAliases.length !== 0;
233226
}
234227

235228
private renderJoinRule() {

0 commit comments

Comments
 (0)