remove timeline tiles for m.room.aliases events
This commit is contained in:
parent
49fe1887df
commit
0d8b4ac194
2 changed files with 0 additions and 67 deletions
|
@ -269,70 +269,6 @@ function textForMessageEvent(ev) {
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
function textForRoomAliasesEvent(ev) {
|
|
||||||
// An alternative implementation of this as a first-class event can be found at
|
|
||||||
// https://github.com/matrix-org/matrix-react-sdk/blob/dc7212ec2bd12e1917233ed7153b3e0ef529a135/src/components/views/messages/RoomAliasesEvent.js
|
|
||||||
// This feels a bit overkill though, and it's not clear the i18n really needs it
|
|
||||||
// so instead it's landing as a simple textual event.
|
|
||||||
|
|
||||||
const maxShown = 3;
|
|
||||||
|
|
||||||
const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
|
|
||||||
const oldAliases = ev.getPrevContent().aliases || [];
|
|
||||||
const newAliases = ev.getContent().aliases || [];
|
|
||||||
|
|
||||||
const addedAliases = newAliases.filter((x) => !oldAliases.includes(x));
|
|
||||||
const removedAliases = oldAliases.filter((x) => !newAliases.includes(x));
|
|
||||||
|
|
||||||
if (!addedAliases.length && !removedAliases.length) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (addedAliases.length && !removedAliases.length) {
|
|
||||||
if (addedAliases.length > maxShown) {
|
|
||||||
return _t("%(senderName)s added %(addedAddresses)s and %(count)s other addresses to this room", {
|
|
||||||
senderName: senderName,
|
|
||||||
count: addedAliases.length - maxShown,
|
|
||||||
addedAddresses: addedAliases.slice(0, maxShown).join(', '),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return _t('%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.', {
|
|
||||||
senderName: senderName,
|
|
||||||
count: addedAliases.length,
|
|
||||||
addedAddresses: addedAliases.join(', '),
|
|
||||||
});
|
|
||||||
} else if (!addedAliases.length && removedAliases.length) {
|
|
||||||
if (removedAliases.length > maxShown) {
|
|
||||||
return _t("%(senderName)s removed %(removedAddresses)s and %(count)s other addresses from this room", {
|
|
||||||
senderName: senderName,
|
|
||||||
count: removedAliases.length - maxShown,
|
|
||||||
removedAddresses: removedAliases.slice(0, maxShown).join(', '),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return _t('%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.', {
|
|
||||||
senderName: senderName,
|
|
||||||
count: removedAliases.length,
|
|
||||||
removedAddresses: removedAliases.join(', '),
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
const combined = addedAliases.length + removedAliases.length;
|
|
||||||
if (combined > maxShown) {
|
|
||||||
return _t("%(senderName)s removed %(countRemoved)s and added %(countAdded)s addresses to this room", {
|
|
||||||
senderName: senderName,
|
|
||||||
countAdded: addedAliases.length,
|
|
||||||
countRemoved: removedAliases.length,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return _t(
|
|
||||||
'%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.', {
|
|
||||||
senderName: senderName,
|
|
||||||
addedAddresses: addedAliases.join(', '),
|
|
||||||
removedAddresses: removedAliases.join(', '),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function textForCanonicalAliasEvent(ev) {
|
function textForCanonicalAliasEvent(ev) {
|
||||||
const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
|
const senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
|
||||||
const oldAlias = ev.getPrevContent().alias;
|
const oldAlias = ev.getPrevContent().alias;
|
||||||
|
@ -612,7 +548,6 @@ const handlers = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const stateHandlers = {
|
const stateHandlers = {
|
||||||
'm.room.aliases': textForRoomAliasesEvent,
|
|
||||||
'm.room.canonical_alias': textForCanonicalAliasEvent,
|
'm.room.canonical_alias': textForCanonicalAliasEvent,
|
||||||
'm.room.name': textForRoomNameEvent,
|
'm.room.name': textForRoomNameEvent,
|
||||||
'm.room.topic': textForTopicEvent,
|
'm.room.topic': textForTopicEvent,
|
||||||
|
|
|
@ -48,8 +48,6 @@ const eventTileTypes = {
|
||||||
|
|
||||||
const stateEventTileTypes = {
|
const stateEventTileTypes = {
|
||||||
'm.room.encryption': 'messages.EncryptionEvent',
|
'm.room.encryption': 'messages.EncryptionEvent',
|
||||||
'm.room.aliases': 'messages.TextualEvent',
|
|
||||||
// 'm.room.aliases': 'messages.RoomAliasesEvent', // too complex
|
|
||||||
'm.room.canonical_alias': 'messages.TextualEvent',
|
'm.room.canonical_alias': 'messages.TextualEvent',
|
||||||
'm.room.create': 'messages.RoomCreate',
|
'm.room.create': 'messages.RoomCreate',
|
||||||
'm.room.member': 'messages.TextualEvent',
|
'm.room.member': 'messages.TextualEvent',
|
||||||
|
|
Loading…
Reference in a new issue