+ return {
if (response.statusCode < 200 || response.statusCode >= 300) {
this.setState({ [REPOS[i]]: response.statusText });
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index ba951792d0..926734a767 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -21,10 +21,8 @@ import SettingsStore from "../../../settings/SettingsStore";
const React = require('react');
import PropTypes from 'prop-types';
-const MatrixClientPeg = require('../../../MatrixClientPeg');
const sdk = require('../../../index');
const dis = require('../../../dispatcher');
-const Modal = require("../../../Modal");
import { _t } from '../../../languageHandler';
module.exports = React.createClass({
@@ -42,7 +40,46 @@ module.exports = React.createClass({
},
getInitialState: function() {
- return {};
+ return {
+ statusMessage: this.getStatusMessage(),
+ };
+ },
+
+ componentDidMount() {
+ if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
+ return;
+ }
+ const { user } = this.props.member;
+ if (!user) {
+ return;
+ }
+ user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
+ },
+
+ componentWillUmount() {
+ const { user } = this.props.member;
+ if (!user) {
+ return;
+ }
+ user.removeListener(
+ "User._unstable_statusMessage",
+ this._onStatusMessageCommitted,
+ );
+ },
+
+ getStatusMessage() {
+ const { user } = this.props.member;
+ if (!user) {
+ return "";
+ }
+ return user._unstable_statusMessage;
+ },
+
+ _onStatusMessageCommitted() {
+ // The `User` object has observed a status message change.
+ this.setState({
+ statusMessage: this.getStatusMessage(),
+ });
},
shouldComponentUpdate: function(nextProps, nextState) {
@@ -74,22 +111,23 @@ module.exports = React.createClass({
},
getPowerLabel: function() {
- return _t("%(userName)s (power %(powerLevelNumber)s)", {userName: this.props.member.userId, powerLevelNumber: this.props.member.powerLevel});
+ return _t("%(userName)s (power %(powerLevelNumber)s)", {
+ userName: this.props.member.userId,
+ powerLevelNumber: this.props.member.powerLevel,
+ });
},
render: function() {
const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
- const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
const EntityTile = sdk.getComponent('rooms.EntityTile');
const member = this.props.member;
const name = this._getDisplayName();
- const active = -1;
const presenceState = member.user ? member.user.presence : null;
let statusMessage = null;
if (member.user && SettingsStore.isFeatureEnabled("feature_custom_status")) {
- statusMessage = member.user._unstable_statusMessage;
+ statusMessage = this.state.statusMessage;
}
const av = (
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 95073b7be8..1f9c0c1523 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -62,6 +62,7 @@ module.exports = React.createClass({
notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
notificationCount: this.props.room.getUnreadNotificationCount(),
selected: this.props.room.roomId === ActiveRoomObserver.getActiveRoomId(),
+ statusMessage: this._getStatusMessage(),
});
},
@@ -79,6 +80,33 @@ module.exports = React.createClass({
return Boolean(dmRooms);
},
+ _shouldShowStatusMessage() {
+ if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
+ return false;
+ }
+ const isInvite = this.props.room.getMyMembership() === "invite";
+ const isJoined = this.props.room.getMyMembership() === "join";
+ const looksLikeDm = this.props.room.getInvitedAndJoinedMemberCount() === 2;
+ return !isInvite && isJoined && looksLikeDm;
+ },
+
+ _getStatusMessageUser() {
+ const selfId = MatrixClientPeg.get().getUserId();
+ const otherMember = this.props.room.currentState.getMembersExcept([selfId])[0];
+ if (!otherMember) {
+ return null;
+ }
+ return otherMember.user;
+ },
+
+ _getStatusMessage() {
+ const statusUser = this._getStatusMessageUser();
+ if (!statusUser) {
+ return "";
+ }
+ return statusUser._unstable_statusMessage;
+ },
+
onRoomTimeline: function(ev, room) {
if (room !== this.props.room) return;
this.setState({
@@ -112,7 +140,13 @@ module.exports = React.createClass({
this.setState({
notificationCount: this.props.room.getUnreadNotificationCount(),
});
- break;
+ break;
+ // RoomTiles are one of the few components that may show custom status and
+ // also remain on screen while in Settings toggling the feature. This ensures
+ // you can clearly see the status hide and show when toggling the feature.
+ case 'feature_custom_status_changed':
+ this.forceUpdate();
+ break;
}
},
@@ -128,6 +162,16 @@ module.exports = React.createClass({
MatrixClientPeg.get().on("Room.name", this.onRoomName);
ActiveRoomObserver.addListener(this.props.room.roomId, this._onActiveRoomChange);
this.dispatcherRef = dis.register(this.onAction);
+
+ if (this._shouldShowStatusMessage()) {
+ const statusUser = this._getStatusMessageUser();
+ if (statusUser) {
+ statusUser.on(
+ "User._unstable_statusMessage",
+ this._onStatusMessageCommitted,
+ );
+ }
+ }
},
componentWillUnmount: function() {
@@ -139,6 +183,16 @@ module.exports = React.createClass({
}
ActiveRoomObserver.removeListener(this.props.room.roomId, this._onActiveRoomChange);
dis.unregister(this.dispatcherRef);
+
+ if (this._shouldShowStatusMessage()) {
+ const statusUser = this._getStatusMessageUser();
+ if (statusUser) {
+ statusUser.removeListener(
+ "User._unstable_statusMessage",
+ this._onStatusMessageCommitted,
+ );
+ }
+ }
},
componentWillReceiveProps: function(props) {
@@ -166,6 +220,13 @@ module.exports = React.createClass({
return false;
},
+ _onStatusMessageCommitted() {
+ // The status message `User` object has observed a message change.
+ this.setState({
+ statusMessage: this._getStatusMessage(),
+ });
+ },
+
onClick: function(ev) {
if (this.props.onClick) {
this.props.onClick(this.props.room.roomId, ev);
@@ -251,15 +312,9 @@ module.exports = React.createClass({
const mentionBadges = this.props.highlight && this._shouldShowMentionBadge();
const badges = notifBadges || mentionBadges;
- const isJoined = this.props.room.getMyMembership() === "join";
- const looksLikeDm = this.props.room.getInvitedAndJoinedMemberCount() === 2;
let subtext = null;
- if (!isInvite && isJoined && looksLikeDm && SettingsStore.isFeatureEnabled("feature_custom_status")) {
- const selfId = MatrixClientPeg.get().getUserId();
- const otherMember = this.props.room.currentState.getMembersExcept([selfId])[0];
- if (otherMember && otherMember.user && otherMember.user._unstable_statusMessage) {
- subtext = otherMember.user._unstable_statusMessage;
- }
+ if (this._shouldShowStatusMessage()) {
+ subtext = this.state.statusMessage;
}
const classes = classNames({
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0086ed0378..ef0ff1ebf7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -296,7 +296,6 @@
"Pin rooms I'm mentioned in to the top of the room list": "Pin rooms I'm mentioned in to the top of the room list",
"Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list",
"Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
- "Show empty room list headings": "Show empty room list headings",
"Always invite users which may not exist": "Always invite users which may not exist",
"Show developer tools": "Show developer tools",
"Collecting app version information": "Collecting app version information",
@@ -1088,8 +1087,10 @@
"Forget": "Forget",
"Low Priority": "Low Priority",
"Direct Chat": "Direct Chat",
- "Set a new status...": "Set a new status...",
"Clear status": "Clear status",
+ "Update status": "Update status",
+ "Set status": "Set status",
+ "Set a new status...": "Set a new status...",
"View as Grid": "View as Grid",
"View Community": "View Community",
"Sorry, your browser is not able to run Riot.": "Sorry, your browser is not able to run Riot.",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index a04301e31e..836e906b6e 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -22,6 +22,7 @@ import {
NotificationsEnabledController,
} from "./controllers/NotificationControllers";
import LazyLoadingController from "./controllers/LazyLoadingController";
+import CustomStatusController from "./controllers/CustomStatusController";
// These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -88,6 +89,7 @@ export const SETTINGS = {
displayName: _td("Custom user status messages"),
supportedLevels: LEVELS_FEATURE,
default: false,
+ controller: new CustomStatusController(),
},
"feature_lazyloading": {
isFeature: true,
@@ -324,11 +326,6 @@ export const SETTINGS = {
supportedLevels: ['room-device'],
default: false,
},
- "RoomSubList.showEmpty": {
- supportedLevels: LEVELS_ACCOUNT_SETTINGS,
- displayName: _td('Show empty room list headings'),
- default: true,
- },
"alwaysInviteUnknownUsers": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Always invite users which may not exist'),
diff --git a/src/settings/controllers/CustomStatusController.js b/src/settings/controllers/CustomStatusController.js
new file mode 100644
index 0000000000..0fc6619d92
--- /dev/null
+++ b/src/settings/controllers/CustomStatusController.js
@@ -0,0 +1,28 @@
+/*
+Copyright 2019 New Vector Ltd
+
+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 SettingController from "./SettingController";
+import dis from "../../dispatcher";
+
+export default class CustomStatusController extends SettingController {
+ onChange(level, roomId, newValue) {
+ // Dispatch setting change so that some components that are still visible when the
+ // Settings page is open (such as RoomTiles) can reflect the change.
+ dis.dispatch({
+ action: "feature_custom_status_changed",
+ });
+ }
+}
{ form }
-
- { clearButton }
;
}
}
diff --git a/src/components/views/dialogs/ChangelogDialog.js b/src/components/views/dialogs/ChangelogDialog.js
index 3c9414fd88..965029c069 100644
--- a/src/components/views/dialogs/ChangelogDialog.js
+++ b/src/components/views/dialogs/ChangelogDialog.js
@@ -36,7 +36,7 @@ export default class ChangelogDialog extends React.Component {
for (let i=0; i- { clearButton }