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

Merge pull request #818 from turt2live/travis/hide-read-receipts 

Add option to hide other people's read receipts.
pull/21833/head
Matthew Hodgson 2017-04-22 01:36:45 +01:00 committed by GitHub
parent b36eb90a10 872d0e0f50
commit d2d24bf0fa
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/UserSettings.js
View File

@ -44,6 +44,10 @@ const SETTINGS_LABELS = [
id: 'autoplayGifsAndVideos', id: 'autoplayGifsAndVideos',
label: 'Autoplay GIFs and videos', label: 'Autoplay GIFs and videos',
}, },
{
id: 'hideReadReceipts',
label: 'Hide read receipts'
},
{ {
id: 'dontSendTypingNotifications', id: 'dontSendTypingNotifications',
label: "Don't send typing notifications", label: "Don't send typing notifications",

6
src/components/views/rooms/EventTile.js
View File

@ -23,6 +23,7 @@ var Modal = require('../../../Modal');
var sdk = require('../../../index'); var sdk = require('../../../index');
var TextForEvent = require('../../../TextForEvent'); var TextForEvent = require('../../../TextForEvent');
import WithMatrixClient from '../../../wrappers/WithMatrixClient'; import WithMatrixClient from '../../../wrappers/WithMatrixClient';
import * as UserSettingsStore from "../../../UserSettingsStore";
var ContextualMenu = require('../../structures/ContextualMenu'); var ContextualMenu = require('../../structures/ContextualMenu');
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
@ -284,6 +285,11 @@ module.exports = WithMatrixClient(React.createClass({
}, },
getReadAvatars: function() { getReadAvatars: function() {
// return early if the user doesn't want any read receipts
if (UserSettingsStore.getSyncedSetting('hideReadReceipts', false)) {
return (<span className="mx_EventTile_readAvatars"></span>);
}
const ReadReceiptMarker = sdk.getComponent('rooms.ReadReceiptMarker'); const ReadReceiptMarker = sdk.getComponent('rooms.ReadReceiptMarker');
const avatars = []; const avatars = [];
const receiptOffset = 15; const receiptOffset = 15;