Update status message in the member list and user info panel when it is changed

src/components/views/right_panel/UserInfo.tsx

@@ -76,6 +76,7 @@ import { bulkSpaceBehaviour } from "../../../utils/space";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../../settings/UIFeature";
 import { TimelineRenderingType } from "../../../contexts/RoomContext";
+import { useUserStatusMessage } from "../../../hooks/useUserStatusMessage";
 
 export interface IDevice {
     deviceId: string;
@@ -1502,6 +1503,7 @@ const UserInfoHeader: React.FC<{
     e2eStatus: E2EStatus;
 }> = ({ member, e2eStatus }) => {
     const cli = useContext(MatrixClientContext);
+    const statusMessage = useUserStatusMessage(member);
 
     const onMemberAvatarClick = useCallback(() => {
         const avatarUrl = (member as RoomMember).getMxcAvatarUrl
@@ -1539,20 +1541,10 @@ const UserInfoHeader: React.FC<{
     let presenceState;
     let presenceLastActiveAgo;
     let presenceCurrentlyActive;
-    let statusMessage;
-
     if (member instanceof RoomMember && member.user) {
         presenceState = member.user.presence;
         presenceLastActiveAgo = member.user.lastActiveAgo;
         presenceCurrentlyActive = member.user.currentlyActive;
-
-        if (SettingsStore.getValue("feature_custom_status")) {
-            if ((member as RoomMember).user) {
-                statusMessage = member.user.unstable_statusMessage;
-            } else {
-                statusMessage = (member as unknown as User).unstable_statusMessage;
-            }
-        }
     }
 
     const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
@@ -1573,7 +1565,7 @@ const UserInfoHeader: React.FC<{
     }
 
     let statusLabel = null;
-    if (statusMessage) {
+    if (SettingsStore.getValue("feature_custom_status") && statusMessage) {
         statusLabel = <span className="mx_UserInfo_statusMessage">{ statusMessage }</span>;
     }
 

src/components/views/rooms/MemberTile.tsx

@@ -66,7 +66,7 @@ export default class MemberTile extends React.Component<IProps, IState> {
         if (SettingsStore.getValue("feature_custom_status")) {
             const { user } = this.props.member;
             if (user) {
-                user.on("User._unstable_statusMessage", this.onStatusMessageCommitted);
+                user.on("User.unstable_statusMessage", this.onStatusMessageCommitted);
             }
         }
 
@@ -93,7 +93,7 @@ export default class MemberTile extends React.Component<IProps, IState> {
         const { user } = this.props.member;
         if (user) {
             user.removeListener(
-                "User._unstable_statusMessage",
+                "User.unstable_statusMessage",
                 this.onStatusMessageCommitted,
             );
         }

src/hooks/useUserStatusMessage.ts

@@ -0,0 +1,38 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { MatrixClient, RoomMember } from "matrix-js-sdk";
+import { User } from "matrix-js-sdk/src/models/user";
+import { useContext } from "react";
+
+import { GroupMember } from "../components/views/right_panel/UserInfo";
+import MatrixClientContext from "../contexts/MatrixClientContext";
+import { useEventEmitterState } from "./useEventEmitter";
+
+type StatusMessageUser = User | RoomMember | GroupMember;
+
+const getUser = (cli: MatrixClient, user: StatusMessageUser): User => cli.getUser(user?.userId);
+const getStatusMessage = (cli: MatrixClient, user: StatusMessageUser): string => {
+    return getUser(cli, user).unstable_statusMessage;
+};
+
+// Hook to simplify handling Matrix User status
+export const useUserStatusMessage = (user?: StatusMessageUser): string => {
+    const cli = useContext(MatrixClientContext);
+    return useEventEmitterState(getUser(cli, user), "User.unstable_statusMessage", () => {
+        return getStatusMessage(cli, user);
+    });
+};