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

Check for the spec version when determining private read receipt support (#9341) 

Co-authored-by: Travis Ralston <travisr@matrix.org>
pull/28788/head^2
Šimon Brandner 2022-10-04 09:38:23 +02:00 committed by GitHub
parent ff59f68a9f
commit bb2f4fb5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/TimelinePanel.tsx
View File

@ -994,7 +994,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
if (e.errcode === 'M_UNRECOGNIZED' && lastReadEvent) { if (e.errcode === 'M_UNRECOGNIZED' && lastReadEvent) {
if ( if (
!sendRRs !sendRRs
&& !cli.doesServerSupportUnstableFeature("org.matrix.msc2285.stable") && !(await cli.doesServerSupportUnstableFeature("org.matrix.msc2285.stable"))
&& !(await cli.isVersionSupported("v1.4"))
) return; ) return;
try { try {
return await cli.sendReadReceipt( return await cli.sendReadReceipt(

5
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
View File

@ -125,9 +125,12 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
} }
public async componentDidMount(): Promise<void> { public async componentDidMount(): Promise<void> {
const cli = MatrixClientPeg.get();
this.setState({ this.setState({
disablingReadReceiptsSupported: ( disablingReadReceiptsSupported: (
await MatrixClientPeg.get().doesServerSupportUnstableFeature("org.matrix.msc2285.stable") (await cli.doesServerSupportUnstableFeature("org.matrix.msc2285.stable"))
|| (await cli.isVersionSupported("v1.4"))
), ),
}); });
} }