OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4004 from matrix-org/t3chguy/invite 

Use Sets instead of array scans and simplify hiding of invalid users when inviting
pull/21833/head
Michael Telatynski 2020-01-30 21:16:51 +00:00 committed by GitHub
parent 3a9acb55e7 7db6f89a9f
commit b98b0fe478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/views/dialogs/InviteDialog.js
View File

@ -301,18 +301,16 @@ export default class InviteDialog extends React.PureComponent {
throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog"); throw new Error("When using KIND_INVITE a roomId is required for an InviteDialog");
} }
let alreadyInvited = []; const alreadyInvited = new Set([MatrixClientPeg.get().getUserId(), SdkConfig.get()['welcomeUserId']]);
if (props.roomId) { if (props.roomId) {
const room = MatrixClientPeg.get().getRoom(props.roomId); const room = MatrixClientPeg.get().getRoom(props.roomId);
if (!room) throw new Error("Room ID given to InviteDialog does not look like a room"); if (!room) throw new Error("Room ID given to InviteDialog does not look like a room");
alreadyInvited = [ room.getMembersWithMembership('invite').forEach(m => alreadyInvited.add(m.userId));
...room.getMembersWithMembership('invite'), room.getMembersWithMembership('join').forEach(m => alreadyInvited.add(m.userId));
...room.getMembersWithMembership('join'), // add banned users, so we don't try to invite them
...room.getMembersWithMembership('ban'), // so we don't try to invite them room.getMembersWithMembership('ban').forEach(m => alreadyInvited.add(m.userId));
].map(m => m.userId);
} }
this.state = { this.state = {
targets: [], // array of Member objects (see interface above) targets: [], // array of Member objects (see interface above)
filterText: "", filterText: "",
@ -333,12 +331,12 @@ export default class InviteDialog extends React.PureComponent {
this._editorRef = createRef(); this._editorRef = createRef();
} }
_buildRecents(excludedTargetIds: string[]): {userId: string, user: RoomMember, lastActive: number} { _buildRecents(excludedTargetIds: Set<string>): {userId: string, user: RoomMember, lastActive: number} {
const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals();
const recents = []; const recents = [];
for (const userId in rooms) { for (const userId in rooms) {
// Filter out user IDs that are already in the room / should be excluded // Filter out user IDs that are already in the room / should be excluded
if (excludedTargetIds.includes(userId)) { if (excludedTargetIds.has(userId)) {
console.warn(`[Invite:Recents] Excluding ${userId} from recents`); console.warn(`[Invite:Recents] Excluding ${userId} from recents`);
continue; continue;
} }
@ -381,13 +379,10 @@ export default class InviteDialog extends React.PureComponent {
return recents; return recents;
} }
_buildSuggestions(excludedTargetIds: string[]): {userId: string, user: RoomMember} { _buildSuggestions(excludedTargetIds: Set<string>): {userId: string, user: RoomMember} {
const maxConsideredMembers = 200; const maxConsideredMembers = 200;
const client = MatrixClientPeg.get(); const joinedRooms = MatrixClientPeg.get().getRooms()
const excludedUserIds = [client.getUserId(), SdkConfig.get()['welcomeUserId']]; .filter(r => r.getMyMembership() === 'join' && r.getJoinedMemberCount() <= maxConsideredMembers);
const joinedRooms = client.getRooms()
.filter(r => r.getMyMembership() === 'join')
.filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);
// Generates { userId: {member, rooms[]} } // Generates { userId: {member, rooms[]} }
const memberRooms = joinedRooms.reduce((members, room) => { const memberRooms = joinedRooms.reduce((members, room) => {
@ -396,10 +391,10 @@ export default class InviteDialog extends React.PureComponent {
return members; // Do nothing return members; // Do nothing
} }
const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId)); const joinedMembers = room.getJoinedMembers().filter(u => !excludedTargetIds.has(u.userId));
for (const member of joinedMembers) { for (const member of joinedMembers) {
// Filter out user IDs that are already in the room / should be excluded // Filter out user IDs that are already in the room / should be excluded
if (excludedTargetIds.includes(member.userId)) { if (excludedTargetIds.has(member.userId)) {
continue; continue;
} }
@ -440,7 +435,7 @@ export default class InviteDialog extends React.PureComponent {
// room to see who has sent a message in the last few hours, and giving them a score // room to see who has sent a message in the last few hours, and giving them a score
// which correlates to the freshness of their message. In theory, this results in suggestions // which correlates to the freshness of their message. In theory, this results in suggestions
// which are closer to "continue this conversation" rather than "this person exists". // which are closer to "continue this conversation" rather than "this person exists".
const trueJoinedRooms = client.getRooms().filter(r => r.getMyMembership() === 'join'); const trueJoinedRooms = MatrixClientPeg.get().getRooms().filter(r => r.getMyMembership() === 'join');
const now = (new Date()).getTime(); const now = (new Date()).getTime();
const earliestAgeConsidered = now - (60 * 60 * 1000); // 1 hour ago const earliestAgeConsidered = now - (60 * 60 * 1000); // 1 hour ago
const maxMessagesConsidered = 50; // so we don't iterate over a huge amount of traffic const maxMessagesConsidered = 50; // so we don't iterate over a huge amount of traffic
@ -456,7 +451,7 @@ export default class InviteDialog extends React.PureComponent {
const events = room.getLiveTimeline().getEvents(); // timelines are most recent last const events = room.getLiveTimeline().getEvents(); // timelines are most recent last
for (let i = events.length - 1; i >= Math.max(0, events.length - maxMessagesConsidered); i--) { for (let i = events.length - 1; i >= Math.max(0, events.length - maxMessagesConsidered); i--) {
const ev = events[i]; const ev = events[i];
if (excludedUserIds.includes(ev.getSender())) { if (excludedTargetIds.has(ev.getSender())) {
continue; continue;
} }
if (ev.getTs() <= earliestAgeConsidered) { if (ev.getTs() <= earliestAgeConsidered) {