PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Use the now-prefixed js-sdk status message API

Browse source 
See 08b3dfa3b5
This commit is contained in:
Travis Ralston 2018-12-12 23:07:03 -07:00
parent b0b7932f5f
commit f2649f7807
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/avatars/MemberStatusMessageAvatar.js
View file

@ -40,7 +40,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents); MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
if (this.props.member.user) { if (this.props.member.user) {
this.setState({message: this.props.member.user.statusMessage}); this.setState({message: this.props.member.user._unstable_statusMessage});
} else { } else {
this.setState({message: ""}); this.setState({message: ""});
} }
@ -55,7 +55,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
_onRoomStateEvents(ev, state) { _onRoomStateEvents(ev, state) {
if (ev.getStateKey() !== MatrixClientPeg.get().getUserId()) return; if (ev.getStateKey() !== MatrixClientPeg.get().getUserId()) return;
if (ev.getType() !== "im.vector.user_status") return; if (ev.getType() !== "im.vector.user_status") return;
// TODO: We should be relying on `this.props.member.user.statusMessage` // TODO: We should be relying on `this.props.member.user._unstable_statusMessage`
this.setState({message: ev.getContent()["status"]}); this.setState({message: ev.getContent()["status"]});
this.forceUpdate(); this.forceUpdate();
} }
@ -82,7 +82,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
} }
render() { render() {
const hasStatus = this.props.member.user ? !!this.props.member.user.statusMessage : false; const hasStatus = this.props.member.user ? !!this.props.member.user._unstable_statusMessage : false;
const classes = classNames({ const classes = classNames({
"mx_MemberStatusMessageAvatar": true, "mx_MemberStatusMessageAvatar": true,

6
src/components/views/context_menus/StatusMessageContextMenu.js
View file

@ -29,18 +29,18 @@ export default class StatusMessageContextMenu extends React.Component {
this._onStatusChange = this._onStatusChange.bind(this); this._onStatusChange = this._onStatusChange.bind(this);
this.state = { this.state = {
message: props.user ? props.user.statusMessage : "", message: props.user ? props.user._unstable_statusMessage : "",
}; };
} }
async _onClearClick(e) { async _onClearClick(e) {
await MatrixClientPeg.get().setStatusMessage(""); await MatrixClientPeg.get()._unstable_setStatusMessage("");
this.setState({message: ""}); this.setState({message: ""});
} }
_onSubmit(e) { _onSubmit(e) {
e.preventDefault(); e.preventDefault();
MatrixClientPeg.get().setStatusMessage(this.state.message); MatrixClientPeg.get()._unstable_setStatusMessage(this.state.message);
} }
_onStatusChange(e) { _onStatusChange(e) {

2
src/components/views/rooms/MemberInfo.js
View file

@ -895,7 +895,7 @@ module.exports = withMatrixClient(React.createClass({
presenceState = this.props.member.user.presence; presenceState = this.props.member.user.presence;
presenceLastActiveAgo = this.props.member.user.lastActiveAgo; presenceLastActiveAgo = this.props.member.user.lastActiveAgo;
presenceCurrentlyActive = this.props.member.user.currentlyActive; presenceCurrentlyActive = this.props.member.user.currentlyActive;
statusMessage = this.props.member.user.statusMessage; statusMessage = this.props.member.user._unstable_statusMessage;
} }
const room = this.props.matrixClient.getRoom(this.props.member.roomId); const room = this.props.matrixClient.getRoom(this.props.member.roomId);

2
src/components/views/rooms/MemberTile.js
View file

@ -84,7 +84,7 @@ module.exports = React.createClass({
const name = this._getDisplayName(); const name = this._getDisplayName();
const active = -1; const active = -1;
const presenceState = member.user ? member.user.presence : null; const presenceState = member.user ? member.user.presence : null;
const statusMessage = member.user ? member.user.statusMessage : null; const statusMessage = member.user ? member.user._unstable_statusMessage : null;
const av = ( const av = (
<MemberAvatar member={member} width={36} height={36} /> <MemberAvatar member={member} width={36} height={36} />

4
src/components/views/rooms/RoomTile.js
View file

@ -257,8 +257,8 @@ module.exports = React.createClass({
if (!isInvite && isJoined && looksLikeDm) { if (!isInvite && isJoined && looksLikeDm) {
const selfId = MatrixClientPeg.get().getUserId(); const selfId = MatrixClientPeg.get().getUserId();
const otherMember = this.props.room.currentState.getMembersExcept([selfId])[0]; const otherMember = this.props.room.currentState.getMembersExcept([selfId])[0];
if (otherMember.user && otherMember.user.statusMessage) { if (otherMember.user && otherMember.user._unstable_statusMessage) {
subtext = otherMember.user.statusMessage; subtext = otherMember.user._unstable_statusMessage;
} }
} }