diff --git a/src/TextForEvent.js b/src/TextForEvent.js index a17bd7838e..6b68941ee3 100644 --- a/src/TextForEvent.js +++ b/src/TextForEvent.js @@ -199,6 +199,11 @@ function textForMessageEvent(ev) { } 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 senderName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender(); const oldAliases = ev.getPrevContent().aliases || []; const newAliases = ev.getContent().aliases || []; diff --git a/src/components/views/messages/RoomAliasesEvent.js b/src/components/views/messages/RoomAliasesEvent.js deleted file mode 100644 index f15c5caf49..0000000000 --- a/src/components/views/messages/RoomAliasesEvent.js +++ /dev/null @@ -1,173 +0,0 @@ -/* -Michael Telatynski <7t3chguy@gmail.com> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -/**************************************************************** - ** ** - ** THIS CLASS IS NOT USED TO RENDER ALIAS CHANGES, IN ORDER ** - ** TO TRY TO KEEP THINGS SIMPLE AND JUST USE TextualEvent. ** - ** ** - ** The code is kept here for ease of reference in future ** - ** should we need the GenericEventListSummary stuff ** - ** ** - ****************************************************************/ - -'use strict'; - -import React from 'react'; -import PropTypes from 'prop-types'; -import { _t } from '../../../languageHandler'; - -export class GenericEventListSummary extends React.Component { - static propTypes = { - // An summary to display when collapsed - summary: PropTypes.string.isRequired, - // whether to show summary whilst children are expanded - alwaysShowSummary: PropTypes.bool, - // An array of EventTiles to render when expanded - children: PropTypes.array.isRequired, - // Called when the GELS expansion is toggled - onToggle: PropTypes.func, - // how many children should cause GELS to act - threshold: PropTypes.number.isRequired, - }; - - static defaultProps = { - threshold: 1, - }; - - constructor(props, context) { - super(props, context); - this._toggleSummary = this._toggleSummary.bind(this); - } - - state = { - expanded: false, - }; - - _toggleSummary() { - this.setState({expanded: !this.state.expanded}); - this.props.onToggle(); - } - - render() { - const fewEvents = this.props.children.length < this.props.threshold; - const expanded = this.state.expanded || fewEvents; - const showSummary = !expanded || this.props.alwaysShowSummary; - - let expandedEvents = null; - if (expanded) { - expandedEvents = this.props.children; - } - - if (fewEvents) { - return