mirror of https://github.com/vector-im/riot-web
Merge pull request #1463 from turt2live/travis/peek_rr
Don't send RR or RM when peeking at a roompull/21833/head
commit
b73e28add3
|
@ -117,6 +117,7 @@ module.exports = React.createClass({
|
||||||
guestsCanJoin: false,
|
guestsCanJoin: false,
|
||||||
canPeek: false,
|
canPeek: false,
|
||||||
showApps: false,
|
showApps: false,
|
||||||
|
isPeeking: false,
|
||||||
|
|
||||||
// error object, as from the matrix client/server API
|
// error object, as from the matrix client/server API
|
||||||
// If we failed to load information about the room,
|
// If we failed to load information about the room,
|
||||||
|
@ -266,6 +267,7 @@ module.exports = React.createClass({
|
||||||
console.log("Attempting to peek into room %s", roomId);
|
console.log("Attempting to peek into room %s", roomId);
|
||||||
this.setState({
|
this.setState({
|
||||||
peekLoading: true,
|
peekLoading: true,
|
||||||
|
isPeeking: true, // this will change to false if peeking fails
|
||||||
});
|
});
|
||||||
MatrixClientPeg.get().peekInRoom(roomId).then((room) => {
|
MatrixClientPeg.get().peekInRoom(roomId).then((room) => {
|
||||||
this.setState({
|
this.setState({
|
||||||
|
@ -274,6 +276,11 @@ module.exports = React.createClass({
|
||||||
});
|
});
|
||||||
this._onRoomLoaded(room);
|
this._onRoomLoaded(room);
|
||||||
}, (err) => {
|
}, (err) => {
|
||||||
|
// Stop peeking if anything went wrong
|
||||||
|
this.setState({
|
||||||
|
isPeeking: false,
|
||||||
|
});
|
||||||
|
|
||||||
// This won't necessarily be a MatrixError, but we duck-type
|
// This won't necessarily be a MatrixError, but we duck-type
|
||||||
// here and say if it's got an 'errcode' key with the right value,
|
// here and say if it's got an 'errcode' key with the right value,
|
||||||
// it means we can't peek.
|
// it means we can't peek.
|
||||||
|
@ -290,6 +297,7 @@ module.exports = React.createClass({
|
||||||
} else if (room) {
|
} else if (room) {
|
||||||
// Stop peeking because we have joined this room previously
|
// Stop peeking because we have joined this room previously
|
||||||
MatrixClientPeg.get().stopPeeking();
|
MatrixClientPeg.get().stopPeeking();
|
||||||
|
this.setState({isPeeking: false});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -1728,8 +1736,8 @@ module.exports = React.createClass({
|
||||||
<TimelinePanel ref={this._gatherTimelinePanelRef}
|
<TimelinePanel ref={this._gatherTimelinePanelRef}
|
||||||
timelineSet={this.state.room.getUnfilteredTimelineSet()}
|
timelineSet={this.state.room.getUnfilteredTimelineSet()}
|
||||||
showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
|
showReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
|
||||||
manageReadReceipts={true}
|
manageReadReceipts={!this.state.isPeeking}
|
||||||
manageReadMarkers={true}
|
manageReadMarkers={!this.state.isPeeking}
|
||||||
hidden={hideMessagePanel}
|
hidden={hideMessagePanel}
|
||||||
highlightedEventId={highlightedEventId}
|
highlightedEventId={highlightedEventId}
|
||||||
eventId={this.state.initialEventId}
|
eventId={this.state.initialEventId}
|
||||||
|
|
Loading…
Reference in New Issue