mirror of https://github.com/vector-im/riot-web
Remove deprecated `m.room.aliases` references (#9431)
* Remove deprecated `m.room.aliases` references * Update SlashCommands.tsxt3chguy/dedup-icons-17oct
parent
2d9f828810
commit
6009d1c176
|
@ -711,7 +711,7 @@ export const Commands = [
|
|||
runFn: function(roomId, args) {
|
||||
const cli = MatrixClientPeg.get();
|
||||
|
||||
let targetRoomId;
|
||||
let targetRoomId: string;
|
||||
if (args) {
|
||||
const matches = args.match(/^(\S+)$/);
|
||||
if (matches) {
|
||||
|
@ -725,16 +725,11 @@ export const Commands = [
|
|||
// Try to find a room with this alias
|
||||
const rooms = cli.getRooms();
|
||||
for (let i = 0; i < rooms.length; i++) {
|
||||
const aliasEvents = rooms[i].currentState.getStateEvents('m.room.aliases');
|
||||
for (let j = 0; j < aliasEvents.length; j++) {
|
||||
const aliases = aliasEvents[j].getContent().aliases || [];
|
||||
for (let k = 0; k < aliases.length; k++) {
|
||||
if (aliases[k] === roomAlias) {
|
||||
targetRoomId = rooms[i].roomId;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (targetRoomId) break;
|
||||
if (rooms[i].getCanonicalAlias() === roomAlias ||
|
||||
rooms[i].getAltAliases().includes(roomAlias)
|
||||
) {
|
||||
targetRoomId = rooms[i].roomId;
|
||||
break;
|
||||
}
|
||||
if (targetRoomId) break;
|
||||
}
|
||||
|
|
|
@ -42,7 +42,6 @@ export function eventTriggersUnreadCount(ev: MatrixEvent): boolean {
|
|||
case EventType.RoomThirdPartyInvite:
|
||||
case EventType.CallAnswer:
|
||||
case EventType.CallHangup:
|
||||
case EventType.RoomAliases:
|
||||
case EventType.RoomCanonicalAlias:
|
||||
case EventType.RoomServerAcl:
|
||||
case M_BEACON.name:
|
||||
|
|
|
@ -103,7 +103,6 @@ describe('eventTriggersUnreadCount()', () => {
|
|||
EventType.RoomThirdPartyInvite,
|
||||
EventType.CallAnswer,
|
||||
EventType.CallHangup,
|
||||
EventType.RoomAliases,
|
||||
EventType.RoomCanonicalAlias,
|
||||
EventType.RoomServerAcl,
|
||||
];
|
||||
|
|
Loading…
Reference in New Issue