User Info fetch latest RoomMember instead of showing historical data

pull/21833/head
Michael Telatynski 2019-12-28 17:51:38 +00:00
parent 6ef6b5909f
commit a0cb6ce302
1 changed files with 24 additions and 19 deletions

View File

@ -1020,6 +1020,8 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
// Load room if we are given a room id and memoize it
const room = useMemo(() => roomId ? cli.getRoom(roomId) : null, [cli, roomId]);
// fetch latest room member if we have a room, so we don't show historical information
const member = useMemo(() => room ? room.getMember(user.userId) : user, [room, user]);
// only display the devices list if our client supports E2E
const _enableDevices = cli.isCryptoEnabled();
@ -1051,7 +1053,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
setPendingUpdateCount(pendingUpdateCount - 1);
}, [pendingUpdateCount]);
const roomPermissions = useRoomPermissions(cli, room, user);
const roomPermissions = useRoomPermissions(cli, room, member);
const onSynapseDeactivate = useCallback(async () => {
const QuestionDialog = sdk.getComponent('views.dialogs.QuestionDialog');
@ -1084,7 +1086,6 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
}, [cli, user.userId]);
const onMemberAvatarClick = useCallback(() => {
const member = user;
const avatarUrl = member.getMxcAvatarUrl ? member.getMxcAvatarUrl() : member.avatarUrl;
if (!avatarUrl) return;
@ -1096,7 +1097,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
};
Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
}, [cli, user]);
}, [cli, member]);
let synapseDeactivateButton;
let spinner;
@ -1113,11 +1114,11 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
}
let adminToolsContainer;
if (room && user.roomId) {
if (room && member.roomId) {
adminToolsContainer = (
<RoomAdminToolsContainer
powerLevels={powerLevels}
member={user}
member={member}
room={room}
startUpdating={startUpdating}
stopUpdating={stopUpdating}>
@ -1147,20 +1148,20 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
}
const displayName = user.name || user.displayname;
const displayName = member.name || member.displayname;
let presenceState;
let presenceLastActiveAgo;
let presenceCurrentlyActive;
let statusMessage;
if (user instanceof RoomMember && user.user) {
presenceState = user.user.presence;
presenceLastActiveAgo = user.user.lastActiveAgo;
presenceCurrentlyActive = user.user.currentlyActive;
if (member instanceof RoomMember && member.user) {
presenceState = member.user.presence;
presenceLastActiveAgo = member.user.lastActiveAgo;
presenceCurrentlyActive = member.user.currentlyActive;
if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
statusMessage = user.user._unstable_statusMessage;
statusMessage = member.user._unstable_statusMessage;
}
}
@ -1190,13 +1191,13 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
<div>
<div>
<MemberAvatar
member={user}
member={member}
width={2 * 0.3 * window.innerHeight} // 2x@30vh
height={2 * 0.3 * window.innerHeight} // 2x@30vh
resizeMethod="scale"
fallbackUserId={user.userId}
fallbackUserId={member.userId}
onClick={onMemberAvatarClick}
urls={user.avatarUrl ? [user.avatarUrl] : undefined} />
urls={member.avatarUrl ? [member.avatarUrl] : undefined} />
</div>
</div>
</div>
@ -1210,10 +1211,14 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
title={_t('Close')} />;
}
const memberDetails = <PowerLevelSection
powerLevels={powerLevels}
user={user} room={room} roomPermissions={roomPermissions}
/>;
const memberDetails = (
<PowerLevelSection
powerLevels={powerLevels}
user={member}
room={room}
roomPermissions={roomPermissions}
/>
);
const isRoomEncrypted = useIsEncrypted(cli, room);
// undefined means yet to be loaded, null means failed to load, otherwise list of devices
@ -1349,7 +1354,7 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
devices={devices}
canInvite={roomPermissions.canInvite}
isIgnored={isIgnored}
member={user} />
member={member} />
{ adminToolsContainer }