matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2026-01-03 23:22:30 +03:00
Code Activity

just need the member names actually

Browse Source
This commit is contained in:
Bruno Windels
2018-07-26 18:52:14 +02:00
parent 20b4285849
commit 576f7142c1
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/models/room.js
View File

@@ -1295,16 +1295,16 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
const inviteJoinCount = joinedMemberCount + invitedMemberCount;
// get members that are NOT ourselves and are actually in the room.
let otherMembers = null;
let otherNames = null;
if (room._summaryHeroes) {
// if we have a summary, the member state events
// should be in the room state
otherMembers = room._summaryHeroes.map((userId) => {
otherNames = room._summaryHeroes.map((userId) => {
const member = room.getMember(userId);
return member ? member : {name: userId};
return member ? member.name : userId;
});
} else {
otherMembers = room.currentState.getMembers().filter((m) => {
let otherMembers = room.currentState.getMembers().filter((m) => {
return m.userId !== userId &&
(m.membership === "invite" || m.membership === "join");
});
@@ -1312,10 +1312,11 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
otherMembers.sort((a, b) => a.userId.localeCompare(b.userId));
// only 5 first members, immitate _summaryHeroes
otherMembers = otherMembers.slice(0, 5);
otherNames = otherMembers.map((m) => m.name);
}
if (inviteJoinCount) {
return memberListToRoomName(otherMembers, inviteJoinCount);
return memberNamesToRoomName(otherNames, inviteJoinCount);
}
const myMembership = room.getMyMembership(userId);
@@ -1327,43 +1328,43 @@ function calculateRoomName(room, userId, ignoreRoomNameEvent) {
if (thirdPartyInvites && thirdPartyInvites.length) {
const thirdPartyNames = thirdPartyInvites.map((i) => {
return {name: i.getContent().display_name};
return i.getContent().display_name;
});
return `Inviting ${memberListToRoomName(thirdPartyNames)}`;
return `Inviting ${memberNamesToRoomName(thirdPartyNames)}`;
}
}
// let's try to figure out who was here before
let leftMembers = otherMembers;
let leftNames = otherNames;
// if we didn't have heroes, try finding them in the room state
if(!leftMembers.length) {
leftMembers = room.currentState.getMembers().filter((m) => {
if(!leftNames.length) {
leftNames = room.currentState.getMembers().filter((m) => {
return m.userId !== userId &&
m.membership !== "invite" &&
m.membership !== "join";
});
}).map((m) => m.name);
}
if(leftMembers.length) {
return `Empty room (was ${memberListToRoomName(leftMembers)})`;
if(leftNames.length) {
return `Empty room (was ${memberNamesToRoomName(leftNames)})`;
} else {
return "Empty room";
}
}
function memberListToRoomName(members, count = (members.length + 1)) {
function memberNamesToRoomName(names, count = (names.length + 1)) {
const countWithoutMe = count - 1;
if (!members.length) {
if (!names.length) {
return count <= 1 ? "Empty room" : null;
} else if (members.length === 1 && countWithoutMe <= 1) {
return members[0].name;
} else if (members.length === 2 && countWithoutMe <= 2) {
return `${members[0].name} and ${members[1].name}`;
} else if (names.length === 1 && countWithoutMe <= 1) {
return names[0];
} else if (names.length === 2 && countWithoutMe <= 2) {
return `${names[0]} and ${names[1]}`;
} else {
const plural = countWithoutMe > 1;
if (plural) {
return `${members[0].name} and ${countWithoutMe} others`;
return `${names[0]} and ${countWithoutMe} others`;
} else {
return `${members[0].name} and 1 other`;
return `${names[0]} and 1 other`;
}
}
}