Merge pull request #761 from matrix-org/luke/fix-people-section2
Fix people section DropTarget and refactor Roomspull/21833/head
						commit
						7eb3a776dc
					
				
							
								
								
									
										14
									
								
								src/Rooms.js
								
								
								
								
							
							
						
						
									
										14
									
								
								src/Rooms.js
								
								
								
								
							|  | @ -79,6 +79,20 @@ export function looksLikeDirectMessageRoom(room, me) { | |||
|     return false; | ||||
| } | ||||
| 
 | ||||
| export function guessAndSetDMRoom(room, isDirect) { | ||||
|     let newTarget; | ||||
|     if (isDirect) { | ||||
|         const guessedTarget = guessDMRoomTarget( | ||||
|             room, room.getMember(MatrixClientPeg.get().credentials.userId), | ||||
|         ); | ||||
|         newTarget = guessedTarget.userId; | ||||
|     } else { | ||||
|         newTarget = null; | ||||
|     } | ||||
| 
 | ||||
|     return setDMRoom(room.roomId, newTarget); | ||||
| } | ||||
| 
 | ||||
| /** | ||||
|  * Marks or unmarks the given room as being as a DM room. | ||||
|  * @param {string} roomId The ID of the room to modify | ||||
|  |  | |||
|  | @ -485,6 +485,8 @@ module.exports = React.createClass({ | |||
| 
 | ||||
|                 <RoomSubList list={ self.state.lists['im.vector.fake.direct'] } | ||||
|                              label="People" | ||||
|                              tagName="im.vector.fake.direct" | ||||
|                              verb="tag direct chat" | ||||
|                              editable={ true } | ||||
|                              order="recent" | ||||
|                              selectedRoom={ self.props.selectedRoom } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Luke Barnard
						Luke Barnard