{
+ _t("This bridge was provisioned by %(pill)s", {
+ pill,
+ })
+ }
);
}
- const bot = (
Date: Fri, 3 Jan 2020 13:57:59 +0000
Subject: [PATCH 109/292] Tweak as per git review
---
.../settings/tabs/room/BridgeSettingsTab.js | 69 +++++++++----------
src/i18n/strings/en_EN.json | 8 +--
2 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 82382e7828..9e6bdf8958 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019 New Vector Ltd
+Copyright 2019 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.
@@ -33,17 +33,6 @@ export default class BridgeSettingsTab extends React.Component {
roomId: PropTypes.string.isRequired,
};
- constructor() {
- super();
-
- this.state = {
- };
- }
-
- componentWillMount() {
-
- }
-
_renderBridgeCard(event, room) {
const content = event.getContent();
if (!content || !content.channel || !content.protocol) {
@@ -56,21 +45,18 @@ export default class BridgeSettingsTab extends React.Component {
let creator = null;
if (content.creator) {
- const pill = ;
- creator = ({
- _t("This bridge was provisioned by %(pill)s", {
- pill,
- })
- }
);
+ creator = { _t("This bridge was provisioned by ", {}, {
+ user: ,
+ })}
;
}
- const bot = ( {_t("This bridge is managed by the %(pill)s bot user.", {
- pill: {_t("This bridge is managed by the bot user.", {}, {
+ user: );
let channelLink = channelName;
if (channel.external_url) {
- channelLink = {channelName};
+ channelLink = {channelName};
}
let networkLink = networkName;
if (network && network.external_url) {
- networkLink = {networkName};
+ networkLink = {networkName};
}
const chanAndNetworkInfo = (
- (_t("Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s", {
+ _t("Bridged into , on ", {}, {
channelLink,
networkLink,
protocolName,
- }))
+ })
);
let networkIcon = null;
@@ -101,9 +87,13 @@ export default class BridgeSettingsTab extends React.Component {
MatrixClientPeg.get().getHomeserverUrl(),
network.avatar, 32, 32, "crop",
);
- networkIcon = ;
+ networkIcon = ;
}
let channelIcon = null;
@@ -112,13 +102,16 @@ export default class BridgeSettingsTab extends React.Component {
MatrixClientPeg.get().getHomeserverUrl(),
channel.avatar, 32, 32, "crop",
);
- console.log(channel.avatar);
- channelIcon = ;
+ channelIcon = ;
}
- const heading = _t("Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s", {
+ const heading = _t("Connected to on ", { }, {
channelIcon,
channelName,
networkName,
@@ -127,7 +120,7 @@ export default class BridgeSettingsTab extends React.Component {
return (
-
{heading}
+
{heading}
{_t("Connected via %(protocolName)s", { protocolName })}
{creator}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6fcfd2eb95..1f66891857 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -763,10 +763,10 @@
"Room version:": "Room version:",
"Developer options": "Developer options",
"Open Devtools": "Open Devtools",
- "This bridge was provisioned by %(pill)s": "This bridge was provisioned by %(pill)s",
- "This bridge is managed by the %(pill)s bot user.": "This bridge is managed by the %(pill)s bot user.",
- "Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s": "Bridged into %(channelLink)s %(networkLink)s, on %(protocolName)s",
- "Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s": "Connected to %(channelIcon)s %(channelName)s on %(networkIcon)s %(networkName)s",
+ "This bridge was provisioned by ": "This bridge was provisioned by ",
+ "This bridge is managed by the bot user.": "This bridge is managed by the bot user.",
+ "Bridged into , on ": "Bridged into , on ",
+ "Connected to on ": "Connected to on ",
"Connected via %(protocolName)s": "Connected via %(protocolName)s",
"Bridge Info": "Bridge Info",
"Below is a list of bridges connected to this room.": "Below is a list of bridges connected to this room.",
From 831053de112921eaffafac5d94933e0e6dcc6a88 Mon Sep 17 00:00:00 2001
From: Half-Shot
Date: Fri, 3 Jan 2020 13:58:07 +0000
Subject: [PATCH 110/292] Make bridge info cards more obvious
---
res/css/views/dialogs/_RoomSettingsDialog.scss | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 4b13684d9f..aa66e97f9e 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -62,8 +62,10 @@ limitations under the License.
.mx_RoomSettingsDialog_BridgeList li {
list-style-type: none;
- padding: 0;
- margin: 0;
- border-bottom: 1px solid $panel-divider-color;
+ padding: 5px;
+ margin-bottom: 5px;
+ border-width: 1px 0px;
+ border-color: #dee1f3;
+ border-style: solid;
}
From 50e19ba43d64e168e670e4657153f9359477bcb6 Mon Sep 17 00:00:00 2001
From: Half-Shot
Date: Fri, 3 Jan 2020 14:04:59 +0000
Subject: [PATCH 111/292] User may not be a bot, therefore do not imply it.
---
src/components/views/settings/tabs/room/BridgeSettingsTab.js | 2 +-
src/i18n/strings/en_EN.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index 9e6bdf8958..c3c85ec31c 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -55,7 +55,7 @@ export default class BridgeSettingsTab extends React.Component {
})};
}
- const bot = ( {_t("This bridge is managed by the bot user.", {}, {
+ const bot = (
{_t("This bridge is managed by .", {}, {
user: ": "This bridge was provisioned by ",
- "This bridge is managed by the bot user.": "This bridge is managed by the bot user.",
+ "This bridge is managed by .": "This bridge is managed by .",
"Bridged into , on ": "Bridged into , on ",
"Connected to on ": "Connected to on ",
"Connected via %(protocolName)s": "Connected via %(protocolName)s",
From 0b16f862e97b79a72acf0f4c7ce19e6a9f55ef4a Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev
Date: Fri, 3 Jan 2020 14:51:20 +0000
Subject: [PATCH 112/292] Translated using Weblate (Bulgarian)
Currently translated at 97.8% (1956 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
---
src/i18n/strings/bg.json | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 7911eb4607..2c53a45fc2 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1962,5 +1962,13 @@
"Room ID": "Идентификатор на стаята",
"Widget ID": "Идентификатор на приспособлението",
"Using this widget may share data with %(widgetDomain)s & your Integration Manager.": "Използването на това приспособление може да сподели данни с %(widgetDomain)s и с мениджъра на интеграции.",
- "Using this widget may share data with %(widgetDomain)s.": "Използването на това приспособление може да сподели данни с %(widgetDomain)s."
+ "Using this widget may share data with %(widgetDomain)s.": "Използването на това приспособление може да сподели данни с %(widgetDomain)s.",
+ "Widgets do not use message encryption.": "Приспособленията не използваш шифроване на съобщенията.",
+ "Widget added by": "Приспособлението е добавено от",
+ "This widget may use cookies.": "Това приспособление може да използва бисквитки.",
+ "More options": "Още опции",
+ "Language Dropdown": "Избор на език",
+ "Integrations are disabled": "Интеграциите са изключени",
+ "Enable 'Manage Integrations' in Settings to do this.": "Включете 'Управление на интеграции' от настройките за направите това.",
+ "Integrations not allowed": "Интеграциите не са разрешени"
}
From 5897c8ca7ff5c20ef9f027097c6dae3735d52887 Mon Sep 17 00:00:00 2001
From: David Baker
Date: Fri, 3 Jan 2020 15:00:51 +0000
Subject: [PATCH 113/292] Remove 'unverify' from UserInfoPanel
It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
---
src/components/views/right_panel/UserInfo.js | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 208c5e8906..809fdcb6d7 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -74,17 +74,6 @@ const _getE2EStatus = (cli, userId, devices) => {
return "warning";
};
-async function unverifyUser(matrixClient, userId) {
- const devices = await matrixClient.getStoredDevicesForUser(userId);
- for (const device of devices) {
- if (device.isVerified()) {
- matrixClient.setDeviceVerified(
- userId, device.deviceId, false,
- );
- }
- }
-}
-
function openDMForUser(matrixClient, userId) {
const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
@@ -331,14 +320,6 @@ const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => {
);
}
- let unverifyButton;
- if (devices && devices.some(device => device.isVerified())) {
- unverifyButton = (
- unverifyUser(cli, member.userId)} className="mx_UserInfo_field mx_UserInfo_destructive">
- { _t('Unverify user') }
-
- );
- }
return (
@@ -350,7 +331,6 @@ const UserOptionsSection = ({member, isIgnored, canInvite, devices}) => {
{ insertPillButton }
{ inviteUserButton }
{ ignoreButton }
- { unverifyButton }
|
From 206d4c78d2a3c943fd3d1ab6980061e4fb38a1ce Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Fri, 3 Jan 2020 12:32:29 -0700
Subject: [PATCH 123/292] Fix references to 'this' in Avatar and Unread
---
src/Avatar.js | 2 +-
src/Unread.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Avatar.js b/src/Avatar.js
index 3377849eca..70be0a4684 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -32,7 +32,7 @@ export function avatarUrlForMember(member, width, height, resizeMethod) {
// member can be null here currently since on invites, the JS SDK
// does not have enough info to build a RoomMember object for
// the inviter.
- url = this.defaultAvatarUrlForString(member ? member.userId : '');
+ url = defaultAvatarUrlForString(member ? member.userId : '');
}
return url;
}
diff --git a/src/Unread.js b/src/Unread.js
index c2eaa468f5..dba8be492d 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -77,7 +77,7 @@ export function doesRoomHaveUnreadMessages(room) {
// that counts and we can stop looking because the user's read
// this and everything before.
return false;
- } else if (!shouldHideEvent(ev) && this.eventTriggersUnreadCount(ev)) {
+ } else if (!shouldHideEvent(ev) && eventTriggersUnreadCount(ev)) {
// We've found a message that counts before we hit
// the user's read receipt, so this room is definitely unread.
return true;
From 31d5617c97e34deda775a05c1e0337f2c7bd23d8 Mon Sep 17 00:00:00 2001
From: Travis Ralston
Date: Fri, 3 Jan 2020 19:41:06 -0700
Subject: [PATCH 124/292] Add suggestions for which users to invite to chat
Fixes https://github.com/vector-im/riot-web/issues/11198
Note this doesn't implement the entire algorithm in 11198 because it feels too complicated at this stage. Instead, the idea is to review the suggestions closer to when the whole dialog is complete and fix them then: https://github.com/vector-im/riot-web/issues/11769
Algorithm for picking members is largely based on https://github.com/matrix-org/matrix-react-sdk/commit/db5218e19a26b650d4af37de81f516c68ab7e9b8
---
.../views/dialogs/DMInviteDialog.js | 91 ++++++++++++++++---
src/i18n/strings/en_EN.json | 3 +-
2 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/src/components/views/dialogs/DMInviteDialog.js b/src/components/views/dialogs/DMInviteDialog.js
index ff498e3e75..bdeae6bc3e 100644
--- a/src/components/views/dialogs/DMInviteDialog.js
+++ b/src/components/views/dialogs/DMInviteDialog.js
@@ -23,6 +23,7 @@ import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
import DMRoomMap from "../../../utils/DMRoomMap";
import {RoomMember} from "matrix-js-sdk/lib/matrix";
import * as humanize from "humanize";
+import SdkConfig from "../../../SdkConfig";
// TODO: [TravisR] Make this generic for all kinds of invites
@@ -36,10 +37,6 @@ class DMRoomTile extends React.PureComponent {
onToggle: PropTypes.func.isRequired,
};
- constructor() {
- super();
- }
-
_onClick = (e) => {
// Stop the browser from highlighting text
e.preventDefault();
@@ -84,6 +81,8 @@ export default class DMInviteDialog extends React.PureComponent {
filterText: "",
recents: this._buildRecents(),
numRecentsShown: INITIAL_ROOMS_SHOWN,
+ suggestions: this._buildSuggestions(),
+ numSuggestionsShown: INITIAL_ROOMS_SHOWN,
};
}
@@ -109,6 +108,59 @@ export default class DMInviteDialog extends React.PureComponent {
return recents;
}
+ _buildSuggestions(): {userId: string, user: RoomMember} {
+ const maxConsideredMembers = 200;
+ const client = MatrixClientPeg.get();
+ const excludedUserIds = [client.getUserId(), SdkConfig.get()['welcomeUserId']];
+ const joinedRooms = client.getRooms()
+ .filter(r => r.getMyMembership() === 'join')
+ .filter(r => r.getJoinedMemberCount() <= maxConsideredMembers);
+ const memberRooms = joinedRooms.reduce((members, room) => {
+ const joinedMembers = room.getJoinedMembers().filter(u => !excludedUserIds.includes(u.userId));
+ for (const member of joinedMembers) {
+ if (!members[member.userId]) {
+ members[member.userId] = {
+ member: member,
+ // Track the room size of the 'picked' member so we can use the profile of
+ // the smallest room (likely a DM).
+ pickedMemberRoomSize: room.getJoinedMemberCount(),
+ rooms: [],
+ };
+ }
+
+ members[member.userId].rooms.push(room);
+
+ if (room.getJoinedMemberCount() < members[member.userId].pickedMemberRoomSize) {
+ members[member.userId].member = member;
+ members[member.userId].pickedMemberRoomSize = room.getJoinedMemberCount();
+ }
+ }
+ return members;
+ }, {/* userId => {member, rooms[]} */});
+ const memberScores = Object.values(memberRooms).reduce((scores, entry) => {
+ const numMembersTotal = entry.rooms.reduce((c, r) => c + r.getJoinedMemberCount(), 0);
+ const maxRange = maxConsideredMembers * entry.rooms.length;
+ scores[entry.member.userId] = {
+ member: entry.member,
+ numRooms: entry.rooms.length,
+ score: Math.max(0, Math.pow(1 - (numMembersTotal / maxRange), 5)),
+ };
+ return scores;
+ }, {/* userId => {member, numRooms, score} */});
+ const members = Object.values(memberScores);
+ members.sort((a, b) => {
+ if (a.score === b.score) {
+ if (a.numRooms === b.numRooms) {
+ return a.member.userId.localeCompare(b.member.userId);
+ }
+
+ return b.numRooms - a.numRooms;
+ }
+ return b.score - a.score;
+ });
+ return members.map(m => ({userId: m.userId, user: m.member}));
+ }
+
_startDm = () => {
this.props.onFinished(this.state.targets);
};
@@ -125,6 +177,10 @@ export default class DMInviteDialog extends React.PureComponent {
this.setState({numRecentsShown: this.state.numRecentsShown + INCREMENT_ROOMS_SHOWN});
};
+ _showMoreSuggestions = () => {
+ this.setState({numSuggestionsShown: this.state.numSuggestionsShown + INCREMENT_ROOMS_SHOWN});
+ };
+
_toggleMember = (userId) => {
const targets = this.state.targets.map(t => t); // cheap clone for mutation
const idx = targets.indexOf(userId);
@@ -133,29 +189,39 @@ export default class DMInviteDialog extends React.PureComponent {
this.setState({targets});
};
- _renderRecents() {
- if (!this.state.recents || this.state.recents.length === 0) return null;
+ _renderSection(kind: "recents"|"suggestions") {
+ const sourceMembers = kind === 'recents' ? this.state.recents : this.state.suggestions;
+ let showNum = kind === 'recents' ? this.state.numRecentsShown : this.state.numSuggestionsShown;
+ const showMoreFn = kind === 'recents' ? this._showMoreRecents.bind(this) : this._showMoreSuggestions.bind(this);
+ const lastActive = (m) => kind === 'recents' ? m.lastActive : null;
+ const sectionName = kind === 'recents' ? _t("Recent Conversations") : _t("Suggestions");
+
+ if (!sourceMembers || sourceMembers.length === 0) return null;
+
+ // If we're going to hide one member behind 'show more', just use up the space of the button
+ // with the member's tile instead.
+ if (showNum === sourceMembers.length - 1) showNum++;
// .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 toRender = sourceMembers.slice(0, showNum);
+ const hasMore = toRender.length < sourceMembers.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")}
+ {sectionName}
{tiles}
{showMore}
@@ -209,7 +275,8 @@ export default class DMInviteDialog extends React.PureComponent {
{_t("Go")}