Skip to content

Commit 5e1dc7e

Browse files
feat: Disabled message read receipt in federated rooms (#6858)
Co-authored-by: Diego Mello <[email protected]>
1 parent a04c42a commit 5e1dc7e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

app/views/RoomView/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ import UserPreferences from '../../lib/methods/userPreferences';
102102
import { type IRoomViewProps, type IRoomViewState } from './definitions';
103103
import { roomAttrsUpdate, stateAttrsUpdate } from './constants';
104104
import { EncryptedRoom, MissingRoomE2EEKey } from './components';
105+
import { isRoomFederated } from '../../lib/methods/isRoomFederated';
105106
import { InvitedRoom } from './components/InvitedRoom';
106107
import { getInvitationData } from '../../lib/methods/getInvitationData';
107108
import { isInviteSubscription } from '../../lib/methods/isInviteSubscription';
@@ -1366,6 +1367,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
13661367
let dateSeparator = null;
13671368
let showUnreadSeparator = false;
13681369
const isBeingEdited = action === 'edit' && item.id === selectedMessages[0];
1370+
const federated = 'id' in room && isRoomFederated(room);
13691371

13701372
if (!previousItem) {
13711373
dateSeparator = item.ts;
@@ -1433,7 +1435,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
14331435
Message_GroupingPeriod={Message_GroupingPeriod}
14341436
timeFormat={Message_TimeFormat}
14351437
useRealName={useRealName}
1436-
isReadReceiptEnabled={Message_Read_Receipt_Enabled}
1438+
isReadReceiptEnabled={Message_Read_Receipt_Enabled && !federated}
14371439
autoTranslateRoom={canAutoTranslate && 'id' in room && room.autoTranslate}
14381440
autoTranslateLanguage={'id' in room ? room.autoTranslateLanguage : undefined}
14391441
navToRoomInfo={this.navToRoomInfo}

0 commit comments

Comments
 (0)