+ );
+ }
+}
+
+export default class DMInviteDialog extends React.PureComponent {
+ static propTypes = {
+ // Takes an array of user IDs/emails to invite.
+ onFinished: PropTypes.func.isRequired,
+ };
+
+ constructor() {
+ super();
+
+ this.state = {
+ targets: [], // string[] of mxids/email addresses
+ filterText: "",
+ recents: this._buildRecents(),
+ numRecentsShown: INITIAL_ROOMS_SHOWN,
+ };
+ }
+
+ _buildRecents(): {userId: string, user: RoomMember, lastActive: number} {
+ const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals();
+ const recents = [];
+ for (const userId in rooms) {
+ const room = rooms[userId];
+ const member = room.getMember(userId);
+ if (!member) continue; // just skip people who don't have memberships for some reason
+
+ const lastEventTs = room.timeline && room.timeline.length
+ ? room.timeline[room.timeline.length - 1].getTs()
+ : 0;
+ if (!lastEventTs) continue; // something weird is going on with this room
+
+ recents.push({userId, user: member, lastActive: lastEventTs});
+ }
+
+ // Sort the recents by last active to save us time later
+ recents.sort((a, b) => b.lastActive - a.lastActive);
+
+ return recents;
+ }
+
+ _startDm = () => {
+ this.props.onFinished(this.state.targets);
+ };
+
+ _cancel = () => {
+ this.props.onFinished([]);
+ };
+
+ _updateFilter = (e) => {
+ this.setState({filterText: e.target.value});
+ };
+
+ _showMoreRecents = () => {
+ this.setState({numRecentsShown: this.state.numRecentsShown + INCREMENT_ROOMS_SHOWN});
+ };
+
+ _toggleMember = (userId) => {
+ const targets = this.state.targets.map(t => t); // cheap clone for mutation
+ const idx = targets.indexOf(userId);
+ if (idx >= 0) targets.splice(idx, 1);
+ else targets.push(userId);
+ this.setState({targets});
+ };
+
+ _renderRecents() {
+ if (!this.state.recents || this.state.recents.length === 0) return null;
+
+ // .slice() will return an incomplete array but won't error on us if we go too far
+ const toRender = this.state.recents.slice(0, this.state.numRecentsShown);
+ const hasMore = toRender.length < this.state.recents.length;
+
+ const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+ let showMore = null;
+ if (hasMore) {
+ showMore = (
+
+ {_t("Show more")}
+
+ );
+ }
+
+ const tiles = toRender.map(r => (
+
+ ));
+ return (
+
+
{_t("Recent Conversations")}
+ {tiles}
+ {showMore}
+
+ );
+ }
+
+ render() {
+ const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ const Field = sdk.getComponent("elements.Field");
+ const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
+ // Dev note: The use of Field is temporary/incomplete pending https://github.com/vector-im/riot-web/issues/11197
+ // For now, we just list who the targets are.
+ const editor = (
+
+ {_t(
+ "If you can't find someone, ask them for their username, or share your " +
+ "username (%(userId)s) or profile link.",
+ {userId},
+ {a: (sub) => {sub}},
+ )}
+
+ {targets}
+
+ {editor}
+
+ {_t("Go")}
+
+
+ {this._renderRecents()}
+
+
+ );
+ }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2065454525..cac3f2f619 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -358,6 +358,7 @@
"Render simple counters in room header": "Render simple counters in room header",
"Multiple integration managers": "Multiple integration managers",
"Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
+ "New DM invite dialog (under development)": "New DM invite dialog (under development)",
"Enable cross-signing to verify per-user instead of per-device (in development)": "Enable cross-signing to verify per-user instead of per-device (in development)",
"Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
"Use the new, faster, composer for writing messages": "Use the new, faster, composer for writing messages",
@@ -1430,6 +1431,11 @@
"View Servers in Room": "View Servers in Room",
"Toolbox": "Toolbox",
"Developer Tools": "Developer Tools",
+ "Show more": "Show more",
+ "Recent Conversations": "Recent Conversations",
+ "Direct Messages": "Direct Messages",
+ "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or profile link.",
+ "Go": "Go",
"An error has occurred.": "An error has occurred.",
"Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.": "Verify this user to mark them as trusted. Trusting users gives you extra peace of mind when using end-to-end encrypted messages.",
"Verifying this user will mark their device as trusted, and also mark your device as trusted to them.": "Verifying this user will mark their device as trusted, and also mark your device as trusted to them.",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index f1299a9045..d606528ca3 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -128,6 +128,12 @@ export const SETTINGS = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
+ "feature_ftue_dms": {
+ isFeature: true,
+ displayName: _td("New DM invite dialog (under development)"),
+ supportedLevels: LEVELS_FEATURE,
+ default: false,
+ },
"mjolnirRooms": {
supportedLevels: ['account'],
default: [],
diff --git a/src/utils/DMRoomMap.js b/src/utils/DMRoomMap.js
index af65b6f001..498c073e0e 100644
--- a/src/utils/DMRoomMap.js
+++ b/src/utils/DMRoomMap.js
@@ -1,5 +1,6 @@
/*
Copyright 2016 OpenMarket Ltd
+Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,6 +17,7 @@ limitations under the License.
import MatrixClientPeg from '../MatrixClientPeg';
import _uniq from 'lodash/uniq';
+import {Room} from "matrix-js-sdk/lib/matrix";
/**
* Class that takes a Matrix Client and flips the m.direct map
@@ -144,6 +146,13 @@ export default class DMRoomMap {
return this.roomToUser[roomId];
}
+ getUniqueRoomsWithIndividuals(): {[userId: string]: Room} {
+ return Object.keys(this.roomToUser)
+ .map(r => ({userId: this.getUserIdForRoomId(r), room: this.matrixClient.getRoom(r)}))
+ .filter(r => r.userId && r.room && r.room.getInvitedAndJoinedMemberCount() === 2)
+ .reduce((obj, r) => (obj[r.userId] = r.room) && obj, {});
+ }
+
_getUserToRooms() {
if (!this.userToRooms) {
const userToRooms = this.mDirectEvent;
diff --git a/yarn.lock b/yarn.lock
index b8b877ab62..fc2b9e04c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4089,6 +4089,11 @@ humanize-ms@^1.2.1:
dependencies:
ms "^2.0.0"
+humanize@^0.0.9:
+ version "0.0.9"
+ resolved "https://registry.yarnpkg.com/humanize/-/humanize-0.0.9.tgz#1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"
+ integrity sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ=
+
iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"