From 07633fe67f726c84b47fbc41984122f1ffd8ff61 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 10 Aug 2017 13:12:50 +0100
Subject: [PATCH] At /user, view member of current room

With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name).

To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change.

Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.
---
 src/components/structures/LoggedInView.js |  4 +--
 src/components/structures/MatrixChat.js   | 44 +++++++++++++++++------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 093fae5d7b..0790a5766e 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -301,13 +301,13 @@ export default React.createClass({
 
             case PageTypes.UserView:
                 page_element = null; // deliberately null for now
-                right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.rightOpacity} />;
+                right_panel = <RightPanel opacity={this.props.rightOpacity} />;
                 break;
             case PageTypes.GroupView:
                 page_element = <GroupView
                     groupId={this.props.currentGroupId}
                 />;
-                //right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.rightOpacity} />;
+                //right_panel = <RightPanel opacity={this.props.rightOpacity} />;
                 break;
         }
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index cb6419c9e8..784526b09b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -448,6 +448,7 @@ module.exports = React.createClass({
                         });
                     }, 0);
                 }
+                this.notifyNewScreen('user/' + payload.member.userId);
                 break;
             case 'view_room':
                 // Takes either a room ID or room alias: if switching to a room the client is already
@@ -1203,21 +1204,44 @@ module.exports = React.createClass({
         } else if (screen.indexOf('user/') == 0) {
             const userId = screen.substring(5);
 
-            if (params.action === 'chat') {
-                this._chatCreateOrReuse(userId);
-                return;
-            }
+            // Wait for the first sync so that `getRoom` gives us a room object if it's
+            // in the sync response
+            const waitFor = this.firstSyncPromise ?
+                this.firstSyncPromise.promise : Promise.resolve();
+            waitFor.then(() => {
+                if (params.action === 'chat') {
+                    this._chatCreateOrReuse(userId);
+                    return;
+                }
 
-            this.setState({ viewUserId: userId });
-            this._setPage(PageTypes.UserView);
-            this.notifyNewScreen('user/' + userId);
-            const member = new Matrix.RoomMember(null, userId);
-            if (member) {
+                // Get the member object for the current room, if a current room is set or
+                // we have a last_room in localStorage. The user might not be a member of
+                // this room (in which case member will be falsey).
+                let member;
+                const roomId = this.state.currentRoomId || localStorage.getItem('mx_last_room_id');
+                if (roomId) {
+                    const room = MatrixClientPeg.get().getRoom(roomId);
+                    if (room) {
+                        member = room.getMember(userId);
+                    }
+                }
+
+                if (member) {
+                    // This user is a member of this room, so view the room
+                    dis.dispatch({
+                        action: 'view_room',
+                        room_id: roomId,
+                    });
+                } else {
+                    // This user is not a member of this room, show the user view
+                    member = new Matrix.RoomMember(roomId, userId);
+                    this._setPage(PageTypes.UserView);
+                }
                 dis.dispatch({
                     action: 'view_user',
                     member: member,
                 });
-            }
+            });
         } else if (screen.indexOf('group/') == 0) {
             const groupId = screen.substring(6);