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

Merge pull request #4999 from matrix-org/t3chguy/room-list/14503 

Fix Room Tile Icon to not ignore DMs in other tags
pull/21833/head
Michael Telatynski 2020-07-16 12:42:07 +01:00 committed by GitHub
parent 725fa7df9b c94c937b31
commit 9db05db951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/avatars/DecoratedRoomAvatar.tsx
View File

@ -66,7 +66,7 @@ export default class DecoratedRoomAvatar extends React.PureComponent<IProps, ISt
oobData={this.props.oobData} oobData={this.props.oobData}
viewAvatarOnClick={this.props.viewAvatarOnClick} viewAvatarOnClick={this.props.viewAvatarOnClick}
/> />
<RoomTileIcon room={this.props.room} tag={this.props.tag} /> <RoomTileIcon room={this.props.room} />
{badge} {badge}
</div>; </div>;
} }

6
src/components/views/rooms/RoomTileIcon.tsx
View File

@ -49,7 +49,6 @@ function tooltipText(variant: Icon) {
interface IProps { interface IProps {
room: Room; room: Room;
tag: TagID;
} }
interface IState { interface IState {
@ -137,10 +136,11 @@ export default class RoomTileIcon extends React.Component<IProps, IState> {
private calculateIcon(): Icon { private calculateIcon(): Icon {
let icon = Icon.None; let icon = Icon.None;
if (this.props.tag === DefaultTagID.DM && this.props.room.getJoinedMemberCount() === 2) { // We look at the DMRoomMap and not the tag here so that we don't exclude DMs in Favourites
const otherUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
if (otherUserId && this.props.room.getJoinedMemberCount() === 2) {
// Track presence, if available // Track presence, if available
if (isPresenceEnabled()) { if (isPresenceEnabled()) {
const otherUserId = DMRoomMap.shared().getUserIdForRoomId(this.props.room.roomId);
if (otherUserId) { if (otherUserId) {
this.dmUser = MatrixClientPeg.get().getUser(otherUserId); this.dmUser = MatrixClientPeg.get().getUser(otherUserId);
icon = this.getPresenceIcon(); icon = this.getPresenceIcon();