OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow sender for backwards compat

pull/21833/head
Will Hunt 2020-11-30 13:02:04 +00:00
parent e7693dc95d
commit da86bc0b0a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/settings/BridgeTile.tsx
View File

@ -70,10 +70,16 @@ export default class BridgeTile extends React.PureComponent<IProps> {
render() {
const content: IBridgeStateEvent = this.props.ev.getContent();
// Validate
if (!content.bridgebot || !content.channel?.id || !content.protocol?.id) {
if (!content.channel?.id || !content.protocol?.id) {
console.warn(`Bridge info event ${this.props.ev.getId()} has missing content. Tile will not render`);
return null;
}
if (!content.bridgebot) {
// Bridgebot was not required previously, so in order to not break rooms we are allowing
// the sender to be used in place. When the proposal is merged, this should be removed.
console.warn(`Bridge info event ${this.props.ev.getId()} does not provide a 'bridgebot' key which is deprecated behaviour. Using sender for now.`);
content.bridgebot = this.props.ev.getSender();
}
const { channel, network, protocol } = content;
const protocolName = protocol.displayname || protocol.id;
const channelName = channel.displayname || channel.id;