imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use getJoinedMemberCount() instead of getJoinedMembers().length as the latter doesnt take LL into account

Browse source
This commit is contained in:
Bruno Windels 2018-08-22 14:08:18 +02:00
parent 860c6355f0
commit a54629276f
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ScalarMessaging.js
View file

@ -480,7 +480,7 @@ function getMembershipCount(event, roomId) {
sendError(event, _t('This room is not recognised.')); sendError(event, _t('This room is not recognised.'));
return; return;
} }
const count = room.getJoinedMembers().length; const count = room.getJoinedMemberCount();
sendResponse(event, count); sendResponse(event, count);
} }

2
src/VectorConferenceHandler.js
View file

@ -72,7 +72,7 @@ ConferenceCall.prototype._getConferenceUserRoom = function() {
for (var i = 0; i < rooms.length; i++) { for (var i = 0; i < rooms.length; i++) {
var confUser = rooms[i].getMember(this.confUserId); var confUser = rooms[i].getMember(this.confUserId);
if (confUser && confUser.membership === "join" && if (confUser && confUser.membership === "join" &&
rooms[i].getJoinedMembers().length === 2) { rooms[i].getJoinedMemberCount() === 2) {
confRoom = rooms[i]; confRoom = rooms[i];
break; break;
} }

2
src/components/structures/RightPanel.js
View file

@ -280,7 +280,7 @@ module.exports = React.createClass({
const room = cli.getRoom(this.props.roomId); const room = cli.getRoom(this.props.roomId);
let isUserInRoom; let isUserInRoom;
if (room) { if (room) {
const numMembers = room.getJoinedMembers().length; const numMembers = room.getJoinedMemberCount();
membersTitle = _t('%(count)s Members', { count: numMembers }); membersTitle = _t('%(count)s Members', { count: numMembers });
membersBadge = <div title={membersTitle}>{ formatCount(numMembers) }</div>; membersBadge = <div title={membersTitle}>{ formatCount(numMembers) }</div>;
isUserInRoom = room.hasMembershipState(this.context.matrixClient.credentials.userId, 'join'); isUserInRoom = room.hasMembershipState(this.context.matrixClient.credentials.userId, 'join');

2
src/components/structures/RoomView.js
View file

@ -363,7 +363,7 @@ module.exports = React.createClass({
// XXX: EVIL HACK to autofocus inviting on empty rooms. // XXX: EVIL HACK to autofocus inviting on empty rooms.
// We use the setTimeout to avoid racing with focus_composer. // We use the setTimeout to avoid racing with focus_composer.
if (this.state.room && if (this.state.room &&
this.state.room.getJoinedMembers().length == 1 && this.state.room.getJoinedMemberCount() == 1 &&
this.state.room.getLiveTimeline() && this.state.room.getLiveTimeline() &&
this.state.room.getLiveTimeline().getEvents() && this.state.room.getLiveTimeline().getEvents() &&
this.state.room.getLiveTimeline().getEvents().length <= 6) { this.state.room.getLiveTimeline().getEvents().length <= 6) {